(www-format-value-as-domain-list): New function.
[chise/est.git] / cwiki-view.el
index 17d1996..4834330 100644 (file)
@@ -9,7 +9,9 @@
   (unless level
     (setq level 1))
   (let ((char (www-uri-decode-char uri-char))
-       logical-feature displayed-features)
+       logical-feature displayed-features
+       parents
+       GlyphWiki-id)
     (when (characterp char)
       (when (= (length uri-char) 1)
        (setq uri-char (www-uri-encode-char char)))
                  (decode-uri-string uri-char 'utf-8-mcs-er))
          'utf-8-mcs-er))
        (princ "<body>\n"))
-      (princ (format "<h%d>%s</h%d>\n"
+      (dolist (feature (char-feature-property '$object 'additional-features))
+       (mount-char-attribute-table
+        (char-feature-name-at-domain feature '$rev=latest)))
+      (when (setq parents (www-char-feature char '<-denotational))
+       (princ (format "<p>%s %s</p>\n<hr>\n"
+                      (www-format-value-as-char-list parents)
+                      (www-format-feature-name '->denotational lang))))
+      (when (setq parents (www-char-feature char '<-subsumptive))
+       (princ (format "<p>%s %s</p>\n<hr>\n"
+                      (www-format-value-as-char-list parents)
+                      (www-format-feature-name '->subsumptive lang))))
+      (setq GlyphWiki-id (char-GlyphWiki-id char))
+      (princ (format "<h%d>%s%s</h%d>\n"
                     level
                     (www-format-encode-string (char-to-string char))
+                    (if GlyphWiki-id
+                        (format
+                         " <a href=\"http://glyphwiki.org/wiki/%s\"><img alt=\"%s\" src=\"http://glyphwiki.org/glyph/%s.50px.png\" /></a>"
+                         GlyphWiki-id
+                         GlyphWiki-id GlyphWiki-id)
+                      "")
                     level))
       (if (> level 1)
          (princ "<ul>"))
-      (dolist (feature (char-feature-property '$object 'additional-features))
-       (mount-char-attribute-table
-        (char-feature-name-at-domain feature '$rev=latest)))
       (dolist (cell (sort (char-attribute-alist char)
                          (lambda (a b)
                            (char-attribute-name< (car a)(car b)))))
               (www-format-encode-string uri-char)))
       (princ
        (if (= level 1)
+          "<p>\n"
+        "<li>\n"))
+      (princ
+       "<form action=\"http://chise.zinbun.kyoto-u.ac.jp/ids-find\">\n")
+      (princ
+       (www-format-encode-string
+       (format "%c" char)))
+      (princ
+       (format
+       " <input type=\"text\" name=\"components\"
+size=\"30\" maxlength=\"30\" value=\"%s\" />"
+       (encode-coding-string (char-to-string char) 'utf-8-jp-er)))
+      ;; (princ (www-format-encode-string "と"))
+      ;; (princ "<input type=\"text\" name=\"additional-components\"
+size=\;; "30\" maxlength=\"30\" value=\"\" />")
+      (princ
+       (www-format-encode-string
+       "を\u542Bむ\u6F22\u5B57を\u63A2す"))
+      (princ " <input type=\"submit\" value=\"search\" />\n")
+      (princ "</form>\n")
+      (princ
+       (if (= level 1)
           "</p>\n"
         "<li>\n"))
       )))
              (symbol-name feature-name))))
     (princ (format "<p>name : %s "
                   (or (www-format-feature-name feature-name) "")))
-    (www-html-display-text
-     (format "[[[edit|%s?feature=%s&property=name&char=%s]]]"
-            ;; (char-feature-property feature-name 'name)
+    (princ
+     (format " <a href=\"%s?feature=%s&property=name&format=string&char=%s\"
+><input type=\"submit\" value=\"edit\" /></a>"
             chise-wiki-edit-url
-            uri-feature-name ; (www-uri-encode-feature-name feature-name)
+            uri-feature-name
             uri-char))
+    ;; (www-html-display-text
+    ;;  (format "[[[edit|%s?feature=%s&property=name&char=%s]]]"
+    ;;          ;; (char-feature-property feature-name 'name)
+    ;;          chise-wiki-edit-url
+    ;;          uri-feature-name ; (www-uri-encode-feature-name feature-name)
+    ;;          uri-char))
     (princ "</p>")
     (when lang
       (princ "<p>")
        (format "%s : %s"
                name@lang
                (or (char-feature-property feature-name name@lang) ""))))
-      (www-html-display-text
-       (format " [[[edit|%s?feature=%s&property=%s&char=%s]]]"
+      (princ
+       (format " <a href=\"%s?feature=%s&property=%s&format=string&char=%s\"
+><input type=\"submit\" value=\"edit\" /></a>"
               chise-wiki-edit-url
               uri-feature-name
               name@lang
               uri-char))
+      ;; (www-html-display-text
+      ;;  (format " [[[edit|%s?feature=%s&property=%s&char=%s]]]"
+      ;;          chise-wiki-edit-url
+      ;;          uri-feature-name
+      ;;          name@lang
+      ;;          uri-char))
       (princ "</p>"))
     (www-html-display-paragraph
      (format "type : %s"
              (or (www-feature-type feature-name)
                 ;; (char-feature-property feature-name 'type)
                 'generic)))
-    (www-html-display-paragraph
-     (format "value-format : %s"
-            (www-xml-format-list
-             (or (www-feature-value-format feature-name)
-                 'default))))
+    (princ (format "<p>value-format : %s "
+                  (www-format-value
+                   nil 'value-format 
+                   (or (www-feature-value-format feature-name)
+                       'default)
+                   'default
+                   'without-tags)))
+    ;; (www-html-display-paragraph
+    ;;  (format "value-format : %s"
+    ;;          (www-xml-format-list
+    ;;           (or (www-feature-value-format feature-name)
+    ;;               'default))))
+    (princ
+     (format
+      " <a href=\"%s?feature=%s&property=value-format&format=wiki-text&char=%s\"
+><input type=\"submit\" value=\"edit\" /></a></p>"
+      chise-wiki-edit-url
+      uri-feature-name
+      uri-char))
+
     (www-html-display-paragraph
      (format "format : %s"
             (www-xml-format-list