- Delete temporary setting to convert each pair of `=shinjigen@1ed'

  and `=shinjigen@rev' to the corresponding `=shinjigen'.
- Delete temporary setting to convert each pair of `shinjigen@1ed' and
  `shinjigen@rev' to `shinjigen' in *sources features.
- Add temporary setting to add `=jis-x0213-1' for each character which
  has a code-point of JIS X 0208:1990.

diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el
index e174afc..85d2069 100644 (file)
--- a/lisp/utf-2000/maps-conf.el
+++ b/lisp/utf-2000/maps-conf.el
@@ -127,35 +127,43 @@
 ;;        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)
+;; (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)))
+;; (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))