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

`ucs-domain'.
(dump-jis-x0208-1990-to-ucs-table): Modify for
`dump-94x94-ccs-to-ucs-table'.
(dump-jis-x0212-to-ucs-table): Likewise.
(dump-jis-x0213-1-to-ucs-table): Use `=>ucs@jis' instead of
`=>ucs-jis'.
(dump-jis-x0213-2-to-ucs-table): Modify for
`dump-94x94-ccs-to-ucs-table'.
(dump-cns-11643-3-to-ucs-table): Likewise.
(dump-cns-11643-4-to-ucs-table): Likewise.
(dump-big5-to-ucs-table): Use `=>ucs@big5' instead of `=>ucs-big5'.

diff --git a/dump-tables.el b/dump-tables.el
index 7abbd34..1134b54 100644 (file)
--- a/dump-tables.el
+++ b/dump-tables.el
@@ -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)
@@ -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)
@@ -87,7 +88,7 @@
                                   (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)
@@ -138,7 +139,7 @@
                     (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)))
+                              (get-char-attribute chr '=>ucs@big5)))
            (insert (format "B-%02X%02X" row cell))
            (if ucs-big5
                (insert (format "\tBU+%04X\t" ucs-big5))