X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cwiki-common.el;h=28a7a9e6e07cd54229bc8f305eed305dafe0930c;hb=HEAD;hp=303e5aff18f9a8905ce0b0d75f4cdb6f0d025ea3;hpb=d53970157f5b3fe43b99dde93c0dae5374051d5f;p=chise%2Fest.git
diff --git a/cwiki-common.el b/cwiki-common.el
index 303e5af..f4e7e6f 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1,9 +1,13 @@
;; -*- 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")
@@ -36,26 +40,73 @@
(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)
+
+(mount-char-attribute-table '=hdic-tsj-glyph-id)
+(mount-char-attribute-table '=hdic-syp-entry-id)
+(mount-char-attribute-table '=hdic-ktb-entry-id)
+(mount-char-attribute-table '=hdic-ktb-seal-glyph-id)
+(mount-char-attribute-table 'hdic-tsj-word-id)
+(mount-char-attribute-table 'hdic-tsj-word)
+(mount-char-attribute-table 'hdic-tsj-word-description)
+(mount-char-attribute-table 'hdic-tsj-word-remarks)
+(mount-char-attribute-table 'hdic-syp-description)
+(mount-char-attribute-table 'hdic-ktb-description)
+(mount-char-attribute-table 'hdic-ktb-entry-type)
+(mount-char-attribute-table 'hdic-ktb-diff)
+(mount-char-attribute-table 'hdic-ktb-syp-id)
+(mount-char-attribute-table 'hdic-ktb-yy-id)
+(mount-char-attribute-table 'hdic-ktb-ndl-pid)
+(mount-char-attribute-table '<-HDIC-SYP@tenrei-bansho-meigi)
+(mount-char-attribute-table '->HDIC-SYP@tenrei-bansho-meigi)
+(mount-char-attribute-table '<-Small-Seal@tenrei-bansho-meigi)
+(mount-char-attribute-table '->Small-Seal@tenrei-bansho-meigi)
+
+(mount-char-attribute-table 'sound@fanqie)
(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-bitmap-glyph-image-url
+ "https://image.chise.org/glyphs")
+
+(defvar chise-wiki-legacy-bitmap-glyphs-url
+ "https://www.chise.org/glyphs")
(defvar chise-wiki-hng-bitmap-glyphs-url
- "http://hng.chise.org/glyphs/HNG")
+ "https://image.hng-data.org/glyphs/HNG")
+
+(defvar chise-wiki-daijiten-bitmap-glyphs-url
+ "https://image.hng-data.org/glyphs/daijiten")
+
+(defvar chise-wiki-glyphwiki-glyph-image-url
+ "https://glyphwiki.org/glyph")
(defvar chise-wiki-glyph-cgi-url
- "http://www.chise.org/chisewiki/glyph.cgi")
+ "https://www.chise.org/chisewiki/glyph.cgi")
(defvar chise-wiki-displayed-features nil)
@@ -74,8 +125,8 @@
=zinbun-oracle =>zinbun-oracle
=daikanwa
=gt =gt-k
- =>>>adobe-japan1
- =>>>jis-x0208 =>>>jis-x0213-1 =>>>jis-x0213-2
+ ==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
@@ -88,8 +139,8 @@
=+>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 ==ucs@unicode
+ ==ucs@jis ==ucs@cns ==ucs@ks
===ucs@iso
=ruimoku-v6
=big5
@@ -114,14 +165,17 @@
=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@cognate
=>ucs-itaiji-001
=>ucs-itaiji-002
=>ucs-itaiji-003
@@ -129,11 +183,117 @@
=>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
))
+(defvar est-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)
+ '(=cns11643-4 "C4-" 4 X)
+ '(=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)
+ '(=jis-x0212 "JSP-" 4 X)
+ '(=cbeta "CB" 5 d)
+ '(=jis-x0208@1997 "J97-" 4 X)
+ '(=jis-x0208@1978 "J78-" 4 X)
+ '(=jis-x0208@1983 "J83-" 4 X)
+ '(=ruimoku-v6 "RUI6-" 4 X)
+ '(=zinbun-oracle "ZOB-" 4 d)
+ '(=daijiten "DJT-" 5 d)
+ '(=>ucs-itaiji-001 "A-U-i001+" 4 X)
+ '(=>ucs-itaiji-002 "A-U-i002+" 4 X)
+ '(=>ucs-itaiji-003 "A-U-i003+" 4 X)
+ '(=>ucs-itaiji-004 "A-U-i004+" 4 X)
+ '(=>ucs-itaiji-005 "A-U-i005+" 4 X)
+ '(=>ucs-itaiji-006 "A-U-i006+" 4 X)
+ '(=>ucs-itaiji-007 "A-U-i007+" 4 X)
+ '(=>ucs-itaiji-008 "A-U-i008+" 4 X)
+ '(=>ucs-itaiji-009 "A-U-i009+" 4 X)
+ '(=>ucs-itaiji-010 "A-U-i010+" 4 X)
+ '(=>ucs-itaiji-011 "A-U-i011+" 4 X)
+ '(=>ucs-itaiji-001@iwds-1 "A-IWDSU-i001+" 4 X)
+ '(=>ucs-itaiji-002@iwds-1 "A-IWDSU-i002+" 4 X)
+ '(=>ucs-itaiji-003@iwds-1 "A-IWDSU-i003+" 4 X)
+ '(=>ucs-itaiji-006@iwds-1 "A-IWDSU-i006+" 4 X)
+ '(=jef-china3 "JC3-" 4 X)
+ '(=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)
+ '(=>>daikanwa "G-M-" 5 d)
+ '(===ucs@ks "R-KU+" 4 X)
+ coded-charset-entity-reference-alist))
+
(defun decode-uri-string (string &optional coding-system)
(if (> (length string) 0)
(let ((i 0)
@@ -202,6 +362,8 @@
'space-separated)
((eq type 'structure)
'space-separated-ids)
+ ((eq type 'domain-list)
+ 'space-separated-source-list)
((eq type 'stext)
'wiki-text)
))
@@ -392,179 +554,183 @@
;;; @ 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 ?-)
- "*")
- (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 ?/)
- "...")
- (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"
- (est-uri-decode-feature-name-body
- (substring uri-feature (match-end 0)))))
- )
- ((string-match "^to\\." uri-feature)
- (intern (format "->%s"
- (est-uri-decode-feature-name-body
- (substring uri-feature (match-end 0)))))
- )
- ((string-match "^rep\\." uri-feature)
- (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"
- (est-uri-decode-feature-name-body
- (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))
- ?>)
- (est-uri-decode-feature-name-body
- (substring uri-feature (match-end 0)))))
- )
- ((string-match "^o\\." uri-feature)
- (intern (format "=+>%s"
- (est-uri-decode-feature-name-body
- (substring uri-feature (match-end 0)))))
- )
- ((string-match "^a\\." uri-feature)
- (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))
- ?=)
- (est-uri-decode-feature-name-body
- (substring uri-feature (match-end 0)))))
- )
- ((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)))
- (find-charset feature))
- feature)
- ((and (setq feature (intern (format "=>>>%s" uri-feature)))
- (find-charset feature))
- feature)
- ((and (setq feature (intern (format "=%s" uri-feature)))
- (find-charset feature))
- feature)
- (t (intern uri-feature)))))
-
-(defun www-uri-encode-feature-name (feature-name)
- (setq feature-name (symbol-name feature-name))
- (cond
- ((string-match "^=\\+>\\([^=>]+\\)" feature-name)
- (concat "o."
- (est-uri-encode-feature-name-body
- (substring feature-name (match-beginning 1))))
- )
- ((string-match "^=\\([^=>]+\\)" feature-name)
- (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."
- (est-uri-encode-feature-name-body
- (substring feature-name (match-beginning 1))))
- )
- ((string-match "^=>>>\\([^=>]+\\)" feature-name)
- (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))
- (est-uri-encode-feature-name-body
- (substring feature-name (match-end 1))))
- )
- ((string-match "^=>\\([^=>]+\\)" feature-name)
- (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))
- (est-uri-encode-feature-name-body
- (substring feature-name (match-end 0))))
- )
- ((string-match "^->" feature-name)
- (concat "to."
- (est-uri-encode-feature-name-body
- (substring feature-name (match-end 0))))
- )
- ((string-match "^<-" feature-name)
- (concat "from."
- (est-uri-encode-feature-name-body
- (substring feature-name (match-end 0))))
- )
- (t (est-uri-encode-feature-name-body feature-name))))
+;; (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"
+;; (est-uri-decode-feature-name-body
+;; (substring uri-feature (match-end 0)))))
+;; )
+;; ((string-match "^to\\." uri-feature)
+;; (intern (format "->%s"
+;; (est-uri-decode-feature-name-body
+;; (substring uri-feature (match-end 0)))))
+;; )
+;; ((string-match "^rep\\." uri-feature)
+;; (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"
+;; (est-uri-decode-feature-name-body
+;; (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))
+;; ?>)
+;; (est-uri-decode-feature-name-body
+;; (substring uri-feature (match-end 0)))))
+;; )
+;; ((string-match "^o\\." uri-feature)
+;; (intern (format "=+>%s"
+;; (est-uri-decode-feature-name-body
+;; (substring uri-feature (match-end 0)))))
+;; )
+;; ((string-match "^a\\." uri-feature)
+;; (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))
+;; ?=)
+;; (est-uri-decode-feature-name-body
+;; (substring uri-feature (match-end 0)))))
+;; )
+;; ((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)))
+;; (find-charset feature))
+;; feature)
+;; ((and (setq feature (intern (format "=>>>%s" uri-feature)))
+;; (find-charset feature))
+;; feature)
+;; ((and (setq feature (intern (format "=%s" uri-feature)))
+;; (find-charset feature))
+;; feature)
+;; (t (intern uri-feature)))))
+
+;; (defun www-uri-encode-feature-name (feature-name)
+;; (setq feature-name (symbol-name feature-name))
+;; (cond
+;; ((string-match "^=\\+>\\([^=>]+\\)" feature-name)
+;; (concat "o."
+;; (est-uri-encode-feature-name-body
+;; (substring feature-name (match-beginning 1))))
+;; )
+;; ((string-match "^=\\([^=>]+\\)" feature-name)
+;; (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."
+;; (est-uri-encode-feature-name-body
+;; (substring feature-name (match-beginning 1))))
+;; )
+;; ((string-match "^=>>>\\([^=>]+\\)" feature-name)
+;; (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))
+;; (est-uri-encode-feature-name-body
+;; (substring feature-name (match-end 1))))
+;; )
+;; ((string-match "^=>\\([^=>]+\\)" feature-name)
+;; (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))
+;; (est-uri-encode-feature-name-body
+;; (substring feature-name (match-end 0))))
+;; )
+;; ((string-match "^->" feature-name)
+;; (concat "to."
+;; (est-uri-encode-feature-name-body
+;; (substring feature-name (match-end 0))))
+;; )
+;; ((string-match "^<-" feature-name)
+;; (concat "from."
+;; (est-uri-encode-feature-name-body
+;; (substring feature-name (match-end 0))))
+;; )
+;; (t (est-uri-encode-feature-name-body feature-name))))
(defun www-uri-make-feature-name-url (uri-genre uri-feature-name uri-object)
(if est-hide-cgi-mode
@@ -649,8 +815,8 @@
(format (if est-hide-cgi-mode
"rep.id=%s"
"rep.id:%s")
- (est-uri-encode-feature-name-body
- (format "%s" (concord-object-id object))))))
+ (www-uri-encode-feature-name
+ (concord-object-id object)))))
(defun est-format-object (object &optional readable)
(if (characterp object)
@@ -658,7 +824,8 @@
(let ((ret (or (if readable
(or (concord-object-get object 'name)
(concord-object-get object '=name)
- (concord-object-get object 'title)))
+ (concord-object-get object 'title)
+ (concord-object-get object '=title)))
(concord-object-id object))))
(format "%s" ret))))
@@ -791,88 +958,7 @@
(if without-tags
(encode-coding-region (point-min)(point-max) 'utf-8-mcs-er)
(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)
- '(=cns11643-1 "C1-" 4 X)
- '(=cns11643-2 "C2-" 4 X)
- '(=cns11643-3 "C3-" 4 X)
- '(=cns11643-4 "C4-" 4 X)
- '(=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)
- '(=gb2312 "G0-" 4 X)
- '(=gb12345 "G1-" 4 X)
- '(=jis-x0208@1990 "J90-" 4 X)
- '(=jis-x0212 "JSP-" 4 X)
- '(=cbeta "CB" 5 d)
- '(=jis-x0208@1997 "J97-" 4 X)
- '(=jis-x0208@1978 "J78-" 4 X)
- '(=jis-x0208@1983 "J83-" 4 X)
- '(=ruimoku-v6 "RUI6-" 4 X)
- '(=zinbun-oracle "ZOB-" 4 d)
- '(=jef-china3 "JC3-" 4 X)
- '(=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)
- '(==cbeta "CB" 5 d)
- '(=big5 "B-" 4 X)
- '(=daikanwa "M-" 5 d)
- coded-charset-entity-reference-alist)))
+ est-coded-charset-entity-reference-alist))
(encode-coding-region (point-min)(point-max) 'utf-8-mcs-er)
(goto-char (point-min))
@@ -882,7 +968,7 @@
(format ""
code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
(/ code 1000) code
www-format-char-img-style)
t 'literal))
@@ -895,7 +981,7 @@ style=\"%s\">"
(format "
"
plane code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
plane
(- (lsh code -8) 32)
(- (logand code 255) 32)
@@ -909,7 +995,7 @@ style=\"%s\">"
(format "
"
code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
(- (lsh code -8) 32)
(- (logand code 255) 32)
www-format-char-img-style)
@@ -923,7 +1009,7 @@ style=\"%s\">"
(format "
"
plane code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
plane
(- (lsh code -8) 32)
(- (logand code 255) 32)
@@ -938,7 +1024,7 @@ style=\"%s\">"
(format "
"
plane code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
plane code
www-format-char-img-style)
t 'literal))
@@ -950,7 +1036,19 @@ style=\"%s\">"
(format "
"
code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-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-legacy-bitmap-glyphs-url
code
www-format-char-img-style)
t 'literal))
@@ -963,7 +1061,7 @@ style=\"vertical-align:middle\">"
(format "
"
plane code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
plane
(- (lsh code -8) 32)
(- (logand code 255) 32)
@@ -978,7 +1076,7 @@ style=\"%s\">"
(format "
"
plane code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
plane code
www-format-char-img-style)
t 'literal))
@@ -987,8 +1085,8 @@ style=\"%s\">"
(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)
+ (format "
"
+ code chise-wiki-bitmap-glyph-image-url code)
t 'literal))
(goto-char (point-min))
@@ -996,14 +1094,47 @@ style=\"%s\">"
(setq code (string-to-int (match-string 2)))
(replace-match
(format "
"
+style=\"vertical-align:middle; width: auto; max-height: 80px\">"
code
- chise-wiki-bitmap-glyphs-url
+ chise-wiki-legacy-bitmap-glyphs-url
code
www-format-char-img-style)
t 'literal))
(goto-char (point-min))
+ (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 "&\\(A-\\)?SW-JIGUGE\\([45]?\\)-\\([0-9]+\\);" nil t)
+ (setq subcode (match-string 2)
+ code (string-to-int (match-string 3)))
+ (setq plane
+ (if (string= subcode "")
+ "5"
+ subcode))
+ (replace-match
+ (format "