X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=8e235d1ff74c8226de0d93a828f8c063a291e618;hb=c24fc299da6ef6e8b4aa69ea3194d2680cfb991a;hp=e16e603a059bd0f80d53951dfe928017c6d43b6d;hpb=c9150730ec9b4f193764948d210f4b40bdf50979;p=chise%2Fest.git diff --git a/cwiki-common.el b/cwiki-common.el index e16e603..8e235d1 100644 --- a/cwiki-common.el +++ b/cwiki-common.el @@ -61,6 +61,7 @@ (mount-char-attribute-table '<-HNG@MISC) (mount-char-attribute-table 'abstract-glyph@iwds-1) +(mount-char-attribute-table 'abstract-glyph@iwds-1/confluented) (defvar est-hide-cgi-mode nil) @@ -137,6 +138,7 @@ =ucs-var-002 =ucs-var-003 =ucs-var-004 + =ucs-var-010 =ucs@unicode ==ucs@unicode ===ucs@unicode @@ -153,6 +155,7 @@ =>ucs-itaiji-005 =>ucs-itaiji-006 =>ucs-itaiji-007 + =>ucs-itaiji-008 ===adobe-japan1 ===cns11643-1 ===cns11643-2 ===cns11643-3 ===cns11643-4 ===cns11643-5 ===cns11643-6 ===cns11643-7 @@ -1182,6 +1185,35 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">" t 'literal)) (goto-char (point-min)) + (while (re-search-forward + "&\\(A-\\)?CDP-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 "\"cdp-%04x-var-%03d\"" + code + plane + code + plane + www-format-char-img-style) + t 'literal)) + + (goto-char (point-min)) + (while (re-search-forward + "&\\(A-\\|g2-\\)?M-\\([0-9]+\\);" + nil t) + (setq code (string-to-int (match-string 2))) + (replace-match + (format "\"dkw-%05d\"" + code + code + 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)) @@ -1384,7 +1416,8 @@ 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) - (===ucs@jis "u" 4 x nil) + (===mj "jmj-" 6 d nil) + (===ucs@jis "u" 4 x "-j") (===daikanwa "dkw-" 5 d nil) (===ucs@ks "u" 4 x "-k") (==ucs-itaiji-005 "u" 4 x "-itaiji-005") @@ -1392,12 +1425,25 @@ style=\"vertical-align:middle\">" (=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-var-006 "u" 4 x "-var-006") + (=ucs-var-010 "u" 4 x "-var-010") (=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-004 "u" 4 x "-itaiji-004") + (=ucs-itaiji-005 "u" 4 x "-itaiji-005") + (=ucs-itaiji-006 "u" 4 x "-itaiji-006") + (=ucs-itaiji-007 "u" 4 x "-itaiji-007") + (=ucs-itaiji-008 "u" 4 x "-itaiji-008") (=ucs-itaiji-084 "u" 4 x "-itaiji-084") (=>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-004 "u" 4 x "-itaiji-004") + (=>ucs-itaiji-005 "u" 4 x "-itaiji-005") (=>ucs-itaiji-006 "u" 4 x "-itaiji-006") + (=>ucs-itaiji-007 "u" 4 x "-itaiji-007") + (=>ucs-itaiji-008 "u" 4 x "-itaiji-008") (==adobe-japan1-0 "aj1-" 5 d nil) (==adobe-japan1-1 "aj1-" 5 d nil) (==adobe-japan1-2 "aj1-" 5 d nil) @@ -1405,10 +1451,14 @@ 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) - (==ucs@jis "u" 4 x nil) + (==mj "jmj-" 6 d nil) + (==ucs@jis "u" 4 x "-j") (==ucs@iso "u" 4 x nil) - (==ucs@cns "u" 4 x "-t") + ;; (==ucs@cns "u" 4 x "-t") (==ucs@unicode "u" 4 x "-us") + (==ucs@JP/hanazono "u" 4 x "-jv") + (==gt "gt-" 5 d nil) + (==gt-k "gt-k" 5 d nil) (==daikanwa "dkw-" 5 d nil) (==ucs@ks "u" 4 x "-k") (==jis-x0208@1978 "j78-" 4 x nil) @@ -1437,31 +1487,46 @@ 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) + (=hanyo-denshi/ks "koseki-" 6 d nil) + (=mj "jmj-" 6 d nil) (=decomposition@cid) (=decomposition@hanyo-denshi) - (=hanyo-denshi/ks "koseki-" 6 d nil) (=koseki "koseki-" 6 d nil) - (=ucs@jis "u" 4 x nil) - (=ucs@cns "u" 4 x "-t") + (=hanyo-denshi/tk "toki-" 8 d nil) + (=ucs@jis "u" 4 x "-j") + ;; (=ucs@cns "u" 4 x "-t") (=ucs@ks "u" 4 x "-k") - (=ucs@JP "u" 4 x nil) + (=ucs@JP "u" 4 x "-jv") + (=ucs@JP/hanazono "u" 4 x "-jv") (=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) + (=+>big5-cdp "cdp-" 4 x nil) + (=>big5-cdp@iwds-1 "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") + (=>cbeta "cbeta-" 5 d nil) + (=big5-cdp-var-001 "cdp-" 4 x "-var-001") + (=big5-cdp-var-003 "cdp-" 4 x "-var-003") + (=big5-cdp-var-005 "cdp-" 4 x "-var-005") (=big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001") (=big5-cdp-itaiji-002 "cdp-" 4 x "-itaiji-002") + (=big5-cdp-itaiji-003 "cdp-" 4 x "-itaiji-003") (=>big5-cdp-itaiji-001 "cdp-" 4 x "-itaiji-001") + (=>big5-cdp-itaiji-002 "cdp-" 4 x "-itaiji-002") + (=>big5-cdp-itaiji-003 "cdp-" 4 x "-itaiji-003") (=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) (=gt-k "gt-k" 5 d nil) + (=>gt-k "gt-k" 5 d nil) + (=daikanwa "dkw-" 5 d nil) + (=ruimoku-v6 "rui6-" 4 x nil) + (=>ruimoku-v6 "rui6-" 4 x nil) + (=ucs@iso "u" 4 x "-u") + (=ucs@unicode "u" 4 x "-us") (=jis-x0208@1978/1pr "j78-" 4 x nil) (=jis-x0208@1978/-4pr "j78-" 4 x nil) (=jis-x0208@1978 "j78-" 4 x nil) @@ -1471,18 +1536,14 @@ style=\"vertical-align:middle\">" (=+>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) - (=cns11643-4 "c4-" 4 x nil) - (=cns11643-5 "c5-" 4 x nil) - (=cns11643-6 "c6-" 4 x nil) - (=cns11643-7 "c7-" 4 x nil) + ;; (=cns11643-1 "c1-" 4 x nil) + ;; (=cns11643-2 "c2-" 4 x nil) + ;; (=cns11643-3 "c3-" 4 x nil) + ;; (=cns11643-4 "c4-" 4 x nil) + ;; (=cns11643-5 "c5-" 4 x nil) + ;; (=cns11643-6 "c6-" 4 x nil) + ;; (=cns11643-7 "c7-" 4 x nil) (=jis-x0208 "j90-" 4 x nil) (=jis-x0208@1990 "j90-" 4 x nil) (=jis-x0208@1983 "j83-" 4 x nil) @@ -1505,23 +1566,23 @@ style=\"vertical-align:middle\">" (encode-char char '=jis-x0213-1) (encode-char char '=jis-x0213-2)) (setq code (encode-char char '=ucs@jis))) - (format "u%04x" code) + (format "u%04x-j" code) ) ((and (or (encode-char char '=gb2312) (encode-char char '=gb12345)) (setq code (encode-char char '=ucs@gb))) (format "u%04x-g" code) ) - ((and (or (encode-char char '=cns11643-1) - (encode-char char '=cns11643-2) - (encode-char char '=cns11643-3) - (encode-char char '=cns11643-4) - (encode-char char '=cns11643-5) - (encode-char char '=cns11643-6) - (encode-char char '=cns11643-7)) - (setq code (encode-char char '=ucs@cns))) - (format "u%04x-t" code) - ) + ;; ((and (or (encode-char char '=cns11643-1) + ;; (encode-char char '=cns11643-2) + ;; (encode-char char '=cns11643-3) + ;; (encode-char char '=cns11643-4) + ;; (encode-char char '=cns11643-5) + ;; (encode-char char '=cns11643-6) + ;; (encode-char char '=cns11643-7)) + ;; (setq code (encode-char char '=ucs@cns))) + ;; (format "u%04x-t" code) + ;; ) ((and (encode-char char '=ks-x1001) (setq code (encode-char char '=ucs@ks))) (format "u%04x-k" code)