X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=3737c996dfc218db76ee278e9da643864a58f2b6;hb=8dc1a6e8faecef86f4b9b861a9905390a3b64114;hp=0a030db0674d90e417ec201aa9c45abd8bbf7529;hpb=0cc833771e86d91e4f95c3160572b83ede377e5d;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 0a030db..3737c99 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -4,7 +4,7 @@
 		"JX1-to-UCS.txt" "JX2-to-UCS.txt"
 		"K0-to-UCS.txt"
 		"G0-to-UCS.txt"
-		"C2-to-UCS.txt"
+		"C1-to-UCS.txt" "C2-to-UCS.txt"
 		"C3-to-UCS.txt" "C4-to-UCS.txt"
 		"C5-to-UCS.txt" "C6-to-UCS.txt"
 		"C7-to-UCS.txt"
@@ -94,7 +94,8 @@
 	#x5A45 #x4754 #x343A #x3B36 #x4658
 	#x3749 #x3F74 #x4528 #x4030 #x5A4C
 	#x507B #x507E #x5353 #x5A44 #x6E2B
-	#x5B30))
+	#x5B30 #x4C40 #x376E #x6067 #x4E28
+	#x6425))
 
 (map-char-attribute
  (lambda (c v)
@@ -256,3 +257,38 @@
      (put-char-attribute c '=>jis-x0213-1 v))
    nil)
  '=>jis-x0208)
+
+(let (dg-chr)
+  (map-char-attribute
+   (lambda (c v)
+     (when (setq dg-chr (decode-char '===jis-x0213-1@2000 v))
+       (unless (eq c dg-chr)
+	 (put-char-attribute dg-chr '===hanyo-denshi/jc v)))
+     nil)
+   '==hanyo-denshi/jc)
+  (map-char-attribute
+   (lambda (c v)
+     (when (setq dg-chr (decode-char '===jis-x0213-2 v))
+       (unless (eq c dg-chr)
+	 (put-char-attribute dg-chr '===hanyo-denshi/jd v)))
+     nil)
+   '==hanyo-denshi/jd)
+  )
+
+(let (j-chr)
+  (map-char-attribute
+   (lambda (c v)
+     (if (and (setq j-chr (decode-char '=ucs@JP v))
+	      (not (eq j-chr c))
+	      (null (encode-char c '=ucs)))
+	 (put-char-attribute c '=ucs@JP/hanazono nil))
+     nil)
+   '=ucs@unicode)
+  (map-char-attribute
+   (lambda (c v)
+     (if (and (setq j-chr (decode-char '==ucs@JP v))
+	      (not (eq j-chr c)))
+	 (put-char-attribute c '==ucs@JP/hanazono nil))
+     nil)
+   '==ucs@unicode)
+  )