X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=004fd467ec0f1a89c99a48446659915e8a9bf1ed;hb=da2be43abba911e16d709f01892f4104f5f99b23;hp=ec534655276047c5930900125b61235b5cf1c484;hpb=3b031bad3c2c135a48e65dff617022440b29cc2e;p=chise%2Fest.git
diff --git a/cwiki-common.el b/cwiki-common.el
index ec53465..004fd46 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -101,6 +101,19 @@
=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
@@ -110,6 +123,12 @@
=>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
@@ -818,6 +837,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)
@@ -850,13 +870,14 @@
'(=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 "&\\(A-\\|G-\\|g2-\\)?CB\\([0-9]+\\);" nil t)
+ (while (re-search-forward "&\\(A-\\|G-\\|g2-\\|R-\\)?CB\\([0-9]+\\);" nil t)
(setq code (string-to-int (match-string 2)))
(replace-match
(format ""
(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
@@ -1043,8 +1064,8 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&A-compU[+-]\\([0-9A-F]+\\);" nil t)
- (setq code (string-to-int (match-string 1) 16))
+ (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 ""
@@ -1055,7 +1076,7 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
(goto-char (point-min))
(while (re-search-forward
- "&\\(A-\\)?U-i\\([0-9]+\\)\\+\\([0-9A-F]+\\);"
+ "&\\(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))
@@ -1081,11 +1102,27 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&U-v\\([0-9]+\\)\\+\\([0-9A-F]+\\);" nil t)
- (setq plane (string-to-int (match-string 1))
- code (string-to-int (match-string 2) 16))
+ (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
@@ -1286,14 +1323,17 @@ style=\"vertical-align:middle\">"
(===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)
@@ -1315,6 +1355,13 @@ style=\"vertical-align:middle\">"
(=>>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)
@@ -1342,6 +1389,9 @@ style=\"vertical-align:middle\">"
(=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)
@@ -1379,7 +1429,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)