CHISE-wiki character: %s

X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-view.el;h=85dc28403d3c097b38b64e3b4947d12b23d35531;hb=1217edd65b1604eb403c9324b61bcd451d6aae5d;hp=4834330cf655cf644244605888c937fdc7446fb4;hpb=93dac2e3bdd0f786510e024caca5bbc39af3b14f;p=chise%2Fest.git diff --git a/cwiki-view.el b/cwiki-view.el index 4834330..85dc284 100644 --- a/cwiki-view.el +++ b/cwiki-view.el @@ -1,44 +1,124 @@ ;; -*- coding: utf-8-mcs-er -*- -(require 'cwiki-common) +(require 'cwiki-format) (defvar chise-wiki-view-url "view.cgi") -(defvar chise-wiki-edit-url "edit/edit.cgi") -(defvar chise-wiki-add-url "edit/add.cgi") +(defvar chise-wiki-edit-url "edit.cgi") +(defvar chise-wiki-add-url "add.cgi") -(defun www-display-char-desc (uri-char &optional lang level) +(defun www-edit-display-feature-input-box (char feature-name + &optional format value) + (if (symbolp char) + (setq char (or (concord-decode-object '=id char 'feature) + (concord-make-object 'feature char)))) + (unless format + (setq format 'default)) + (unless value + (setq value (www-get-feature-value char feature-name))) + (if (and (symbolp value) + (eq format 'wiki-text)) + (setq value (list (list value)))) + (princ + (format "

" + feature-name)) + (princ (encode-coding-string " \u2190 " 'utf-8-mcs-er)) + (princ + (format "%s +

+" + (if (or (eq format 'HEX)(eq format 'hex)) + "0x" + "") + format + (mapconcat (lambda (c) + (cond + ;; ((eq c ?<) "<") + ;; ((eq c ?>) ">") + ((eq c ?\u0022) """) + (t + (char-to-string c)))) + (est-format-list value format nil nil " ") + ""))) + ) + +(defun www-display-object-desc (genre uri-object &optional lang level simple + uri-feature-name-to-edit editing-format) (unless level - (setq level 1)) - (let ((char (www-uri-decode-char uri-char)) - logical-feature displayed-features + (setq level 0)) + (let ((object (www-uri-decode-object genre uri-object)) + feature-name-to-edit + base-name-to-edit metadata-name-to-edit + without-header + logical-feature chise-wiki-displayed-features parents - GlyphWiki-id) - (when (characterp char) - (when (= (length uri-char) 1) - (setq uri-char (www-uri-encode-char char))) + GlyphWiki-id ret object-spec) + (if (eq level 0) + (setq level 1 + without-header nil) + (setq without-header t)) + (when object + (when uri-feature-name-to-edit + (setq feature-name-to-edit + (www-uri-decode-feature-name uri-feature-name-to-edit)) + (setq ret (symbol-name feature-name-to-edit)) + (if (string-match "\\*" ret) + (setq base-name-to-edit (intern + (substring ret 0 (match-beginning 0))) + metadata-name-to-edit (intern + (substring ret (match-end 0)))) + (setq base-name-to-edit feature-name-to-edit)) + (when (stringp editing-format) + (setq editing-format (intern editing-format)))) + (when (and (eq genre 'character) + (= (length uri-object) 1)) + (setq uri-object (www-uri-encode-object object))) (when (= level 1) (princ (encode-coding-string (format " -CHISE-wiki character: %s +EsT %s = %s \n" - (decode-uri-string uri-char 'utf-8-mcs-er)) + genre + (decode-uri-string uri-object 'utf-8-mcs-er)) 'utf-8-mcs-er)) (princ "\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)) + (when (eq genre 'character) + (dolist (feature (char-feature-property '$object 'additional-features)) + (mount-char-attribute-table + (char-feature-name-at-domain feature '$rev=latest)))) + (princ + (format + (if simple + "

+ + + + +

\n" + "

+ + + +

\n") + genre + uri-object)) + (when (setq parents (www-get-feature-value object '<-denotational)) (princ (format "

%s %s

\n" (www-format-value-as-char-list parents) (www-format-feature-name '->denotational lang)))) - (when (setq parents (www-char-feature char '<-subsumptive)) + (when (setq parents (www-get-feature-value object '<-subsumptive)) (princ (format "

%s %s

\n" (www-format-value-as-char-list parents) (www-format-feature-name '->subsumptive lang)))) - (setq GlyphWiki-id (char-GlyphWiki-id char)) + (when (eq genre 'character) + (setq GlyphWiki-id (char-GlyphWiki-id object))) (princ (format "%s%s\n" level - (www-format-encode-string (char-to-string char)) + (www-format-encode-string + (est-format-object object 'readable)) (if GlyphWiki-id (format " $\"%s\"$ " @@ -48,107 +128,170 @@ level)) (if (> level 1) (princ "

\n") + (princ + (encode-coding-string + (format "

(%s : )

+" + genre genre + (decode-uri-string uri-object 'utf-8-mcs-er)) + 'utf-8-mcs-er))) + (setq object-spec + (if (eq genre 'character) + (char-attribute-alist object) + (concord-object-spec object))) + (when feature-name-to-edit + (unless (assq base-name-to-edit object-spec) + (setq object-spec (cons (cons base-name-to-edit nil) + object-spec)))) + (dolist (cell (sort object-spec (lambda (a b) - (char-attribute-name< (car a)(car b))))) + (char-attribute-name< + (char-feature-name-sans-versions (car a)) + (char-feature-name-sans-versions (car b)))))) (setq logical-feature (char-feature-name-sans-versions (car cell))) - (unless (memq logical-feature displayed-features) - (push logical-feature displayed-features) - (princ - (if (= level 1) - "

\n" - "

\n")) - (princ - (www-format-eval-list - (or (char-feature-property logical-feature ; (car cell) - 'format) - '((name) " : " (value))) - char - logical-feature ; (car cell) - lang uri-char)) - (princ - (format " \n" + "

\n")) + (princ + (www-format-eval-list + (www-feature-format logical-feature) + object + logical-feature ; (car cell) + lang uri-object + nil simple)) + (unless simple + (princ + (format " " - chise-wiki-edit-url - (www-format-encode-string uri-char) - (www-format-encode-string - (www-uri-encode-feature-name - (intern (format "%s*note" - logical-feature ; (car cell) - )))))) - (princ - (if (= level 1) - "

\n" - "

\n")) + chise-wiki-edit-url + genre + (www-format-encode-string uri-object) + (www-format-encode-string + (www-uri-encode-feature-name + (intern (format "%s*note" + logical-feature ; (car cell) + ))))))) + (when (and feature-name-to-edit + (eq base-name-to-edit (car cell)) metadata-name-to-edit) + (princ "

") + (www-edit-display-feature-input-box + object feature-name-to-edit editing-format) + (princ "

")) + (princ + (if (= level 1) + "\n" + "

\n")) + )) )) (princ (if (= level 1) "

\n" "

\n")) - (princ - (format "\n")) + (unless simple + (princ + (format " " - chise-wiki-add-url - (www-format-encode-string uri-char))) + chise-wiki-add-url + genre + (www-format-encode-string uri-object)))) (princ (if (= level 1) "

\n" "

\n")) - (princ - "\n") - (princ - (www-format-encode-string - (format "%c" char))) - (princ - (format - " \n") + (princ + (www-format-encode-string + (est-format-object object) + ;; (if (eq genre 'character) + ;; (format "%c" object) + ;; (format "%s" (concord-object-id object))) + )) + (princ + (format + " " - (encode-coding-string (char-to-string char) 'utf-8-jp-er))) - ;; (princ (www-format-encode-string "ã¨")) - ;; (princ "") - (princ - (www-format-encode-string - "ã\u542Bã\u6F22\u5B57ã\u63A2ã")) - (princ " \n") - (princ "

\n")) ))) -(defun www-display-feature-desc (uri-feature-name uri-char &optional lang) +(defun www-display-feature-desc (uri-feature-name genre uri-object + &optional lang simple) (let ((feature-name (www-uri-decode-feature-name uri-feature-name)) (name@lang (intern (format "name@%s" lang)))) (princ (encode-coding-string (format " -CHISE-wiki feature: %s +EsT feature: %s \n" feature-name) 'utf-8-mcs-er)) (princ "\n") (princ + (format + (if simple + "
+ + + + +
+
\n" + "
+ + + +
+
\n") + uri-feature-name genre uri-object)) + (princ (format "
%s
\n" (www-format-encode-string (symbol-name feature-name)))) (princ (format "
name : %s " (or (www-format-feature-name feature-name) ""))) - (princ - (format " " - chise-wiki-edit-url - 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 "
") + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "
\n") (when lang (princ "
") (princ @@ -156,20 +299,17 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (format "%s : %s" name@lang (or (char-feature-property feature-name name@lang) "")))) - (princ - (format " " - 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 "
")) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + name@lang + genre + uri-object)) + (princ "\n")) + (princ "
\n")) (www-html-display-paragraph (format "type : %s" (or (www-feature-type feature-name) @@ -181,25 +321,38 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (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 - "
" - chise-wiki-edit-url - uri-feature-name - uri-char)) + 'without-tags) + )) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "
\n") - (www-html-display-paragraph - (format "format : %s" - (www-xml-format-list - (or (char-feature-property feature-name 'format) - '((name) " : " (value)))))) + (princ "
format : ") + (www-html-display-text + (decode-coding-string + (www-xml-format-list + (www-feature-format feature-name)) + 'utf-8-mcs-er)) + (unless simple + (princ + (format + " " + chise-wiki-edit-url + uri-feature-name + genre + uri-object)) + (princ "\n")) + (princ "
\n") + (www-html-display-paragraph (format "description : %s" (or (char-feature-property feature-name 'description) @@ -220,6 +373,7 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (let* ((target (pop command-line-args-left)) (user (pop command-line-args-left)) (accept-language (pop command-line-args-left)) + (mode (intern (pop command-line-args-left))) (lang (intern (car (split-string @@ -236,6 +390,14 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") ") (cond ((stringp target) + (when (string-match "^char=\$&[^&;]+;\$" target) + (setq ret (match-end 0)) + (setq target + (concat "char=" + (www-uri-encode-object + (www-uri-decode-object + 'character (match-string 1 target))) + (substring target ret)))) (setq target (mapcar (lambda (cell) (if (string-match "=" cell) @@ -249,25 +411,36 @@ size=\;; "30\" maxlength=\"30\" value=\"\" />") (split-string target "&"))) (setq ret (car target)) (cond ((eq (car ret) 'char) - (www-display-char-desc - (cdr ret) ; (decode-uri-string (cdr ret) 'utf-8-mcs-er) - lang) + (www-display-object-desc + 'character + (cdr ret) + lang nil + (eq mode 'simple)) ) ((eq (car ret) 'feature) (www-display-feature-desc (decode-uri-string (cdr ret) 'utf-8-mcs-er) - (cdr (assq 'char target)) - ;; (decode-uri-string (cdr (assq 'char target))) - lang) + (car (nth 1 target)) + (cdr (nth 1 target)) + lang + (eq mode 'simple)) + ) + (t + (www-display-object-desc + (car ret) + (cdr ret) + lang nil + (eq mode 'simple)) )) )) (princ "\n
\n") + (princ (format "mode=%S\n" mode)) (princ (format "user=%s\n" user)) - (princ (format "local user=%s\n" (user-login-name))) + ;; (princ (format "local user=%s\n" (user-login-name))) (princ (format "lang=%S\n" lang)) - (princ emacs-version) - (princ " CHISE ") - (princ xemacs-chise-version) + (princ (encode-coding-string (emacs-version) 'utf-8-jp-er)) + ;; (princ " CHISE ") + ;; (princ xemacs-chise-version) (princ " ")