X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-conf.el;h=87dcd216322df3718fba824cbea5906e0e520121;hb=ec9ee9e6c9aaeb2b9d15df6b716310cc226dfcd1;hp=89ed344dc9bccf6e58c9049c8d1c2379cfbbf334;hpb=dd86a34418ca525307734cf1aa4871940b2425bf;p=chise%2Fxemacs-chise.git

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 89ed344..87dcd21 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -3,7 +3,7 @@
 ;; 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 MORIOKA Tomohiko
+;;   2009, 2010, 2011, 2012, 2013, 2014 MORIOKA Tomohiko
 
 ;; Keywords: mule, multilingual, character set, coding system
 
@@ -1421,6 +1421,46 @@
 		  mother	=>>big5-cdp))
 
   (make-charset
+   '=mj
+   "Moji-Jouhou-Kiban characters"
+   `(long-name "Moji-Jouhou-Kiban"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+               ;; registry "mj-0$"
+	       min-code	      ,(lsh #x6404 16)
+	       max-code	   ,(+ (lsh #x6404 16) 68053)
+	       code-offset    ,(lsh #x6404 16)))
+  (make-charset
+   '=mj-0
+   "Moji-Jouhou-Kiban plane 0"
+   '(long-name "Moji-Jouhou-Kiban-0"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-0$"
+	       mother =mj
+	       min-code	0
+	       max-code	#xFFFF))
+  (make-charset
+   '=mj-1
+   "Moji-Jouhou-Kiban plane 1"
+   '(long-name "Moji-Jouhou-Kiban-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-1$"
+	       mother =mj
+	       min-code	#x10000
+	       code-offset #x10000))
+
+  (make-charset
    '=hanyo-denshi/ja
    "JA (JIS X0208) part of Han'you-Denshi characters"
    `(long-name "Han'you-Denshi/JA"
@@ -1561,6 +1601,43 @@
 	       direction l2r))
 
   (make-charset
+   '==mj
+   "Moji-Jouhou-Kiban detailed glyph-images."
+   '(long-name "MJ glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =mj))
+  (make-charset
+   '==mj-0
+   "MJ detailed glyph-images plane 0"
+   '(long-name "MJ glyph-images-0"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-0$"
+	       mother ==mj
+	       min-code	0
+	       max-code	#xFFFF))
+  (make-charset
+   '==mj-1
+   "MJ detailed glyph-images plane 1"
+   '(long-name "MJ glyph-images-1"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "mj-1$"
+	       mother ==mj
+	       min-code	#x10000
+	       code-offset #x10000))
+
+  (make-charset
    '==hanyo-denshi/ja
    "Han'you-Denshi/JA detailed glyph-images."
    '(long-name "Han'you-Denshi/JA glyph-images"
@@ -1649,6 +1726,17 @@
 	       registry "HanyoDenshi\\.HG-0$"
 	       mother =hanyo-denshi/hg))
   (make-charset
+   '==hanyo-denshi/ip
+   "Han'you-Denshi/IP detailed glyph-images."
+   '(long-name "Han'you-Denshi/IP glyph-images"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       registry "HanyoDenshi\\.IP-0$"
+	       mother =hanyo-denshi/ip))
+  (make-charset
    '==hanyo-denshi/jt
    "JT (Juuki Touitsu Moji) detailed glyph-images."
    '(long-name "Han'you-Denshi/JT glyph-images"
@@ -1684,6 +1772,17 @@
 	       max-code	   ,(+ (lsh #x6403 16) #xFFFF)
 	       code-offset    ,(lsh #x6403 16)))
 
+  (make-charset
+   '=koseki
+   "Representative glyph-images of KoSeki-touitsu-moji."
+   '(long-name "KoSeki-touitsu-moji"
+	       chars 256
+	       dimension 3
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =hanyo-denshi/ks))
+
   (define-charset-alias '=>>>hanyo-denshi/ja '=hanyo-denshi/ja)
   ;; (make-charset
   ;;  '=>>>hanyo-denshi/ja
@@ -1793,6 +1892,17 @@
   ;;              mother =hanyo-denshi/ks))
 
   (make-charset
+   '=>>mj
+   "Moji-Jouhou-Kiban abstract glyphs."
+   '(long-name "MJ glyphs"
+	       chars 256
+	       dimension 2
+	       columns 2
+	       graphic 2
+	       direction l2r
+	       mother =mj))
+
+  (make-charset
    '=>>hanyo-denshi/ja
    "Han'you-Denshi/JA abstract glyphs"
    '(long-name "Han'you-Denshi/JA glyphs"
@@ -2263,8 +2373,8 @@
   (define-charset-alias 'shinjigen-2-p '=shinjigen/+p@rev)
 
   (make-charset '==shinjigen
-		"Kadokawa ShinJigen dictionary (common parts)"
-		`(long-name	"Shinjigen common parts"
+		"Detailed glyph-images of ShinJigen (common parts)"
+		'(long-name	"Shinjigen common parts"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -2272,9 +2382,19 @@
 		  direction	l2r
 		  mother	=shinjigen
 		  registry	"Shinjigen\\(\\.[0-9]+\\)?-*"))
+  (make-charset '==shinjigen@1ed
+		"Detailed glyph-images of ShinJigen (the first edition)"
+		'(long-name	"Detailed glyph-images of Shinjigen-1"
+		  chars		256
+		  dimension	2
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  mother	==shinjigen
+		  registry	"Shinjigen\\(\\.[0-9]+\\)?-1"))
   (make-charset '==shinjigen@rev
-		"Kadokawa ShinJigen dictionary (the revised edition)"
-		`(long-name	"Shinjigen-2"
+		"Detailed glyph-images of ShinJigen (the revised edition)"
+		'(long-name	"Detailed glyph-images of Shinjigen-2"
 		  chars		256
 		  dimension	2
 		  columns	2
@@ -2282,6 +2402,16 @@
 		  direction	l2r
 		  mother	==shinjigen
 		  registry	"Shinjigen\\(\\.[0-9]+\\)?-2"))
+  (make-charset
+   '==shinjigen/+p@rev
+   "Detailed glyph-images of ShinJigen (the second edition) number with '"
+   '(long-name	"Detailed glyph-images of Shinjigen-2 with '"
+		mother	=shinjigen/+p@rev
+		chars		256
+		dimension	2
+		columns	2
+		graphic	2
+		direction	l2r))
 
   (make-charset '=big5-pua
 		"Big5 with private used area"
@@ -2458,6 +2588,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"
@@ -2673,36 +2814,36 @@
 		  =>iso-ir	177
 		  mother	=>>ucs@unicode))
 
-  (make-charset '=>>>ucs@iso
-		"Representative glyph-forms of ISO/IEC 10646"
-		'(long-name	"UCS glyph-forms for UCS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>ucs@iso))
-  (make-charset '=>>>ucs@unicode
-		"Representative glyph-forms of Unicode"
-		'(long-name	"UCS glyph-forms for Unicode"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@iso))
-  (make-charset '=>>>ucs@jis
-		"UCS Representative glyph-forms for JIS X0208/0212/0213"
-		'(long-name	"UCS glyph-forms for JIS"
-		  chars		256
-		  dimension	3
-		  columns	2
-		  graphic	2
-		  direction	l2r
-		  =>iso-ir	177
-		  mother	=>>>ucs@unicode))
+  ;; (make-charset '=>>>ucs@iso
+  ;;               "Representative glyph-forms of ISO/IEC 10646"
+  ;;               '(long-name     "UCS glyph-forms for UCS"
+  ;;                 chars         256
+  ;;                 dimension     3
+  ;;                 columns       2
+  ;;                 graphic       2
+  ;;                 direction     l2r
+  ;;                 =>iso-ir      177
+  ;;                 mother        =>>ucs@iso))
+  ;; (make-charset '=>>>ucs@unicode
+  ;;               "Representative glyph-forms of Unicode"
+  ;;               '(long-name     "UCS glyph-forms for Unicode"
+  ;;                 chars         256
+  ;;                 dimension     3
+  ;;                 columns       2
+  ;;                 graphic       2
+  ;;                 direction     l2r
+  ;;                 =>iso-ir      177
+  ;;                 mother        =>>>ucs@iso))
+  ;; (make-charset '=>>>ucs@jis
+  ;;               "UCS Representative glyph-forms for JIS X0208/0212/0213"
+  ;;               '(long-name     "UCS glyph-forms 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 glyph-forms for JIS X 0208/0212:1990"
   ;;               '(long-name     "UCS glyph-forms for JIS:1990"
@@ -2763,7 +2904,10 @@
 		  graphic	2
 		  direction	l2r
 		  =>iso-ir	177
-		  mother	=>>>ucs@iso))
+                  mother	=>>ucs@iso
+		  ;; mother	=>>>ucs@iso
+		  ))
+  (define-charset-alias '=>>>ucs@iso '=ucs@iso)
   (make-charset '=ucs@unicode
 		"Unicode for its representative glyphs"
 		'(long-name	"UCS for Unicode"
@@ -2774,6 +2918,7 @@
 		  direction	l2r
 		  =>iso-ir	177
 		  mother	=ucs@iso))
+  (define-charset-alias '=>>>ucs@unicode '=ucs@unicode)
   (make-charset '=ucs@gb
 		"ISO/IEC 10646 for GB"
 		'(long-name	"UCS for GB"
@@ -2850,6 +2995,7 @@
 		  =>iso-ir	177
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-jis '=ucs@jis)
+  (define-charset-alias '=>>>ucs@jis '=ucs@jis)
   (make-charset '=ucs@jis/fw
 		"ISO/IEC 10646 for JIS X0208/0212/0213 with fullwidth"
 		'(long-name	"UCS for JIS-fullwidth"
@@ -2951,6 +3097,16 @@
 		  mother	=ucs@unicode))
   (define-charset-alias 'ucs-ks '=ucs@ks)
   (define-charset-alias '=>>>ucs@ks '=ucs@ks)
+  (make-charset '=ucs@ks/2012
+		"Mapping for Korean Standards in ISO/IEC 10646:2012"
+		'(long-name	"UCS:2012 for KS"
+		  chars		256
+		  dimension	3
+		  columns	2
+		  graphic	2
+		  direction	l2r
+		  =>iso-ir	177
+		  mother	=ucs@ks))
   (make-charset '=ucs-bmp@ks
 		"ISO/IEC 10646 BMP for KS"
 		'(long-name	"BMP for KS"