![\"CB%05d\"](\"/glyphs/cb-gaiji/%02d/CB%05d.gif\")
\n"
- ;; code (/ code 1000) code))
- ;; (when code-desc
- ;; (insert (format "CB%05d![\"HDIC-TSJ-%s\"](\"https://viewer.hdic.jp/img/tsj/%s.jpg\")
"
+ ret ret)
+ t 'literal)))
+
+ (goto-char (point-min))
+ (while (re-search-forward "&\\(R-\\)?CHISE-HDIC-SYP\\([0-9A-F]+\\);" nil t)
+ (setq code (string-to-int (match-string 2) 16))
+ (setq char (decode-char '===chise-hdic-syp code))
+ (when (setq ret (get-char-attribute char '=hdic-syp-entry-id))
+ (replace-match
+ (format
+ "![\"HDIC-SYP-%s\"](\"https://viewer.hdic.jp/img/syp/%s\")
"
+ ret ret)
+ t 'literal)))
+
+ (goto-char (point-min))
+ (while (re-search-forward "&\\(R-\\)?CHISE-HDIC-KTB\\([0-9A-F]+\\);" nil t)
+ (setq code (string-to-int (match-string 2) 16))
+ (setq char (decode-char '===chise-hdic-ktb code))
+ (when (setq ret (get-char-attribute char '=hdic-ktb-entry-id))
+ (replace-match
+ (format
+ "![\"HDIC-KTB-%s\"](\"https://hdic.chise.org/img/ktb/%s.jpg\")
"
+ ret ret)
+ t 'literal)))
+
+ (goto-char (point-min))
(while (re-search-forward "&\\(o-\\|G-\\|g2-\\|R-\\)?AJ1-\\([0-9]+\\);" nil t)
(setq code (string-to-int (match-string 2)))
(replace-match
@@ -612,7 +561,7 @@ style=\"vertical-align:middle\">"
(concat dest (substring string i))
coding-system))))
-(defconst www-ids-find-version "0.99.2")
+(defconst www-ids-find-version "0.100.1")
(defvar www-ids-find-ideographic-products-file-name
(expand-file-name "ideographic-products"
@@ -632,105 +581,56 @@ style=\"vertical-align:middle\">"
"~tomo/projects/chise/ids/www/tang-chars.udd")
(defun www-ids-find-format-char (c &optional code-desc)
- (princ
- (format "%s"
- 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 "\n"
- ;; code (/ code 1000) code))
- ;; (when code-desc
- ;; (insert (format "CB%05d" code)))
- ;; )
- ;; ((string-match "&JC3-\\([0-9A-F]+\\);" str)
- ;; (setq code (string-to-int (match-string 1 str) 16))
- ;; (insert (format "![\"JC3-%04X\"](\"http://kanji.zinbun.kyoto-u.ac.jp/db/CHINA3/Gaiji/%04x.gif\")
\n"
- ;; code code))
- ;; (when code-desc
- ;; (insert (format "JC3-%04X" 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 "![\"J%s-%04X\"](\"/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" 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 "![\"G%d-%04X\"](\"/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" 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 "![\"C%d-%04X\"](\"/glyphs/CNS%d/%04X.gif\")
\n"
- ;; plane code plane code))
- ;; (when code-desc
- ;; (insert (format "C%d-%04X" plane code)))
- ;; )
- ;; ((string-match "&ZOB-\\([0-9]+\\);" str)
- ;; (setq code (string-to-int (match-string 1 str)))
- ;; (insert (format "![\"ZOB-%04d\"](\"/glyphs/ZOB-1968/%04d.png\")
\n"
- ;; code code))
- ;; (when code-desc
- ;; (insert (format "ZOB-%04d" code)))
- ;; )
- ;; (t
- ;; (insert (format "")
- ;; (insert str)
- ;; (insert "")
- ;; ))
- ;; (goto-char (point-min))
- ;; (while (search-forward "&" nil t)
- ;; (replace-match "&" t 'literal))
- ;; (buffer-string))))
- )
-
+ (let* ((ucs (encode-char c '=ucs)))
+ (princ
+ (format "%s"
+ www-ids-find-char-viewer-url
+ (www-uri-encode-object c)
+ (if ucs
+ (format "![\"u%04x\"](\"%s/u%04x.svg\")
%s"
+ ucs
+ chise-wiki-glyphwiki-glyph-image-url
+ ucs
+ (if code-desc
+ (encode-coding-string (format " (%c)" c) 'utf-8-mcs-er)
+ ""))
+ (www-format-encode-string (char-to-string c)))))
+ ))
+
+(defun www-ids-find-format-ids (ids &optional code-desc)
+ (let (len i ucs ret)
+ (setq i 0
+ len (length ids))
+ (while (< i len)
+ (www-ids-find-format-char (aref ids i))
+ (setq i (1+ i)))
+ (when code-desc
+ (princ
+ (format " (%s)"
+ (mapconcat
+ (lambda (c)
+ (setq ucs (or (char-ucs c)
+ (encode-char c '=>ucs@iso)
+ (encode-char c '=>ucs@unicode)
+ (encode-char c '=>ucs@iwds-1)
+ (encode-char c '=>ucs@iwds-1/normalized)
+ (encode-char c '=>ucs@component)
+ (encode-char c '=>ucs@cognate)))
+ (cond (ucs
+ (encode-coding-string
+ (char-to-string (decode-char '=ucs ucs))
+ 'utf-8-mcs-er)
+ )
+ (t
+ (setq ret (encode-coding-string
+ (char-to-string c) 'utf-8-mcs-er))
+ (if (eq (aref ret 0) ?&)
+ (concat "&" (substring ret 1)))
+ )))
+ ids ""))))))
+
(defun www-ids-find-format-line (c is)
- (let (ucs len i ids)
+ (let (ucs ids)
(princ "")
(www-ids-find-format-char c 'code-desc)
(princ "")
@@ -750,14 +650,16 @@ style=\"vertical-align:middle\">"
(format " (link map)"
www-ids-find-chise-link-map-url-prefix ucs)))
(princ " ")
+ ;; (www-ids-find-format-ideographic-structure is 'code-desc)
(when is
(setq ids (ideographic-structure-to-ids is))
- (setq i 0
- len (length ids))
+ ;; (setq i 0
+ ;; len (length ids))
(princ "")
- (while (< i len)
- (www-ids-find-format-char (aref ids i))
- (setq i (1+ i)))
+ (www-ids-find-format-ids ids 'code-desc)
+ ;; (while (< i len)
+ ;; (www-ids-find-format-char (aref ids i))
+ ;; (setq i (1+ i)))
(princ ""))
(when (and ucs
(with-current-buffer
@@ -976,7 +878,7 @@ li { margin: 0 0 -0.2em; }
(princ (encode-coding-string "部品文字列" 'utf-8-jp-er))
(princ "
- (length components) 0)
(princ (encode-coding-string components 'utf-8-er)))
(princ "\">
@@ -1082,7 +984,7 @@ href=\"http://www.shuiren.org/\">睡人亭）による解説