From: tomo <tomo>
Date: Tue, 1 Jul 2003 07:01:30 +0000 (+0000)
Subject: (dump-94x94-ccs-to-ucs-table): Use `encode-char' with `defined-only'
X-Git-Tag: chise-base-0_23~52
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c48cb4f231fa86728f4cdf3ad0da02af30c320da;p=chise%2Ftomoyo-tools.git

(dump-94x94-ccs-to-ucs-table): Use `encode-char' with `defined-only'
mode instead of `get-char-attribute' to get CCS-feature values.
(dump-jis-x0213-1-to-ucs-table): Likewise; abolish setting for
`->ucs'.
(dump-big5-to-ucs-table): Likewise.
(dump-jef-china3-to-ucs-table): Use `encode-char' with `defined-only'
mode instead of `get-char-attribute' to get CCS-feature values.
(dump-cbeta-to-ucs-table): Likewise.
---

diff --git a/dump-tables.el b/dump-tables.el
index 689812a..7abbd34 100644
--- 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.
 
@@ -39,9 +39,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))
@@ -81,10 +81,10 @@
 	(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)))
@@ -135,10 +135,9 @@
 	(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)
+		     (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
@@ -164,7 +163,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 +184,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)