X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-edit.el;h=0c9a07bd7d62d34403032ccea1e092a214128d90;hp=ceceeb111d4dec3f8d130017f10d97f4432e60ed;hb=HEAD;hpb=2c334867d01e2864d14b13d1a7d718a688fa327d diff --git a/cwiki-edit.el b/cwiki-edit.el index ceceeb1..0c9a07b 100644 --- a/cwiki-edit.el +++ b/cwiki-edit.el @@ -2,131 +2,163 @@ (defvar chise-wiki-view-url "view.cgi") (defvar chise-wiki-edit-url "edit.cgi") -(require 'cwiki-common) +;; (require 'cwiki-format) +(require 'cwiki-view) -(defun www-edit-display-input-box (object name value &optional format) - (when (stringp format) - (setq format (intern format))) - (let (prefix) - (if (or (eq format 'HEX) - (eq format 'hex)) - (if (integerp value) - (setq prefix "0x"))) - (princ (www-format-encode-string - (format "%s \u2190 %s" - name - (or prefix "")))) - (princ - (format " - +;; (defun www-edit-display-input-box (object name value &optional format) +;; (when (stringp format) +;; (setq format (intern format))) +;; (let (prefix) +;; (if (or (eq format 'HEX) +;; (eq format 'hex)) +;; (if (integerp value) +;; (setq prefix "0x"))) +;; (princ (www-format-encode-string +;; (format "%s \u2190 %s" +;; name +;; (or prefix "")))) +;; (princ +;; (format " +;; +;; +;; " +;; (www-format-encode-string +;; (format "%s" name) 'without-tags) +;; (www-format-apply-value object name +;; format nil value +;; nil nil +;; 'without-tags) +;; )))) -" - (www-format-encode-string - (format "%s" name) 'without-tags) - (www-format-apply-value object name - format nil value - nil nil - 'without-tags) - )))) +;; (defun www-edit-display-feature-input-box (char feature-name +;; &optional format value) +;; (unless format +;; (setq format 'default)) +;; (unless value +;; (setq value (www-get-feature-value char feature-name))) +;; (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-unit +;; (est-eval-unit +;; (if (symbolp format) +;; (list format) +;; format) +;; char feature-name) +;; 'without-tags) +;; ;; (www-format-value char feature-name +;; ;; value format 'without-tags) +;; ""))) +;; ) -(defun www-edit-display-feature-input-box (char feature-name - &optional format value) - (unless format - (setq format 'default)) - (unless value - (setq value (www-char-feature char feature-name))) - (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)))) - (www-format-value char feature-name - value format 'without-tags) - ""))) - ) +(defun www-edit-display-object-desc (genre uri-object uri-feature-name + &optional lang format) + (www-display-object-desc genre uri-object nil lang 1 nil + uri-feature-name format)) -(defun www-edit-display-char-desc (uri-char uri-feature-name - &optional lang format) - (when (stringp format) - (setq format (intern format))) - (let ((char (www-uri-decode-char uri-char)) - (feature-name (www-uri-decode-feature-name uri-feature-name)) - base-name metadata-name - char-spec str) - (when (characterp char) - (princ - (format " -%s %s
\n%s %s
\n(ã«é\u5B9Aããªã) " - (decode-uri-string uri-char 'utf-8-mcs-er)) + (decode-uri-string uri-object 'utf-8-mcs-er)) 'utf-8-mcs-er)) (princ "
") (if (eq property-name 'name) @@ -200,6 +232,18 @@ size=\"30\" maxlength=\"30\" value=\"%s\">ã«é\u5B9Aããªã) (or (www-feature-value-format feature-name) 'default)) uri-feature-name))) + (if (eq property-name 'value-presentation-format) + (www-edit-display-feature-input-box + feature-name property-name + 'default ; 'wiki-text + (or (www-feature-value-format feature-name) + 'default)) + (www-html-display-paragraph + (format "value-presentation-format : %s [[[edit|edit.cgi?feature=%s&property=value-presentation-format]]]" + (www-xml-format-list + (or (www-feature-value-format feature-name) + 'default)) + uri-feature-name))) (if (eq property-name 'format) (www-edit-display-feature-input-box feature-name property-name @@ -258,7 +302,8 @@ size=\"30\" maxlength=\"30\" value=\"%s\">ã«é\u5B9Aããªã) (split-string target "&"))) (setq ret (car target)) (cond ((eq (car ret) 'char) - (www-edit-display-char-desc + (www-edit-display-object-desc + 'character (cdr ret) ; (decode-uri-string (cdr ret) 'utf-8-mcs-er) (decode-uri-string (cdr (assq 'feature target)) 'utf-8-mcs-er) @@ -272,10 +317,20 @@ size=\"30\" maxlength=\"30\" value=\"%s\">ã«é\u5B9Aããªã) (decode-uri-string (cdr (assq 'property target)) 'utf-8-mcs-er) lang - (cdr (assq 'char target)) - ;; (decode-uri-string (cdr (assq 'char target)) - ;; 'utf-8-mcs-er) - ) + (car (nth 3 target)) + (cdr (nth 3 target)) + ;; (cdr (assq 'char target)) + ) + ) + (t + (www-edit-display-object-desc + (car ret) + (cdr ret) + (decode-uri-string (cdr (assq 'feature target)) + 'utf-8-mcs-er) + lang + (decode-uri-string (cdr (assq 'format target)) + 'utf-8-mcs-er)) )) (www-html-display-paragraph (format "%S" target)) @@ -285,7 +340,7 @@ size=\"30\" maxlength=\"30\" value=\"%s\">ã«é\u5B9Aããªã) (princ (format "lang=%S\n" lang)) (princ emacs-version) (princ " CHISE ") - (princ xemacs-chise-version) + (princ (encode-coding-string xemacs-chise-version 'utf-8-jp-er)) (princ " ") @@ -293,3 +348,5 @@ size=\"30\" maxlength=\"30\" value=\"%s\">ã«é\u5B9Aããªã) (error nil (princ (format "%S" err))) )) + +(provide 'cwiki-edit)