X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=71afb452d072d79527248b215ea7ce37a18282fa;hb=9a6ac2f63daf97dbc8293239f729ceaea2827b03;hp=49d8d4bcbf09ddea137db2ef59c10aeb53eb2837;hpb=dd4782e1cdf8b23129e3d87bcf054726a1f1636d;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 49d8d4b..71afb45 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -3,7 +3,8 @@
 ;; Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008,
-;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+;;   MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -1483,24 +1484,60 @@
 
   (make-charset
    '=>>cns11643-1
-   "CNS 11643 Plane 1 abstract glyphs."
+   "CNS 11643 Plane 1 detailed glyphs."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
 	      dimension 2
 	      chars 94
 	      mother =cns11643-1
-	      =>iso-ir 184
+	      =>iso-ir 171
+	      graphic 0))
+  (make-charset
+   '=>>cns11643-2
+   "CNS 11643 Plane 2 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-2
+	      =>iso-ir 172
+	      graphic 0))
+  (make-charset
+   '=>>cns11643-3
+   "CNS 11643 Plane 3 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?3$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-3
+	      =>iso-ir 183
 	      graphic 0))
   (make-charset
    '=>>cns11643-4
-   "CNS 11643 Plane 4 abstract glyphs."
+   "CNS 11643 Plane 4 detailed glyphs."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?4$"
 	      dimension 2
 	      chars 94
 	      mother =cns11643-4
 	      =>iso-ir 184
 	      graphic 0))
+  (make-charset
+   '=>>cns11643-6
+   "CNS 11643 Plane 6 detailed glyphs."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?6$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-6
+	      =>iso-ir 186
+	      graphic 0))
 
   (make-charset
+   '=>cns11643-1
+   "CNS 11643 Plane 1 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?1$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-1
+	      =>iso-ir 171
+	      graphic 0))
+  (make-charset
    '=>cns11643-2
    "CNS 11643 Plane 2 abstract characters."
    '(registry "CNS11643[.-]\\(.*[.-]\\)?2$"
@@ -2192,6 +2229,17 @@
 	       graphic 2
 	       direction l2r
 	       registry "HanyoDenshi\\.TKMF-1$"))
+  (make-charset
+   '==hanyo-denshi/tk/mf-01
+   "font encoding for TK (TouKi) characters"
+   `(long-name "Han'you-Denshi/TK font encoding"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =hanyo-denshi/tk/mf-01
+	       registry "HanyoDenshi\\.TKMF-1$"))
 
   (make-charset
    '===mj
@@ -3577,9 +3625,9 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
-  (make-charset '=>ucs@component
-		"UCS encoding for abstract components of IWDS-1."
-		'(long-name	"UCS for IWDS-1 abstract components"
+  (make-charset '=>ucs@cognate
+		"UCS abstract characters based on cognate."
+		'(long-name	"UCS based on cognate"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -3588,9 +3636,9 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
-  (make-charset '=>ucs@hanyo-denshi
-		"UCS abstract characters based on Han'you-Denshi collection."
-		'(long-name	"UCS base characters of Han'you-Denshi"
+  (make-charset '=>ucs@component
+		"UCS encoding for abstract components of IWDS-1."
+		'(long-name	"UCS for IWDS-1 abstract components"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -3599,6 +3647,17 @@
 		  =>iso-ir	177
 		  mother	=ucs))
 
+  ;; (make-charset '=>ucs@hanyo-denshi
+  ;;               "UCS abstract characters based on Han'you-Denshi collection."
+  ;;               '(long-name     "UCS base characters of Han'you-Denshi"
+  ;;                 chars         256
+  ;;                 dimension     3
+  ;;                 columns       2
+  ;;                 graphic       2
+  ;;                 direction     l2r
+  ;;                 =>iso-ir      177
+  ;;                 mother        =ucs))
+
   (make-charset '=>ucs@iso
 		"Abstract characters of ISO/IEC 10646 representatives"
 		'(long-name	"UCS characters for ISO"
@@ -3976,6 +4035,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
+		  ;; mother	=>ucs@iwds-1
 		  mother	=ucs@cns
 		  ;; mother	=>>ucs@cns
 		  ))
@@ -4366,7 +4426,7 @@
 		  mother	=ucs-var-002))
   (make-charset '==ucs-bmp-var-002
 		"uXXXX-var-002's abstract glyph-forms in BMP"
-		'(long-name	"UCS-BMP-var-002 characters"
+		'(long-name	"UCS-BMP-var-002 glyph-forms"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -4377,6 +4437,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.var002-0"))
+  (make-charset '==ucs-sip-var-002
+		"uXXXX-var-002's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-var-002 glyph-forms"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-var-002
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.var002-2"))
 
   (make-charset '=ucs-var-003
 		"uXXXX-var-003 glyph-images of GlyphWiki"
@@ -4412,6 +4483,30 @@
 		  mother	=ucs-var-003
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.var003-2"))
+  (make-charset '=+>ucs-var-003
+		"uXXXX-var-003's unified glyphs of GlyphWiki"
+		'(long-name	"UCS-var-003 unified glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-var-003))
+  (make-charset '=+>ucs-bmp-var-003
+		"uXXXX-var-003's unified glyphs in BMP"
+		'(long-name	"UCS-BMP-var-003 unified glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=+>ucs-var-003
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.var003-0"))
+
   (make-charset '=ucs-var-004
 		"uXXXX-var-004 glyph-images of GlyphWiki"
 		'(long-name	"UCS-var-004"
@@ -4618,6 +4713,27 @@
 		  mother	=>ucs-itaiji-001
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji001-2"))
+  (make-charset '==ucs-itaiji-001
+		"Abstract glyph-forms corresponding with uXXXX-itaiji-001 of GlyphWiki"
+		'(long-name	"UCS-itaiji-001"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-001))
+  (make-charset '==ucs-sip-itaiji-001
+		"uXXXX-itaiji-001's abstract glyph-forms in SIP"
+		'(long-name	"UCS-SIP-itaiji-001"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==ucs-itaiji-001
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji001-2"))
 
   (make-charset '=ucs-itaiji-002
 		"uXXXX-itaiji-002 glyphs of GlyphWiki"
@@ -4837,6 +4953,51 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji004-0"))
+  (make-charset '=ucs-sip-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji004-2"))
+  (make-charset '=>ucs-itaiji-004
+		"Abstract characters corresponding with uXXXX-itaiji-004 of GlyphWiki"
+		'(long-name	"UCS-itaiji-004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-004))
+  (make-charset '=>ucs-bmp-itaiji-004
+		"uXXXX-itaiji-004's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-004 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-004
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji004-0"))
+  (make-charset '=>ucs-sip-itaiji-004
+		"uXXXX-itaiji-004 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-004"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-004
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji004-2"))
 
   (make-charset '=ucs-itaiji-005
 		"uXXXX-itaiji-005 glyphs of GlyphWiki"
@@ -4861,6 +5022,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji005-0"))
+  (make-charset '=ucs-sip-itaiji-005
+		"uXXXX-itaiji-005 glyph-images in SIP"
+		'(long-name	"UCS-SIP-itaiji-005"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=ucs-itaiji-005
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji005-2"))
   (make-charset '=>ucs-itaiji-005
 		"Abstract characters corresponding with uXXXX-itaiji-005 of GlyphWiki"
 		'(long-name	"UCS-itaiji-005"
@@ -4884,6 +5056,17 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji005-0"))
+  (make-charset '=>ucs-sip-itaiji-005
+		"uXXXX-itaiji-005's abstract characters in SIP"
+		'(long-name	"UCS-SIP-itaiji-005 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>ucs-itaiji-005
+		  min-code #x20000 max-code #x2FFFF
+		  registry "ucs00\\.itaiji005-2"))
   (make-charset '==ucs-itaiji-005
 		"Abstract glyph-forms corresponding with uXXXX-itaiji-005 of GlyphWiki"
 		'(long-name	"UCS-itaiji-005"
@@ -4955,8 +5138,8 @@
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji006-0"))
 
-  (make-charset '=>ucs-itaiji-007
-		"Abstract characters corresponding with uXXXX-itaiji-007 of GlyphWiki"
+  (make-charset '=ucs-itaiji-007
+		"uXXXX-itaiji-007 glyphs of GlyphWiki"
 		'(long-name	"UCS-itaiji-007"
 		  chars		256
 		  dimension	3
@@ -4965,19 +5148,32 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs))
-  (make-charset '=>ucs-sip-itaiji-007
-		"uXXXX-itaiji-007 characters in SIP"
+  (make-charset '=ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-007"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-007
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji007-0"))
+  (make-charset '=ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 glyph-images in SIP"
 		'(long-name	"UCS-SIP-itaiji-007"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=>ucs-itaiji-007
+		  mother	=ucs-itaiji-007
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji007-2"))
-  (make-charset '=ucs-itaiji-007
-		"uXXXX-itaiji-007 glyphs of GlyphWiki"
+  (make-charset '=>ucs-itaiji-007
+		"Abstract characters corresponding with uXXXX-itaiji-007 of GlyphWiki"
 		'(long-name	"UCS-itaiji-007"
 		  chars		256
 		  dimension	3
@@ -4986,28 +5182,28 @@
 		  direction	l2r
                   ;; =>iso-ir	177
 		  mother	=ucs))
-  (make-charset '=ucs-bmp-itaiji-007
-		"uXXXX-itaiji-007 glyph-images in BMP"
-		'(long-name	"UCS-BMP-itaiji-007"
+  (make-charset '=>ucs-bmp-itaiji-007
+		"uXXXX-itaiji-007's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-007 characters"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
                   ;; =>iso-ir	177
-		  mother	=ucs-itaiji-007
+		  mother	=>ucs-itaiji-007
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji007-0"))
-  (make-charset '=ucs-sip-itaiji-007
-		"uXXXX-itaiji-007 glyph-images in SIP"
+  (make-charset '=>ucs-sip-itaiji-007
+		"uXXXX-itaiji-007 characters in SIP"
 		'(long-name	"UCS-SIP-itaiji-007"
 		  chars		256
 		  dimension	2
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=ucs-itaiji-007
+		  mother	=>ucs-itaiji-007
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji007-2"))
 
@@ -5058,6 +5254,53 @@
 		  min-code #x2E00
 		  max-code #x9FCC
 		  registry "ucs\\.itaiji009-0"))
+  (make-charset '=>ucs-itaiji-009
+		"Abstract characters corresponding with uXXXX-itaiji-009 of GlyphWiki"
+		'(long-name	"UCS-itaiji-009"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs-bmp-itaiji-009
+		"uXXXX-itaiji-009's abstract characters in BMP"
+		'(long-name	"UCS-BMP-itaiji-009 characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=>ucs-itaiji-009
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji009-0"))
+
+  (make-charset '=ucs-itaiji-010
+		"uXXXX-itaiji-010 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-010"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-010
+		"uXXXX-itaiji-010 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-010"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-010
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji010-0"))
 
   (make-charset '=ucs-itaiji-011
 		"uXXXX-itaiji-011 glyphs of GlyphWiki"
@@ -5094,6 +5337,30 @@
 		  min-code #x20000 max-code #x2FFFF
 		  registry "ucs00\\.itaiji011-2"))
 
+  (make-charset '=ucs-itaiji-012
+		"uXXXX-itaiji-012 glyphs of GlyphWiki"
+		'(long-name	"UCS-itaiji-012"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=ucs-bmp-itaiji-012
+		"uXXXX-itaiji-012 glyph-images in BMP"
+		'(long-name	"UCS-BMP-itaiji-012"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+                  ;; =>iso-ir	177
+		  mother	=ucs-itaiji-012
+		  min-code #x2E00
+		  max-code #x9FCC
+		  registry "ucs\\.itaiji012-0"))
+
   (make-charset '=ucs-itaiji-084
 		"uXXXX-itaiji-084 glyph-images of GlyphWiki"
 		'(long-name	"UCS-itaiji-084"
@@ -5308,6 +5575,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>ucs-bmp-cjk@cognate
+   "CJK Characters in BMP for abstract characters based on cognate."
+   '(long-name "CJK in BMP@cognate"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =>ucs@cognate
+	       min-code #x2E00
+               max-code #x9FCC
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '=>ucs-bmp-cjk@component
    "CJK Characters in BMP for IWDS-1 abstract components."
    '(long-name "CJK in BMP@component"
@@ -5490,6 +5772,32 @@
 	       min-code #x20000 max-code #x2FFFF
 	       code-offset #x20000))
   (make-charset
+   '=>ucs-sip@iwds-1
+   "CJK Characters in SIP based on IWDS-1."
+   '(long-name "CJK in SIP@IWDS-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@iwds-1
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
+   '=>ucs-sip@cognate
+   "CJK Characters in SIP for abstract characters based on cognate."
+   '(long-name "CJK in SIP@cognate"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "ucs00-2$"
+	       mother =>ucs@cognate
+	       min-code #x20000 max-code #x2FFFF
+	       code-offset #x20000))
+  (make-charset
    '=>ucs-sip@component
    "CJK Characters in SIP for IWDS-1 abstract components."
    '(long-name "CJK in SIP@component"