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

diff --git a/install-ids.el b/install-ids.el
index eb02062..9f0b9e3 100644
--- a/install-ids.el
+++ b/install-ids.el
@@ -70,7 +70,8 @@
 ;;     (setq i (1+ i))))
 
 (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 +79,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 +87,33 @@
 
   (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)
   (princ "done.\n")
 
   (princ "Updating char-feature `ideographic-structure'...")