X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=install-ids.el;h=a9ce523188cc4ff86a8091e710448ec11a174017;hb=a466df040c02b4bde7ca1aba5380b16bce800507;hp=8d7f1e2de4f20de7f38749cc9c55fe2775c827c2;hpb=18eb38c9ba2664f71ae69b6d87259f4ad12e04e1;p=chise%2Fids.git

diff --git a/install-ids.el b/install-ids.el
index 8d7f1e2..a9ce523 100644
--- a/install-ids.el
+++ b/install-ids.el
@@ -25,14 +25,29 @@
 (install-ids-read-file "IDS-UCS-Basic.txt" load-ids-simplify t)
 
 (install-ids-read-file "IDS-UCS-Ext-A.txt" load-ids-simplify t)
+
 (let ((i 1))
   (while (<= i 6)
     (install-ids-read-file (format "IDS-UCS-Ext-B-%d.txt" i)
 			   load-ids-simplify t)
     (setq i (1+ i))))
 
+(install-ids-read-file "IDS-UCS-Ext-C.txt" load-ids-simplify t)
+
+(install-ids-read-file "IDS-UCS-Ext-D.txt" load-ids-simplify t)
+
+(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)
+
+(install-ids-read-file "IDS-UCS-Compat-Supplement.txt" load-ids-simplify t)
+
 (let ((i 1))
-  (while (<= i 2)
+  (while (<= i 3)
     (install-ids-read-file (format "IDS-CNS-%d.txt" i)
 			   load-ids-simplify t)
     (setq i (1+ i))))
@@ -50,28 +65,117 @@
 (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))))
+;; (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")
+(install-ids-read-file "IDS-SW-JIGUGE.txt" load-ids-simplify t)
 
-(princ "Updating char-feature `ideographic-products'...")
-(let* ((feature-dir
+(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)
+
+  (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) : %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)
+  (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)))