X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=556ff20092a2495508a4635c36b0450f9be5f328;hb=ff88918be2640d8e58b95240125f8e66db18d305;hp=0eb9e365579f456492256d60688dfa19d3aba983;hpb=4c7fc86ad22ceee93f43e0d174e6970925a6b407;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index 0eb9e36..556ff20 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"
@@ -16,8 +16,7 @@
 (jp-jouyou-read-file "../etc/char-data/jp-jouyou.txt")
 
 (let ((ucs #xE000)
-      big5 chr
-      ret)
+      big5 chr)
   (while (<= ucs #xF848)
     (setq chr (decode-char 'ucs ucs))
     (when (setq big5 (get-char-attribute chr '=big5-pua))
@@ -27,7 +26,7 @@
     (setq ucs (1+ ucs))))
 
 
-(setq gt-pj-1-and-jis-x0208-1990-different-code-points
+(defconst gt-pj-1-and-jis-x0208-1990-different-code-points
       '(#x5C37 #x5C52 #x3521 #x5D62 #x5F4A
 	#x5F5B #x6062 #x4849 #x6173 #x306B
 	#x6328 #x6352 #x6362 #x6471 #x6524
@@ -72,12 +71,36 @@
 	#x5563 #x5D7A #x4575 #x5F7C #x3B38
 	#x3237 #x3B51 #x596E #x5B5B #x6640
 	#x6D75 #x4D2C #x737B #x7379 #x5E7A
-	#x3E7A #x3865 #x557B #x436B))
+	#x3E7A #x3865 #x557B #x436B #x413B
+	#x562D #x4C28 #x562F #x5631 #x5632
+	#x5633 #x5635 #x463D #x362E #x3265
+	#x563B #x4A76 #x5638 #x5637 #x3A6A
+	#x5642 #x563D #x5647 #x5641 #x5644
+	#x5648 #x564A #x3A37 #x564F #x4568
+	#x5653 #x5652 #x5654 #x5655 #x5659
+	#x565C #x3474 #x562E #x5630 #x5639
+	#x3D54 #x5645 #x564E #x5651 #x564C
+	#x3460 #x565B #x5628 #x5726 #x5759
+	#x583E #x5833 #x5843 #x584E #x5860
+	#x585D #x4463 #x4C31 #x5351 #x6243
+	#x587A #x5921 #x4879 #x4530 #x4863
+	#x5932 #x3E35 #x4D5E #x5A2D #x4471
+	#x5939 #x3348 #x3969 #x594D #x3044
+	#x594B #x3027 #x3F36 #x405C #x5964
+	#x5962 #x5953 #x5977 #x3B35 #x4531
+	#x5A26 #x5A2B #x5A2F #x5A36 #x5A37
+	#x5A3B #x5A2C #x5A2A #x5A40 #x5A3F
+	#x5A41 #x327E #x384E #x5A43 #x5A47
+	#x5A45 #x4754 #x343A #x3B36 #x4658
+	#x3749 #x3F74 #x4528 #x4030 #x5A4C
+	#x507B #x507E #x5353 #x5A44 #x6E2B
+	#x5B30 #x4C40 #x376E #x6067 #x4E28
+	#x6425))
 
 (map-char-attribute
  (lambda (c v)
    (unless (memq v gt-pj-1-and-jis-x0208-1990-different-code-points)
-     (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
+     (put-char-attribute (decode-char '=jis-x0208@1990 v)
 			 '=gt-pj-1 v))
    nil)
  '=gt-pj-1)
@@ -188,21 +211,38 @@
   (buffer-disable-undo)
   (insert-file-contents "../etc/char-data/JX3-JX1-rep-diff.txt")
   (goto-char (point-min))
-  (let (ku ten char code ucs)
+  (let (ku ten char code ucs rep-char)
     (while (re-search-forward "^1-\\([0-9]+\\)-\\([0-9]+\\)[ \t]+" nil t)
       (setq ku (string-to-number (match-string 1))
 	    ten (string-to-number (match-string 2)))
       (setq char (make-char '=jis-x0213-1@2000 (+ ku 32)(+ ten 32)))
       (setq code (encode-char char '=jis-x0213-1@2000))
-      (put-char-attribute char '=jis-x0213-1@2000 code)
-      (remove-char-attribute char '=jis-x0213-1)
-      (remove-char-attribute char '=jis-x0213-1@2004)
       (setq ucs (encode-char char '=ucs@jis/2000))
-      (remove-char-attribute char '=ucs@jis)
-      (remove-char-attribute char '=ucs@jis/2004)
-      (when (setq char (decode-char '=jis-x0213-1@2004 code))
-	(unless (eq (encode-char char '=ucs@jis/2004) ucs)
-	  (put-char-attribute char '=ucs@jis/2004 ucs)))
+      (setq rep-char (decode-char '==jis-x0213-1@2000 code))
+      (cond
+       ((or (eq char rep-char)
+	    (null rep-char))
+	(put-char-attribute char '=jis-x0213-1@2000 code)
+	(remove-char-attribute char '=jis-x0213-1)
+	(remove-char-attribute char '=jis-x0213-1@2004)
+	(remove-char-attribute char '=ucs@jis)
+	(remove-char-attribute char '=ucs@jis/2004)
+	(when (setq char (decode-char '=jis-x0213-1@2004 code))
+	  (unless (eq (encode-char char '=ucs@jis/2004) ucs)
+	    (put-char-attribute char '=ucs@jis/2004 ucs)))
+	)
+       (rep-char
+	(put-char-attribute rep-char '==jis-x0213-1@2000 code)
+	(remove-char-attribute rep-char '==jis-x0213-1)
+	(remove-char-attribute rep-char '==jis-x0213-1@2004)
+	(setq ucs (or (encode-char rep-char '==ucs@jis/2000)
+		      ucs))
+	(remove-char-attribute rep-char '==ucs@jis)
+	(remove-char-attribute rep-char '==ucs@jis/2004)
+	(when (setq rep-char (decode-char '==jis-x0213-1@2004 code))
+	  (unless (eq (encode-char rep-char '==ucs@jis/2004) ucs)
+	    (put-char-attribute rep-char '==ucs@jis/2004 ucs)))
+	))
       (unless (eq code #x332A)
 	(when (setq char (decode-char '=>jis-x0208@1997 code 'defined-only))
 	  (unless (eq (encode-char char '=>>jis-x0208) code)
@@ -217,38 +257,3 @@
      (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))