X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=install-ids.el;h=9f0b9e33360f836b9c8ea0bc8e97508b6a5fc784;hb=ffab6920a23162ed33e3da68ae8f28a12d65699d;hp=fac71cc93641f07f908d2ab1f69c49cc23a3304b;hpb=2d0c989576184e13e2a422379d03c2f62cd256f6;p=chise%2Fids.git

diff --git a/install-ids.el b/install-ids.el
index fac71cc..9f0b9e3 100644
--- a/install-ids.el
+++ b/install-ids.el
@@ -38,6 +38,12 @@
 
 (install-ids-read-file "IDS-UCS-Ext-E.txt" load-ids-simplify t)
 
+(install-ids-read-file "IDS-UCS-Ext-F.txt" load-ids-simplify t)
+
+(install-ids-read-file "IDS-UCS-Ext-G.txt" load-ids-simplify t)
+
+(install-ids-read-file "IDS-UCS-Compat.txt" load-ids-simplify t)
+
 (let ((i 1))
   (while (<= i 3)
     (install-ids-read-file (format "IDS-CNS-%d.txt" i)
@@ -57,28 +63,65 @@
 (install-ids-read-file "IDS-CBETA.txt" load-ids-simplify t)
 
 (install-ids-read-file "IDS-CDP.txt" load-ids-simplify t)
-(let ((i 1))
-  (while (<= i 12)
-    (install-ids-read-file (format "IDS-HZK%02d.txt" i)
-			   load-ids-simplify t)
-    (setq i (1+ i))))
-
-(princ "Updating char-feature `ideographic-structure'...")
-(save-char-attribute-table 'ideographic-structure)
-(princ "done.\n")
-
-(princ "Updating char-feature `ideographic-products'...")
-(let* ((feature-dir
+;; (let ((i 1))
+;;   (while (<= i 12)
+;;     (install-ids-read-file (format "IDS-HZK%02d.txt" i)
+;;                            load-ids-simplify t)
+;;     (setq i (1+ i))))
+
+(princ "Generating apparent-structure...")
+(let* ((terminal-coding-system 'utf-8-mcs-er)
+       (feature-dir
 	(expand-file-name
 	 "feature"
 	 (expand-file-name
 	  "character" chise-system-db-directory)))
        (p-file
 	(expand-file-name "ideographic-products" feature-dir))
-       old-p-file)
+       old-p-file
+       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))
+  (ids-update-index 'in-memory)
+
+  (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'...")
+  (save-char-attribute-table 'ideographic-structure)
+  (save-char-attribute-table 'ideographic-structure@apparent)
+  (princ "done.\n")
+
+  (princ "Updating char-feature `ideographic-products'...")
   (ids-update-index)
   (when old-p-file
     (delete-file old-p-file)))