Mount `{->|<-}HNG@{CN|JP}/{manuscript|printed}' and
[chise/est.git] / cwiki-common.el
index f8f840c..9817062 100644 (file)
@@ -1,9 +1,13 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (require 'char-db-util)
+;; (require 'concord-images)
 
 (setq file-name-coding-system 'utf-8-mcs-er)
 
 
+(concord-assign-genre 'image-resource "/usr/local/var/photo/db")
+(concord-assign-genre 'glyph-image "/usr/local/var/photo/db")
+
 (concord-assign-genre 'creator@ruimoku "/usr/local/var/ruimoku/db")
 (concord-assign-genre 'person-name@ruimoku "/usr/local/var/ruimoku/db")
 
 
 (mount-char-attribute-table '*instance@morpheme-entry/zh-classical)
 
+(concord-assign-genre 'ud@zh-classical "/usr/local/var/kanbun/db")
+
+
+(concord-assign-genre 'hng-card "/usr/local/var/hng-card/db")
+
+(mount-char-attribute-table '->HNG)
+(mount-char-attribute-table '<-HNG)
+(mount-char-attribute-table '->HNG@CN/manuscript)
+(mount-char-attribute-table '<-HNG@CN/manuscript)
+(mount-char-attribute-table '->HNG@CN/printed)
+(mount-char-attribute-table '<-HNG@CN/printed)
+(mount-char-attribute-table '->HNG@JP/manuscript)
+(mount-char-attribute-table '<-HNG@JP/manuscript)
+(mount-char-attribute-table '->HNG@JP/printed)
+(mount-char-attribute-table '<-HNG@JP/printed)
+(mount-char-attribute-table '->HNG@KR)
+(mount-char-attribute-table '<-HNG@KR)
+(mount-char-attribute-table '->HNG@MISC)
+(mount-char-attribute-table '<-HNG@MISC)
+
 
 (defvar est-hide-cgi-mode nil)
 (defvar est-view-url-prefix "..")
 (defvar chise-wiki-bitmap-glyphs-url
   "http://www.chise.org/glyphs")
 
+(defvar chise-wiki-hng-bitmap-glyphs-url
+  "http://hng.chise.org/glyphs/HNG")
+
 (defvar chise-wiki-glyph-cgi-url
   "http://www.chise.org/chisewiki/glyph.cgi")
 
 (defvar chise-wiki-displayed-features nil)
 
+(defvar est-coded-charset-priority-list
+  '(; =ucs
+    =cns11643-1 =cns11643-2 =cns11643-3
+    =cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7
+    =gb2312 =gb12345
+    =jis-x0208 =jis-x0208@1990
+    =jis-x0213-2
+    =jis-x0212
+    =adobe-japan1
+    =cbeta =jef-china3
+    =jis-x0213-1@2000 =jis-x0213-1@2004
+    =jis-x0208@1983 =jis-x0208@1978
+    =zinbun-oracle =>zinbun-oracle
+    =daikanwa
+    =gt =gt-k
+    =>>>adobe-japan1
+    =>>>jis-x0208 =>>>jis-x0213-1 =>>>jis-x0213-2
+    =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-2
+    =>>adobe-japan1
+    =+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2
+    =+>jis-x0208@1978
+    =+>adobe-japan1
+    =>jis-x0208 =>jis-x0213-1
+    =>>gt
+    =>ucs@iso =>ucs@unicode
+    =>ucs@jis =>ucs@cns =>ucs@ks
+    =+>ucs@iso =+>ucs@unicode
+    =>>ucs@iso =>>ucs@unicode
+    =>>ucs@jis =>>ucs@cns =>>ucs@ks
+    =>>>ucs@iso =>>>ucs@unicode
+    =>>>ucs@jis =>>>ucs@cns =>>>ucs@ks
+    ===ucs@iso
+    =ruimoku-v6
+    =big5
+    =big5-cdp
+    =>cbeta
+    =mj
+    ==mj
+    ===mj
+    =ucs-itaiji-001
+    =ucs-itaiji-002
+    =ucs-itaiji-003
+    =ucs-itaiji-004
+    =ucs-itaiji-005
+    =ucs-itaiji-006
+    =ucs-itaiji-007
+    =ucs-itaiji-008
+    =ucs-itaiji-009
+    =ucs-itaiji-010
+    =ucs-itaiji-011
+    =ucs-itaiji-084
+    =ucs-var-001
+    =ucs-var-002
+    =ucs-var-003
+    =ucs-var-004
+    =ucs@unicode
+    ==ucs@unicode
+    ===ucs@unicode
+    ==>ucs@bucs
+    ===daikanwa/+p
+    ===gt
+    =>ucs@iwds-1
+    =>ucs@component
+    =>ucs-itaiji-001
+    =>ucs-itaiji-002
+    =>ucs-itaiji-003
+    =>ucs-itaiji-004
+    =>ucs-itaiji-005
+    =>ucs-itaiji-006
+    =>ucs-itaiji-007
+    ===adobe-japan1
+    ===cns11643-1 ===cns11643-2 ===cns11643-3
+    ===cns11643-4 ===cns11643-5 ===cns11643-6 ===cns11643-7
+    ))
+
 (defun decode-uri-string (string &optional coding-system)
   (if (> (length string) 0)
       (let ((i 0)
         ))))
 
 (defun www-feature-format (feature-name)
-  (or (char-feature-property feature-name 'format)
+  (or (char-feature-property feature-name 'presentation-format)
+      (char-feature-property feature-name 'format)
       (let (fn parent ret)
        (setq fn feature-name)
        (while (and (setq parent (char-feature-name-parent fn))
                      (est-uri-decode-feature-name-body
                       (substring uri-feature (match-end 0)))))
       )
-     ((string-match "^rep2\\." uri-feature)
-      (intern (format "==%s"
+     ((string-match "^rep[2i]\\." uri-feature)
+      (intern (format "===%s"
                      (est-uri-decode-feature-name-body
                       (substring uri-feature (match-end 0)))))
       )
                      (est-uri-decode-feature-name-body
                       (substring uri-feature (match-end 0)))))
       )
-     ((string-match "^gi\\." uri-feature)
-      (intern (format "=>>>%s"
+     ((string-match "^g[i2]\\." uri-feature)
+      (intern (format "==%s"
                      (est-uri-decode-feature-name-body
                       (substring uri-feature (match-end 0)))))
       )
             (substring feature-name (match-beginning 1))))
     )
    ((string-match "^==\\([^=>]+\\)" feature-name)
-    (concat "rep2."
+    (concat "g2."
+           (est-uri-encode-feature-name-body
+            (substring feature-name (match-beginning 1))))
+    )
+   ((string-match "^===\\([^=>]+\\)" feature-name)
+    (concat "repi."
            (est-uri-encode-feature-name-body
             (substring feature-name (match-beginning 1))))
     )
             (format "%%%02X" byte))
           (encode-coding-string (char-to-string object) 'utf-8-mcs-er)
           "")
-       (let ((ccs-list '(; =ucs
-                         =cns11643-1 =cns11643-2 =cns11643-3
-                         =cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7
-                         =gb2312 =gb12345
-                         =jis-x0208 =jis-x0208@1990
-                         =jis-x0213-2
-                         =jis-x0212
-                         =adobe-japan1
-                         =cbeta =jef-china3
-                         =jis-x0213-1@2000 =jis-x0213-1@2004
-                         =jis-x0208@1983 =jis-x0208@1978
-                         =zinbun-oracle =>zinbun-oracle
-                         =daikanwa
-                         =gt =gt-k
-                         =>>>adobe-japan1
-                         =>>>jis-x0208 =>>>jis-x0213-1 =>>>jis-x0213-2
-                         =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-2
-                         =>>adobe-japan1
-                         =+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2
-                         =+>jis-x0208@1978
-                         =+>adobe-japan1
-                         =>jis-x0208 =>jis-x0213-1
-                         =>>gt
-                         =>ucs@iso =>ucs@unicode
-                         =>ucs@jis =>ucs@cns =>ucs@ks
-                         =>>ucs@iso =>>ucs@unicode
-                         =>>ucs@jis =>>ucs@cns =>>ucs@ks
-                         =>>>ucs@iso =>>>ucs@unicode
-                         =>>>ucs@jis =>>>ucs@cns =>>>ucs@ks
-                         =ruimoku-v6
-                         =big5
-                         =big5-cdp))
+       (let ((ccs-list est-coded-charset-priority-list)
              ccs ret)
          (while (and ccs-list
                      (setq ccs (pop ccs-list))
 (defun www-format-encode-string (string &optional without-tags as-body)
   (with-temp-buffer
     (insert string)
-    (let (plane code start end char variants ret rret)
+    (let (plane code subcode start end char variants ret rret)
       (when as-body
        (goto-char (point-min))
        (while (search-forward "&" nil t)
        (let ((coded-charset-entity-reference-alist
               (list*
                '(=gt                   "GT-" 5 d)
+               '(=mj                    "MJ" 6 d)
                '(=hanyo-denshi/ja   "HD-JA-" 4 X)
                '(=hanyo-denshi/jb   "HD-JB-" 4 X)
                '(=hanyo-denshi/jc   "HD-JC-" 4 X)
                '(=hanyo-denshi/ip   "HD-IP-" 4 X)
                '(=hanyo-denshi/jt   "HD-JT-" 4 X)
                '(=hanyo-denshi/ks   "HD-KS-" 6 d)
+               '(=>>hanyo-denshi/ja "G-HD-JA-" 4 X)
+               '(=>>hanyo-denshi/jb "G-HD-JB-" 4 X)
+               '(=>>hanyo-denshi/jc "G-HD-JC-" 4 X)
+               '(=>>hanyo-denshi/jd "G-HD-JD-" 4 X)
+               '(=>>hanyo-denshi/ft "G-HD-FT-" 4 X)
+               '(=>>hanyo-denshi/ia "G-HD-IA-" 4 X)
+               '(=>>hanyo-denshi/ib "G-HD-IB-" 4 X)
+               '(=>>hanyo-denshi/hg "G-HD-HG-" 4 X)
+               '(=>>hanyo-denshi/ip "G-HD-IP-" 4 X)
+               '(=>>hanyo-denshi/jt "G-HD-JT-" 4 X)
+               '(=>>hanyo-denshi/ks "G-HD-KS-" 6 d)
+               '(==mj                  "g2-MJ" 6 d)
+               '(==hanyo-denshi/ja "g2-HD-JA-" 4 X)
+               '(==hanyo-denshi/jb "g2-HD-JB-" 4 X)
+               '(==hanyo-denshi/jc "g2-HD-JC-" 4 X)
+               '(==hanyo-denshi/jd "g2-HD-JD-" 4 X)
+               '(==hanyo-denshi/ft "g2-HD-FT-" 4 X)
+               '(==hanyo-denshi/ia "g2-HD-IA-" 4 X)
+               '(==hanyo-denshi/ib "g2-HD-IB-" 4 X)
+               '(==hanyo-denshi/hg "g2-HD-HG-" 4 X)
+               '(==hanyo-denshi/ip "g2-HD-IP-" 4 X)
+               '(==hanyo-denshi/jt "g2-HD-JT-" 4 X)
+               '(==hanyo-denshi/ks "g2-HD-KS-" 6 d)
                '(=cns11643-1           "C1-" 4 X)
                '(=cns11643-2           "C2-" 4 X)
                '(=cns11643-3           "C3-" 4 X)
                '(=cns11643-7           "C7-" 4 X)
                '(=adobe-japan1-6       "AJ1-" 5 d)
                '(=big5-cdp             "CDP-" 4 X)
+               '(=>big5-cdp          "A-CDP-" 4 X)
                '(=gb2312               "G0-" 4 X)
                '(=gb12345              "G1-" 4 X)
                '(=jis-x0208@1990       "J90-" 4 X)
                '(=jef-china3           "JC3-" 4 X)
                '(=ucs@unicode          "UU+" 4 X)
                '(=ucs@JP/hanazono  "hanaJU+" 4 X)
-               '(=daikanwa              "M-" 5 d)
                '(==cns11643-1        "R-C1-" 4 X)
                '(==cns11643-2        "R-C2-" 4 X)
                '(==cns11643-3        "R-C3-" 4 X)
                '(==cns11643-5        "R-C5-" 4 X)
                '(==cns11643-6        "R-C6-" 4 X)
                '(==cns11643-7        "R-C7-" 4 X)
+               '(=hanziku-1         "HZK01-" 4 X)
+               '(=hanziku-2         "HZK02-" 4 X)
+               '(=hanziku-3         "HZK03-" 4 X)
+               '(=hanziku-4         "HZK04-" 4 X)
+               '(=hanziku-5         "HZK05-" 4 X)
+               '(=hanziku-6         "HZK06-" 4 X)
+               '(=hanziku-7         "HZK07-" 4 X)
+               '(=hanziku-8         "HZK08-" 4 X)
+               '(=hanziku-9         "HZK09-" 4 X)
+               '(=hanziku-10        "HZK10-" 4 X)
+               '(=hanziku-11        "HZK11-" 4 X)
+               '(=hanziku-12        "HZK12-" 4 X)
+               '(==cbeta               "CB" 5 d)
+               '(=big5                  "B-" 4 X)
+               '(=daikanwa              "M-" 5 d)
                coded-charset-entity-reference-alist)))
          (encode-coding-region (point-min)(point-max) 'utf-8-mcs-er)
 
          (goto-char (point-min))
-         (while (re-search-forward "&CB\\([0-9]+\\);" nil t)
-           (setq code (string-to-int (match-string 1)))
+         (while (re-search-forward "&\\(A-\\|G-\\|g2-\\|R-\\)?CB\\([0-9]+\\);" nil t)
+           (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"CB%05d\" src=\"%s/cb-gaiji/%02d/CB%05d.gif\"
 style=\"%s\">"
@@ -787,7 +903,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?J\\(78\\|83\\|90\\|97\\|SP\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
+         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?J\\(78\\|83\\|90\\|97\\|SP\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
            (setq plane (match-string 2)
                  code (string-to-int (match-string 3) 16))
            (replace-match
@@ -802,7 +918,20 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(o-\\)?HD-\\(JA\\|JB\\|JC\\|JD\\|FT\\|IA\\|IB\\|HG\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
+         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?J0-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
+           (replace-match
+            (format "<img alt=\"J0-%04X\" src=\"%s/JIS-90/%02d-%02d.gif\"
+style=\"%s\">"
+                    code
+                    chise-wiki-bitmap-glyphs-url
+                    (- (lsh code -8) 32)
+                    (- (logand code 255) 32)
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?HD-\\(JA\\|JB\\|JC\\|JD\\|FT\\|IA\\|IB\\|HG\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
            (setq plane (match-string 2)
                  code (string-to-int (match-string 3) 16))
            (replace-match
@@ -817,7 +946,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?HD-\\(IP\\|JT\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
+         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?HD-\\(IP\\|JT\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
            (setq plane (match-string 2)
                  code (string-to-int (match-string 3) 16))
            (replace-match
@@ -830,7 +959,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?HD-KS-\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?HD-KS-\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"HD-KS%06d\" src=\"%s/IVD/HanyoDenshi/KS%06d.png\"
@@ -870,8 +999,8 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&JC3-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
-           (setq code (string-to-int (match-string 1) 16))
+         (while (re-search-forward "&\\(R-\\)?JC3-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
            (replace-match
             (format "<img alt=\"JC3-%04X\" src=\"http://kanji.zinbun.kyoto-u.ac.jp/db/CHINA3/Gaiji/%04x.gif\">"
                     code code)
@@ -890,7 +1019,32 @@ style=\"vertical-align:middle\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?AJ1-\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&HNG\\([0-9]+\\)-\\([0-9][0-9][0-9][0-9]\\)\\([0-9]\\);" nil t)
+           (setq plane (match-string 1)
+                 code (string-to-int (match-string 2))
+                 subcode (string-to-int (match-string 3)))
+           (setq subcode
+                 (if (eq subcode 0)
+                     ""
+                   (char-to-string (decode-char 'ascii (+ 96 subcode)))))
+           (replace-match
+            (format
+             "<div class=\"tooltip\"><img alt=\"HNG%s-%04d%s\" src=\"%s/%s/%04d%s.png\" style=\"
+vertical-align:middle; width: 48px; height: 48px\"><span
+class=\"tooltiptext\">%s</span></div>"
+             plane code subcode
+             chise-wiki-hng-bitmap-glyphs-url
+             plane code subcode
+             (charset-description
+              (car (find (format "HNG%s-" plane)
+                         coded-charset-entity-reference-alist
+                         :test (lambda (key cell)
+                                 (string= key (nth 1 cell))))))
+             )
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?AJ1-\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"AJ1-%05d\" src=\"%s/IVD/AdobeJapan1/CID+%d.png\"
@@ -902,7 +1056,97 @@ style=\"vertical-align:middle\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(G-\\|R-\\|g2-\\)?GT-\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|o-\\|G-\\|g2-\\|R-\\)?MJ\\([0-9]+\\);" nil t)
+           (setq code (string-to-int (match-string 2)))
+           (replace-match
+            (format "<img alt=\"MJ%06d\" src=\"http://mojikiban.ipa.go.jp/MJ%06d.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    code
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?IU[+-]\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
+           (replace-match
+            (format "<img alt=\"u%04x\" src=\"http://glyphwiki.org/glyph/u%04x.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    code
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&A-\\(comp\\|cgn\\)U[+-]\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
+           (replace-match
+            (format "<img alt=\"u%04x\" src=\"http://glyphwiki.org/glyph/u%04x.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    code
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward
+                 "&\\(A-\\|g2-\\)?U-i\\([0-9]+\\)\\+\\([0-9A-F]+\\);"
+                 nil t)
+           (setq plane (string-to-int (match-string 2))
+                 code (string-to-int (match-string 3) 16))
+           (replace-match
+            (format "<img alt=\"u%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-itaiji-%03d.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    plane
+                    code
+                    plane
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&A-IWDSU\\+\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 1) 16))
+           (replace-match
+            (format "<img alt=\"A-IWDSU+%04x\" src=\"http://glyphwiki.org/glyph/u%04x.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    code
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward
+                 "&\\(A-\\)?CDP-i\\([0-9]+\\)-\\([0-9A-F]+\\);"
+                 nil t)
+           (setq plane (string-to-int (match-string 2))
+                 code (string-to-int (match-string 3) 16))
+           (replace-match
+            (format "<img alt=\"cdp-%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/cdp-%04x-itaiji-%03d.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    plane
+                    code
+                    plane
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&\\(g2-\\)?U-v\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t)
+           (setq plane (string-to-int (match-string 2))
+                 code (string-to-int (match-string 3) 16))
+           (replace-match
+            (format "<img alt=\"u%04x-var-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-var-%03d.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+                    code
+                    plane
+                    code
+                    plane
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&\\(A-\\|G-\\|R-\\|g2-\\)?GT-\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"GT-%05d\" src=\"%s?char=GT-%05d\"
@@ -914,7 +1158,7 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(G-\\)?GT-K\\([0-9]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|G-\\|g2-\\)?GT-K\\([0-9]+\\);" nil t)
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"GT-K%05d\" src=\"%s?char=GT-K%05d\"
@@ -938,8 +1182,9 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&CDP-\\([0-9A-F]+\\);" nil t)
-           (setq code (string-to-int (match-string 1) 16))
+         (while (re-search-forward
+                 "&\\(A-\\|G-\\|g2-\\|R-\\)?CDP-\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
            (replace-match
             (format "<img alt=\"CDP-%04X\" src=\"%s?char=CDP-%04X\"
 style=\"%s\">"
@@ -950,8 +1195,24 @@ style=\"%s\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&RUI6-\\([0-9A-F]+\\);" nil t)
-           (setq code (string-to-int (match-string 1) 16))
+         (while (re-search-forward
+                 "&\\(I-\\)?HZK\\(0[1-9]\\|1[0-2]\\)-\\([0-9A-F]+\\);" nil t)
+           (setq plane (match-string 2)
+                 code (string-to-int (match-string 3) 16))
+           (replace-match
+            (format "<img alt=\"HZK%s-%04X\" src=\"%s?char=HZK%s-%04X\"
+style=\"%s\">"
+                    plane
+                    code
+                    chise-wiki-glyph-cgi-url
+                    plane
+                    code
+                    www-format-char-img-style)
+            t 'literal))
+
+         (goto-char (point-min))
+         (while (re-search-forward "&\\(A-\\|G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
            (replace-match
             (format "<img alt=\"RUI6-%04X\" src=\"%s?char=RUI6-%04X\"
 style=\"vertical-align:middle\">"
@@ -974,7 +1235,7 @@ style=\"vertical-align:middle\">"
             t 'literal))
 
          (goto-char (point-min))
-         (while (re-search-forward "&\\(A-\\|R-\\)?\\(UU\\+\\|U-\\)\\([0-9A-F]+\\);" nil t)
+         (while (re-search-forward "&\\(A-\\|G-\\|g2-\\|R-\\)?\\(UU\\+\\|U-\\)\\([0-9A-F]+\\);" nil t)
            (setq code (string-to-int (match-string 3) 16))
            (replace-match
             (format "<img alt=\"UU+%04X\" src=\"http://www.unicode.org/cgi-bin/refglyph?24-%04X\"
@@ -995,7 +1256,9 @@ style=\"vertical-align:middle\">"
                         (or (www-get-feature-value char '->subsumptive)
                             (www-get-feature-value char '->denotational)))
                   (progn
-                    (while (and variants
+                    (if (characterp variants)
+                        (setq variants (list variants)))
+                    (while (and variants
                                 (setq ret (www-format-encode-string
                                            (char-to-string (car variants))))
                                 (string-match "&MCS-\\([0-9A-F]+\\);" ret))
@@ -1064,7 +1327,59 @@ style=\"vertical-align:middle\">"
 ;;;
 
 (defvar coded-charset-GlyphWiki-id-alist
-  '((=ucs              "u"     4 x nil)
+  '((===adobe-japan1-0 "aj1-"  5 d nil)
+    (===adobe-japan1-1 "aj1-"  5 d nil)
+    (===adobe-japan1-2 "aj1-"  5 d nil)
+    (===adobe-japan1-3 "aj1-"  5 d nil)
+    (===adobe-japan1-4 "aj1-"  5 d nil)
+    (===adobe-japan1-5 "aj1-"  5 d nil)
+    (===adobe-japan1-6 "aj1-"  5 d nil)
+    (===ucs@jis                "u"     4 x nil)
+    (===daikanwa       "dkw-"  5 d nil)
+    (===ucs@ks         "u"     4 x "-k")
+    (==ucs-itaiji-005  "u"     4 x "-itaiji-005")
+    (=ucs-var-001      "u"     4 x "-var-001")
+    (=ucs-var-002      "u"     4 x "-var-002")
+    (=ucs-var-003      "u"     4 x "-var-003")
+    (=ucs-var-004      "u"     4 x "-var-004")
+    (=ucs-itaiji-001   "u"     4 x "-itaiji-001")
+    (=ucs-itaiji-002   "u"     4 x "-itaiji-002")
+    (=ucs-itaiji-003   "u"     4 x "-itaiji-003")
+    (=ucs-itaiji-084   "u"     4 x "-itaiji-084")
+    (=>ucs-itaiji-001  "u"     4 x "-itaiji-001")
+    (=>ucs-itaiji-006  "u"     4 x "-itaiji-006")
+    (==adobe-japan1-0  "aj1-"  5 d nil)
+    (==adobe-japan1-1  "aj1-"  5 d nil)
+    (==adobe-japan1-2  "aj1-"  5 d nil)
+    (==adobe-japan1-3  "aj1-"  5 d nil)
+    (==adobe-japan1-4  "aj1-"  5 d nil)
+    (==adobe-japan1-5  "aj1-"  5 d nil)
+    (==adobe-japan1-6  "aj1-"  5 d nil)
+    (==ucs@jis         "u"     4 x nil)
+    (==ucs@iso         "u"     4 x nil)
+    (==ucs@cns         "u"     4 x "-t")
+    (==ucs@unicode     "u"     4 x "-us")
+    (==daikanwa                "dkw-"  5 d nil)
+    (==ucs@ks          "u"     4 x "-k")
+    (==jis-x0208@1978  "j78-"  4 x nil)
+    (==jis-x0208       "j90-"  4 x nil)
+    (==jis-x0208@1990  "j90-"  4 x nil)
+    (==jis-x0208@1983  "j83-"  4 x nil)
+    (==cbeta          "cbeta-" 5 d nil)
+    (=>>hanyo-denshi/ks        "koseki-" 6 d nil)
+    (=>>jis-x0208@1978 "j78-"  4 x nil)
+    (=>>big5-cdp       "cdp-"  4 x nil)
+    (=>>adobe-japan1-0 "aj1-"  5 d nil)
+    (=>>adobe-japan1-1 "aj1-"  5 d nil)
+    (=>>adobe-japan1-2 "aj1-"  5 d nil)
+    (=>>adobe-japan1-3 "aj1-"  5 d nil)
+    (=>>adobe-japan1-4 "aj1-"  5 d nil)
+    (=>>adobe-japan1-5 "aj1-"  5 d nil)
+    (=>>adobe-japan1-6 "aj1-"  5 d nil)
+    (=>>jis-x0208      "j90-"  4 x nil)
+    (=>>jis-x0208@1990 "j90-"  4 x nil)
+    (=>>jis-x0208@1983 "j83-"  4 x nil)
+    (=>>daikanwa       "dkw-"  5 d nil)
     (=adobe-japan1-0   "aj1-"  5 d nil)
     (=adobe-japan1-1   "aj1-"  5 d nil)
     (=adobe-japan1-2   "aj1-"  5 d nil)
@@ -1075,32 +1390,42 @@ style=\"vertical-align:middle\">"
     (=decomposition@cid)
     (=decomposition@hanyo-denshi)
     (=hanyo-denshi/ks  "koseki-" 6 d nil)
-    (=>>hanyo-denshi/ks        "koseki-" 6 d nil)
+    (=koseki           "koseki-" 6 d nil)
     (=ucs@jis          "u"     4 x nil)
     (=ucs@cns          "u"     4 x "-t")
+    (=ucs@ks           "u"     4 x "-k")
+    (=ucs@JP           "u"     4 x nil)
+    (=ucs@gb           "u"     4 x "-g")
+    (=ucs@iso          "u"     4 x "-u")
+    (=ucs@unicode      "u"     4 x "-us")
+    (=big5-cdp         "cdp-"  4 x nil)
+    (=>big5-cdp                "cdp-"  4 x nil)
+    (=cbeta           "cbeta-" 5 d nil)
+    (=big5-cdp-var-3   "cdp-"  4 x "-var-3")
+    (=big5-cdp-var-5   "cdp-"  4 x "-var-5")
+    (=big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001")
+    (=big5-cdp-itaiji-002 "cdp-" 4 x "-itaiji-002")
+    (=>big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001")
+    (=jef-china3       "jc3-"  4 x nil)
     (=jis-x0212                "jsp-"  4 x nil)
     (=jis-x0213-1@2000 "jx1-2000-" 4 x nil)
     (=jis-x0213-1@2004 "jx1-2004-" 4 x nil)
     (=jis-x0213-2      "jx2-"  4 x nil)
-    (=gt               "gt-"   5 d nil)
-    (=daikanwa         "dkw-"  5 d nil)
     (=gt-k             "gt-k"  5 d nil)
-    (=jef-china3       "jc3-"  4 x nil)
-    (=big5             "b-"    4 x nil)
-    (=ucs@ks           "u"     4 x "-k")
-    (=ks-x1001         "k0-"   4 x nil)
     (=jis-x0208@1978/1pr "j78-"        4 x nil)
     (=jis-x0208@1978/-4pr "j78-" 4 x nil)
     (=jis-x0208@1978   "j78-"  4 x nil)
-    (=>>>jis-x0208@1978        "j78-"  4 x nil)
-    (=>>jis-x0208@1978 "j78-"  4 x nil)
     (=+>jis-x0208@1978 "j78-"  4 x nil)
-    (=ucs@JP           "u"     4 x nil)
-    (=ucs@gb           "u"     4 x "-g")
-    (=ucs@iso          "u"     4 x "-u")
-    (=ucs@unicode      "u"     4 x "-us")
-    (=big5-cdp         "cdp-"  4 x nil)
-    (=>>big5-cdp       "cdp-"  4 x nil)
+    (=+>jis-x0208      "j90-"  4 x nil)
+    (=+>jis-x0208@1990 "j90-"  4 x nil)
+    (=+>jis-x0208@1983 "j83-"  4 x nil)
+    (=ucs              "u"     4 x nil)
+    (=big5             "b-"    4 x nil)
+    (=daikanwa         "dkw-"  5 d nil)
+    (=gt               "gt-"   5 d nil)
+    (=ruimoku-v6       "rui6-" 4 x nil)
+    (=>ruimoku-v6      "rui6-" 4 x nil)
+    (=ks-x1001         "k0-"   4 x nil)
     (=cns11643-1       "c1-"   4 x nil)
     (=cns11643-2       "c2-"   4 x nil)
     (=cns11643-3       "c3-"   4 x nil)
@@ -1109,19 +1434,8 @@ style=\"vertical-align:middle\">"
     (=cns11643-6       "c6-"   4 x nil)
     (=cns11643-7       "c7-"   4 x nil)
     (=jis-x0208                "j90-"  4 x nil)
-    (=>>>jis-x0208     "j90-"  4 x nil)
-    (=>>jis-x0208      "j90-"  4 x nil)
-    (=+>jis-x0208      "j90-"  4 x nil)
     (=jis-x0208@1990   "j90-"  4 x nil)
-    (=>>>jis-x0208@1990        "j90-"  4 x nil)
-    (=>>jis-x0208@1990 "j90-"  4 x nil)
-    (=+>jis-x0208@1990 "j90-"  4 x nil)
     (=jis-x0208@1983   "j83-"  4 x nil)
-    (=>>>jis-x0208@1983        "j83-"  4 x nil)
-    (=>>jis-x0208@1983 "j83-"  4 x nil)
-    (=+>jis-x0208@1983 "j83-"  4 x nil)
-    (=cbeta            "cb"    5 d nil)
-    (=>>daikanwa       "dkw-"  5 d nil)
     ))
 
 (defun char-GlyphWiki-id (char)
@@ -1129,7 +1443,7 @@ style=\"vertical-align:middle\">"
        spec ret code)
     (while (and rest
                (setq spec (pop rest))
-               (null (setq ret (char-feature char (car spec))))))
+               (null (setq ret (get-char-attribute char (car spec))))))
     (when ret
       (or
        (and (listp ret)
@@ -1138,7 +1452,8 @@ style=\"vertical-align:middle\">"
            (cond
             ((and (or (encode-char char '=jis-x0208@1990)
                       (encode-char char '=jis-x0212)
-                      (encode-char char '=jis-x0213-1))
+                      (encode-char char '=jis-x0213-1)
+                      (encode-char char '=jis-x0213-2))
                   (setq code (encode-char char '=ucs@jis)))
              (format "u%04x" code)
              )