Sync up with r21-4-11-chise-0_20-3.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index cac056d..e92e4f1 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,20 @@
+2003-03-22  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * Ideograph-R009-Man.el: Reformatted.
+
+       * char-db-util.el (insert-char-attributes): Convert `=>ucs-gb' to
+       `=>ucs@gb'.
+
+2003-03-22  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * Ideograph-R181-Leaf.el, Ideograph-R172-Short-Tailed-Bird.el,
+       Ideograph-R154-Shell.el, Ideograph-R141-Tiger.el,
+       Ideograph-R149-Speech.el, Ideograph-R120-Silk.el,
+       Ideograph-R119-Rice.el, Ideograph-R116-Cave.el,
+       Ideograph-R085-Water.el, Ideograph-R079-Weapon.el,
+       Ideograph-R061-Heart.el, Ideograph-R038-Woman.el,
+       Ideograph-R032-Earth.el: Rename `=>ucs-gb' to `=>ucs@gb'.
+
 2003-03-20  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
        * Ideograph-R186-Fragrant.el, Ideograph-R196-Bird.el,

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index 7467ebe..ce2fce0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -782,7 +782,7 @@
     (total-strokes      . 4)
     (->same-ideograph
      (:sources (morohashi-daikanwa)
-      :char    ((=>ucs         . #x5167)       ; 內
+      :char    ((=>ucs              . #x5167)  ; 內
                 (ideographic-radical . 11)     ; ⼊
                 (ideographic-strokes . 2)
                 (total-strokes       . 4)

diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index af4ee7b..86f5df0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -7660,7 +7660,7 @@
     ))
 (define-char
   '((=>ucs*            . #x585A)       ; 塚
-    (=>ucs-gb          . #x585A)       ; 塚
+    (=>ucs@gb          . #x585A)       ; 塚
     (=>ucs-cns         . #x585A)       ; �����
     (=>ucs-big5                . #x585A)       ; �����
     (ideographic-radical . 32) ; ⼟

diff --git a/lisp/utf-2000/Ideograph-R038-Woman.el b/lisp/utf-2000/Ideograph-R038-Woman.el
index c5f2f66..c61e824 100644 (file)
--- a/lisp/utf-2000/Ideograph-R038-Woman.el
+++ b/lisp/utf-2000/Ideograph-R038-Woman.el
@@ -12684,7 +12684,7 @@
     ))
 (define-char
   '((=>ucs*            . #x5B3E)       ; 嬾
-    (=>ucs-gb          . #x5B3E)       ; 嬾
+    (=>ucs@gb          . #x5B3E)       ; 嬾
     (morohashi-daikanwa        6872 0 4)
     (ideographic-radical . 38) ; ⼥
     (ideographic-strokes . 16)

diff --git a/lisp/utf-2000/Ideograph-R061-Heart.el b/lisp/utf-2000/Ideograph-R061-Heart.el
index 1360538..78dca1a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R061-Heart.el
+++ b/lisp/utf-2000/Ideograph-R061-Heart.el
@@ -15419,7 +15419,7 @@
     ))
 (define-char
   '((=>ucs*            . #x61F2)       ; 懲
-    (=>ucs-gb          . #x61F2)       ; 懲
+    (=>ucs@gb          . #x61F2)       ; 懲
     (=>ucs-cns         . #x61F2)       ; �����
     (=>ucs-ks          . #x61F2)       ; �����
     (morohashi-daikanwa        11424 0 1)

diff --git a/lisp/utf-2000/Ideograph-R079-Weapon.el b/lisp/utf-2000/Ideograph-R079-Weapon.el
index caf15fb..98163c6 100644 (file)
--- a/lisp/utf-2000/Ideograph-R079-Weapon.el
+++ b/lisp/utf-2000/Ideograph-R079-Weapon.el
@@ -322,7 +322,7 @@
     ))
 (define-char
   '((=>ucs*            . #x6BBA)       ; 殺
-    (=>ucs-gb          . #x6BBA)       ; 殺
+    (=>ucs@gb          . #x6BBA)       ; 殺
     (=>ucs-jis         . #x6BBA)       ; �����
     (morohashi-daikanwa        16629 0 1)
     (ideographic-radical . 79) ; ⽎

diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 426fc55..3472872 100644 (file)
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -6475,7 +6475,7 @@
     ))
 (define-char
   '((=>ucs*            . #x6D41)       ; 流
-    (=>ucs-gb          . #x6D41)       ; 流
+    (=>ucs@gb          . #x6D41)       ; 流
     (=>ucs-jis         . #x6D41)       ; �����
     (=>ucs-ks          . #x6D41)       ; �����
     (morohashi-daikanwa        17572 1 1)
@@ -20463,7 +20463,7 @@
     ))
 (define-char
   '((=>ucs*            . #x701E)       ; 瀞
-    (=>ucs-gb          . #x701E)       ; 瀞
+    (=>ucs@gb          . #x701E)       ; 瀞
     (=>ucs-jis         . #x701E)       ; 瀞
     (morohashi-daikanwa        18520 0 5 0)
     (ideographic-radical . 85) ; ⽔

diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index 45830af..d695e02 100644 (file)
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -335,7 +335,7 @@
     ))
 (define-char
   '((=>ucs*            . #x7A81)       ; 突
-    (=>ucs-gb          . #x7A81)       ; 突
+    (=>ucs@gb          . #x7A81)       ; 突
     (=>ucs-cns         . #x7A81)       ; �����
     (ideographic-radical . 116)        ; ⽳
     (ideographic-strokes . 4)

diff --git a/lisp/utf-2000/Ideograph-R119-Rice.el b/lisp/utf-2000/Ideograph-R119-Rice.el
index 1481cf9..71e9029 100644 (file)
--- a/lisp/utf-2000/Ideograph-R119-Rice.el
+++ b/lisp/utf-2000/Ideograph-R119-Rice.el
@@ -3375,7 +3375,7 @@
     ))
 (define-char
   '((=>ucs*            . #x7CE8)       ; 糨
-    (=>ucs-gb          . #x7CE8)       ; 糨
+    (=>ucs@gb          . #x7CE8)       ; 糨
     (morohashi-daikanwa        27114 0 5)
     (ideographic-radical . 119)        ; ⽶
     (ideographic-strokes . 12)

diff --git a/lisp/utf-2000/Ideograph-R120-Silk.el b/lisp/utf-2000/Ideograph-R120-Silk.el
index bac1142..713b075 100644 (file)
--- a/lisp/utf-2000/Ideograph-R120-Silk.el
+++ b/lisp/utf-2000/Ideograph-R120-Silk.el
@@ -9476,7 +9476,7 @@
     ))
 (define-char
   '((=>ucs*            . #x7DF4)       ; 練
-    (=>ucs-gb          . #x7DF4)       ; 練
+    (=>ucs@gb          . #x7DF4)       ; 練
     (=>ucs-cns         . #x7DF4)       ; 練
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 9)
@@ -12923,7 +12923,7 @@
     ))
 (define-char
   '((=>ucs*            . #x7E41)       ; 繁
-    (=>ucs-gb          . #x7E41)       ; 繁
+    (=>ucs@gb          . #x7E41)       ; 繁
     (ideographic-radical . 120)        ; ⽷
     (ideographic-strokes . 11)
     (total-strokes      . 17)

diff --git a/lisp/utf-2000/Ideograph-R141-Tiger.el b/lisp/utf-2000/Ideograph-R141-Tiger.el
index 2856161..06b7435 100644 (file)
--- a/lisp/utf-2000/Ideograph-R141-Tiger.el
+++ b/lisp/utf-2000/Ideograph-R141-Tiger.el
@@ -523,7 +523,7 @@
     ))
 (define-char
   '((=>ucs*            . #x865C)       ; 虜
-    (=>ucs-gb          . #x865C)       ; 虜
+    (=>ucs@gb          . #x865C)       ; 虜
     (=>ucs-jis         . #x865C)       ; 虜
     (morohashi-daikanwa        32720 1 0)
     (ideographic-radical . 141)        ; ⾌

diff --git a/lisp/utf-2000/Ideograph-R149-Speech.el b/lisp/utf-2000/Ideograph-R149-Speech.el
index 20877e1..e250891 100644 (file)
--- a/lisp/utf-2000/Ideograph-R149-Speech.el
+++ b/lisp/utf-2000/Ideograph-R149-Speech.el
@@ -6776,7 +6776,7 @@
     ))
 (define-char
   '((=>ucs*            . #x8B01)       ; 謁
-    (=>ucs-gb          . #x8B01)       ; 謁
+    (=>ucs@gb          . #x8B01)       ; 謁
     (=>ucs-cns         . #x8B01)       ; 謁
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 9)
@@ -8645,7 +8645,7 @@
     ))
 (define-char
   '((=>ucs*            . #x8B39)       ; 謹
-    (=>ucs-gb          . #x8B39)       ; 謹
+    (=>ucs@gb          . #x8B39)       ; 謹
     (=>ucs-cns         . #x8B39)       ; 謹
     (ideographic-radical . 149)        ; ⾔
     (ideographic-strokes . 11)

diff --git a/lisp/utf-2000/Ideograph-R154-Shell.el b/lisp/utf-2000/Ideograph-R154-Shell.el
index e487f2f..14b8e86 100644 (file)
--- a/lisp/utf-2000/Ideograph-R154-Shell.el
+++ b/lisp/utf-2000/Ideograph-R154-Shell.el
@@ -1800,7 +1800,7 @@
     ))
 (define-char
   '((=>ucs*            . #x8CD3)       ; 賓
-    (=>ucs-gb          . #x8CD3)       ; 賓
+    (=>ucs@gb          . #x8CD3)       ; 賓
     (=>ucs-cns         . #x8CD3)       ; 賓
     (ideographic-radical . 154)        ; ⾙
     (ideographic-strokes . 7)

diff --git a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
index cfd25d6..eedeb86 100644 (file)
--- a/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
+++ b/lisp/utf-2000/Ideograph-R172-Short-Tailed-Bird.el
@@ -3189,7 +3189,7 @@
     ))
 (define-char
   '((=>ucs*            . #x96E3)       ; 難
-    (=>ucs-gb          . #x96E3)       ; 難
+    (=>ucs@gb          . #x96E3)       ; 難
     (=>ucs-cns         . #x96E3)       ; 難
     (ideographic-radical . 172)        ; ⾫
     (ideographic-strokes . 11)

diff --git a/lisp/utf-2000/Ideograph-R181-Leaf.el b/lisp/utf-2000/Ideograph-R181-Leaf.el
index b2f3abd..4c8b46b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R181-Leaf.el
+++ b/lisp/utf-2000/Ideograph-R181-Leaf.el
@@ -2032,7 +2032,7 @@
     ))
 (define-char
   '((=>ucs*            . #x983B)       ; 頻
-    (=>ucs-gb          . #x983B)       ; 頻
+    (=>ucs@gb          . #x983B)       ; 頻
     (=>ucs-cns         . #x983B)       ; 頻
     (ideographic-radical . 181)        ; ⾴
     (ideographic-strokes . 7)

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 34dd0d3..0e306bd 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -498,24 +498,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))
       )
@@ -845,7 +858,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)))