From: tomo <tomo>
Date: Sun, 23 Mar 2003 06:32:02 +0000 (+0000)
Subject: (insert-char-attributes): Convert `=>ucs-gb' to `=>ucs@gb'.
X-Git-Tag: r21-4-11-chise-0_20-3^2~3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf67ea1111f2fe9a5281a967818aa306c73354a6;p=chise%2Fxemacs-chise.git

(insert-char-attributes): Convert `=>ucs-gb' to `=>ucs@gb'.
---

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index d8bb506..48df7e12 100644
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -475,24 +475,37 @@
 		      line-breaking))
       (setq attributes (delq 'script attributes))
       )
-    (when (and (memq '=>ucs attributes)
-	       (setq value (get-char-attribute char '=>ucs)))
-      (insert (format "(=>ucs\t\t. #x%04X)\t; %c%s"
-		      value (decode-char '=ucs value)
-		      line-breaking))
-      (setq attributes (delq '=>ucs attributes))
-      )
-    (when (and (memq '=>ucs* attributes)
-	       (setq value (get-char-attribute char '=>ucs*)))
-      (insert (format "(=>ucs*\t\t. #x%04X)\t; %c%s"
-		      value (decode-char '=ucs value)
-		      line-breaking))
-      (setq attributes (delq '=>ucs* attributes))
-      )
+    (dolist (name '(=>ucs =>ucs*))
+      (when (and (memq name attributes)
+		 (setq value (get-char-attribute char name)))
+	(insert (format "(%-18s . #x%04X)\t; %c%s"
+			name value (decode-char '=ucs value)
+			line-breaking))
+	(setq attributes (delq name attributes))))
+    ;; (when (and (memq '=>ucs* attributes)
+    ;;            (setq value (get-char-attribute char '=>ucs*)))
+    ;;   (insert (format "(=>ucs*\t\t. #x%04X)\t; %c%s"
+    ;;                   value (decode-char '=ucs value)
+    ;;                   line-breaking))
+    ;;   (setq attributes (delq '=>ucs* attributes))
+    ;;   )
+    (dolist (name '(=>ucs@gb))
+      (when (and (memq name attributes)
+		 (setq value (get-char-attribute char name)))
+	(insert (format "(%-18s . #x%04X)\t; %c%s"
+			name value
+			(decode-char (intern
+				      (concat "="
+					      (substring
+					       (symbol-name name) 2)))
+				     value)
+			line-breaking))
+	(setq attributes (delq name attributes))
+	))
     (when (and (memq '=>ucs-gb attributes)
 	       (setq value (get-char-attribute char '=>ucs-gb)))
-      (insert (format "(=>ucs-gb\t\t. #x%04X)\t; %c%s"
-		      value (decode-char '=ucs value)
+      (insert (format "(=>ucs@gb\t\t. #x%04X)\t; %c%s"
+		      value (decode-char '=ucs@gb value)
 		      line-breaking))
       (setq attributes (delq '=>ucs-gb attributes))
       )
@@ -829,7 +842,12 @@
     (while attributes
       (setq name (car attributes))
       (if (setq value (get-char-attribute char name))
-	  (cond ((eq name 'jisx0208-1978/4X)
+	  (cond ((string-match "^=>ucs@" (symbol-name name))
+		 (insert (format "(%-18s . #x%04X)\t; %c%s"
+				 name value (decode-char '=ucs value)
+				 line-breaking))
+		 )
+		((eq name 'jisx0208-1978/4X)
 		 (insert (format "(%-18s . #x%04X)%s"
 				 name value
 				 line-breaking)))