X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-edit.el;h=aa0007c3c4b754de43411c3db50d665e7786b3dc;hb=3dbf379010ad0b6fd9491a2496b9aa00d3d39371;hp=dc633c954c7511043a3a6a904b1a50895b13edd0;hpb=9a3766c07578e4798ba19b92f79518bdb902d1b2;p=chise%2Fest.git diff --git a/cwiki-edit.el b/cwiki-edit.el index dc633c9..aa0007c 100644 --- a/cwiki-edit.el +++ b/cwiki-edit.el @@ -1,33 +1,11 @@ ;; -*- coding: utf-8-mcs-er -*- -(defvar chise-wiki-view-url "../view.cgi") +(defvar chise-wiki-view-url "view.cgi") (defvar chise-wiki-edit-url "edit.cgi") (require 'cwiki-common) +(require 'est-xml) -(defun www-edit-display-char-feature-default (char feature-name &optional value - lang) - (unless value - (setq value (char-feature char feature-name))) - (www-html-display-paragraph - (format "[[%s|%s?feature=%s]] : %s [[[edit|edit.cgi?char=%s&feature=%s]]]" - (www-format-feature-name feature-name lang) - chise-wiki-view-url - (www-uri-encode-feature-name feature-name) - (www-format-value value feature-name nil 'without-tags) - (char-to-string char) - (www-uri-encode-feature-name feature-name) - ))) - -(defun www-edit-display-char-feature-as-ucs (char feature-name &optional value) - (unless value - (setq value (char-feature char feature-name))) - (www-html-display-paragraph - (format "= [[U+%s|http://www.unicode.org/cgi-bin/GetUnihanData.pl?codepoint=%s]] (%d)" - (www-format-value-as-HEX value) - (www-format-value-as-HEX value) - value))) - -(defun www-edit-display-input-box (name value &optional format) +(defun www-edit-display-input-box (object name value &optional format) (when (stringp format) (setq format (intern format))) (let (prefix) @@ -47,69 +25,86 @@ size=\"30\" maxlength=\"30\" value=\"%s\"> " (www-format-encode-string (format "%s" name) 'without-tags) - (www-format-apply-value format nil value + (www-format-apply-value object name + format nil value nil nil 'without-tags) )))) -(defun www-edit-display-char-desc (uri-char uri-feature-name - &optional lang format) +(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)))) + (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) (when (stringp format) (setq format (intern format))) - (let ((char (www-uri-decode-char uri-char)) + (let ((object (www-uri-decode-object genre uri-object)) (feature-name (www-uri-decode-feature-name uri-feature-name)) base-name metadata-name - char-spec str) - (when (characterp char) + object-spec str) + (when (characterp object) (princ (format "