X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=b5bf4c03861b44b17ddad60e36da1a6c439601e8;hb=80a872505b801316f6918daca3b403dd42e33f99;hp=97fbc62b33f72f02be1bdb8b85a1af2383afb2fe;hpb=a2e7005a5e6c061dddbde3664c940215e74ff30a;p=chise%2Fest.git
diff --git a/cwiki-common.el b/cwiki-common.el
index 97fbc62..b5bf4c0 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1,8 +1,15 @@
;; -*- coding: utf-8-mcs-er -*-
(require 'char-db-util)
+;; (require 'concord-images)
(setq file-name-coding-system 'utf-8-mcs-er)
+(concord-assign-genre 'code-point "/usr/local/var/chise-ipld/db")
+(concord-assign-genre 'coded-character "/usr/local/var/chise-ipld/db")
+(concord-assign-genre 'glyph "/usr/local/var/chise-ipld/db")
+
+(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")
@@ -32,9 +39,25 @@
(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)
@@ -79,6 +102,7 @@
=>>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
@@ -87,7 +111,45 @@
=ruimoku-v6
=big5
=big5-cdp
- =ucs-itaiji-002))
+ =>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)
@@ -748,6 +810,7 @@
(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)
@@ -770,6 +833,7 @@
'(=>>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)
@@ -790,6 +854,7 @@
'(=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)
@@ -803,7 +868,6 @@
'(=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)
@@ -811,12 +875,27 @@
'(==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 ""
@@ -943,6 +1022,27 @@ style=\"vertical-align:middle\">"
t 'literal))
(goto-char (point-min))
+ (while (re-search-forward "&SW-JIGUGE\\([45]?\\)-\\([0-9]+\\);" nil t)
+ (setq subcode (match-string 1)
+ code (string-to-int (match-string 2)))
+ (setq plane
+ (if (string= subcode "")
+ "5"
+ subcode))
+ (replace-match
+ (format "
"
+ plane code
+ chise-wiki-bitmap-glyphs-url
+ plane code
+ (charset-description
+ (if (string= subcode "")
+ '=shuowen-jiguge
+ (intern (format "===shuowen-jiguge%s" subcode)))))
+ t 'literal))
+
+ (goto-char (point-min))
(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))
@@ -953,12 +1053,18 @@ style=\"vertical-align:middle\">"
(char-to-string (decode-char 'ascii (+ 96 subcode)))))
(replace-match
(format
- ""
+ ""
plane code subcode
chise-wiki-hng-bitmap-glyphs-url
plane code subcode
- www-format-char-img-style)
+ (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))
@@ -974,10 +1080,10 @@ style=\"vertical-align:middle\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?MJ\\([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 ""
code
code
@@ -985,7 +1091,7 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(o-\\|G-\\|g2-\\)?IU-\\([0-9A-F]+\\);" nil t)
+ (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 ""
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?U-i\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t)
+ (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 ""
+ 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
@@ -1010,7 +1129,48 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(G-\\|R-\\|g2-\\)?GT-\\([0-9]+\\);" nil t)
+ (while (re-search-forward "&A-IWDSU\\+\\([0-9A-F]+\\);" nil t)
+ (setq code (string-to-int (match-string 1) 16))
+ (replace-match
+ (format ""
+ 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 ""
+ 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 ""
+ 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 ""
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 ""
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?CDP-\\([0-9A-F]+\\);" nil t)
+ (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 ""
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 ""
+ 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 ""
@@ -1103,7 +1280,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))
@@ -1172,14 +1351,27 @@ 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)
+ '((===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)
@@ -1187,50 +1379,77 @@ style=\"vertical-align:middle\">"
(==adobe-japan1-4 "aj1-" 5 d nil)
(==adobe-japan1-5 "aj1-" 5 d nil)
(==adobe-japan1-6 "aj1-" 5 d 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)
+ (==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)
+ (=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)
(=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@jis "u" 4 x nil)
- (==ucs@iso "u" 4 x nil)
- (===ucs@jis "u" 4 x nil)
(=ucs@cns "u" 4 x "-t")
- (==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)
- (==daikanwa "dkw-" 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")
- (==ucs@ks "u" 4 x "-k")
- (===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)
@@ -1239,26 +1458,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)
- (=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-itaiji-002 "u" 4 x "-itaiji-002")
- (=ucs-itaiji-084 "u" 4 x "-itaiji-084")
- (=big5-cdp-var-3 "cdp-" 4 x "-var-3")
- (=big5-cdp-var-5 "cdp-" 4 x "-var-5")
))
(defun char-GlyphWiki-id (char)
@@ -1266,7 +1467,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)