X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=cd0191286026a57010fda71bd44bc5da63615c90;hb=ee2268c392055f33392c57aa7a8631ea76d028e1;hp=b5ca5227c54cd59ba57f945e130a751b1868003e;hpb=c6ddc84bb5a2be4b59aa7b757fd774ba0d66d67d;p=chise%2Fest.git

diff --git a/cwiki-common.el b/cwiki-common.el
index b5ca522..cd01912 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)
@@ -1005,6 +1019,27 @@ style=\"vertical-align:middle\">"
 	     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 "<div class=\"tooltip\"><img alt=\"SW-JIGUGE%s-%05d\" src=\"%s/ShuoWen/Jiguge%s/%05d.png\"
+style=\"vertical-align:middle; width: auto; max-height: 80px\"><span
+class=\"tooltiptext\">%s</span></div>"
+		     plane code
+		     chise-wiki-bitmap-glyphs-url
+		     plane code
+		     (charset-description
+		      (if (string= subcode "")
+			  '=shuowen-jiguge
+			(intern (format "===shuowen-jiguge%s" subcode)))))
+	     t 'literal))
+
+	  (goto-char (point-min))
 	  (while (re-search-forward "&HNG\\([0-9]+\\)-\\([0-9][0-9][0-9][0-9]\\)\\([0-9]\\);" nil t)
 	    (setq plane (match-string 1)
 		  code (string-to-int (match-string 2))
@@ -1016,7 +1051,7 @@ style=\"vertical-align:middle\">"
 	    (replace-match
 	     (format
 	      "<div class=\"tooltip\"><img alt=\"HNG%s-%04d%s\" src=\"%s/%s/%04d%s.png\" style=\"
-vertical-align:middle; width: 48px; height: 48px\"><span
+vertical-align:middle; width: auto; max-height: 60px\"><span
 class=\"tooltiptext\">%s</span></div>"
 	      plane code subcode
 	      chise-wiki-hng-bitmap-glyphs-url
@@ -1045,7 +1080,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
@@ -1064,8 +1099,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\">"
@@ -1429,7 +1464,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)