X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-common.el;h=9817062192355028b9dd81e334078990e16bde89;hp=35b0915b5aa27c6c609325696cf8354df4371af3;hb=df2fa617d25de8d6ccae25b062f2b973e2d95113;hpb=0bcaee145ef2f8e5f5527b0a3af3796a8e5cb671

diff --git a/cwiki-common.el b/cwiki-common.el
index 35b0915..9817062 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -36,11 +36,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)
@@ -837,6 +851,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)
@@ -869,13 +884,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 "<img alt=\"CB%05d\" src=\"%s/cb-gaiji/%02d/CB%05d.gif\"
@@ -1043,7 +1059,7 @@ style=\"vertical-align:middle\">"
 	  (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 "<img alt=\"MJ%06d\" src=\"http://mojikiban.ipa.go.jp/search/MJ%06d\"
+	     (format "<img alt=\"MJ%06d\" src=\"http://mojikiban.ipa.go.jp/MJ%06d.png\"
 style=\"vertical-align:middle; width: 48px; height: 48px\">"
 		     code
 		     code
@@ -1062,8 +1078,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 "<img alt=\"u%04x\" src=\"http://glyphwiki.org/glyph/u%04x.100px.png\"
 style=\"vertical-align:middle; width: 48px; height: 48px\">"
@@ -1074,7 +1090,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))
@@ -1106,7 +1122,7 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
 	    (setq plane (string-to-int (match-string 2))
 		  code (string-to-int (match-string 3) 16))
 	    (replace-match
-	     (format "<img alt=\"u%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/cdp-%04x-itaiji-%03d.100px.png\"
+	     (format "<img alt=\"cdp-%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/cdp-%04x-itaiji-%03d.100px.png\"
 style=\"vertical-align:middle; width: 48px; height: 48px\">"
 		     code
 		     plane
@@ -1116,11 +1132,11 @@ 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 "&\\(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 "<img alt=\"u%04x-itaiji-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-var-%03d.100px.png\"
+	     (format "<img alt=\"u%04x-var-%03d\" src=\"http://glyphwiki.org/glyph/u%04x-var-%03d.100px.png\"
 style=\"vertical-align:middle; width: 48px; height: 48px\">"
 		     code
 		     plane
@@ -1321,6 +1337,7 @@ 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")
@@ -1352,6 +1369,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)
@@ -1419,7 +1443,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)