From: tomo <tomo>
Date: Tue, 2 Sep 2008 01:33:56 +0000 (+0000)
Subject: - Disable temporary setting to convert `shinjigen-1' and `shinjigen-2'
X-Git-Tag: r21-4-21-chise-0_24-shinjigen-inheritance^20~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=544c113bb7dcd6a71dc759698c6ce28a173d08a7;p=chise%2Fxemacs-chise.git.1

- Disable temporary setting to convert `shinjigen-1' and `shinjigen-2'
  to `shinjigen@1ed' and `shinjigen@rev' in *sources features.
- Add temporary setting to convert each pair of `=shinjigen@1ed' and
  `=shinjigen@rev' to the corresponding `=shinjigen'.
- Add temporary setting to convert each pair of `shinjigen@1ed' and
  `shinjigen@rev' to `shinjigen' in *sources features.
---

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index ea88545..e174afc 100644
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -110,6 +110,33 @@
        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)))
+
+(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)
@@ -120,9 +147,15 @@
 	     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))
+       (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)))