(U-00027B32): Use "𡲬" instead of "⿸尸⿱氺出".
[chise/ids.git] / www / www-ids-find.el
index b42bf75..5907fb4 100644 (file)
@@ -18,7 +18,7 @@
         (concat dest (substring string i))
         coding-system))))
 
-(defconst www-ids-find-version "0.26")
+(defconst www-ids-find-version "0.99.1")
 
 (defvar www-ids-find-ideographic-products-file-name
   (expand-file-name "ideographic-products"
       (princ (encode-coding-string "\e$B"M\e(B[\e$BEbBeBsK\\e(B]</a>" 'utf-8-jp-er)))
     (princ "<br>\n")))
 
+(defun www-ids-insert-chars-including-components* (components
+                                                  &optional ignored-chars products)
+  (unless products
+    (setq products (ideograph-find-products components ignored-chars)))
+  (let (is as bs len)
+    (setq len (length products))
+    (princ "<ul>\n")
+    (dolist (c (cond
+               ((>= len 1024)
+                (sort (copy-list products)
+                      (lambda (a b)
+                        (< (char-int a)(char-int b))))
+                )
+               ((>= len 512)
+                (sort (copy-list products)
+                      (lambda (a b)
+                        (if (setq as (char-total-strokes a))
+                            (if (setq bs (char-total-strokes b))
+                                (if (= as bs)
+                                    (< (char-int a)(char-int b))
+                                  (< as bs))
+                              t)
+                          (< (char-int a)(char-int b)))))
+                )
+               (t
+                (sort (copy-list products)
+                      (lambda (a b)
+                        (if (setq as (char-total-strokes a))
+                            (if (setq bs (char-total-strokes b))
+                                (if (= as bs)
+                                    (ideograph-char< a b)
+                                  (< as bs))
+                              t)
+                          (ideograph-char< a b))))
+                )))
+      (unless (memq c ignored-chars)
+       (setq is (char-feature c 'ideographic-structure))
+       (princ "<li>")
+       (www-ids-find-format-line c is)
+       (setq ignored-chars
+             (www-ids-insert-chars-including-components*
+              (char-to-string c) (cons c ignored-chars)))
+       )
+      )
+    (princ "</ul>\n")
+    )
+  ignored-chars)
+
 (defun www-ids-insert-chars-including-components (components
                                                  &optional ignored-chars)
-  (let ((products (ideographic-products-find components))
+  (let ((products (ideograph-find-products components ignored-chars))
        is as bs len ignore-children)
     (setq len (length products))
     (when (>= len 1024)
     (if (>= len 2048)
        (dolist (c products)
          (www-ids-find-format-char c))
-      (princ "<ul>\n")
-      (dolist (c (cond
-                  ;; ((>= len 2048)
-                  ;;  (setq ignore-children t)
-                  ;;  products)
-                  ;; ((>= len 1024)
-                  ;;  products)
-                 ((>= len 1024)
-                  (sort (copy-list products)
-                        (lambda (a b)
-                          (< (char-int a)(char-int b))))
-                  )
-                 ((>= len 512)
-                  (sort (copy-list products)
-                        (lambda (a b)
-                          (if (setq as (char-total-strokes a))
-                              (if (setq bs (char-total-strokes b))
-                                  (if (= as bs)
-                                      (< (char-int a)(char-int b))
-                                    (< as bs))
-                                t)
-                            (< (char-int a)(char-int b)))))
-                  )
-                 (t
-                  (sort (copy-list products)
+      (setq ignored-chars
+           (nreverse
+            (www-ids-insert-chars-including-components* components ignored-chars products)))
+      (dolist (c ignored-chars)
+       (dolist (vc (char-component-variants c))
+         (unless (memq vc ignored-chars)
+           (when (setq is (get-char-attribute vc 'ideographic-structure))
+             (princ "<li>")
+             (www-ids-find-format-line vc is)
+             (setq ignored-chars
+                   (www-ids-insert-chars-including-components*
+                    (char-to-string vc)
+                    (cons vc ignored-chars)))))))
+      (setq products (ideograph-find-products-with-variants components ignored-chars))
+      (setq len (length products))
+      (when (>= len 512)
+       (setq ignore-children t)
+       (princ
+        (encode-coding-string
+         "<p>\e$B7k2L$,B?$9$.$k$?$a!"4XO";z$N:F5"E*8!:w$r>JN,$7$^$7$?!#\e(B</p>"
+         'utf-8-jp-er)))
+      (if (>= len 1024)
+         (dolist (c products)
+           (www-ids-find-format-char c))
+       (dolist (c (sort (copy-tree products)
                         (lambda (a b)
                           (if (setq as (char-total-strokes a))
                               (if (setq bs (char-total-strokes b))
                                       (ideograph-char< a b)
                                     (< as bs))
                                 t)
-                            (ideograph-char< a b))))
-                  )))
-       (unless (memq c ignored-chars)
-         (setq is (char-feature c 'ideographic-structure))
-         (princ "<li>")
-         (www-ids-find-format-line c is)
-         (unless ignore-children
-            ;; (princ "<ul>\n")
-           (setq ignored-chars
-                 (www-ids-insert-chars-including-components
-                  (char-to-string c)
-                  (cons c ignored-chars)))
-            ;; (princ "</ul>\n")
+                            (ideograph-char< a b)))))
+         (unless (memq c ignored-chars)
+           (setq is (get-char-attribute c 'ideographic-structure))
+           (princ "<li>")
+           (www-ids-find-format-line c is)
+           (unless ignore-children
+             (setq ignored-chars
+                   (www-ids-insert-chars-including-components*
+                    (char-to-string c)
+                    (cons c ignored-chars))))
            ))
-       )
-      (princ "</ul>\n")
-      ))
+       ))
+    )
   ignored-chars)
 
 (defun www-batch-ids-find ()
             \"http://www.w3.org/TR/html4/loose.dtd\">
 <html lang=\"ja\">
 <head>
+<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">
 <title>CHISE IDS Find</title>
+<link href=\"/css/bootstrap-4.5.0.min.css\" rel=\"stylesheet\">
 <style type=\"text/css\">
 <!--
 .entry { font-size: 36px; }
@@ -312,31 +358,40 @@ li { margin: 0 0 -0.2em; }
 
 <body>
 
-<h1>")
+<div class=\"jumbotron jumbotron-fluid mb-0\">
+<h1 class=\"display-4 text-center\">")
     (princ (encode-coding-string "CHISE IDS \e$B4A;z8!:w\e(B" 'utf-8-jp-er))
     (princ "</h1>")
     (princ "
-<p>Version ")
+<p class=\"text-center\">Version ")
     (princ www-ids-find-version)
     (princ (format-time-string
-           " (Last-modified: %Y-%m-%d %H:%M:%S)"
+           " (Last-modified: %Y-%m-%d %H:%M:%S)</p>"
            (nth 5
                 (file-attributes
                  www-ids-find-ideographic-products-file-name))))
     (princ "
-<hr>
-<p>
+</div>
+<div class=\"container mt-0 mw-100 d-inline-block align-top bg-dark\">
+<p />
+<div class=\"input-group mb-3 h3 my-4\">
+<div class=\"input-group-prepend mw-75 ml-3\">
 <form action=\"/ids-find\" method=\"GET\">
+<span class=\"input-group-text\" id=\"basic-addon1\">
 ")
     (princ (encode-coding-string "\e$BItIJJ8;zNs\e(B" 'utf-8-jp-er))
-    (princ " <input type=\"text\" name=\"components\" size=\"30\" maxlength=\"30\" value=\"")
+    (princ "</span>
+</div>
+<input type=\"text\" class=\"form-control\" aria-describedby=\"basic-addon1\" name=\"components\" size=\"30\" maxlength=\"30\" value=\"")
     (if (> (length components) 0)
        (princ (encode-coding-string components 'utf-8-er)))
     (princ "\">
-<input type=\"submit\" value=\"")
+<input class=\"mr-3\" type=\"submit\" value=\"")
     (princ (encode-coding-string "\e$B8!:w3+;O\e(B" 'utf-8-jp-er))
     (princ "\">
 </form>
+</div>
+</div>
 
 ")
     (unless (file-newer-than-file-p
@@ -351,6 +406,8 @@ li { margin: 0 0 -0.2em; }
       )
     (cond
      (components
+      (princ "<div class=\"container\">
+")
       ;; (map-char-attribute
       ;;  (lambda (c v)
       ;;    (when (every (lambda (p)
@@ -377,15 +434,21 @@ li { margin: 0 0 -0.2em; }
       ;; (princ "<ul>\n")
       (www-ids-insert-chars-including-components components)
       ;; (princ "</ul>\n")
+      (princ "</div>\n")
       )
      (t
-      (princ (encode-coding-string "<hr>
+      (princ (encode-coding-string "<div class=\"container mt-4\">
+<div class=\"ml-3\">
 <p>
 \e$B;XDj$7$?ItIJ$rA4$F4^$`4A;z$N0lMw$rI=<($7$^$9!#\e(B
+</p>
 <p>
-CHISE \e$B$GMQ$$$i$l$k<BBV;2>H7A<0!JNc!'\e(B&amp;M-00256;\e$B!K$GItIJ$r;XDj$9$k;v$b$G$-$^$9!#\e(B" 'utf-8-jp-er))
+CHISE \e$B$GMQ$$$i$l$k<BBV;2>H7A<0!JNc!'\e(B&amp;M-00256;\e$B!K$GItIJ$r;XDj$9$k;v$b$G$-$^$9!#\e(B
+</p>
+</div>
+" 'utf-8-jp-er))
       (princ (encode-coding-string "
-<p>
+<p  class=\"ml-0\">
 \[Links\]
 <ul>
 <li><a href=\"http://www.shuiren.org/chuden/toyoshi/syoseki/chise_ids.html\"
@@ -398,7 +461,7 @@ href=\"http://www.shuiren.org/\">\e$B?g?MDb\e(B</a>\e$B!K$K$h$k2r@b\e(B
 >\e$B2aN)c7\e(B</a>\e$B!K\e(B
 </ul>
 <ul>
-<li><a href=\"http://cvs.m17n.org/viewcvs/chise/ids/www/www-ids-find.el?view=markup\"
+<li><a href=\"http://git.chise.org/gitweb/?p=chise/ids.git;a=blob;f=www/www-ids-find.el\"
 >www-ids-find.el (source file (Emacs Lisp part))
 <li><a href=\"http://www.chise.org/ids/\"
 >\e$B!V\e(BCHISE \e$B4A;z9=B$>pJs%G!<%?%Y!<%9!W\e(B</a>
@@ -414,21 +477,27 @@ href=\"http://www.shuiren.org/\">\e$B?g?MDb\e(B</a>\e$B!K$K$h$k2r@b\e(B
 >\e$B5~ETBg3X\e(B21\e$B@$5*\e(BCOE\e$B!VEl%"%8%"@$3&$N?MJ8>pJs3X8&5f650i5rE@!W\e(B</a>
 <li><a href=\"http://www.unicode.org/\"
 >Unicode</a>
-</ul>"
+</ul>
+</p>
+</div>
+"
  'utf-8-jp-er))
 
       ))
-    (princ "<hr>")
-    (princ "<p>
-Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2015 <a href=\"http://kanji.zinbun.kyoto-u.ac.jp/~tomo/\"
->MORIOKA Tomohiko</a>")
+    (princ "<hr>
+<div class=\"container\">
+")
+    (princ "<div class=\"ml-0\">
+Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2015, 2016, 2017, 2020 <a href=\"http://kanji.zinbun.kyoto-u.ac.jp/~tomo/\"
+>MORIOKA Tomohiko</a></div>")
     (princ
      (format
-      "<p>Powered by <a
+      "<div>Powered by <a
 href=\"http://www.chise.org/xemacs/\"
->XEmacs CHISE</a> %s."
+>XEmacs CHISE</a> %s.</div>"
       (encode-coding-string xemacs-chise-version 'utf-8-jp-er)))
     (princ "
+</div>
 </body>
 </html>
 ")))