X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=91eaa9f5593b0a605a62931cac8357f3f0e1098d;hb=bf074efb990583b7bb81b16246b99775ce7d7663;hp=326fa7f3f31ea844663ef9175d3ab59e93c0be5a;hpb=3a14975bf32bbe7f416ed359d0584453c4e56aad;p=chise%2Fest.git

diff --git a/cwiki-common.el b/cwiki-common.el
index 326fa7f..91eaa9f 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1,9 +1,13 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (require 'char-db-util)
+;; (require 'concord-images)
 
 (setq file-name-coding-system 'utf-8-mcs-er)
 
 
+(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")
 
@@ -33,6 +37,8 @@
 (mount-char-attribute-table '*instance@morpheme-entry/zh-classical)
 
 
+(concord-assign-genre 'hng-card "/usr/local/var/hng-card/db")
+
 (mount-char-attribute-table '->HNG)
 (mount-char-attribute-table '<-HNG)
 
@@ -94,7 +100,12 @@
     =ucs-itaiji-001
     =ucs-itaiji-002
     =ucs-itaiji-003
-    =ucs@unicode))
+    =ucs@unicode
+    ==ucs@unicode
+    ===ucs@unicode
+    ==>ucs@bucs
+    ===daikanwa/+p
+    ===gt))
 
 (defun decode-uri-string (string &optional coding-system)
   (if (> (length string) 0)
@@ -975,12 +986,18 @@ style=\"vertical-align:middle\">"
 		    (char-to-string (decode-char 'ascii (+ 96 subcode)))))
 	    (replace-match
 	     (format
-	      "<img alt=\"HNG%s-%04d%s\" src=\"%s/%s/%04d%s.png\"
-style=\"vertical-align:middle; width: 48px; height: 48px\">"
+	      "<div class=\"tooltip\"><img alt=\"HNG%s-%04d%s\" src=\"%s/%s/%04d%s.png\" style=\"
+vertical-align:middle; width: 48px; height: 48px\"><span
+class=\"tooltiptext\">%s</span></div>"
 	      plane code subcode
 	      chise-wiki-hng-bitmap-glyphs-url
 	      plane code subcode
-	      www-format-char-img-style)
+	      (charset-description
+	       (car (find (format "HNG%s-" plane)
+			  coded-charset-entity-reference-alist
+			  :test (lambda (key cell)
+				  (string= key (nth 1 cell))))))
+	      )
 	     t 'literal))
 
 	  (goto-char (point-min))
@@ -1032,6 +1049,17 @@ style=\"vertical-align:middle; width: 48px; height: 48px\">"
 	     t 'literal))
 
 	  (goto-char (point-min))
+	  (while (re-search-forward "&A-IWDSU\\+\\([0-9A-F]+\\);" nil t)
+	    (setq code (string-to-int (match-string 1) 16))
+	    (replace-match
+	     (format "<img alt=\"A-IWDSU+%04x\" src=\"http://glyphwiki.org/glyph/u%04x.100px.png\"
+style=\"vertical-align:middle; width: 48px; height: 48px\">"
+		     code
+		     code
+		     www-format-char-img-style)
+	     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))
@@ -1110,8 +1138,8 @@ style=\"%s\">"
 	     t 'literal))
 
 	  (goto-char (point-min))
-	  (while (re-search-forward "&RUI6-\\([0-9A-F]+\\);" nil t)
-	    (setq code (string-to-int (match-string 1) 16))
+	  (while (re-search-forward "&\\(G-\\|g2-\\|R-\\)?RUI6-\\([0-9A-F]+\\);" nil t)
+	    (setq code (string-to-int (match-string 2) 16))
 	    (replace-match
 	     (format "<img alt=\"RUI6-%04X\" src=\"%s?char=RUI6-%04X\"
 style=\"vertical-align:middle\">"