Apply new glyph-image conventions for `ucs@*', `adobe-japan1-*',

[chise/xemacs-chise.git.1] / lisp / utf-2000 / char-db-util.el

diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el
index 4b9f502..77ce5ba 100644 (file)
--- a/lisp/utf-2000/char-db-util.el
+++ b/lisp/utf-2000/char-db-util.el
@@ -1,7 +1,7 @@
 ;;; char-db-util.el --- Character Database utility -*- coding: utf-8-er; -*-
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010, 2011, 2012 MORIOKA Tomohiko.
+;;   2007, 2008, 2009, 2010, 2011, 2012, 2013 MORIOKA Tomohiko.
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.
@@ -79,7 +79,8 @@
    ?𠦒 ?冓 ?幺 ?𢆶 ?叀 ?玄 ?予 ?放 ?𠬪 ?𣦼 ; 130
    ?歺 ?死 ?冎 ?骨 ?肉 ?筋 ?刀 ?刃 ?㓞 ?丰 ; 140
    ?耒 ?𧢲 ?竹 ?箕 ?丌 ?左 ?工 ?㠭 ?巫 ?甘 ; 150
-   ?旨 ?曰 ?乃 ?丂 ?可 ?兮 ?号 ?亏 ?喜 ?壴 ; 160
+   ?曰 ?乃 ?丂 ?可 ?兮 ?号 ?亏 ?旨 ?喜 ?壴 ; 160
+;  ?旨 ?曰 ?乃 ?丂 ?可 ?兮 ?号 ?亏 ?喜 ?壴 ; 160
    ?鼓 ?豈 ?豆 ?豊 ?豐 ?䖒 ?虍 ?虎 ?虤 ?皿 ; 170
    ?𠙴 ?去 ?血 ?丶 ?丹 ?青 ?井 ?皀 ?鬯 ?食 ; 180
    ?亼 ?會 ?倉 ?入 ?缶 ?矢 ?高 ?冂 ?𩫏 ?京 ; 190
@@ -93,6 +94,7 @@
    ?𣎳 ?林 ?麻 ?尗 ?耑 ?韭 ?瓜 ?瓠 ?宀 ?宮 ; 270
    ?呂 ?穴 ?㝱 ?𤕫 ?冖 ?𠔼 ?冃 ?㒳 ?网 ?襾 ; 280
    ?巾 ?巿 ?帛 ?白 ?㡀 ?黹 ?人 ?𠤎 ?匕 ?从 ; 290
+   ?比 ?北 ?丘 ?㐺 ?𡈼 ?重 ?臥 ?身 ?㐆 ?衣 ; 300
    ])
 
 (defun shuowen-radical (number)
@@ -214,8 +216,14 @@
     =+>jis-x0208
     =+>jis-x0213-1
     =+>jis-x0213-2
+    =+>adobe-japan1-0
+    =+>adobe-japan1-1
+    =+>adobe-japan1-2
+    =+>adobe-japan1-3
+    =+>adobe-japan1-4
+    =+>adobe-japan1-5
+    =+>adobe-japan1-6
     =+>jis-x0208@1978
-    =+>adobe-japan1
     =>jis-x0208
     =>jis-x0208@1997
     =>jis-x0213-1
@@ -258,7 +266,9 @@
     =ruimoku-v6
     =>>ruimoku-v6
     =jef-china3
-    =shinjigen))
+    =shinjigen
+    =big5-cdp-var-3
+    =big5-cdp-var-5))
 
 
 ;;; @ char-db formatters
@@ -538,20 +548,28 @@
                         =daikanwa/+2p =>>daikanwa/+2p
                         =gt =>>>gt =>>gt =+>gt =>gt
                         =gt-k =>>gt-k =>gt-k
-                        =adobe-japan1-0 =>>>adobe-japan1-0 =>>adobe-japan1-0
-                        =adobe-japan1-1 =>>>adobe-japan1-1 =>>adobe-japan1-1
-                        =adobe-japan1-2 =>>>adobe-japan1-2 =>>adobe-japan1-2
-                        =adobe-japan1-3 =>>>adobe-japan1-3 =>>adobe-japan1-3
-                        =adobe-japan1-4 =>>>adobe-japan1-4 =>>adobe-japan1-4
-                        =adobe-japan1-5 =>>>adobe-japan1-5 =>>adobe-japan1-5
-                        =adobe-japan1-6 =>>>adobe-japan1-6 =>>adobe-japan1-6
-                        =+>adobe-japan1
+                        =adobe-japan1-0 =>>>adobe-japan1-0
+                        =adobe-japan1-1 =>>>adobe-japan1-1
+                        =adobe-japan1-2 =>>>adobe-japan1-2
+                        =adobe-japan1-3 =>>>adobe-japan1-3
+                        =adobe-japan1-4 =>>>adobe-japan1-4
+                        =adobe-japan1-5 =>>>adobe-japan1-5
+                        =adobe-japan1-6 =>>>adobe-japan1-6
+                        =>>adobe-japan1-0 =+>adobe-japan1-0
+                        =>>adobe-japan1-1 =+>adobe-japan1-1
+                        =>>adobe-japan1-2 =+>adobe-japan1-2
+                        =>>adobe-japan1-3 =+>adobe-japan1-3
+                        =>>adobe-japan1-4 =+>adobe-japan1-4
+                        =>>adobe-japan1-5 =+>adobe-japan1-5
+                        =>>adobe-japan1-6 =+>adobe-japan1-6
                         =cbeta =>>cbeta
                         =zinbun-oracle =>zinbun-oracle))
             ;; (string-match "^=adobe-" (symbol-name name))
            )
        "(%-18s . %05d)\t; %c")
-       ((memq name '(=hanyo-denshi/ks =>>>hanyo-denshi/ks =>>hanyo-denshi/ks mojikyo))
+       ((memq name '(=hanyo-denshi/ks
+                    =>>>hanyo-denshi/ks =>>hanyo-denshi/ks
+                    =zihai mojikyo))
        "(%-18s . %06d)\t; %c")
        ((>= (charset-dimension name) 2)
        "(%-18s . #x%04X)\t; %c")
@@ -626,7 +644,10 @@
                           =jis-x0212
                           =jis-x0208@1983
                           =jis-x0208@1978
-                          =shinjigen))))
+                          =shinjigen
+                          =shinjigen@1ed
+                          =shinjigen@rev
+                          =shinjigen/+p@rev))))
           ((eq source 'CN)
            (setq required-features
                  (union required-features
@@ -1012,17 +1033,17 @@
            (setq strokes value)))
       (setq attributes (delq 'cns-strokes attributes))
       )
-    (when (and (memq 'shinjigen-1-radical attributes)
-              (setq value (get-char-attribute char 'shinjigen-1-radical)))
-      (unless (eq value radical)
-       (insert (format "(shinjigen-1-radical . %S)\t; %c%s"
-                       value
-                       (ideographic-radical value)
-                       line-breaking))
-       (or radical
-           (setq radical value)))
-      (setq attributes (delq 'shinjigen-1-radical attributes))
-      )
+    ;; (when (and (memq 'shinjigen-1-radical attributes)
+    ;;            (setq value (get-char-attribute char 'shinjigen-1-radical)))
+    ;;   (unless (eq value radical)
+    ;;     (insert (format "(shinjigen-1-radical . %S)\t; %c%s"
+    ;;                     value
+    ;;                     (ideographic-radical value)
+    ;;                     line-breaking))
+    ;;     (or radical
+    ;;         (setq radical value)))
+    ;;   (setq attributes (delq 'shinjigen-1-radical attributes))
+    ;;   )
     (when (and (memq 'ideographic- attributes)
               (setq value (get-char-attribute char 'ideographic-)))
       (insert "(ideographic-       ")