X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=www%2Fwww-ids-find.el;h=1dce832793de8353af081e476a306c0b40b62347;hb=2fadf24f129be384945dd64fdc7c80ff3e1fd8d3;hp=8c5b29a995658bf4471ac97807121fc2cbeea653;hpb=b8670993f9cc923f9d509ae0c5733f91e7542a2f;p=chise%2Fids.git

diff --git a/www/www-ids-find.el b/www/www-ids-find.el
index 8c5b29a..1dce832 100644
--- a/www/www-ids-find.el
+++ b/www/www-ids-find.el
@@ -1,4 +1,7 @@
 (require 'ids-find)
+(require 'cwiki-common)
+
+(setq www-format-char-img-style "vertical-align:middle;")
 
 (defun decode-url-string (string &optional coding-system)
   (if (> (length string) 0)
@@ -15,7 +18,7 @@
 	 (concat dest (substring string i))
 	 coding-system))))
 
-(defconst www-ids-find-version "0.25.0")
+(defconst www-ids-find-version "0.26")
 
 (defvar www-ids-find-ideographic-products-file-name
   (expand-file-name "ideographic-products"
@@ -25,6 +28,9 @@
 		      "character"
 		      chise-system-db-directory))))
 
+(defvar www-ids-find-char-viewer-url
+  "/est/view/character/")
+
 (defvar www-ids-find-chise-link-map-url-prefix
   "http://fonts.jp/chise_linkmap/map.cgi?code=")
 
@@ -32,93 +38,108 @@
   "~tomo/projects/chise/ids/www/tang-chars.udd")
 
 (defun www-ids-find-format-char (c &optional code-desc)
-  (let ((str (encode-coding-string (format "%c" c) 'utf-8-er))
-	plane code)
-    (princ
-     (with-temp-buffer
-       (cond
-	((string-match "&CB\\([0-9]+\\);" str)
-	 (setq code (string-to-int (match-string 1 str)))
-	 (insert "<a href=\"/char-desc?char=")
-	 (insert str)
-	 (insert (format "\"><img alt=\"CB%05d\" src=\"/glyphs/cb-gaiji/%02d/CB%05d.gif\">\n"
-			 code (/ code 1000) code))
-	 (when code-desc
-	   (insert (format "CB%05d</a>" code)))
-	 )
-	((string-match "&JC3-\\([0-9A-F]+\\);" str)
-	 (setq code (string-to-int (match-string 1 str) 16))
-	 (insert "<a href=\"/char-desc?char=")
-	 (insert str)
-	 (insert (format "\"><img alt=\"JC3-%04X\" src=\"http://kanji.zinbun.kyoto-u.ac.jp/db/CHINA3/Gaiji/%04x.gif\">\n"
-			 code code))
-	 (when code-desc
-	   (insert (format "JC3-%04X</a>" code)))
-	 )
-	((string-match "&J\\(78\\|83\\|90\\|SP\\)-\\([0-9A-F]+\\);" str)
-	 (setq plane (match-string 1 str)
-	       code (string-to-int (match-string 2 str) 16))
-	 (insert "<a href=\"/char-desc?char=")
-	 (insert str)
-	 (insert (format "\"><img alt=\"J%s-%04X\" src=\"/glyphs/JIS-%s/%02d-%02d.gif\">\n"
-			 plane code plane
-			 (- (lsh code -8) 32)
-			 (- (logand code 255) 32)))
-	 (when code-desc
-	   (insert (format "J%s-%04X</a>" plane code)))
-	 )
-	((string-match "&G\\([01]\\)-\\([0-9A-F]+\\);" str)
-	 (setq plane (string-to-int (match-string 1 str))
-	       code (string-to-int (match-string 2 str) 16))
-	 (insert "<a href=\"/char-desc?char=")
-	 (insert str)
-	 (insert (format "\"><img alt=\"G%d-%04X\" src=\"/glyphs/GB%d/%02d-%02d.gif\">\n"
-			 plane code plane
-			 (- (lsh code -8) 32)
-			 (- (logand code 255) 32)))
-	 (when code-desc
-	   (insert (format "G%d-%04X</a>" plane code)))
-	 )
-	((string-match "&C\\([1-7]\\)-\\([0-9A-F]+\\);" str)
-	 (setq plane (string-to-int (match-string 1 str))
-	       code (string-to-int (match-string 2 str) 16))
-	 (insert "<a href=\"/char-desc?char=")
-	 (insert str)
-	 (insert (format "\"><img alt=\"C%d-%04X\" src=\"/glyphs/CNS%d/%04X.gif\">\n"
-			 plane code plane code))
-	 (when code-desc
-	   (insert (format "C%d-%04X</a>" plane code)))
-	 )
-	((string-match "&ZOB-\\([0-9]+\\);" str)
-	 (setq code (string-to-int (match-string 1 str)))
-	 (insert "<a href=\"/char-desc?char=")
-	 (insert str)
-	 (insert (format "\"><img alt=\"ZOB-%04d\" src=\"/glyphs/ZOB-1968/%04d.png\">\n"
-			 code code))
-	 (when code-desc
-	   (insert (format "ZOB-%04d</a>" code)))
-	 )
-	(t
-	 (insert "<a href=\"/char-desc?char=")
-         ;; (insert str)
-	 (insert
-	  (mapconcat (lambda (c)
-		       (if (<= (char-int c) #x7F)
-			   (char-to-string c)
-			 (format "%%%02X" c)))
-		     str ""))
-	 (insert "\">")
-	 (insert str)
-	 (insert "</a>")
-	 ))
-       (goto-char (point-min))
-       (while (search-forward "&" nil t)
-         (replace-match "&amp;" t 'literal))
-       (buffer-string)))))
+  (princ
+   (format "<a href=\"%s%s\">%s</a>"
+	   www-ids-find-char-viewer-url
+	   (www-uri-encode-object c)
+	   (www-format-encode-string (char-to-string c))))
+  ;; (let ((str (encode-coding-string (format "%c" c) 'utf-8-er))
+  ;;       plane code)
+  ;;   (princ
+  ;;    (with-temp-buffer
+  ;;      (cond
+  ;;       ((string-match "&CB\\([0-9]+\\);" str)
+  ;;        (setq code (string-to-int (match-string 1 str)))
+  ;;        (insert (format "<a href=\"%s"
+  ;;                        www-ids-find-char-viewer-url))
+  ;;        (insert str)
+  ;;        (insert (format "\"><img alt=\"CB%05d\" src=\"/glyphs/cb-gaiji/%02d/CB%05d.gif\">\n"
+  ;;                        code (/ code 1000) code))
+  ;;        (when code-desc
+  ;;          (insert (format "CB%05d</a>" code)))
+  ;;        )
+  ;;       ((string-match "&JC3-\\([0-9A-F]+\\);" str)
+  ;;        (setq code (string-to-int (match-string 1 str) 16))
+  ;;        (insert (format "<a href=\"%s"
+  ;;                        www-ids-find-char-viewer-url))
+  ;;        (insert str)
+  ;;        (insert (format "\"><img alt=\"JC3-%04X\" src=\"http://kanji.zinbun.kyoto-u.ac.jp/db/CHINA3/Gaiji/%04x.gif\">\n"
+  ;;                        code code))
+  ;;        (when code-desc
+  ;;          (insert (format "JC3-%04X</a>" code)))
+  ;;        )
+  ;;       ((string-match "&J\\(78\\|83\\|90\\|SP\\)-\\([0-9A-F]+\\);" str)
+  ;;        (setq plane (match-string 1 str)
+  ;;              code (string-to-int (match-string 2 str) 16))
+  ;;        (insert (format "<a href=\"%s"
+  ;;                        www-ids-find-char-viewer-url))
+  ;;        (insert str)
+  ;;        (insert (format "\"><img alt=\"J%s-%04X\" src=\"/glyphs/JIS-%s/%02d-%02d.gif\">\n"
+  ;;                        plane code plane
+  ;;                        (- (lsh code -8) 32)
+  ;;                        (- (logand code 255) 32)))
+  ;;        (when code-desc
+  ;;          (insert (format "J%s-%04X</a>" plane code)))
+  ;;        )
+  ;;       ((string-match "&G\\([01]\\)-\\([0-9A-F]+\\);" str)
+  ;;        (setq plane (string-to-int (match-string 1 str))
+  ;;              code (string-to-int (match-string 2 str) 16))
+  ;;        (insert (format "<a href=\"%s"
+  ;;                        www-ids-find-char-viewer-url))
+  ;;        (insert str)
+  ;;        (insert (format "\"><img alt=\"G%d-%04X\" src=\"/glyphs/GB%d/%02d-%02d.gif\">\n"
+  ;;                        plane code plane
+  ;;                        (- (lsh code -8) 32)
+  ;;                        (- (logand code 255) 32)))
+  ;;        (when code-desc
+  ;;          (insert (format "G%d-%04X</a>" plane code)))
+  ;;        )
+  ;;       ((string-match "&C\\([1-7]\\)-\\([0-9A-F]+\\);" str)
+  ;;        (setq plane (string-to-int (match-string 1 str))
+  ;;              code (string-to-int (match-string 2 str) 16))
+  ;;        (insert (format "<a href=\"%s"
+  ;;                        www-ids-find-char-viewer-url))
+  ;;        (insert str)
+  ;;        (insert (format "\"><img alt=\"C%d-%04X\" src=\"/glyphs/CNS%d/%04X.gif\">\n"
+  ;;                        plane code plane code))
+  ;;        (when code-desc
+  ;;          (insert (format "C%d-%04X</a>" plane code)))
+  ;;        )
+  ;;       ((string-match "&ZOB-\\([0-9]+\\);" str)
+  ;;        (setq code (string-to-int (match-string 1 str)))
+  ;;        (insert (format "<a href=\"%s"
+  ;;                        www-ids-find-char-viewer-url))
+  ;;        (insert str)
+  ;;        (insert (format "\"><img alt=\"ZOB-%04d\" src=\"/glyphs/ZOB-1968/%04d.png\">\n"
+  ;;                        code code))
+  ;;        (when code-desc
+  ;;          (insert (format "ZOB-%04d</a>" code)))
+  ;;        )
+  ;;       (t
+  ;;        (insert (format "<a href=\"%s"
+  ;;                        www-ids-find-char-viewer-url))
+  ;;        ;; (insert str)
+  ;;        (insert
+  ;;         (mapconcat (lambda (c)
+  ;;                      (if (<= (char-int c) #x7F)
+  ;;                          (char-to-string c)
+  ;;                        (format "%%%02X" c)))
+  ;;                    str ""))
+  ;;        (insert "\">")
+  ;;        (insert str)
+  ;;        (insert "</a>")
+  ;;        ))
+  ;;      (goto-char (point-min))
+  ;;      (while (search-forward "&" nil t)
+  ;;        (replace-match "&amp;" t 'literal))
+  ;;      (buffer-string))))
+  )
   
 (defun www-ids-find-format-line (c is)
   (let (ucs len i ids)
+    (princ "<span class=\"entry\">")
     (www-ids-find-format-char c 'code-desc)
+    (princ "</span>")
     (princ
      (or (if (setq ucs (or (char-ucs c)
 			   (encode-char c 'ucs)))
@@ -139,9 +160,11 @@
       (setq ids (ideographic-structure-to-ids is))
       (setq i 0
 	    len (length ids))
+      (princ "<span class=\"ids\">")      
       (while (< i len)
 	(www-ids-find-format-char (aref ids i))
-	(setq i (1+ i))))
+	(setq i (1+ i)))
+      (princ "</span>"))
     (when (and ucs
 	       (with-current-buffer
 		   (find-file-noselect
@@ -266,6 +289,18 @@
 <html lang=\"ja\">
 <head>
 <title>CHISE IDS Find</title>
+<style type=\"text/css\">
+<!--
+.entry { font-size: 36px; }
+.entry a img { height: 36px; }
+.ids { font-size: 24px; }
+.ids a img { height: 24px; }
+img { vertical-align:middle; }
+a { text-decoration:none; }
+ul { margin: 0 0; }
+li { margin: 0 0 -0.2em; }
+-->
+</style>
 </head>
 
 <body>
@@ -358,11 +393,11 @@ href=\"http://www.shuiren.org/\">睡人亭</a>）による解説
 <ul>
 <li><a href=\"http://cvs.m17n.org/viewcvs/chise/ids/www/www-ids-find.el?view=markup\"
 >www-ids-find.el (source file (Emacs Lisp part))
-<li><a href=\"http://chise.zinbun.kyoto-u.ac.jp/chise/ids/\"
+<li><a href=\"http://www.chise.org/ids/\"
 >「CHISE 漢字構造情報データベース」</a>
 <li><a href=\"http://fonts.jp/chise_linkmap/\"
 >「chise_linkmap : CHISE 漢字連環図」</a> by 上地宏一さん
-<li><a href=\"http://chise.zinbun.kyoto-u.ac.jp/chise/\"
+<li><a href=\"http://www.chise.org/\"
 >CHISE Project</a>
 </ul>
 <ul>
@@ -378,12 +413,12 @@ href=\"http://www.shuiren.org/\">睡人亭</a>）による解説
       ))
     (princ "<hr>")
     (princ "<p>
-Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 <a href=\"http://kanji.zinbun.kyoto-u.ac.jp/~tomo/\"
+Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2015 <a href=\"http://kanji.zinbun.kyoto-u.ac.jp/~tomo/\"
 >MORIOKA Tomohiko</a>")
     (princ
      (format
       "<p>Powered by <a
-href=\"http://chise.zinbun.kyoto-u.ac.jp/chise/xemacs/\"
+href=\"http://www.chise.org/xemacs/\"
 >XEmacs CHISE</a> %s."
       (encode-coding-string xemacs-chise-version 'utf-8-jp-er)))
     (princ "