X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=291a138348cf82d721cf3f065d0b9b43ec0f3449;hb=ebe341d23879fafeffb99e9bf85e4b8e869f1493;hp=cae1b123258058a12a94ff8270b24a95cb184f7d;hpb=47b3fa0b20323de9304bd8f603704ab65666e84e;p=chise%2Fest.git
diff --git a/cwiki-common.el b/cwiki-common.el
index cae1b12..291a138 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1,8 +1,16 @@
;; -*- coding: utf-8-mcs-er -*-
(require 'char-db-util)
+(require 'chiset-common)
+;; (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")
@@ -23,26 +31,136 @@
(mount-char-attribute-table '*instance@ruimoku/bibliography/title)
;; (mount-char-attribute-table '*instance@ruimoku/bibliography/content*note)
-(concord-assign-genre 'morpheme-entry@zh-classical "/usr/local/var/kanbun/db")
+(concord-assign-genre 'entry@zh-classical "/usr/local/var/kanbun/db")
+;; (concord-assign-genre 'morpheme-entry@zh-classical "/usr/local/var/kanbun/db")
(concord-assign-genre 'word-class@zh-classical "/usr/local/var/kanbun/db")
(concord-assign-genre 'morpheme@zh-classical "/usr/local/var/kanbun/db")
(concord-assign-genre 'sentence@zh-classical "/usr/local/var/kanbun/db")
-(concord-assign-genre 'sentence-entry@zh-classical "/usr/local/var/kanbun/db")
+;; (concord-assign-genre 'sentence-entry@zh-classical "/usr/local/var/kanbun/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)
+(mount-char-attribute-table 'abstract-glyph@iwds-1)
+(mount-char-attribute-table 'abstract-glyph@iwds-1/confluented)
+
+
+(defvar est-hide-cgi-mode nil)
+(defvar est-view-url-prefix "..")
(defvar chise-wiki-view-url "view.cgi")
(defvar chise-wiki-edit-url "edit.cgi")
(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-daijiten-bitmap-glyphs-url
+ "http://hng.chise.org/glyphs/daijiten")
+
(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-var-010
+ =ucs@unicode
+ ==ucs@unicode
+ ===ucs@unicode
+ ==>daijiten
+ ==>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
+ =>ucs-itaiji-008
+ ===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)
@@ -81,7 +199,8 @@
))))
(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))
@@ -300,46 +419,109 @@
;;; @ URI representation
;;;
+;; (defun est-uri-decode-feature-name-body (uri-feature)
+;; (let ((len (length uri-feature))
+;; (i 0)
+;; ch dest)
+;; (while (< i len)
+;; (setq dest
+;; (concat
+;; dest
+;; (if (eq (aref uri-feature i) ?\.)
+;; (if (and (< (+ i 2) len)
+;; (eq (aref uri-feature (+ i 2)) ?\.))
+;; (prog1
+;; (cond
+;; ((eq (setq ch (aref uri-feature (1+ i))) ?\.)
+;; "/")
+;; ((eq ch ?-)
+;; "*")
+;; ((eq ch ?_)
+;; "+")
+;; (t
+;; (substring uri-feature i (+ i 3))
+;; ))
+;; (setq i (+ i 3)))
+;; (setq i (1+ i))
+;; ".")
+;; (prog1
+;; (char-to-string (aref uri-feature i))
+;; (setq i (1+ i)))))))
+;; dest))
+
+;; (defun est-uri-encode-feature-name-body (feature)
+;; (mapconcat (lambda (c)
+;; (cond ((eq c ?*)
+;; ".-.")
+;; ((eq c ?/)
+;; "...")
+;; ((eq c ?+)
+;; "._.")
+;; (t (char-to-string c))))
+;; feature ""))
+
(defun www-uri-decode-feature-name (uri-feature)
(let (feature)
(setq uri-feature (decode-uri-string uri-feature 'utf-8-mcs-er))
(cond
((string-match "^from\\." uri-feature)
- (intern (format "<-%s" (substring uri-feature (match-end 0))))
+ (intern (format "<-%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
((string-match "^to\\." uri-feature)
- (intern (format "->%s" (substring uri-feature (match-end 0))))
+ (intern (format "->%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
((string-match "^rep\\." uri-feature)
- (intern (format "=%s" (substring uri-feature (match-end 0))))
+ (intern (format "=%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
+ )
+ ((string-match "^rep[2i]\\." uri-feature)
+ (intern (format "===%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
((string-match "^g\\." uri-feature)
- (intern (format "=>>%s" (substring uri-feature (match-end 0))))
+ (intern (format "=>>%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
- ((string-match "^gi\\." uri-feature)
- (intern (format "=>>>%s" (substring uri-feature (match-end 0))))
+ ((string-match "^g[i2]\\." uri-feature)
+ (intern (format "==%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
((string-match "^gi\\([0-9]+\\)\\." uri-feature)
(intern (format "=>>%s%s"
(make-string (string-to-int
(match-string 1 uri-feature))
?>)
- (substring uri-feature (match-end 0))))
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
((string-match "^o\\." uri-feature)
- (intern (format "=+>%s" (substring uri-feature (match-end 0))))
+ (intern (format "=+>%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
((string-match "^a\\." uri-feature)
- (intern (format "=>%s" (substring uri-feature (match-end 0))))
+ (intern (format "=>%s"
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
((string-match "^a\\([0-9]+\\)\\." uri-feature)
(intern (format "%s>%s"
(make-string (string-to-int
(match-string 1 uri-feature))
?=)
- (substring uri-feature (match-end 0))))
+ (est-uri-decode-feature-name-body
+ (substring uri-feature (match-end 0)))))
)
- ((and (setq feature (intern (format "=>%s" uri-feature)))
+ ((and (setq uri-feature (est-uri-decode-feature-name-body uri-feature))
+ (setq feature (intern (format "=>%s" uri-feature)))
(find-charset feature))
feature)
((and (setq feature (intern (format "=>>%s" uri-feature)))
@@ -357,49 +539,81 @@
(setq feature-name (symbol-name feature-name))
(cond
((string-match "^=\\+>\\([^=>]+\\)" feature-name)
- (concat "o." (substring feature-name (match-beginning 1)))
+ (concat "o."
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-beginning 1))))
)
((string-match "^=\\([^=>]+\\)" feature-name)
- (concat "rep." (substring feature-name (match-beginning 1)))
+ (concat "rep."
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-beginning 1))))
+ )
+ ((string-match "^==\\([^=>]+\\)" feature-name)
+ (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))))
)
((string-match "^=>>\\([^=>]+\\)" feature-name)
- (concat "g." (substring feature-name (match-beginning 1)))
+ (concat "g."
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-beginning 1))))
)
((string-match "^=>>>\\([^=>]+\\)" feature-name)
- (concat "gi." (substring feature-name (match-beginning 1)))
+ (concat "gi."
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-beginning 1))))
)
((string-match "^=>>\\(>+\\)" feature-name)
(format "gi%d.%s"
(length (match-string 1 feature-name))
- (substring feature-name (match-end 1)))
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-end 1))))
)
((string-match "^=>\\([^=>]+\\)" feature-name)
- (concat "a." (substring feature-name (match-beginning 1)))
+ (concat "a."
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-beginning 1))))
)
((string-match "^\\(=+\\)>" feature-name)
(format "a%d.%s"
(length (match-string 1 feature-name))
- (substring feature-name (match-end 0)))
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-end 0))))
)
((string-match "^->" feature-name)
- (concat "to." (substring feature-name (match-end 0)))
+ (concat "to."
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-end 0))))
)
((string-match "^<-" feature-name)
- (concat "from." (substring feature-name (match-end 0)))
+ (concat "from."
+ (est-uri-encode-feature-name-body
+ (substring feature-name (match-end 0))))
)
- (t feature-name)))
+ (t (est-uri-encode-feature-name-body feature-name))))
(defun www-uri-make-feature-name-url (uri-genre uri-feature-name uri-object)
- (format "%s?feature=%s&%s=%s"
- chise-wiki-view-url uri-feature-name uri-genre uri-object))
+ (if est-hide-cgi-mode
+ (format "../feature/%s&%s/%s"
+ uri-feature-name uri-genre uri-object)
+ (format "%s?feature=%s&%s=%s"
+ chise-wiki-view-url uri-feature-name uri-genre uri-object)))
(defun www-uri-decode-object (genre char-rep)
(let (ccs cpos)
(cond
- ((string-match "\\(%3A\\|:\\)" char-rep)
+ ((string-match (if est-hide-cgi-mode
+ "\\(%3D\\|=\\|%3A\\|:\\)"
+ "\\(%3A\\|:\\)") char-rep)
(setq ccs (substring char-rep 0 (match-beginning 0))
cpos (substring char-rep (match-end 0)))
(setq ccs (www-uri-decode-feature-name ccs))
+ (setq cpos (est-uri-decode-feature-name-body cpos))
(cond
((string-match "^0x" cpos)
(setq cpos
@@ -439,56 +653,35 @@
(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))
(not (setq ret (encode-char object ccs 'defined-only)))))
(cond (ret
- (format "%s:0x%X"
+ (format (if est-hide-cgi-mode
+ "%s=0x%X"
+ "%s:0x%X")
(www-uri-encode-feature-name ccs)
ret))
((and (setq ccs (car (split-char object)))
(setq ret (encode-char object ccs)))
- (format "%s:0x%X"
+ (format (if est-hide-cgi-mode
+ "%s=0x%X"
+ "%s:0x%X")
(www-uri-encode-feature-name ccs)
ret))
(t
- (format "system-char-id:0x%X"
+ (format (if est-hide-cgi-mode
+ "system-char-id=0x%X"
+ "system-char-id:0x%X")
(encode-char object 'system-char-id))
))))
- (format "rep.id:%s" (concord-object-id object))))
+ (format (if est-hide-cgi-mode
+ "rep.id=%s"
+ "rep.id:%s")
+ (est-uri-encode-feature-name-body
+ (format "%s" (concord-object-id object))))))
(defun est-format-object (object &optional readable)
(if (characterp object)
@@ -501,11 +694,17 @@
(format "%s" ret))))
(defun www-uri-make-object-url (object &optional uri-object)
- (format "%s?%s=%s"
- chise-wiki-view-url
- (est-object-genre object)
- (or uri-object
- (www-uri-encode-object object))))
+ (if est-hide-cgi-mode
+ (format "%s/%s/%s"
+ est-view-url-prefix
+ (est-object-genre object)
+ (or uri-object
+ (www-uri-encode-object object)))
+ (format "%s?%s=%s"
+ chise-wiki-view-url
+ (est-object-genre object)
+ (or uri-object
+ (www-uri-encode-object object)))))
;;; @ Feature name presentation
@@ -609,7 +808,7 @@
(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)
@@ -625,6 +824,42 @@
(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/jd "HD-JD-" 4 X)
+ '(=hanyo-denshi/ft "HD-FT-" 4 X)
+ '(=hanyo-denshi/ia "HD-IA-" 4 X)
+ '(=hanyo-denshi/ib "HD-IB-" 4 X)
+ '(=hanyo-denshi/hg "HD-HG-" 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)
+ '(==daijiten "g2-DJT-" 5 d)
'(=cns11643-1 "C1-" 4 X)
'(=cns11643-2 "C2-" 4 X)
'(=cns11643-3 "C3-" 4 X)
@@ -632,6 +867,9 @@
'(=cns11643-5 "C5-" 4 X)
'(=cns11643-6 "C6-" 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)
@@ -642,14 +880,39 @@
'(=jis-x0208@1983 "J83-" 4 X)
'(=ruimoku-v6 "RUI6-" 4 X)
'(=zinbun-oracle "ZOB-" 4 d)
+ '(=daijiten "DJT-" 5 d)
'(=jef-china3 "JC3-" 4 X)
- '(=daikanwa "M-" 5 d)
+ '(=ucs@unicode "UU+" 4 X)
+ '(=ucs@JP/hanazono "hanaJU+" 4 X)
+ '(==cns11643-1 "R-C1-" 4 X)
+ '(==cns11643-2 "R-C2-" 4 X)
+ '(==cns11643-3 "R-C3-" 4 X)
+ '(==cns11643-4 "R-C4-" 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)
+ '(==>daijiten "A2-DJT-" 5 d)
+ '(==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 ""
@@ -660,7 +923,7 @@ style=\"%s\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(o-\\)?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
@@ -675,6 +938,71 @@ style=\"%s\">"
t 'literal))
(goto-char (point-min))
+ (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 "
"
+ 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
+ (format "
"
+ plane code
+ chise-wiki-bitmap-glyphs-url
+ plane
+ (- (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-\\(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
+ (format "
"
+ plane code
+ chise-wiki-bitmap-glyphs-url
+ plane code
+ www-format-char-img-style)
+ t 'literal))
+
+ (goto-char (point-min))
+ (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 "
"
+ code
+ chise-wiki-bitmap-glyphs-url
+ code
+ www-format-char-img-style)
+ t 'literal))
+
+ (goto-char (point-min))
+ (while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?HD-TK-\\([0-9]+\\);" nil t)
+ (setq code (string-to-int (match-string 2)))
+ (replace-match
+ (format "
"
+ code
+ chise-wiki-bitmap-glyphs-url
+ code
+ www-format-char-img-style)
+ t 'literal))
+
+ (goto-char (point-min))
(while (re-search-forward "&G\\([01]\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
(setq plane (string-to-int (match-string 1))
code (string-to-int (match-string 2) 16))
@@ -690,9 +1018,9 @@ style=\"%s\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&C\\([1-7]\\)-\\([0-9A-F][0-9A-F][0-9A-F][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 "&\\(R-\\)?C\\([1-7]\\)-\\([0-9A-F][0-9A-F][0-9A-F][0-9A-F]\\);" nil t)
+ (setq plane (string-to-int (match-string 2))
+ code (string-to-int (match-string 3) 16))
(replace-match
(format "
"
@@ -703,8 +1031,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 "
"
code code)
@@ -723,7 +1051,196 @@ style=\"vertical-align:middle\">"
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&\\(G-\\|g2-\\)?GT-\\([0-9]+\\);" nil t)
+ (while (re-search-forward "&\\(A2-\\|g2-\\|R-\\)?DJT-\\([0-9]+\\);" nil t)
+ (setq code (string-to-int (match-string 2)))
+ (replace-match
+ (format "
"
+ code
+ chise-wiki-daijiten-bitmap-glyphs-url
+ code
+ www-format-char-img-style)
+ 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 "