X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=install-ids.el;h=cbac0963119752a9020e07319b1550473d4ed387;hb=0c323f870454ea41ba895eb07b59560f4f6d218f;hp=d0fcf73717ba84157a7f02198b2cbf0c52a96112;hpb=e30a886e8f3c4b785c6ae770ae517160e904da0f;p=chise%2Fids.git

diff --git a/install-ids.el b/install-ids.el
index d0fcf73..cbac096 100644
--- a/install-ids.el
+++ b/install-ids.el
@@ -12,12 +12,12 @@
   (princ "done.\n"))
 
 
-(mount-char-attribute-table 'ideographic-products)
-(map-char-attribute
- (lambda (c v)
-   (remove-char-attribute c 'ideographic-products)
-   nil)
- 'ideographic-products)
+;; (mount-char-attribute-table 'ideographic-products)
+;; (map-char-attribute
+;;  (lambda (c v)
+;;    (remove-char-attribute c 'ideographic-products)
+;;    nil)
+;;  'ideographic-products)
 
 
 (install-ids-read-file "IDS-JIS-X0208-1990.txt" load-ids-simplify t)
@@ -25,14 +25,27 @@
 (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)
+
 (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,18 +63,55 @@
 (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'...")
-(ids-update-index)
+;; (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
+       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)
+  (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)))
 (princ "done.\n")
 
 ;;; install-ids.el ends hear