X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=77996206b5786972cee155b73647240708b793a6;hb=06edd89cb9c76758032120a125b6fce99f6a38c9;hp=ecae7598f104610426c1c6916c6beef611763551;hpb=7065ef4fdc65099d8344bcedfd286f0b9414fbde;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index ecae759..7799620 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -7,6 +7,7 @@
 		"C2-to-UCS.txt"
 		"C3-to-UCS.txt" "C4-to-UCS.txt"
 		"C5-to-UCS.txt" "C6-to-UCS.txt"
+		"C7-to-UCS.txt"
 		"B-to-UCS.txt" "JC3-to-UCS.txt"))
   (mapping-table-read-file (expand-file-name file "../etc/char-data/")))
 
@@ -68,7 +69,10 @@
 	#x4749 #x4428 #x3A47 #x6E4E #x4269
 	#x4043 #x6E56 #x6132 #x5C54 #x3557
 	#x5827 #x4C68 #x505B #x514A #x5D27
-	#x5563 #x5D7A))
+	#x5563 #x5D7A #x4575 #x5F7C #x3B38
+	#x3237 #x3B51 #x596E #x5B5B #x6640
+	#x6D75 #x4D2C #x737B #x7379 #x5E7A
+	#x3E7A #x3865))
 
 (map-char-attribute
  (lambda (c v)
@@ -102,25 +106,25 @@
 	(put-char-attribute chr '=gt-k i)))
     (setq i (1+ i))))
 
-(let (gt)
-  (dolist (ccs '(=gt-pj-1
-		 =gt-pj-2
-		 =gt-pj-3
-		 =gt-pj-4
-		 =gt-pj-5
-		 =gt-pj-6
-		 =gt-pj-7
-		 =gt-pj-8
-		 =gt-pj-9
-		 =gt-pj-10
-		 =gt-pj-11))
-    (map-char-attribute
-     (lambda (c v)
-       (when (setq gt (encode-char c '=gt))
-	 (put-char-attribute c '=gt gt)
-	 (put-char-attribute (decode-char ccs v) '=gt gt))
-       nil)
-     ccs)))
+;; (let (gt ret)
+;;   (dolist (ccs '(=gt-pj-1
+;;                  =gt-pj-2
+;;                  =gt-pj-3
+;;                  =gt-pj-4
+;;                  =gt-pj-5
+;;                  =gt-pj-6
+;;                  =gt-pj-7
+;;                  =gt-pj-8
+;;                  =gt-pj-9
+;;                  =gt-pj-10
+;;                  =gt-pj-11))
+;;     (map-char-attribute
+;;      (lambda (c v)
+;;        (when (setq gt (encode-char c '=gt))
+;;          (put-char-attribute c '=gt gt)
+;;          (put-char-attribute (decode-char ccs v) '=gt gt))
+;;        nil)
+;;      ccs)))
 
 ;; (let (ret)
 ;;   (dolist (feature
@@ -201,8 +205,10 @@
 	  (put-char-attribute char '=ucs@jis/2004 ucs)))
       (unless (eq code #x332A)
 	(when (setq char (decode-char '=>jis-x0208@1997 code 'defined-only))
-	  (put-char-attribute char '=>jis-x0208 code)
-	  (remove-char-attribute char '=>jis-x0208@1997)))
+	  (unless (eq (encode-char char '=>>jis-x0208) code)
+	    (unless (eq (encode-char char '=+>jis-x0208) code)
+	      (put-char-attribute char '=>jis-x0208 code)
+	      (remove-char-attribute char '=>jis-x0208@1997)))))
       )))
 
 (map-char-attribute
@@ -211,3 +217,38 @@
      (put-char-attribute c '=>jis-x0213-1 v))
    nil)
  '=>jis-x0208)
+
+(dolist (aj1-f '(=>>>adobe-japan1 =>>adobe-japan1))
+  (map-char-attribute
+   (lambda (c v)
+     (cond
+      ((<= v 8283)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-0" aj1-f)) v)
+       )
+      ((<= v 8358)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-1" aj1-f)) v)
+       )
+      ((<= v 8719)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-2" aj1-f)) v)
+       )
+      ((<= v 9353)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-3" aj1-f)) v)
+       )
+      ((<= v 15443)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-4" aj1-f)) v)
+       )
+      ((<= v 20316)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-5" aj1-f)) v)
+       )
+      ((<= v 23057)
+       (remove-char-attribute c aj1-f)
+       (put-char-attribute c (intern (format "%s-6" aj1-f)) v)
+       ))
+     nil)
+   aj1-f))