X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=install-ids.el;h=436c157f6e1108a83829a0343f7ee28ac42afc7d;hb=a4534d0f7936b67cc5bdd4d253f8115ec4d08886;hp=eb02062b526913b54436929e47616fec235de49b;hpb=99b71986102cdf54656769eb51b8a87db579c4a1;p=chise%2Fids.git

diff --git a/install-ids.el b/install-ids.el
index eb02062..436c157 100644
--- a/install-ids.el
+++ b/install-ids.el
@@ -42,8 +42,12 @@
 
 (install-ids-read-file "IDS-UCS-Ext-G.txt" load-ids-simplify t)
 
+(install-ids-read-file "IDS-UCS-Ext-H.txt" load-ids-simplify t)
+
 (install-ids-read-file "IDS-UCS-Compat.txt" load-ids-simplify t)
 
+(install-ids-read-file "IDS-UCS-Compat-Supplement.txt" load-ids-simplify t)
+
 (let ((i 1))
   (while (<= i 3)
     (install-ids-read-file (format "IDS-CNS-%d.txt" i)
@@ -69,8 +73,11 @@
 ;;                            load-ids-simplify t)
 ;;     (setq i (1+ i))))
 
+(install-ids-read-file "IDS-SW-JIGUGE.txt" load-ids-simplify t)
+
 (princ "Generating apparent-structure...")
-(let* ((feature-dir
+(let* ((terminal-coding-system 'utf-8-mcs-er)
+       (feature-dir
 	(expand-file-name
 	 "feature"
 	 (expand-file-name
@@ -78,7 +85,7 @@
        (p-file
 	(expand-file-name "ideographic-products" feature-dir))
        old-p-file
-       a-str)
+       a-str ret)
   (when (file-exists-p p-file)
     (setq old-p-file (make-temp-name p-file))
     (rename-file p-file old-p-file))
@@ -86,12 +93,108 @@
 
   (map-char-attribute
    (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure ret)
+       (setq v ret))
      (unless (setq a-str (get-char-attribute c 'ideographic-structure@apparent))
        (when (setq a-str (functional-ideographic-structure-to-apparent-structure v))
 	 (put-char-attribute c 'ideographic-structure@apparent
 			     (ideographic-structure-compact a-str))))
      nil)
    'ideographic-structure)
+
+  (map-char-attribute
+   (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : [apparent] %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure@apparent ret)
+       (setq v ret))
+     nil)
+   'ideographic-structure@apparent)
+
+  (map-char-attribute
+   (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : [apparent/leftmost] %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure@apparent/leftmost ret)
+       (setq v ret))
+     nil)
+   'ideographic-structure@apparent/leftmost)
+
+  (map-char-attribute
+   (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : [apparent/rightmost] %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure@apparent/rightmost ret)
+       (setq v ret))
+     nil)
+   'ideographic-structure@apparent/rightmost)
+
+  (map-char-attribute
+   (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure ret)
+       (setq v ret))
+     nil)
+   'ideographic-structure)
+  (map-char-attribute
+   (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : [apparent] %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure@apparent ret)
+       (setq v ret))
+     nil)
+   'ideographic-structure@apparent)
+  (map-char-attribute
+   (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : [apparent/leftmost] %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure@apparent/leftmost ret)
+       (setq v ret))
+     nil)
+   'ideographic-structure@apparent/leftmost)
+  (map-char-attribute
+   (lambda (c v)
+     (unless (equal (setq ret (ideographic-structure-compact v)) v)
+       (princ (format "Compact %04X (%c) : [apparent/rightmost] %s -> %s\n"
+		      (char-int c)
+		      c
+		      (ideographic-structure-to-ids v)
+		      (ideographic-structure-to-ids ret)))
+       (put-char-attribute c 'ideographic-structure@apparent/rightmost ret)
+       (setq v ret))
+     nil)
+   'ideographic-structure@apparent/rightmost)
   (princ "done.\n")
 
   (princ "Updating char-feature `ideographic-structure'...")