Basically sync with r21-2-24-utf-2000-0_12-1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 365fd8c..9ad2fee 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -21,6 +21,28 @@
 
        * dump-paths.el: Set and use `utf-2000-lisp-directory'.
 
+2000-01-12  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * mule/mule-charset.el (default-coded-charset-priority-list): Add
+       `mojikyo-pj-[1 .. 21]' in UTF-2000.
+
+1999-11-18  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * mule/mule-charset.el (default-coded-charset-priority-list): Add
+       `japanese-jisx0208-1978' in UTF-2000.
+
+1999-11-15  MORIOKA Tomohiko  <tomo@urania.m17n.org>
+
+       * mule/mule-charset.el (default-coded-charset-priority-list): Add
+       `ideograph-daikanwa' in UTF-2000.
+
+1999-11-15  MORIOKA Tomohiko  <tomo@urania.m17n.org>
+
+       * dumped-lisp.el (preloaded-file-list): Delete
+       "ccs-jisx0201-latin.el".
+
+       * utf-2000/ccs-jisx0201-latin.el: Deleted.
+
 1999-11-15  MORIOKA Tomohiko  <tomo@etl.go.jp>
 
        * dumped-lisp.el (preloaded-file-list): Add

diff --git a/lisp/custom-load.el b/lisp/custom-load.el
index c7bddd7..7f0c64b 100644 (file)
--- a/lisp/custom-load.el
+++ b/lisp/custom-load.el
@@ -73,7 +73,7 @@
 (custom-add-loads 'fill '("simple" "fill"))
 (custom-add-loads 'custom-magic-faces '("cus-edit"))
 (custom-add-loads 'display '("modeline" "toolbar" "scrollbar" "auto-show"))
-(custom-add-loads 'faces '("faces" "cus-edit" "font-lock" "font" "hyper-apropos" "info" "wid-edit"))
+(custom-add-loads 'faces '("faces" "font" "cus-edit" "font-lock" "hyper-apropos" "info" "wid-edit"))
 (custom-add-loads 'emacs '("faces" "help" "files" "cus-edit" "package-get"))
 (custom-add-loads 'processes '("process" "gnuserv"))
 (custom-add-loads 'hyper-apropos '("hyper-apropos"))

diff --git a/lisp/dumped-lisp.el b/lisp/dumped-lisp.el
index e51102b..13d50b7 100644 (file)
--- a/lisp/dumped-lisp.el
+++ b/lisp/dumped-lisp.el
@@ -1,3 +1,4 @@
+
 (setq preloaded-file-list
       (assemble-list
         "backquote"            ; needed for defsubst etc.
@@ -121,81 +122,80 @@
        (when-feature file-coding "code-cmds")
        ;;;;;;;;;;;;;;;;;; MULE support
        (when-feature mule "mule-conf")
-       (when-feature utf-2000 "ccs-jisx0201-latin.el")
-       (when-feature utf-2000 "ccs-jisx0208-1983.el")
-       (when-feature utf-2000 "u00000-C0")
-       (when-feature utf-2000 "u00020-Basic-Latin")
-       (when-feature utf-2000 "u00080-C1")
-       (when-feature utf-2000 "u000A0-Latin-1-Supplement")
-       (when-feature utf-2000 "u00100-Latin-Extended-A")
-       (when-feature utf-2000 "u00180-Latin-Extended-B")
-       (when-feature utf-2000 "u00250-IPA-Extensions")
-       (when-feature utf-2000 "u002B0-Spacing-Modifier-Letters")
-       (when-feature utf-2000 "u00300-Combining-Diacritical-Marks")
-       (when-feature utf-2000 "u00370-Greek")
+       (when-feature utf-2000 "ccs-jisx0208-1983.el")
+       (when-feature utf-2000 "u00000-C0")
+       (when-feature utf-2000 "u00020-Basic-Latin")
+       (when-feature utf-2000 "u00080-C1")
+       (when-feature utf-2000 "u000A0-Latin-1-Supplement")
+       (when-feature utf-2000 "u00100-Latin-Extended-A")
+       (when-feature utf-2000 "u00180-Latin-Extended-B")
+       (when-feature utf-2000 "u00250-IPA-Extensions")
+       (when-feature utf-2000 "u002B0-Spacing-Modifier-Letters")
+       (when-feature utf-2000 "u00300-Combining-Diacritical-Marks")
+       (when-feature utf-2000 "u00370-Greek")
        (when-feature utf-2000 "u00400-Cyrillic")
-;      (when-feature utf-2000 "u00530-Armenian")
-       (when-feature utf-2000 "u00590-Hebrew")
-       (when-feature utf-2000 "u00600-Arabic")
-;      (when-feature utf-2000 "u00700-Syriac")
-;      (when-feature utf-2000 "u00780-Thaana")
-;      (when-feature utf-2000 "u00900-Devanagari")
-;      (when-feature utf-2000 "u00980-Bengali")
-;      (when-feature utf-2000 "u00A00-Gurmukhi")
-;      (when-feature utf-2000 "u00A80-Gujarati")
-;      (when-feature utf-2000 "u00B00-Oriya")
-;      (when-feature utf-2000 "u00B80-Tamil")
-;      (when-feature utf-2000 "u00C00-Telugu")
-;      (when-feature utf-2000 "u00C80-Kannada")
-;      (when-feature utf-2000 "u00D00-Malayalam")
-;      (when-feature utf-2000 "u00D80-Sinhala")
-       (when-feature utf-2000 "u00E00-Thai")
-       (when-feature utf-2000 "u00E80-Lao")
-;      (when-feature utf-2000 "u00F00-Tibetan")
-;      (when-feature utf-2000 "u01000-Myanmar")
-;      (when-feature utf-2000 "u010A0-Georgian")
-       (when-feature utf-2000 "u01100-Hangul-Jamo")
-       (when-feature utf-2000 "u01200-Ethiopic")
-;      (when-feature utf-2000 "u013A0-Cherokee")
-;      (when-feature utf-2000 "u01400-Canadian")
-;      (when-feature utf-2000 "u01680-Ogham")
-;      (when-feature utf-2000 "u016A0-Runic")
-;      (when-feature utf-2000 "u01780-Khmer")
-;      (when-feature utf-2000 "u01800-Mongolian")
-       (when-feature utf-2000 "u01E00-Latin-Extended-Additional")
-;      (when-feature utf-2000 "u01F00-Greek-Extended")
-       (when-feature utf-2000 "u02000-General-Punctuation")
-       (when-feature utf-2000 "u02070-Superscripts")
-       (when-feature utf-2000 "u02080-Subscripts")
-       (when-feature utf-2000 "u020A0-Currency-Symbols")
-;      (when-feature utf-2000
-;                    "u020D0-Combining-Diacritical-Marks-for-Symbols")
-       (when-feature utf-2000 "u02100-Letterlike-Symbols")
-       (when-feature utf-2000 "u02150-Number-Forms")
-       (when-feature utf-2000 "u02190-Arrows")
-       (when-feature utf-2000 "u02200-Mathematical-Operators")
-;      (when-feature utf-2000 "u02300-Miscellaneous-Technical")
-;      (when-feature utf-2000 "u02400-Control-Pictures")
-;      (when-feature utf-2000 "u02440-OCR")
-;      (when-feature utf-2000 "u02460-Enclosed-Alphanumerics")
-;      (when-feature utf-2000 "u02500-Box-Drawing")
-;      (when-feature utf-2000 "u02580-Block-Elements")
-;      (when-feature utf-2000 "u025A0-Geometric-Shapes")
-;      (when-feature utf-2000 "u02600-Miscellaneous-Symbols")
-;      (when-feature utf-2000 "u02700-Dingbats")
-;      (when-feature utf-2000 "u02800-Braille-Patterns")
-;      (when-feature utf-2000 "u02E00-CJK-Radical-Supplement")
-;      (when-feature utf-2000 "u02F00-Kangxi-Radicals")
-;      (when-feature utf-2000 "u02FF0-Ideographic-Description-Characters")
-;      (when-feature utf-2000 "u03000-CJK-Symbols-and-Punctuation")
-;      (when-feature utf-2000 "u03040-Hiragana")
-;      (when-feature utf-2000 "u030A0-Katakana")
-;      (when-feature utf-2000 "u03100-Bopomofo")
-;      (when-feature utf-2000 "u03130-Hangul-Compatibility-Jamo")
-;      (when-feature utf-2000 "u03190-Kanbun")
-;      (when-feature utf-2000 "u031A0-Extended-Bopomofo")
-;      (when-feature utf-2000 "u03200-Enclosed-CJK-Letters-and-Months")
-;      (when-feature utf-2000 "u03300-CJK-Compatibility")
+;      (when-feature utf-2000 "u00530-Armenian")
+       (when-feature utf-2000 "u00590-Hebrew")
+;      (when-feature utf-2000 "u00600-Arabic")
+;      (when-feature utf-2000 "u00700-Syriac")
+;      (when-feature utf-2000 "u00780-Thaana")
+;      (when-feature utf-2000 "u00900-Devanagari")
+;      (when-feature utf-2000 "u00980-Bengali")
+;      (when-feature utf-2000 "u00A00-Gurmukhi")
+;      (when-feature utf-2000 "u00A80-Gujarati")
+;      (when-feature utf-2000 "u00B00-Oriya")
+;      (when-feature utf-2000 "u00B80-Tamil")
+;      (when-feature utf-2000 "u00C00-Telugu")
+;      (when-feature utf-2000 "u00C80-Kannada")
+;      (when-feature utf-2000 "u00D00-Malayalam")
+;      (when-feature utf-2000 "u00D80-Sinhala")
+;      (when-feature utf-2000 "u00E00-Thai")
+;      (when-feature utf-2000 "u00E80-Lao")
+;      (when-feature utf-2000 "u00F00-Tibetan")
+;      (when-feature utf-2000 "u01000-Myanmar")
+;      (when-feature utf-2000 "u010A0-Georgian")
+       (when-feature utf-2000 "u01100-Hangul-Jamo")
+       (when-feature utf-2000 "u01200-Ethiopic")
+;      (when-feature utf-2000 "u013A0-Cherokee")
+;      (when-feature utf-2000 "u01400-Canadian")
+;      (when-feature utf-2000 "u01680-Ogham")
+;      (when-feature utf-2000 "u016A0-Runic")
+;      (when-feature utf-2000 "u01780-Khmer")
+;      (when-feature utf-2000 "u01800-Mongolian")
+       (when-feature utf-2000 "u01E00-Latin-Extended-Additional")
+;      (when-feature utf-2000 "u01F00-Greek-Extended")
+;      (when-feature utf-2000 "u02000-General-Punctuation")
+;      (when-feature utf-2000 "u02070-Superscripts")
+;      (when-feature utf-2000 "u02080-Subscripts")
+;      (when-feature utf-2000 "u020A0-Currency-Symbols")
+;      (when-feature utf-2000
+;                    "u020D0-Combining-Diacritical-Marks-for-Symbols")
+;      (when-feature utf-2000 "u02100-Letterlike-Symbols")
+;      (when-feature utf-2000 "u02150-Number-Forms")
+;      (when-feature utf-2000 "u02190-Arrows")
+;      (when-feature utf-2000 "u02200-Mathematical-Operators")
+;      (when-feature utf-2000 "u02300-Miscellaneous-Technical")
+;      (when-feature utf-2000 "u02400-Control-Pictures")
+;      (when-feature utf-2000 "u02440-OCR")
+;      (when-feature utf-2000 "u02460-Enclosed-Alphanumerics")
+;      (when-feature utf-2000 "u02500-Box-Drawing")
+;      (when-feature utf-2000 "u02580-Block-Elements")
+;      (when-feature utf-2000 "u025A0-Geometric-Shapes")
+;      (when-feature utf-2000 "u02600-Miscellaneous-Symbols")
+;      (when-feature utf-2000 "u02700-Dingbats")
+;      (when-feature utf-2000 "u02800-Braille-Patterns")
+;      (when-feature utf-2000 "u02E00-CJK-Radical-Supplement")
+;      (when-feature utf-2000 "u02F00-Kangxi-Radicals")
+;      (when-feature utf-2000 "u02FF0-Ideographic-Description-Characters")
+;      (when-feature utf-2000 "u03000-CJK-Symbols-and-Punctuation")
+;      (when-feature utf-2000 "u03040-Hiragana")
+;      (when-feature utf-2000 "u030A0-Katakana")
+;      (when-feature utf-2000 "u03100-Bopomofo")
+;      (when-feature utf-2000 "u03130-Hangul-Compatibility-Jamo")
+;      (when-feature utf-2000 "u03190-Kanbun")
+;      (when-feature utf-2000 "u031A0-Extended-Bopomofo")
+;      (when-feature utf-2000 "u03200-Enclosed-CJK-Letters-and-Months")
+;      (when-feature utf-2000 "u03300-CJK-Compatibility")
        (when-feature mule "mule-charset")
        (when-feature mule "mule-coding")
        ;; All files after this can have extended characters in them.

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index 9f3a063..80b0714 100644 (file)
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -267,7 +267,6 @@ DESCRIPTION (string) is the description string of the charset."
 (when (featurep 'utf-2000)
   (setq default-coded-charset-priority-list
        '(ascii
-          ;; latin-iso646-irv
          control-1
          latin-iso8859-1
          latin-iso8859-2
@@ -278,9 +277,8 @@ DESCRIPTION (string) is the description string of the charset."
          cyrillic-iso8859-5
          greek-iso8859-7
          thai-tis620
-          ;; hiragana-jisx0208
-          ;; katakana-jisx0208
          japanese-jisx0208
+         japanese-jisx0208-1978
          japanese-jisx0212
          chinese-cns11643-1
          chinese-cns11643-2
@@ -300,6 +298,28 @@ DESCRIPTION (string) is the description string of the charset."
          ethiopic-ucs
          ethiopic
          ucs-bmp
-         arabic-iso8859-6)))
+         arabic-iso8859-6
+         mojikyo-pj-1
+         mojikyo-pj-2
+         mojikyo-pj-3
+         mojikyo-pj-4
+         mojikyo-pj-5
+         mojikyo-pj-6
+         mojikyo-pj-7
+         mojikyo-pj-8
+         mojikyo-pj-9
+         mojikyo-pj-10
+         mojikyo-pj-11
+         mojikyo-pj-12
+         mojikyo-pj-13
+         mojikyo-pj-14
+         mojikyo-pj-15
+         mojikyo-pj-16
+         mojikyo-pj-17
+         mojikyo-pj-18
+         mojikyo-pj-19
+         mojikyo-pj-20
+         mojikyo-pj-21
+         ideograph-daikanwa)))
 
 ;;; mule-charset.el ends here

diff --git a/lisp/utf-2000/ccs-jisx0201-latin.el b/lisp/utf-2000/ccs-jisx0201-latin.el
deleted file mode 100644 (file)
index 01de436..0000000
--- a/lisp/utf-2000/ccs-jisx0201-latin.el
+++ /dev/null
@@ -1,126 +0,0 @@
-;;; ccs-jisx0201-latin.el --- Mapping table for JIS X 0201-Latin.
-
-;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-
-;; Author: MORIOKA Tomohiko <tomo@m17n.org>
-;; Keywords: coded character set
-
-;; This file is part of UTF-2000.
-
-;; UTF-2000 is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; UTF-2000 is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with UTF-2000; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Code:
-
-(set-charset-mapping-table
- 'latin-jisx0201
- [?\u0021      ; 0x21  EXCLAMATION MARK
-  ?\u0022      ; 0x22  QUOTATION MARK
-  ?\u0023      ; 0x23  NUMBER SIGN
-  ?\u0024      ; 0x24  DOLLAR SIGN
-  ?\u0025      ; 0x25  PERCENT SIGN
-  ?\u0026      ; 0x26  AMPERSAND
-  ?\u0027      ; 0x27  APOSTROPHE
-  ?\u0028      ; 0x28  LEFT PARENTHESIS
-  ?\u0029      ; 0x29  RIGHT PARENTHESIS
-  ?\u002A      ; 0x2A  ASTERISK
-  ?\u002B      ; 0x2B  PLUS SIGN
-  ?\u002C      ; 0x2C  COMMA
-  ?\u002D      ; 0x2D  HYPHEN-MINUS
-  ?\u002E      ; 0x2E  FULL STOP
-  ?\u002F      ; 0x2F  SOLIDUS
-  ?\u0030      ; 0x30  DIGIT ZERO
-  ?\u0031      ; 0x31  DIGIT ONE
-  ?\u0032      ; 0x32  DIGIT TWO
-  ?\u0033      ; 0x33  DIGIT THREE
-  ?\u0034      ; 0x34  DIGIT FOUR
-  ?\u0035      ; 0x35  DIGIT FIVE
-  ?\u0036      ; 0x36  DIGIT SIX
-  ?\u0037      ; 0x37  DIGIT SEVEN
-  ?\u0038      ; 0x38  DIGIT EIGHT
-  ?\u0039      ; 0x39  DIGIT NINE
-  ?\u003A      ; 0x3A  COLON
-  ?\u003B      ; 0x3B  SEMICOLON
-  ?\u003C      ; 0x3C  LESS-THAN SIGN
-  ?\u003D      ; 0x3D  EQUALS SIGN
-  ?\u003E      ; 0x3E  GREATER-THAN SIGN
-  ?\u003F      ; 0x3F  QUESTION MARK
-  ?\u0040      ; 0x40  COMMERCIAL AT
-  ?\u0041      ; 0x41  LATIN CAPITAL LETTER A
-  ?\u0042      ; 0x42  LATIN CAPITAL LETTER B
-  ?\u0043      ; 0x43  LATIN CAPITAL LETTER C
-  ?\u0044      ; 0x44  LATIN CAPITAL LETTER D
-  ?\u0045      ; 0x45  LATIN CAPITAL LETTER E
-  ?\u0046      ; 0x46  LATIN CAPITAL LETTER F
-  ?\u0047      ; 0x47  LATIN CAPITAL LETTER G
-  ?\u0048      ; 0x48  LATIN CAPITAL LETTER H
-  ?\u0049      ; 0x49  LATIN CAPITAL LETTER I
-  ?\u004A      ; 0x4A  LATIN CAPITAL LETTER J
-  ?\u004B      ; 0x4B  LATIN CAPITAL LETTER K
-  ?\u004C      ; 0x4C  LATIN CAPITAL LETTER L
-  ?\u004D      ; 0x4D  LATIN CAPITAL LETTER M
-  ?\u004E      ; 0x4E  LATIN CAPITAL LETTER N
-  ?\u004F      ; 0x4F  LATIN CAPITAL LETTER O
-  ?\u0050      ; 0x50  LATIN CAPITAL LETTER P
-  ?\u0051      ; 0x51  LATIN CAPITAL LETTER Q
-  ?\u0052      ; 0x52  LATIN CAPITAL LETTER R
-  ?\u0053      ; 0x53  LATIN CAPITAL LETTER S
-  ?\u0054      ; 0x54  LATIN CAPITAL LETTER T
-  ?\u0055      ; 0x55  LATIN CAPITAL LETTER U
-  ?\u0056      ; 0x56  LATIN CAPITAL LETTER V
-  ?\u0057      ; 0x57  LATIN CAPITAL LETTER W
-  ?\u0058      ; 0x58  LATIN CAPITAL LETTER X
-  ?\u0059      ; 0x59  LATIN CAPITAL LETTER Y
-  ?\u005A      ; 0x5A  LATIN CAPITAL LETTER Z
-  ?\u005B      ; 0x5B  LEFT SQUARE BRACKET
-  ?\u00A5      ; 0x5C  YEN SIGN
-  ?\u005D      ; 0x5D  RIGHT SQUARE BRACKET
-  ?\u005E      ; 0x5E  CIRCUMFLEX ACCENT
-  ?\u005F      ; 0x5F  LOW LINE
-  ?\u0060      ; 0x60  GRAVE ACCENT
-  ?\u0061      ; 0x61  LATIN SMALL LETTER A
-  ?\u0062      ; 0x62  LATIN SMALL LETTER B
-  ?\u0063      ; 0x63  LATIN SMALL LETTER C
-  ?\u0064      ; 0x64  LATIN SMALL LETTER D
-  ?\u0065      ; 0x65  LATIN SMALL LETTER E
-  ?\u0066      ; 0x66  LATIN SMALL LETTER F
-  ?\u0067      ; 0x67  LATIN SMALL LETTER G
-  ?\u0068      ; 0x68  LATIN SMALL LETTER H
-  ?\u0069      ; 0x69  LATIN SMALL LETTER I
-  ?\u006A      ; 0x6A  LATIN SMALL LETTER J
-  ?\u006B      ; 0x6B  LATIN SMALL LETTER K
-  ?\u006C      ; 0x6C  LATIN SMALL LETTER L
-  ?\u006D      ; 0x6D  LATIN SMALL LETTER M
-  ?\u006E      ; 0x6E  LATIN SMALL LETTER N
-  ?\u006F      ; 0x6F  LATIN SMALL LETTER O
-  ?\u0070      ; 0x70  LATIN SMALL LETTER P
-  ?\u0071      ; 0x71  LATIN SMALL LETTER Q
-  ?\u0072      ; 0x72  LATIN SMALL LETTER R
-  ?\u0073      ; 0x73  LATIN SMALL LETTER S
-  ?\u0074      ; 0x74  LATIN SMALL LETTER T
-  ?\u0075      ; 0x75  LATIN SMALL LETTER U
-  ?\u0076      ; 0x76  LATIN SMALL LETTER V
-  ?\u0077      ; 0x77  LATIN SMALL LETTER W
-  ?\u0078      ; 0x78  LATIN SMALL LETTER X
-  ?\u0079      ; 0x79  LATIN SMALL LETTER Y
-  ?\u007A      ; 0x7A  LATIN SMALL LETTER Z
-  ?\u007B      ; 0x7B  LEFT CURLY BRACKET
-  ?\u007C      ; 0x7C  VERTICAL LINE
-  ?\u007D      ; 0x7D  RIGHT CURLY BRACKET
-  ?\u203E      ; 0x7E  OVERLINE
-  ])
-
-;;; ccs-jisx0201-latin.el ends here

diff --git a/src/ChangeLog b/src/ChangeLog
index 63e0e71..eb34383 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,76 @@
+2000-01-12  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * mule-charset.c (split_builtin_char): Split ideograph-daikanwa
+       characters.
+
+1999-12-24  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * mule-charset.c (Vcharset_mojikyo_pj_[1 .. 21]): New variable.
+       (Qisolated): New variable.
+       (Qinitial): New variable.
+       (Qmedial): New variable.
+       (Qfinal): New variable.
+       (Qvertical): New variable.
+       (Qsmall): New variable.
+       (to_char_code): Use `Qisolated', `Qinitial', `Qmedial', `Qfinal',
+       `Qvertical' and `Qsmall'.
+       (Qmojikyo_pj_[1 .. 21]): New variable.
+       (syms_of_mule_charset): Add new symbols `isolated', `initial',
+       `medial', `final', `vertical', `small' and `mojikyo-pj-[1 .. 21]'.
+       (complex_vars_of_mule_charset): Add new charset `mojikyo-pj-[1
+       .. 21]'.
+
+1999-11-23  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * char-ucs.h (MIN_LEADING_BYTE): Changed to -0x60.
+       (LEADING_BYTE_MOJIKYO_PJ_[1 .. 21]): New macros.
+       (MAX_LEADING_BYTE_PRIVATE): Changed to `(CHARSET_ID_OFFSET - 32)'.
+
+1999-11-18  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * char-ucs.h (LEADING_BYTE_JAPANESE_JISX0208_1990): New macro.
+
+1999-11-15  MORIOKA Tomohiko  <tomo@urania.m17n.org>
+
+       * mule-charset.c (Vcharset_ideograph_daikanwa): New variable.
+       (Vcharset_hiragana_jisx0208): Deleted.
+       (Vcharset_katakana_jisx0208): Deleted.
+       (Qideograph_daikanwa): New variable.
+       (Qhiragana_jisx0208): Deleted.
+       (Qkatakana_jisx0208): Deleted.
+       (syms_of_mule_charset): Add new symbol `ideograph-daikanwa';
+       delete symbol `hiragana-jisx0208' and `katakana-jisx0208'.
+       (complex_vars_of_mule_charset): Add new coded-charset
+       `ideograph-daikanwa'; delete coded-charset `hiragana-jisx0208' and
+       `katakana-jisx0208'.
+
+       * char-ucs.h (LEADING_BYTE_DAIKANWA): New macro.
+       (LEADING_BYTE_HIRAGANA_JISX0208): Deleted.
+       (LEADING_BYTE_KATAKANA_JISX0208): Deleted.
+       (MIN_CHAR_DAIKANWA): New macro.
+       (MAX_CHAR_DAIKANWA): New macro.
+
+2000-01-11  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * mule-charset.c (split_builtin_char): Don't support OBS_94x94.
+
+       * char-ucs.h (MIN_CHAR_OBS_94x94): Deleted.
+       (MAX_CHAR_OBS_94x94): Deleted.
+
+2000-01-11  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * mule-charset.c (split_builtin_char): Use `MAX_CHAR_BMP'.
+
+       * char-ucs.h (MAX_CHAR_BMP): New macro.
+
+2000-01-10  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * text-coding.c: Sync with r21-2-24.
+
+2000-01-08  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * file-coding.c: Modify for UTF-2000.
+
 1999-11-14  MORIOKA Tomohiko  <tomo@urania.m17n.org>
 
        * mule-charset.c (Qsquare): New variable.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 5a4ab89..850a1ac 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -81,7 +81,7 @@ extern Lisp_Object Vcharset_latin_viscii_upper;
 
 typedef int Charset_ID;
 
-#define MIN_LEADING_BYTE               -0x40
+#define MIN_LEADING_BYTE               -0x60
 #define CHARSET_ID_OFFSET              0x00
 
 /* represent normal 80-9F */
@@ -107,11 +107,36 @@ typedef int Charset_ID;
 
 #define LEADING_BYTE_ETHIOPIC_UCS      (CHARSET_ID_OFFSET - 8)
 
-#define LEADING_BYTE_HIRAGANA_JISX0208 (CHARSET_ID_OFFSET - 9)
-#define LEADING_BYTE_KATAKANA_JISX0208 (CHARSET_ID_OFFSET - 10)
+#define LEADING_BYTE_DAIKANWA          (CHARSET_ID_OFFSET - 9)
+
+/* Japanese JIS X0208-1990     2/4 2/{(8),9,10,11} 4/2 (B) */
+#define LEADING_BYTE_JAPANESE_JISX0208_1990 (CHARSET_ID_OFFSET - 10)
+
+/* Konjaku-Mojikyo font (for pseudo-JIS X 0208 encoding) */
+#define LEADING_BYTE_MOJIKYO_PJ_1      (CHARSET_ID_OFFSET - 11)
+#define LEADING_BYTE_MOJIKYO_PJ_2      (CHARSET_ID_OFFSET - 12)
+#define LEADING_BYTE_MOJIKYO_PJ_3      (CHARSET_ID_OFFSET - 13)
+#define LEADING_BYTE_MOJIKYO_PJ_4      (CHARSET_ID_OFFSET - 14)
+#define LEADING_BYTE_MOJIKYO_PJ_5      (CHARSET_ID_OFFSET - 15)
+#define LEADING_BYTE_MOJIKYO_PJ_6      (CHARSET_ID_OFFSET - 16)
+#define LEADING_BYTE_MOJIKYO_PJ_7      (CHARSET_ID_OFFSET - 17)
+#define LEADING_BYTE_MOJIKYO_PJ_8      (CHARSET_ID_OFFSET - 18)
+#define LEADING_BYTE_MOJIKYO_PJ_9      (CHARSET_ID_OFFSET - 19)
+#define LEADING_BYTE_MOJIKYO_PJ_10     (CHARSET_ID_OFFSET - 20)
+#define LEADING_BYTE_MOJIKYO_PJ_11     (CHARSET_ID_OFFSET - 21)
+#define LEADING_BYTE_MOJIKYO_PJ_12     (CHARSET_ID_OFFSET - 22)
+#define LEADING_BYTE_MOJIKYO_PJ_13     (CHARSET_ID_OFFSET - 23)
+#define LEADING_BYTE_MOJIKYO_PJ_14     (CHARSET_ID_OFFSET - 24)
+#define LEADING_BYTE_MOJIKYO_PJ_15     (CHARSET_ID_OFFSET - 25)
+#define LEADING_BYTE_MOJIKYO_PJ_16     (CHARSET_ID_OFFSET - 26)
+#define LEADING_BYTE_MOJIKYO_PJ_17     (CHARSET_ID_OFFSET - 27)
+#define LEADING_BYTE_MOJIKYO_PJ_18     (CHARSET_ID_OFFSET - 28)
+#define LEADING_BYTE_MOJIKYO_PJ_19     (CHARSET_ID_OFFSET - 29)
+#define LEADING_BYTE_MOJIKYO_PJ_20     (CHARSET_ID_OFFSET - 30)
+#define LEADING_BYTE_MOJIKYO_PJ_21     (CHARSET_ID_OFFSET - 31)
 
 #define MIN_LEADING_BYTE_PRIVATE       MIN_LEADING_BYTE
-#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 11)
+#define MAX_LEADING_BYTE_PRIVATE       (CHARSET_ID_OFFSET - 32)
 
 
 /* #define CHARSET_ID_OFFSET_94                (CHARSET_ID_OFFSET - '0') */
@@ -211,7 +236,8 @@ typedef int Charset_ID;
 #define LEADING_BYTE_KOREAN_KPS9566            202
 
 
-#define NUM_LEADING_BYTES      (80 * 3 - MIN_LEADING_BYTE)
+/* #define NUM_LEADING_BYTES   (80 * 3 - MIN_LEADING_BYTE) */
+#define NUM_LEADING_BYTES      (202 - MIN_LEADING_BYTE)
 
 \f
 /************************************************************************/
@@ -393,17 +419,21 @@ CHARSET_BY_ATTRIBUTES (unsigned int type, unsigned char final, int dir)
 #define MIN_CHAR_THAI          0x0E00
 #define MAX_CHAR_THAI          0x0E5F
 
+/*
 #define MIN_CHAR_HIRAGANA      0x3041
 #define MAX_CHAR_HIRAGANA      0x3093
 
 #define MIN_CHAR_KATAKANA      0x30A1
 #define MAX_CHAR_KATAKANA      0x30F6
+*/
 
 #define MIN_CHAR_HALFWIDTH_KATAKANA    0xFF61
 #define MAX_CHAR_HALFWIDTH_KATAKANA    0xFF9F
 
-#define MIN_CHAR_OBS_94x94     0xE00000
-#define MAX_CHAR_OBS_94x94     (0xE00000 + 94 * 94 * 14 - 1)
+#define MAX_CHAR_BMP           0x00FFFF
+
+#define MIN_CHAR_DAIKANWA      0xE00000
+#define MAX_CHAR_DAIKANWA      0xE0FFFF
 
 #define MIN_CHAR_94            0xE90940
 #define MAX_CHAR_94            (MIN_CHAR_94 + 94 * 80 - 1)

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 1fda19d..aa6d22d 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -62,9 +62,29 @@ Lisp_Object Vcharset_ucs_bmp;
 Lisp_Object Vcharset_latin_viscii;
 Lisp_Object Vcharset_latin_viscii_lower;
 Lisp_Object Vcharset_latin_viscii_upper;
+Lisp_Object Vcharset_ideograph_daikanwa;
+Lisp_Object Vcharset_mojikyo_pj_1;
+Lisp_Object Vcharset_mojikyo_pj_2;
+Lisp_Object Vcharset_mojikyo_pj_3;
+Lisp_Object Vcharset_mojikyo_pj_4;
+Lisp_Object Vcharset_mojikyo_pj_5;
+Lisp_Object Vcharset_mojikyo_pj_6;
+Lisp_Object Vcharset_mojikyo_pj_7;
+Lisp_Object Vcharset_mojikyo_pj_8;
+Lisp_Object Vcharset_mojikyo_pj_9;
+Lisp_Object Vcharset_mojikyo_pj_10;
+Lisp_Object Vcharset_mojikyo_pj_11;
+Lisp_Object Vcharset_mojikyo_pj_12;
+Lisp_Object Vcharset_mojikyo_pj_13;
+Lisp_Object Vcharset_mojikyo_pj_14;
+Lisp_Object Vcharset_mojikyo_pj_15;
+Lisp_Object Vcharset_mojikyo_pj_16;
+Lisp_Object Vcharset_mojikyo_pj_17;
+Lisp_Object Vcharset_mojikyo_pj_18;
+Lisp_Object Vcharset_mojikyo_pj_19;
+Lisp_Object Vcharset_mojikyo_pj_20;
+Lisp_Object Vcharset_mojikyo_pj_21;
 Lisp_Object Vcharset_ethiopic_ucs;
-Lisp_Object Vcharset_hiragana_jisx0208;
-Lisp_Object Vcharset_katakana_jisx0208;
 #endif
 Lisp_Object Vcharset_chinese_big5_1;
 Lisp_Object Vcharset_chinese_big5_2;
@@ -88,7 +108,7 @@ struct charset_lookup *chlook;
 static const struct lrecord_description charset_lookup_description_1[] = {
   { XD_LISP_OBJECT_ARRAY, offsetof (struct charset_lookup, charset_by_leading_byte),
 #ifdef UTF2000
-    128+4*128
+    NUM_LEADING_BYTES+4*128
 #else
     128+4*128*2
 #endif
@@ -136,7 +156,7 @@ const Bytecount rep_bytes_by_first_byte[0xA0] =
 #ifdef UTF2000
 
 static Lisp_Object
-mark_char_byte_table (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_char_byte_table (Lisp_Object obj)
 {
   struct Lisp_Char_Byte_Table *cte = XCHAR_BYTE_TABLE (obj);
   int i;
@@ -235,7 +255,7 @@ copy_char_byte_table (Lisp_Object entry)
 
 
 static Lisp_Object
-mark_char_code_table (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_char_code_table (Lisp_Object obj)
 {
   struct Lisp_Char_Code_Table *cte = XCHAR_CODE_TABLE (obj);
 
@@ -394,6 +414,11 @@ Lisp_Object Vcharacter_variant_table;
 Lisp_Object Q_decomposition;
 Lisp_Object Q_ucs;
 Lisp_Object Qcompat;
+Lisp_Object Qisolated;
+Lisp_Object Qinitial;
+Lisp_Object Qmedial;
+Lisp_Object Qfinal;
+Lisp_Object Qvertical;
 Lisp_Object QnoBreak;
 Lisp_Object Qfraction;
 Lisp_Object Qsuper;
@@ -402,6 +427,7 @@ Lisp_Object Qcircle;
 Lisp_Object Qsquare;
 Lisp_Object Qwide;
 Lisp_Object Qnarrow;
+Lisp_Object Qsmall;
 Lisp_Object Qfont;
 
 Emchar
@@ -413,24 +439,36 @@ to_char_code (Lisp_Object v, char* err_msg, Lisp_Object err_arg)
     return XCHAR (v);
   else if (EQ (v, Qcompat))
     return -1;
-  else if (EQ (v, QnoBreak))
+  else if (EQ (v, Qisolated))
     return -2;
-  else if (EQ (v, Qfraction))
+  else if (EQ (v, Qinitial))
     return -3;
-  else if (EQ (v, Qsuper))
+  else if (EQ (v, Qmedial))
     return -4;
-  else if (EQ (v, Qsub))
+  else if (EQ (v, Qfinal))
     return -5;
-  else if (EQ (v, Qcircle))
+  else if (EQ (v, Qvertical))
     return -6;
-  else if (EQ (v, Qsquare))
+  else if (EQ (v, QnoBreak))
     return -7;
-  else if (EQ (v, Qwide))
+  else if (EQ (v, Qfraction))
     return -8;
-  else if (EQ (v, Qnarrow))
+  else if (EQ (v, Qsuper))
     return -9;
-  else if (EQ (v, Qfont))
+  else if (EQ (v, Qsub))
     return -10;
+  else if (EQ (v, Qcircle))
+    return -11;
+  else if (EQ (v, Qsquare))
+    return -12;
+  else if (EQ (v, Qwide))
+    return -13;
+  else if (EQ (v, Qnarrow))
+    return -14;
+  else if (EQ (v, Qsmall))
+    return -15;
+  else if (EQ (v, Qfont))
+    return -16;
   else 
     signal_simple_error (err_msg, err_arg);
 }
@@ -823,9 +861,29 @@ Lisp_Object Qascii,
   Qlatin_viscii_upper,
   Qvietnamese_viscii_lower,
   Qvietnamese_viscii_upper,
+  Qideograph_daikanwa,
+  Qmojikyo_pj_1,
+  Qmojikyo_pj_2,
+  Qmojikyo_pj_3,
+  Qmojikyo_pj_4,
+  Qmojikyo_pj_5,
+  Qmojikyo_pj_6,
+  Qmojikyo_pj_7,
+  Qmojikyo_pj_8,
+  Qmojikyo_pj_9,
+  Qmojikyo_pj_10,
+  Qmojikyo_pj_11,
+  Qmojikyo_pj_12,
+  Qmojikyo_pj_13,
+  Qmojikyo_pj_14,
+  Qmojikyo_pj_15,
+  Qmojikyo_pj_16,
+  Qmojikyo_pj_17,
+  Qmojikyo_pj_18,
+  Qmojikyo_pj_19,
+  Qmojikyo_pj_20,
+  Qmojikyo_pj_21,
   Qethiopic_ucs,
-  Qhiragana_jisx0208,
-  Qkatakana_jisx0208,
 #endif
   Qchinese_big5_1,
   Qchinese_big5_2,
@@ -1472,60 +1530,54 @@ range_charset_code_point (Lisp_Object charset, Emchar ch)
 Lisp_Object
 split_builtin_char (Emchar c)
 {
-  if (c < MIN_CHAR_OBS_94x94)
+  if (c <= MAX_CHAR_BASIC_LATIN)
     {
-      if (c <= MAX_CHAR_BASIC_LATIN)
-       {
-         return list2 (Vcharset_ascii, make_int (c));
-       }
-      else if (c < 0xA0)
-       {
-         return list2 (Vcharset_control_1, make_int (c & 0x7F));
-       }
-      else if (c <= 0xff)
-       {
-         return list2 (Vcharset_latin_iso8859_1, make_int (c & 0x7F));
-       }
-      else if ((MIN_CHAR_GREEK <= c) && (c <= MAX_CHAR_GREEK))
-       {
-         return list2 (Vcharset_greek_iso8859_7,
-                       make_int (c - MIN_CHAR_GREEK + 0x20));
-       }
-      else if ((MIN_CHAR_CYRILLIC <= c) && (c <= MAX_CHAR_CYRILLIC))
-       {
-         return list2 (Vcharset_cyrillic_iso8859_5,
-                       make_int (c - MIN_CHAR_CYRILLIC + 0x20));
-       }
-      else if ((MIN_CHAR_HEBREW <= c) && (c <= MAX_CHAR_HEBREW))
-       {
-         return list2 (Vcharset_hebrew_iso8859_8,
-                       make_int (c - MIN_CHAR_HEBREW + 0x20));
-       }
-      else if ((MIN_CHAR_THAI <= c) && (c <= MAX_CHAR_THAI))
-       {
-         return list2 (Vcharset_thai_tis620,
-                       make_int (c - MIN_CHAR_THAI + 0x20));
-       }
-      else if ((MIN_CHAR_HALFWIDTH_KATAKANA <= c)
-              && (c <= MAX_CHAR_HALFWIDTH_KATAKANA))
-       {
-         return list2 (Vcharset_katakana_jisx0201,
-                       make_int (c - MIN_CHAR_HALFWIDTH_KATAKANA + 33));
-       }
-      else
-       {
-         return list3 (Vcharset_ucs_bmp,
-                       make_int (c >> 8), make_int (c & 0xff));
-       }
+      return list2 (Vcharset_ascii, make_int (c));
     }
-  else if (c <= MAX_CHAR_OBS_94x94)
+  else if (c < 0xA0)
     {
-      return list3 (CHARSET_BY_ATTRIBUTES
-                   (CHARSET_TYPE_94X94,
-                    ((c - MIN_CHAR_OBS_94x94) / (94 * 94)) + '@',
-                    CHARSET_LEFT_TO_RIGHT),
-                   make_int ((((c - MIN_CHAR_OBS_94x94) / 94) % 94) + 33),
-                   make_int (((c - MIN_CHAR_OBS_94x94) % 94) + 33));
+      return list2 (Vcharset_control_1, make_int (c & 0x7F));
+    }
+  else if (c <= 0xff)
+    {
+      return list2 (Vcharset_latin_iso8859_1, make_int (c & 0x7F));
+    }
+  else if ((MIN_CHAR_GREEK <= c) && (c <= MAX_CHAR_GREEK))
+    {
+      return list2 (Vcharset_greek_iso8859_7,
+                   make_int (c - MIN_CHAR_GREEK + 0x20));
+    }
+  else if ((MIN_CHAR_CYRILLIC <= c) && (c <= MAX_CHAR_CYRILLIC))
+    {
+      return list2 (Vcharset_cyrillic_iso8859_5,
+                   make_int (c - MIN_CHAR_CYRILLIC + 0x20));
+    }
+  else if ((MIN_CHAR_HEBREW <= c) && (c <= MAX_CHAR_HEBREW))
+    {
+      return list2 (Vcharset_hebrew_iso8859_8,
+                   make_int (c - MIN_CHAR_HEBREW + 0x20));
+    }
+  else if ((MIN_CHAR_THAI <= c) && (c <= MAX_CHAR_THAI))
+    {
+      return list2 (Vcharset_thai_tis620,
+                   make_int (c - MIN_CHAR_THAI + 0x20));
+    }
+  else if ((MIN_CHAR_HALFWIDTH_KATAKANA <= c)
+          && (c <= MAX_CHAR_HALFWIDTH_KATAKANA))
+    {
+      return list2 (Vcharset_katakana_jisx0201,
+                   make_int (c - MIN_CHAR_HALFWIDTH_KATAKANA + 33));
+    }
+  else if (c <= MAX_CHAR_BMP)
+    {
+      return list3 (Vcharset_ucs_bmp,
+                   make_int (c >> 8), make_int (c & 0xff));
+    }
+  else if ((MIN_CHAR_DAIKANWA <= c) && (c <= MAX_CHAR_DAIKANWA))
+    {
+      return list3 (Vcharset_ideograph_daikanwa,
+                   make_int ((c - MIN_CHAR_DAIKANWA) >> 8),
+                   make_int ((c - MIN_CHAR_DAIKANWA) & 255));
     }
   else if (c <= MAX_CHAR_94)
     {
@@ -2530,6 +2582,11 @@ syms_of_mule_charset (void)
   defsymbol (&Q_ucs,                   "->ucs");
   defsymbol (&Q_decomposition,         "->decomposition");
   defsymbol (&Qcompat,                 "compat");
+  defsymbol (&Qisolated,               "isolated");
+  defsymbol (&Qinitial,                        "initial");
+  defsymbol (&Qmedial,                 "medial");
+  defsymbol (&Qfinal,                  "final");
+  defsymbol (&Qvertical,               "vertical");
   defsymbol (&QnoBreak,                        "noBreak");
   defsymbol (&Qfraction,               "fraction");
   defsymbol (&Qsuper,                  "super");
@@ -2538,6 +2595,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qsquare,                 "square");
   defsymbol (&Qwide,                   "wide");
   defsymbol (&Qnarrow,                 "narrow");
+  defsymbol (&Qsmall,                  "small");
   defsymbol (&Qfont,                   "font");
   defsymbol (&Qucs,                    "ucs");
   defsymbol (&Qucs_bmp,                        "ucs-bmp");
@@ -2546,9 +2604,29 @@ syms_of_mule_charset (void)
   defsymbol (&Qlatin_viscii_upper,     "latin-viscii-upper");
   defsymbol (&Qvietnamese_viscii_lower,        "vietnamese-viscii-lower");
   defsymbol (&Qvietnamese_viscii_upper,        "vietnamese-viscii-upper");
+  defsymbol (&Qideograph_daikanwa,     "ideograph-daikanwa");
+  defsymbol (&Qmojikyo_pj_1,           "mojikyo-pj-1");
+  defsymbol (&Qmojikyo_pj_2,           "mojikyo-pj-2");
+  defsymbol (&Qmojikyo_pj_3,           "mojikyo-pj-3");
+  defsymbol (&Qmojikyo_pj_4,           "mojikyo-pj-4");
+  defsymbol (&Qmojikyo_pj_5,           "mojikyo-pj-5");
+  defsymbol (&Qmojikyo_pj_6,           "mojikyo-pj-6");
+  defsymbol (&Qmojikyo_pj_7,           "mojikyo-pj-7");
+  defsymbol (&Qmojikyo_pj_8,           "mojikyo-pj-8");
+  defsymbol (&Qmojikyo_pj_9,           "mojikyo-pj-9");
+  defsymbol (&Qmojikyo_pj_10,          "mojikyo-pj-10");
+  defsymbol (&Qmojikyo_pj_11,          "mojikyo-pj-11");
+  defsymbol (&Qmojikyo_pj_12,          "mojikyo-pj-12");
+  defsymbol (&Qmojikyo_pj_13,          "mojikyo-pj-13");
+  defsymbol (&Qmojikyo_pj_14,          "mojikyo-pj-14");
+  defsymbol (&Qmojikyo_pj_15,          "mojikyo-pj-15");
+  defsymbol (&Qmojikyo_pj_16,          "mojikyo-pj-16");
+  defsymbol (&Qmojikyo_pj_17,          "mojikyo-pj-17");
+  defsymbol (&Qmojikyo_pj_18,          "mojikyo-pj-18");
+  defsymbol (&Qmojikyo_pj_19,          "mojikyo-pj-19");
+  defsymbol (&Qmojikyo_pj_20,          "mojikyo-pj-20");
+  defsymbol (&Qmojikyo_pj_21,          "mojikyo-pj-21");
   defsymbol (&Qethiopic_ucs,           "ethiopic-ucs");
-  defsymbol (&Qhiragana_jisx0208,      "hiragana-jisx0208");
-  defsymbol (&Qkatakana_jisx0208,      "katakana-jisx0208");
 #endif
   defsymbol (&Qchinese_big5_1,         "chinese-big5-1");
   defsymbol (&Qchinese_big5_2,         "chinese-big5-2");
@@ -2903,6 +2981,247 @@ complex_vars_of_mule_charset (void)
                  build_string ("VISCII 1.1 (Vietnamese)"),
                  build_string ("VISCII1\\.1"),
                  Qnil, 0, 0, 0, 0);
+  staticpro (&Vcharset_ideograph_daikanwa);
+  Vcharset_ideograph_daikanwa =
+    make_charset (LEADING_BYTE_DAIKANWA, Qideograph_daikanwa,
+                 CHARSET_TYPE_256X256, 2, 2, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Daikanwa"),
+                 build_string ("Morohashi's Daikanwa"),
+                 build_string ("Daikanwa dictionary by MOROHASHI Tetsuji"),
+                 build_string ("Daikanwa"),
+                 Qnil, MIN_CHAR_DAIKANWA, MAX_CHAR_DAIKANWA, 0, 0);
+  staticpro (&Vcharset_mojikyo_pj_1);
+  Vcharset_mojikyo_pj_1 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_1, Qmojikyo_pj_1,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-1"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 1"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 1"),
+                 build_string ("jisx0208\\.Mojikyo-1$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_2);
+  Vcharset_mojikyo_pj_2 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_2, Qmojikyo_pj_2,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-2"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 2"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 2"),
+                 build_string ("jisx0208\\.Mojikyo-2$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_3);
+  Vcharset_mojikyo_pj_3 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_3, Qmojikyo_pj_3,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-3"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 3"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 3"),
+                 build_string ("jisx0208\\.Mojikyo-3$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_4);
+  Vcharset_mojikyo_pj_4 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_4, Qmojikyo_pj_4,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-4"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 4"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 4"),
+                 build_string ("jisx0208\\.Mojikyo-4$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_5);
+  Vcharset_mojikyo_pj_5 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_5, Qmojikyo_pj_5,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-5"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 5"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 5"),
+                 build_string ("jisx0208\\.Mojikyo-5$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_6);
+  Vcharset_mojikyo_pj_6 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_6, Qmojikyo_pj_6,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-6"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 6"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 6"),
+                 build_string ("jisx0208\\.Mojikyo-6$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_7);
+  Vcharset_mojikyo_pj_7 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_7, Qmojikyo_pj_7,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-7"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 7"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 7"),
+                 build_string ("jisx0208\\.Mojikyo-7$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_8);
+  Vcharset_mojikyo_pj_8 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_8, Qmojikyo_pj_8,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-8"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 8"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 8"),
+                 build_string ("jisx0208\\.Mojikyo-8$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_9);
+  Vcharset_mojikyo_pj_9 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_9, Qmojikyo_pj_9,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-9"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 9"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 9"),
+                 build_string ("jisx0208\\.Mojikyo-9$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_10);
+  Vcharset_mojikyo_pj_10 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_10, Qmojikyo_pj_10,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-10"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 10"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 10"),
+                 build_string ("jisx0208\\.Mojikyo-10$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_11);
+  Vcharset_mojikyo_pj_11 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_11, Qmojikyo_pj_11,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-11"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 11"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 11"),
+                 build_string ("jisx0208\\.Mojikyo-11$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_12);
+  Vcharset_mojikyo_pj_12 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_12, Qmojikyo_pj_12,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-12"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 12"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 12"),
+                 build_string ("jisx0208\\.Mojikyo-12$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_13);
+  Vcharset_mojikyo_pj_13 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_13, Qmojikyo_pj_13,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-13"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 13"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 13"),
+                 build_string ("jisx0208\\.Mojikyo-13$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_14);
+  Vcharset_mojikyo_pj_14 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_14, Qmojikyo_pj_14,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-14"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 14"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 14"),
+                 build_string ("jisx0208\\.Mojikyo-14$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_15);
+  Vcharset_mojikyo_pj_15 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_15, Qmojikyo_pj_15,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-15"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 15"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 15"),
+                 build_string ("jisx0208\\.Mojikyo-15$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_16);
+  Vcharset_mojikyo_pj_16 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_16, Qmojikyo_pj_16,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-16"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 16"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 16"),
+                 build_string ("jisx0208\\.Mojikyo-16$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_17);
+  Vcharset_mojikyo_pj_17 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_17, Qmojikyo_pj_17,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-17"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 17"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 17"),
+                 build_string ("jisx0208\\.Mojikyo-17$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_18);
+  Vcharset_mojikyo_pj_18 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_18, Qmojikyo_pj_18,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-18"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 18"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 18"),
+                 build_string ("jisx0208\\.Mojikyo-18$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_19);
+  Vcharset_mojikyo_pj_19 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_19, Qmojikyo_pj_19,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-19"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 19"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 19"),
+                 build_string ("jisx0208\\.Mojikyo-19$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_20);
+  Vcharset_mojikyo_pj_20 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_20, Qmojikyo_pj_20,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-20"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 20"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 20"),
+                 build_string ("jisx0208\\.Mojikyo-20$"),
+                 Qnil, 0, 0, 0, 33);
+  staticpro (&Vcharset_mojikyo_pj_21);
+  Vcharset_mojikyo_pj_21 =
+    make_charset (LEADING_BYTE_MOJIKYO_PJ_21, Qmojikyo_pj_21,
+                 CHARSET_TYPE_94X94, 2, 0, 0,
+                 CHARSET_LEFT_TO_RIGHT,
+                 build_string ("Mojikyo-PJ-21"),
+                 build_string ("Mojikyo (pseudo JIS encoding) part 21"),
+                 build_string
+                 ("Konjaku-Mojikyo (pseudo JIS encoding) part 21"),
+                 build_string ("jisx0208\\.Mojikyo-21$"),
+                 Qnil, 0, 0, 0, 33);
   staticpro (&Vcharset_ethiopic_ucs);
   Vcharset_ethiopic_ucs =
     make_charset (LEADING_BYTE_ETHIOPIC_UCS, Qethiopic_ucs,
@@ -2913,28 +3232,6 @@ complex_vars_of_mule_charset (void)
                  build_string ("Ethiopic of UCS"),
                  build_string ("Ethiopic-Unicode"),
                  Qnil, 0x1200, 0x137F, 0x1200, 0);
-  staticpro (&Vcharset_hiragana_jisx0208);
-  Vcharset_hiragana_jisx0208 =
-    make_charset (LEADING_BYTE_HIRAGANA_JISX0208, Qhiragana_jisx0208,
-                 CHARSET_TYPE_94X94, 2, 0, 'B',
-                 CHARSET_LEFT_TO_RIGHT,
-                 build_string ("Hiragana"),
-                 build_string ("Hiragana of JIS X0208"),
-                 build_string ("Japanese Hiragana of JIS X0208"),
-                 build_string ("jisx0208\\.19\\(78\\|83\\|90\\)"),
-                 Qnil, MIN_CHAR_HIRAGANA, MAX_CHAR_HIRAGANA,
-                 (0x24 - 33) * 94 + (0x21 - 33), 33);
-  staticpro (&Vcharset_katakana_jisx0208);
-  Vcharset_katakana_jisx0208 =
-    make_charset (LEADING_BYTE_KATAKANA_JISX0208, Qkatakana_jisx0208,
-                 CHARSET_TYPE_94X94, 2, 0, 'B',
-                 CHARSET_LEFT_TO_RIGHT,
-                 build_string ("Katakana"),
-                 build_string ("Katakana of JIS X0208"),
-                 build_string ("Japanese Katakana of JIS X0208"),
-                 build_string ("jisx0208\\.19\\(78\\|83\\|90\\)"),
-                 Qnil, MIN_CHAR_KATAKANA, MAX_CHAR_KATAKANA,
-                 (0x25 - 33) * 94 + (0x21 - 33), 33);
 #endif
   staticpro (&Vcharset_chinese_big5_1);
   Vcharset_chinese_big5_1 =