X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=6be65b847b2ceb4f828f1ad3ec2078053d57bb62;hb=6e110e97764836d0867a87c63007870c32605ab3;hp=4e0a96325461f8ee7b6dbf071581b265273e31fc;hpb=488e1f81d03bac2798b2a957a3b3590e99e95401;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 4e0a963..6be65b8 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -508,6 +508,18 @@
 	      =>iso-ir 42
 	      ;; final ?@
 	      graphic 0))
+  (make-charset
+   '=+>jis-x0213-1
+   "JIS X 0213 Plain 1 unified abstract glyphs (unchanged part)"
+   '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
+	      dimension 2
+	      chars 94
+	      mother =>>jis-x0213-1
+	      =>iso-ir 228
+              ;; final ?O
+	      graphic 0
+              ;; partial t
+	      ))
 
   (make-charset
    '=>jis-x0208
@@ -539,7 +551,7 @@
    '(registry "jisx0213\\(\\.[0-9]+\\)?-1"
 	      dimension 2
 	      chars 94
-	      mother =>>jis-x0213-1
+	      mother =+>jis-x0213-1
 	      =>iso-ir 228
               ;; final ?O
 	      graphic 0
@@ -573,7 +585,7 @@
 	      ))
   (define-charset-alias '<=>jis-x0213-1@2004 '=>jis-x0213-1@2004)
   (make-charset
-   '=>jis-x0213-2@usual
+   '=+>jis-x0213-2
    "JIS X 0213 Plain 2 based on usual unification."
    '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
 	      dimension 2
@@ -582,17 +594,28 @@
 	      =>iso-ir 229
               ;; final ?P
 	      graphic 0))
+  (define-charset-alias '=>jis-x0213-2@usual '=+>jis-x0213-2)
   (make-charset
    '=>jis-x0213-2
    "JIS X 0213 Plain 2 abstract characters"
    '(registry "jisx0213\\(\\.\\(2000\\|2004\\)\\)?-2"
 	      dimension 2
 	      chars 94
-	      mother =>jis-x0213-2@usual
+	      mother =+>jis-x0213-2
 	      =>iso-ir 229
               ;; final ?P
 	      graphic 0))
 
+  (make-charset
+   '=>cns11643-7
+   "CNS 11643 Plane 7 abstract characters."
+   '(registry "CNS11643[.-]\\(.*[.-]\\)?7$"
+	      dimension 2
+	      chars 94
+	      mother =cns11643-7
+	      =>iso-ir 187
+	      graphic 0))
+
   (make-charset '=big5-cdp
 		"Big5 with CDP extension"
 		'(long-name	"Big5-CDP"
@@ -662,6 +685,15 @@
 		  mother	=>>>gt))
   (define-charset-alias '<=>gt '=>>gt)
   (define-charset-alias '<==>gt '=>>gt)
+  (make-charset '=+>gt
+		"GT 2000 unified abstract glyphs"
+		'(long-name	"Unified abstract GT glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>>gt))
   (make-charset '=>gt
 		"GT 2000 abstract characters"
 		'(long-name	"abstract GT characters"
@@ -670,7 +702,7 @@
 		  columns	2
 		  graphic	2
 		  direction	l2r
-		  mother	=>>gt))
+		  mother	=+>gt))
   (make-charset '=gt-k
 		"Ideographic components of GT"
 		`(long-name	"GT components"
@@ -1077,7 +1109,7 @@
 		  =>iso-ir	177
 		  mother	=>ucs@iso))
   (make-charset '=>ucs@jis
-		"UCS Representative characters for JIS X0208/0212/0213"
+		"UCS representative characters for JIS X0208/0212/0213"
 		'(long-name	"UCS characters for JIS"
 		  chars		256
 		  dimension	3
@@ -1086,46 +1118,89 @@
 		  direction	l2r
 		  =>iso-ir	177
 		  mother	=>ucs@unicode))
-  (make-charset '=>ucs@jis/1990
-		"UCS Representative characters for JIS X0208/0212:1990"
-		'(long-name	"UCS characters for JIS:1990"
+  (make-charset '=>ucs@ks
+		"UCS representative characters for Korean Standards"
+		'(long-name	"UCS characters for KS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@jis))
-  (make-charset '=>ucs@JP
-		"UCS Representative characters for Japanese usual unification"
-		'(long-name	"UCS characters for JP"
+		  mother	=>ucs@unicode))
+  (make-charset '=>ucs@cns
+		"UCS representatives characters for CNS 11643 sources"
+		'(long-name	"UCS characters for CNS 11643"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@jis))
-  (make-charset '=>ucs@ks
-		"UCS Representative characters for Korean Standards"
-		'(long-name	"UCS characters for KS"
+		  mother	=>ucs@unicode))
+
+  (make-charset '=+>ucs@iso
+		"UCS based on ISO/IEC 10646 representative glyphs"
+		'(long-name	"Unified abstract glyphs of UCS"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@unicode))
-  (make-charset '=>ucs@cns
-		"UCS representatives characters for CNS 11643 sources"
-		'(long-name	"UCS characters for CNS 11643"
+		  mother	=>ucs@iso))
+  (make-charset '=+>ucs@unicode
+		"Unicode representative unified abstract glyphs"
+		'(long-name	"UCS unified abstract glyphs for Unicode"
 		  chars		256
 		  dimension	3
 		  columns	2
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@unicode))
+		  mother	=+>ucs@iso))
+  (make-charset '=+>ucs@jis
+		"UCS based on Japanese usual unification"
+		'(long-name	"UCS unified abstract glyphs for JP"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@unicode))
+  (define-charset-alias '=>ucs@JP '=+>ucs@jis)
+  (make-charset '=+>ucs@jis/1990
+		"UCS representative characters for JIS X0208/0212:1990"
+		'(long-name	"UCS characters for JIS:1990"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@jis))
+  (define-charset-alias '=>ucs@jis/1990 '=+>ucs@jis/1990)
+  (make-charset '=+>ucs@ks
+		"UCS representative unified abstract glyphs for Korean Standards"
+		'(long-name	"UCS unified abstract glyphs for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@unicode))
+  (make-charset '=+>ucs@cns
+		"UCS representatives unified abstract glyphs for CNS 11643 sources"
+		'(long-name	"UCS unified abstract glyphs for CNS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=+>ucs@unicode))
 
   (make-charset '=>>ucs@iso
 		"Representative abstract-glyphs of ISO/IEC 10646"
@@ -1136,7 +1211,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>ucs@iso))
+		  mother	=+>ucs@iso))
   (make-charset '=>>ucs@unicode
 		"Representative abstract-glyphs of Unicode"
 		'(long-name	"Unicode abstract glyphs"
@@ -1631,6 +1706,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=>ucs-bmp-cjk@unicode
+   "Unicode representative characters of CJK Unified Ideographs in BMP"
+   '(long-name "Unicode-BMP-CJK"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother =>ucs@unicode
+	       min-code #x2E00
+               max-code #x9FA5
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '==>ucs-bmp-cjk@bucs
    "CJK Characters in BMP of BUCS"
    '(long-name "BUCS-BMP-CJK"
@@ -1646,6 +1736,34 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '=ucs-bmp-cjk-compat
+   "CJK Compatibility Ideographs in BMP of UCS"
+   '(long-name "CJK Compatibility Ideographs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother ucs-bmp
+	       min-code #xF900
+	       max-code #xFAFF
+	       ))
+  (make-charset
+   '=ucs-bmp-cjk-compat@unicode
+   "CJK Compatibility Ideographs of Unicode representatives"
+   '(long-name "CJK Compatibility Ideographs of Unicode"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-ja-.*-ucs-0"
+	       mother =ucs@unicode
+	       min-code #xF900
+	       max-code #xFAFF
+	       ))
+  (make-charset
    '=ucs-sip-ext-b
    "CJK Ideographs Extension B"
    '(long-name "UCS CJK Ext-B"
@@ -1776,6 +1894,87 @@
 	       min-code 0
 	       max-code 23057
 	       registry "AdobeJapan1-6$"))
+  (define-charset-alias '=adobe-japan1 '=adobe-japan1-6)
+
+  (make-charset
+   '=>>>adobe-japan1-0
+   "Adobe-Japan1-0 abstract glyph-forms"
+   '(long-name "Adobe-Japan1 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =adobe-japan1-0
+	       registry "AdobeJapan1-0$"))
+  (make-charset
+   '=>>>adobe-japan1-1
+   "Adobe-Japan1-1 abstract glyph-forms"
+   '(long-name "Adobe-Japan1 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1-0
+	       registry "AdobeJapan1-1$"))
+  (make-charset
+   '=>>>adobe-japan1-2
+   "Adobe-Japan1-2 abstract glyph-forms"
+   '(long-name "Adobe-Japan1 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1-1
+	       registry "AdobeJapan1-2$"))
+  (make-charset
+   '=>>>adobe-japan1-3
+   "Adobe-Japan1-3 abstract glyph-forms"
+   '(long-name "Adobe-Japan1 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1-2
+	       registry "AdobeJapan1-3$"))
+  (make-charset
+   '=>>>adobe-japan1-4
+   "Adobe-Japan1-4 abstract glyph-forms"
+   '(long-name "Adobe-Japan1 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1-3
+	       registry "AdobeJapan1-4$"))
+  (make-charset
+   '=>>>adobe-japan1-5
+   "Adobe-Japan1-5 abstract glyph-forms"
+   '(long-name "Adobe-Japan1 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1-4
+	       registry "AdobeJapan1-5$"))
+  (make-charset
+   '=>>>adobe-japan1-6
+   "Adobe-Japan1-6 abstract glyph-forms"
+   '(long-name "Adobe-Japan1 abstract glyph-forms"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>>adobe-japan1-5
+	       registry "AdobeJapan1-6$"))
+  (define-charset-alias '=>>>adobe-japan1 '=>>>adobe-japan1-6)
+
   (make-charset
    '=>>adobe-japan1
    "Adobe-Japan1 abstract glyphs"
@@ -1785,7 +1984,18 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
-	       mother =adobe-japan1-6
+	       mother =>>>adobe-japan1
+	       registry "AdobeJapan1-6$"))
+  (make-charset
+   '=+>adobe-japan1
+   "Adobe-Japan1 unified abstract glyphs"
+   '(long-name "Adobe-Japan1 unified abstract glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =>>adobe-japan1
 	       registry "AdobeJapan1-6$"))
 
   (make-charset
@@ -1954,6 +2164,17 @@
 	       mother =hanyo-denshi/jt))
 
   (make-charset
+   '=>>hanyo-denshi/ja
+   "Han'you-Denshi/JA abstract glyphs"
+   '(long-name "Han'you-Denshi/JA glyphs"
+	       chars 94
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "HanyoDenshi\\.JA-0$"
+	       mother =hanyo-denshi/ja))
+  (make-charset
    '=>>hanyo-denshi/jb
    "Han'you-Denshi/JB abstract glyphs"
    '(long-name "Han'you-Denshi/JB glyphs"