(ideographic-structure-compact): Try to compact substructures

[chise/ids.git] / ids-dump.el

diff --git a/ids-dump.el b/ids-dump.el
index 8833b87..c2e0798 100644 (file)
--- a/ids-dump.el
+++ b/ids-dump.el
@@ -1,6 +1,6 @@
 ;;; ids-dump.el --- Dump utility of IDS-* files
 
-;; Copyright (C) 2002,2003,2004,2005 MORIOKA Tomohiko
+;; Copyright (C) 2002,2003,2004,2005,2009,2011,2019 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: IDS, IDC, Ideographs, UCS, Unicode
@@ -102,7 +102,7 @@
        (insert
         (format "M-%05d \t%c\t%s\n"
                 i (decode-builtin-char 'ideograph-daikanwa i)
-                (or (ids-format-list
+                (or (ids-dump-format-list
                      (get-char-attribute chr 'ideographic-structure))
                     ""))))
       (when (setq sal (assq i mdh-alist))
@@ -112,7 +112,7 @@
          (insert
           (format "M-%05d'\t%c\t%s\n"
                   i chr
-                  (or (ids-format-list
+                  (or (ids-dump-format-list
                        (get-char-attribute chr 'ideographic-structure))
                       ""))))
        (when (setq chr (assq 2 sal))
@@ -120,7 +120,7 @@
          (insert
           (format "M-%05d\"\t%c\t%s\n"
                   i chr
-                  (ids-format-list
+                  (ids-dump-format-list
                    (get-char-attribute chr 'ideographic-structure)))))
        )
       (setq i (1+ i)))))
@@ -141,7 +141,7 @@
        (format "MH-%04d \t%c\t%s\n"
               (car cell)
               chr
-              (or (ids-format-list
+              (or (ids-dump-format-list
                    (get-char-attribute chr 'ideographic-structure))
                   ""))))))
 
@@ -159,7 +159,7 @@
                 h l
                 (decode-builtin-char 'japanese-jisx0208-1990
                                      (logior (lsh h 8) l))
-                (or (ids-dump-format-list
+                (or (ideographic-structure-to-ids
                      (get-char-attribute chr 'ideographic-structure))
                     "")))
        (setq cell (1+ cell)))
@@ -174,7 +174,7 @@
               h l
               (decode-builtin-char 'japanese-jisx0208-1990
                                    (logior (lsh h 8) l))
-              (or (ids-dump-format-list
+              (or (ideographic-structure-to-ids
                    (get-char-attribute chr 'ideographic-structure))
                   "")))
       (setq cell (1+ cell)))))
@@ -271,6 +271,14 @@
   (interactive "Fdump IDS-UCS-Basic : ")
   (ids-dump-range "IDS-UCS-Basic.txt" filename
                  #'ids-dump-insert-ccs-ranges 'ucs "U+%04X\t%c\t%s\n"
+                 '(#x4E00 . #x9FEA)))
+
+;;;###autoload
+(defun ids-dump-ucs-basic@unicode (filename)
+  (interactive "Fdump IDS-UCS-Basic : ")
+  (ids-dump-range "IDS-UCS-Basic_u.txt" filename
+                 #'ids-dump-insert-ccs-ranges '=ucs@unicode
+                 "UU+%04X\t%c\t%s\n"
                  '(#x4E00 . #x9FA5)))
 
 ;;;###autoload