X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=cwiki-edit.el;h=0c9a07bd7d62d34403032ccea1e092a214128d90;hp=7b8c506dc42dcce227f419902d9a5b8ef2b55fee;hb=HEAD;hpb=ff1dae13d988279765f1f77c81c62b71224ed946
diff --git a/cwiki-edit.el b/cwiki-edit.el
index 7b8c506..0c9a07b 100644
--- a/cwiki-edit.el
+++ b/cwiki-edit.el
@@ -2,7 +2,8 @@
(defvar chise-wiki-view-url "view.cgi")
(defvar chise-wiki-edit-url "edit.cgi")
-(require 'cwiki-format)
+;; (require 'cwiki-format)
+(require 'cwiki-view)
;; (defun www-edit-display-input-box (object name value &optional format)
;; (when (stringp format)
@@ -30,103 +31,134 @@
;; '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))))
- (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-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-object-desc (genre uri-object uri-feature-name
&optional lang format)
- (when (stringp format)
- (setq format (intern format)))
- (let ((object (www-uri-decode-object genre uri-object))
- (feature-name (www-uri-decode-feature-name uri-feature-name))
- base-name metadata-name
- object-spec str)
- (when (characterp object)
- (princ
- (format "
-CHISE-wiki character: %s
-\n"
- (encode-coding-string
- (decode-uri-string uri-object 'utf-8-mcs-er)
- 'utf-8-mcs-er)))
- (princ "\n")
- (princ
- (format "%s
\n"
- (www-format-encode-string (char-to-string object))))
- (princ "\n")
- )))
+ (www-display-object-desc genre uri-object nil lang 1 nil
+ uri-feature-name format))
+
+;; (defun www-edit-display-object-desc (genre uri-object uri-feature-name
+;; &optional lang format)
+;; (when (stringp format)
+;; (setq format (intern format)))
+;; (let ((object (www-uri-decode-object genre uri-object))
+;; (feature-name (www-uri-decode-feature-name uri-feature-name))
+;; base-name metadata-name
+;; parents
+;; object-spec str)
+;; (when object
+;; (princ
+;; (encode-coding-string
+;; (format "
+;; EsT %s = %s
+;; \n"
+;; genre
+;; (decode-uri-string uri-object 'utf-8-mcs-er))
+;; 'utf-8-mcs-er))
+;; (princ "\n")
+;; (when (eq genre 'character)
+;; (dolist (feature (char-feature-property '$object 'additional-features))
+;; (mount-char-attribute-table
+;; (char-feature-name-at-domain feature '$rev=latest))))
+;; (when (setq parents (www-get-feature-value object '<-denotational))
+;; (princ (format "%s %s
\n
\n"
+;; (www-format-value-as-char-list parents)
+;; (www-format-feature-name '->denotational lang))))
+;; (when (setq parents (www-get-feature-value object '<-subsumptive))
+;; (princ (format "%s %s
\n
\n"
+;; (www-format-value-as-char-list parents)
+;; (www-format-feature-name '->subsumptive lang))))
+;; (princ
+;; (format "%s
\n"
+;; (www-format-encode-string (est-format-object object))))
+;; (princ "\n")
+;; )))
(defun www-edit-display-feature-desc (uri-feature-name
uri-property-name
- &optional lang uri-object)
+ &optional lang
+ object-genre uri-object)
(let ((feature-name (www-uri-decode-feature-name uri-feature-name))
(property-name (www-uri-decode-feature-name uri-property-name))
name@lang)
@@ -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
@@ -273,10 +317,10 @@ 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
@@ -304,3 +348,5 @@ size=\"30\" maxlength=\"30\" value=\"%s\">ã«é\u5B9Aããªã)
(error nil
(princ (format "%S" err)))
))
+
+(provide 'cwiki-edit)