(dump-94x94-ccs-to-ucs-table): Change 5th argument `ucs-ccs' to

[chise/tomoyo-tools.git] / dump-tables.el

diff --git a/dump-tables.el b/dump-tables.el
index 689812a..1134b54 100644 (file)
--- a/dump-tables.el
+++ b/dump-tables.el
@@ -1,9 +1,9 @@
 ;;; dump-tables.el --- Dump utility of mapping tables
 
-;; Copyright (C) 2002 MORIOKA Tomohiko
+;; Copyright (C) 2002,2003 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
-;; Keywords: Ideographs, Character Database, UTF-2000, UCS, Unicode
+;; Keywords: Ideographs, Character Database, CHISE, UCS, Unicode
 
 ;; This file is a part of tomoyo-tools.
 
@@ -26,11 +26,12 @@
 
 (defun dump-94x94-ccs-to-ucs-table (filename default-file-name
                                             ccs ccs-prefix
-                                            ucs-ccs ucs-ccs-prefix)
+                                            ucs-domain ucs-ccs-prefix)
   (if (file-directory-p filename)
       (setq filename (expand-file-name default-file-name filename)))
   (with-temp-buffer
-    (let ((ucs-ccs-map (intern (format "=>%s" ucs-ccs)))
+    (let ((ucs-ccs (intern (format "=ucs@%s" ucs-domain)))
+         (ucs-ccs-map (intern (format "=>ucs@%s" ucs-domain)))
          (ccs-format (concat ccs-prefix "%02X%02X"))
          (ucs-ccs-format (concat "\t" ucs-ccs-prefix "%04X\t"))
          (row 33)
@@ -39,9 +40,9 @@
        (setq cell 33)
        (while (< cell 127)
          (when (and (setq chr (make-char ccs row cell))
-                    (setq ucs (or (get-char-attribute chr 'ucs)
+                    (setq ucs (or (encode-char chr 'ucs 'defined-only)
                                   (get-char-attribute chr '=>ucs))))
-           (setq ucs-l (or (get-char-attribute chr ucs-ccs)
+           (setq ucs-l (or (encode-char chr ucs-ccs 'defined-only)
                            (get-char-attribute chr ucs-ccs-map)))
            (insert (format ccs-format row cell))
            (if (and ucs-l (/= ucs-l ucs))
@@ -60,14 +61,14 @@
   (interactive "Fdump J90-to-UCS : ")
   (dump-94x94-ccs-to-ucs-table
    filename "J90-to-UCS.txt"
-   'japanese-jisx0208-1990 "J90-" 'ucs-jis "JU+"))
+   'japanese-jisx0208-1990 "J90-" 'jis "JU+"))
 
 ;;;###autoload
 (defun dump-jis-x0212-to-ucs-table (filename)
   (interactive "Fdump JSP-to-UCS : ")
   (dump-94x94-ccs-to-ucs-table
    filename "JSP-to-UCS.txt"
-   'japanese-jisx0212 "JSP-" 'ucs-jis "JU+"))
+   'japanese-jisx0212 "JSP-" 'jis "JU+"))
 
 ;;;###autoload
 (defun dump-jis-x0213-1-to-ucs-table (filename)
@@ -81,13 +82,13 @@
        (setq cell 33)
        (while (< cell 127)
          (when (and (setq chr (make-char 'japanese-jisx0213-1 row cell))
-                    (not (encode-char chr 'japanese-jisx0208-1990 t))
-                    (setq ucs (or (get-char-attribute chr 'ucs)
-                                  (get-char-attribute chr '=>ucs)
-                                  (get-char-attribute chr '->ucs))))
+                    (not (encode-char chr 'japanese-jisx0208-1990
+                                      'defined-only))
+                    (setq ucs (or (encode-char chr 'ucs 'defined-only)
+                                  (get-char-attribute chr '=>ucs))))
            (when (setq ucs-j
                        (or (encode-char chr '=ucs-jis-2000 'defined-only)
-                           (get-char-attribute chr '=>ucs-jis)))
+                           (get-char-attribute chr '=>ucs@jis)))
              (if (eq ucs-j ucs)
                  (setq ucs-j nil)))
            (insert (format "JX1-%02X%02X" row cell))
@@ -107,21 +108,21 @@
   (interactive "Fdump JX2-to-UCS : ")
   (dump-94x94-ccs-to-ucs-table
    filename "JX2-to-UCS.txt"
-   'japanese-jisx0213-2 "JX2-" 'ucs-jis "JU+"))
+   'japanese-jisx0213-2 "JX2-" 'jis "JU+"))
 
 ;;;###autoload
 (defun dump-cns-11643-3-to-ucs-table (filename)
   (interactive "Fdump C3-to-UCS : ")
   (dump-94x94-ccs-to-ucs-table
    filename "C3-to-UCS.txt"
-   'chinese-cns11643-3 "C3-" 'ucs-cns "CU+"))
+   'chinese-cns11643-3 "C3-" 'cns "CU+"))
 
 ;;;###autoload
 (defun dump-cns-11643-4-to-ucs-table (filename)
   (interactive "Fdump C4-to-UCS : ")
   (dump-94x94-ccs-to-ucs-table
    filename "C4-to-UCS.txt"
-   'chinese-cns11643-4 "C4-" 'ucs-cns "CU+"))
+   'chinese-cns11643-4 "C4-" 'cns "CU+"))
 
 ;;;###autoload
 (defun dump-big5-to-ucs-table (filename)
@@ -135,11 +136,10 @@
        (setq cell #x40)
        (while (< cell #xFE)
          (when (and (setq chr (make-char 'chinese-big5 row cell))
-                    (setq ucs (or (get-char-attribute chr 'ucs)
-                                  (get-char-attribute chr '=>ucs)
-                                  (get-char-attribute chr '->ucs))))
-           (setq ucs-big5 (or (get-char-attribute chr 'ucs-big5)
-                              (get-char-attribute chr '=>ucs-big5)))
+                    (setq ucs (or (encode-char chr 'ucs 'defined-only)
+                                  (get-char-attribute chr '=>ucs))))
+           (setq ucs-big5 (or (encode-char chr 'ucs-big5 'defined-only)
+                              (get-char-attribute chr '=>ucs@big5)))
            (insert (format "B-%02X%02X" row cell))
            (if ucs-big5
                (insert (format "\tBU+%04X\t" ucs-big5))
@@ -164,7 +164,7 @@
        (setq cell #xA1)
        (while (<= cell #xFE)
          (when (and (setq chr (make-char 'china3-jef row cell))
-                    (setq ucs (or (get-char-attribute chr 'ucs)
+                    (setq ucs (or (encode-char chr 'ucs 'defined-only)
                                   (get-char-attribute chr '=>ucs))))
            (insert (format "JC3-%02X%02X\t" row cell))
            (insert (format (if (<= ucs #xFFFF)
@@ -185,7 +185,7 @@
          chr ucs)
       (while (<= i 20000)
        (when (and (setq chr (decode-char 'ideograph-cbeta i))
-                  (setq ucs (or (get-char-attribute chr 'ucs)
+                  (setq ucs (or (encode-char chr 'ucs 'defined-only)
                                 (get-char-attribute chr '=>ucs))))
          (insert (format "CB%05d\t" i))
          (insert (format (if (<= ucs #xFFFF)