update.

[chise/est.git] / cwiki-common.el

diff --git a/cwiki-common.el b/cwiki-common.el
index aad28dd..f4e7e6f 100644 (file)
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -66,6 +66,7 @@
 (mount-char-attribute-table '=hdic-tsj-glyph-id)
 (mount-char-attribute-table '=hdic-syp-entry-id)
 (mount-char-attribute-table '=hdic-ktb-entry-id)
+(mount-char-attribute-table '=hdic-ktb-seal-glyph-id)
 (mount-char-attribute-table 'hdic-tsj-word-id)
 (mount-char-attribute-table 'hdic-tsj-word)
 (mount-char-attribute-table 'hdic-tsj-word-description)
@@ -77,8 +78,12 @@
 (mount-char-attribute-table 'hdic-ktb-syp-id)
 (mount-char-attribute-table 'hdic-ktb-yy-id)
 (mount-char-attribute-table 'hdic-ktb-ndl-pid)
-(mount-char-attribute-table '<-HDIC-SYP@KTB)
-(mount-char-attribute-table '->HDIC-SYP@KTB)
+(mount-char-attribute-table '<-HDIC-SYP@tenrei-bansho-meigi)
+(mount-char-attribute-table '->HDIC-SYP@tenrei-bansho-meigi)
+(mount-char-attribute-table '<-Small-Seal@tenrei-bansho-meigi)
+(mount-char-attribute-table '->Small-Seal@tenrei-bansho-meigi)
+
+(mount-char-attribute-table 'sound@fanqie)
 
 (defvar est-hide-cgi-mode nil)
 (defvar est-view-url-prefix "..")
@@ -357,6 +362,8 @@
               'space-separated)
              ((eq type 'structure)
               'space-separated-ids)
+             ((eq type 'domain-list)
+              'space-separated-source-list)
              ((eq type 'stext)
               'wiki-text)
              ))
@@ -817,7 +824,8 @@
     (let ((ret (or (if readable
                       (or (concord-object-get object 'name)
                           (concord-object-get object '=name)
-                          (concord-object-get object 'title)))
+                          (concord-object-get object 'title)
+                          (concord-object-get object '=title)))
                   (concord-object-id object))))
       (format "%s" ret))))
 
@@ -1086,7 +1094,7 @@ style=\"%s\">"
            (setq code (string-to-int (match-string 2)))
            (replace-match
             (format "<img alt=\"ZOB-%04d\" src=\"%s/ZOB-1968/%04d.png\"
-style=\"vertical-align:middle\">"
+style=\"vertical-align:middle; width: auto; max-height: 80px\">"
                     code
                     chise-wiki-legacy-bitmap-glyphs-url
                     code
@@ -1106,9 +1114,9 @@ style=\"vertical-align:middle; width: auto; max-height: 60px\">"
             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)))
+         (while (re-search-forward "&\\(A-\\)?SW-JIGUGE\\([45]?\\)-\\([0-9]+\\);" nil t)
+           (setq subcode (match-string 2)
+                 code (string-to-int (match-string 3)))
            (setq plane
                  (if (string= subcode "")
                      "5"
@@ -1194,6 +1202,20 @@ class=\"tooltiptext\">%s</span></div>"
               t 'literal)))
 
          (goto-char (point-min))
+         (while (re-search-forward "&\\(R-\\)?CHISE-HDIC-KTBS\\([0-9A-F]+\\);" nil t)
+           (setq code (string-to-int (match-string 2) 16))
+           (setq char (decode-char '===chise-hdic-ktb-seal code))
+           (when (setq ret (get-char-attribute char '=hdic-ktb-seal-glyph-id))
+             (replace-match
+              (format
+               "<div class=\"tooltip\"><img alt=\"HDIC-KTBS-%s\" src=\"https://hdic.jp/glyphs/KTB-Seal/%s.png\" style=\"
+vertical-align:middle; width: auto; max-height: 60px\"><span
+class=\"tooltiptext\">%s</span></div>"
+               ret ret
+               (charset-description '===chise-hdic-ktb-seal))
+              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