X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fmaps-conf.el;h=87c5f04356445f39362d75c89d4aeaf0e369c477;hb=3f562c80c7d6f290f729d492b8039c04685db558;hp=ea8854529973644437ca57f54f3c08be4f87c638;hpb=f8ae56b3326d330d95c0b97e9c881eb53bd18a19;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index ea88545..87c5f04 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -60,7 +60,9 @@
 		     #x4337 #x492D #x3F6C #x6E4D #x4F3F
 		     #x353D #x4324 #x475B #x6E47 #x4371
 		     #x3F5D #x6E49 #x4D6F #x3C72 #x3D37
-		     #x6E4C #x3B44 #x734E #x5567 #x545A))
+		     #x6E4C #x3B44 #x734E #x5567 #x545A
+		     #x3071 #x332A #x516A #x476D #x3675
+		     #x5734))
      (put-char-attribute (decode-char 'japanese-jisx0208-1990 v)
 			 '=gt-pj-1 v))
    nil)
@@ -110,19 +112,60 @@
        nil)
      ccs)))
 
-(let (ret)
-  (dolist (feature
-	   (let (dest)
-	     (dolist (feature (char-attribute-list))
-	       (when (string-match "\\*sources\\($\\|@[^\\*]+$\\)"
-				   (symbol-name feature))
-		 (setq dest (cons feature dest))))
-	     dest))
-    (map-char-attribute
-     (lambda (c v)
-       (when (setq ret (memq 'shinjigen-1 v))
-	 (setcar ret 'shinjigen@1ed))
-       (when (setq ret (memq 'shinjigen-2 v))
-	 (setcar ret 'shinjigen@rev))
-       nil)
-     feature)))
+;; (let (ret)
+;;   (dolist (feature
+;;            (let (dest)
+;;              (dolist (feature (char-attribute-list))
+;;                (when (string-match "\\*sources\\($\\|@[^\\*]+$\\)"
+;;                                    (symbol-name feature))
+;;                  (setq dest (cons feature dest))))
+;;              dest))
+;;     (map-char-attribute
+;;      (lambda (c v)
+;;        (when (setq ret (memq 'shinjigen-1 v))
+;;          (setcar ret 'shinjigen@1ed))
+;;        (when (setq ret (memq 'shinjigen-2 v))
+;;          (setcar ret 'shinjigen@rev))
+;;        nil)
+;;      feature)))
+
+;; (map-char-attribute
+;;  (lambda (c v)
+;;    (when (eq (encode-char c '=shinjigen@rev) v)
+;;      (put-char-attribute c '=shinjigen v)
+;;      (remove-char-attribute c '=shinjigen@1ed)
+;;      (remove-char-attribute c '=shinjigen@rev)
+;;      )
+;;    nil)
+;;  '=shinjigen@1ed)
+
+;; (let (ret)
+;;   (dolist (feature
+;;            (let (dest)
+;;              (dolist (feature (char-attribute-list))
+;;                (when (string-match "\\*sources\\($\\|@[^\\*]+$\\)"
+;;                                    (symbol-name feature))
+;;                  (setq dest (cons feature dest))))
+;;              dest))
+;;     (map-char-attribute
+;;      (lambda (c v)
+;;        (cond ((setq ret (memq 'shinjigen@1ed v))
+;;               (when (memq 'shinjigen@rev ret)
+;;                 (setcar ret 'shinjigen)
+;;                 (delq 'shinjigen@rev ret)
+;;                 ))
+;;              ((setq ret (memq 'shinjigen@rev v))
+;;               (when (memq 'shinjigen@1ed ret)
+;;                 (setcar ret 'shinjigen)
+;;                 (delq 'shinjigen@1ed ret)
+;;                 )))
+;;        nil)
+;;      feature)))
+
+(dolist (ccs '(=jis-x0208 =jis-x0208@1990))
+  (map-char-attribute
+   (lambda (c v)
+     (unless (eq (encode-char c '=jis-x0213-1@2000) v)
+       (put-char-attribute c '=jis-x0213-1 v))
+     nil)
+   ccs))