X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmule%2Fmule-conf.el;h=e2e6ec84f858b5ea8cfd2a36ea1a5f078330047c;hb=5f6f6071478ffdcd73a63c351828fce6044085d6;hp=944b7627ecb161467882a9d9f2364f48df7826f1;hpb=7a33ece202111ba5d58686ea2f2886932512f5c2;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 944b762..e2e6ec8 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -83,12 +83,45 @@
 	      graphic 0
 	      partial t))
   (make-charset
+   '=jis-x0208@1978/2-pr
+   "JIS X 0208:1978, 2nd impression or later."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978/1er-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/4er
+   "JIS X 0208:1978, replaced by errata of 4th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978/2-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
    '=jis-x0208@1978/4-pr
    "JIS X 0208:1978, 4th impression or later."
    '(registry "jisx0208\\.1978"
 	      dimension 2
 	      chars 94
-	      mother =jis-x0208@1978/1er-pr
+	      mother =jis-x0208@1978/2-pr
+              =>iso-ir 42
+	      ;; final ?@
+	      graphic 0
+	      partial t))
+  (make-charset
+   '=jis-x0208@1978/5pr
+   "JIS X 0208:1978, 5th impression."
+   '(registry "jisx0208\\.1978"
+	      dimension 2
+	      chars 94
+	      mother =jis-x0208@1978/4-pr
               =>iso-ir 42
 	      ;; final ?@
 	      graphic 0
@@ -442,6 +475,28 @@
 		  max-code	#x8DFE))
   (define-charset-alias 'chinese-big5-cdp '=big5-cdp)
 
+  (make-charset '=>>big5-cdp
+		"Abstract glyphs of Big5-CDP"
+		'(long-name	"Big5-CDP glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=big5-cdp))
+
+  (make-charset '=>big5-cdp
+		"Big5-CDP abstract characters"
+		'(long-name	"Big5-CDP abstract characters"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"big5\\.cdp-0"
+		  mother	=>>big5-cdp))
+
   (make-charset '=gt
 		"GT 2000"
 		`(long-name	"GT"
@@ -457,7 +512,7 @@
   (define-charset-alias 'ideograph-gt '=gt)
   (make-charset '=>>gt
 		"GT 2000 abstract glyphs"
-		`(long-name	"abstract GT"
+		'(long-name	"GT abstract glyphs"
 		  chars		256
 		  dimension	3
 		  columns	2
@@ -466,6 +521,15 @@
 		  mother	=gt))
   (define-charset-alias '<=>gt '=>>gt)
   (define-charset-alias '<==>gt '=>>gt)
+  (make-charset '=>gt
+		"GT 2000 abstract characters"
+		'(long-name	"abstract GT characters"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=>>gt))
   (make-charset '=gt-k
 		"Ideographic components of GT"
 		`(long-name	"GT components"
@@ -479,6 +543,15 @@
 		  max-code	,(+ (lsh #x6110 16) 17090)
 		  code-offset	,(lsh #x6110 16)))
   (define-charset-alias 'ideograph-gt-k '=gt-k)
+  (make-charset '=>>gt-k
+		"abstract glyphs of GT-K"
+		'(long-name	"GT-K abstract glyphs"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	=gt-k))
   (let ((i 1))
     (while (<= i 11)
       (make-charset
@@ -519,7 +592,7 @@
   (define-charset-alias 'ideograph-gt-pj-k2 '=gt-pj-k2)
 
   (make-charset '=daikanwa
-		"Daikanwa dictionary (revised version 2)"
+		"Daikanwa dictionary (unchanged part)"
 		`(long-name	"Daikanwa"
 		  chars		256
 		  dimension	2
@@ -564,6 +637,17 @@
 		  ))
   (define-charset-alias '=daikanwa-rev2 '=daikanwa@rev2)
 
+  (make-charset '=>daikanwa
+		"Daikanwa abstract characters"
+		'(long-name	"abstract Daikanwa"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  registry	"Daikanwa\\(\\.[0-9]+\\)?-3"
+		  mother	=daikanwa))
+
   (make-charset '=shinjigen
 		"Kadokawa ShinJigen dictionary (common parts)"
 		`(long-name	"Shinjigen common parts"
@@ -716,6 +800,17 @@
 		  columns	2
 		  direction	l2r))
 
+  (make-charset '=>zinbun-oracle
+		"Abstract Oracle Bones"
+		'(long-name	"Abstract characters of Zinbun Oracle Bones."
+		  chars		256
+		  dimension	2
+		  mother	=zinbun-oracle
+		  registry	"zob1968-0"
+		  graphic	2
+		  columns	2
+		  direction	l2r))
+
   (make-charset '=jef-china3
 		"JEF + CHINA3 private characters"
 		'(long-name	"JEF + CHINA3"
@@ -744,6 +839,109 @@
 		  max-code	#xE908FF ; #xE8FF
 		  code-offset	,(- #xE90000 #xE000)))
 
+  (make-charset '==>ucs@bucs
+		"Basic Subset of Coded Character Sets (BUCS)"
+		'(long-name	"BUCS abstract characters"
+		  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"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs))
+  (make-charset '=>ucs@unicode
+		"Abstract characters of Unicode representatives"
+		'(long-name	"UCS characters for Unicode"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@iso))
+
+  (make-charset '=>>ucs@iso
+		"Representative abstract glyphs of ISO/IEC 10646"
+		'(long-name	"UCS glyphs for UCS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>ucs@iso))
+  (make-charset '=>>ucs@unicode
+		"Representative abstract glyphs of Unicode"
+		'(long-name	"Unicode abstract glyphs"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@iso))
+  (make-charset '=>>ucs@jis
+		"UCS Representative glyphs for JIS X0208/0212/0213"
+		'(long-name	"UCS glyphs for JIS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@unicode))
+  (make-charset '=>>ucs@jis/1990
+		"UCS Representative glyphs for JIS X 0208/0212:1990"
+		'(long-name	"UCS glyphs for JIS:1990"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@jis/2000
+		"UCS Representative glyphs for JIS X 0213:2000"
+		'(long-name	"UCS glyphs for JIS:2000"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@jis/2004
+		"UCS Representative glyphs for JIS X 0213:2004"
+		'(long-name	"UCS glyphs for JIS:2004"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@jis))
+  (make-charset '=>>ucs@cns
+		"UCS Representative glyphs for CNS 11643 sources"
+		'(long-name	"UCS glyphs for CNS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=>>ucs@unicode))
+
   (make-charset '=ucs@iso
 		"ISO/IEC 10646 for its representative glyphs"
 		'(long-name	"UCS for ISO"
@@ -753,7 +951,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=ucs))
+		  mother	=>>ucs@iso))
   (make-charset '=ucs@unicode
 		"Unicode for its representative glyphs"
 		'(long-name	"UCS for Unicode"
@@ -869,7 +1067,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	ucs-jis))
+		  mother	=ucs@jis))
   (define-charset-alias '=ucs@jis-1990 '=ucs@jis/1990)
   (define-charset-alias '=ucs-jis-1990 '=ucs@jis/1990)
   (make-charset '=ucs@jis/2000
@@ -881,7 +1079,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	ucs-jis))
+		  mother	=ucs@jis))
   (define-charset-alias '=ucs@jis-2000 '=ucs@jis/2000)
   (define-charset-alias '=ucs-jis-2000 '=ucs@jis/2000)
   (make-charset '=ucs@jis/2004
@@ -893,7 +1091,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	ucs-jis))
+		  mother	=ucs@jis))
   (make-charset '=ucs@JP
 		"UCS for common glyphs used in Japan"
 		'(long-name	"UCS for Japan"
@@ -927,6 +1125,16 @@
 		  mother	=ucs@ks
 		  min-code	#x0000
 		  max-code	#xFFFF))
+  (make-charset '=ucs@cns11643
+		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw"
+		'(long-name	"UCS for CNS11643"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@cns))
   (make-charset '=ucs@big5
 		"ISO/IEC 10646 for Big5"
 		'(long-name	"UCS for Big5"
@@ -936,7 +1144,7 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=ucs@unicode))
+		  mother	=>>ucs@unicode))
   (define-charset-alias 'ucs-big5 '=ucs@big5)
   (make-charset '=ucs@big5/cns11643
 		"ISO/IEC 10646 for Big5 based on www.cns11643.gov.tw"
@@ -948,17 +1156,7 @@
 		  direction	l2r
 		  =>iso-ir	177
 		  mother	=ucs@big5))
-  (make-charset '=ucs@cns11643
-		"ISO/IEC 10646 for CNS based on www.cns11643.gov.tw"
-		'(long-name	"UCS for CNS11643"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=ucs@cns))
-  
+
   (make-charset
    '=ucs-radicals
    "CJK Radicals of UCS"
@@ -1026,6 +1224,21 @@
 	       ;; max-code #xA4CF
 	       ))
   (make-charset
+   '==>ucs-bmp-cjk@bucs
+   "CJK Characters in BMP of BUCS"
+   '(long-name "BUCS-BMP-CJK"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "-zh-.*-ucs-0"
+	       mother ==>ucs@bucs
+	       min-code #x2E00
+               max-code #x9FA5
+	       ;; max-code #xA4CF
+	       ))
+  (make-charset
    '=ucs-sip-ext-b
    "CJK Ideographs Extension B"
    '(long-name "UCS CJK Ext-B"
@@ -1053,6 +1266,19 @@
 	       code-offset #x20000))
 
   (make-charset
+   '=adobe-japan1-base
+   "Adobe-Japan1 Character Collection for CID-Keyed Fonts"
+   `(long-name "Adobe-Japan1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "AdobeJapan1-[0-6]$"
+	       min-code	,(lsh #x6300 16)
+	       max-code	,(+ (lsh #x6300 16) 23057)
+	       code-offset	,(lsh #x6300 16)))
+  (make-charset
    '=adobe-japan1-0
    "Adobe-Japan1-0 Character Collection for CID-Keyed Fonts"
    '(long-name "Adobe-Japan1-0"
@@ -1061,6 +1287,9 @@
 	       columns 2
 	       graphic 2
 	       direction l2r
+	       mother =adobe-japan1-base
+	       min-code 0
+	       max-code 8283
 	       registry "AdobeJapan1-0$"))
   (make-charset
    '=adobe-japan1-1
@@ -1072,6 +1301,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-0
+	       min-code 0
+	       max-code 8358
 	       registry "AdobeJapan1-1$"))
   (make-charset
    '=adobe-japan1-2
@@ -1083,6 +1314,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-1
+	       min-code 0
+	       max-code 8719
 	       registry "AdobeJapan1-2$"))
   (make-charset
    '=adobe-japan1-3
@@ -1094,6 +1327,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-2
+	       min-code 0
+	       max-code 9353
 	       registry "AdobeJapan1-3$"))
   (make-charset
    '=adobe-japan1-4
@@ -1105,6 +1340,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-3
+	       min-code 0
+	       max-code 15443
 	       registry "AdobeJapan1-4$"))
   (make-charset
    '=adobe-japan1-5
@@ -1116,6 +1353,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-4
+	       min-code 0
+	       max-code 20316
 	       registry "AdobeJapan1-5$"))
   (make-charset
    '=adobe-japan1-6
@@ -1127,6 +1366,8 @@
 	       graphic 2
 	       direction l2r
 	       mother =adobe-japan1-5
+	       min-code 0
+	       max-code 23057
 	       registry "AdobeJapan1-6$"))
   )