X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=install-ids.el;h=49e1927687287c9e2098ac7ebee1950e3e2a5324;hb=8b3bfa04df0a827c6ce10eb93dd32b7052559a9b;hp=484e64fde00a5c088a8043a30bfce78c5ad6cae7;hpb=5624ce651b9598adb6dd04c6e42ac2a38d39ffeb;p=chise%2Fids.git

diff --git a/install-ids.el b/install-ids.el
index 484e64f..49e1927 100644
--- a/install-ids.el
+++ b/install-ids.el
@@ -11,17 +11,45 @@
   (ids-read-file file simplify soft)
   (princ "done.\n"))
 
+
+;; (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)
 
 (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 3)
+    (install-ids-read-file (format "IDS-CNS-%d.txt" i)
+			   load-ids-simplify t)
+    (setq i (1+ i))))
+
 (let ((i 1))
   (while (<= i 12)
     (install-ids-read-file (format "IDS-Daikanwa-%02d.txt" i)
@@ -34,10 +62,94 @@
 
 (install-ids-read-file "IDS-CBETA.txt" load-ids-simplify t)
 
-(princ "Saving into ")
-(princ exec-directory)
-(princ "char-db/system-char-id/ideographic-structure...")
-(save-char-attribute-table 'ideographic-structure)
+(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 "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)
+
+  (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) : %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)
+  (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