(or (char-feature-property feature-name 'type)
(let ((str (symbol-name feature-name)))
(cond
+ ((string-match "\\*note\\(@[^*]+\\)?$" str)
+ 'stext)
+ ((string-match "\\*sources\\(@[^*]+\\)?$" str)
+ 'domain-list)
+ ((string-match "\\*" str)
+ nil)
((string-match "^\\(->\\|<-\\)" str)
'relation)
((string-match "^ideographic-structure\\(@\\|$\\)" str)
(cond ((eq type 'relation)
'space-separated-char-list)
((eq type 'structure)
- 'space-separated-ids)))
+ 'space-separated-ids)
+ ((eq type 'stext)
+ 'wiki-text)
+ ))
(if (find-charset feature-name)
(if (and (= (charset-dimension feature-name) 2)
(= (charset-chars feature-name) 94))
"-")
" "))
+(defun www-format-feature-name-as-metadata (feature-name &optional lang)
+ (let ((str (symbol-name feature-name))
+ base meta)
+ (cond
+ ((string-match "\\*[^*]+$" str)
+ (setq base (substring str 0 (match-beginning 0))
+ meta (substring str (match-beginning 0)))
+ (concat (www-format-feature-name* (intern base) lang)
+ meta))
+ (t
+ (www-format-feature-name-default feature-name)
+ ))))
+
(defun www-format-feature-name-as-rel-to (feature-name)
(concat "\u2192" (substring (symbol-name feature-name) 2)))
((find-charset feature-name)
(www-format-feature-name-as-CCS feature-name))
((and (setq name (symbol-name feature-name))
- (string-match "^\\(->\\)" name))
+ (string-match "\\*" name))
+ (www-format-feature-name-as-metadata feature-name lang))
+ ((string-match "^\\(->\\)" name)
(www-format-feature-name-as-rel-to feature-name))
((string-match "^\\(<-\\)" name)
(www-format-feature-name-as-rel-from feature-name))
value)
(www-format-value-as-S-exp value)))
-(defun www-format-value (value &optional feature-name format without-tags)
- ;; (cond
- ;; ((find-charset feature-name)
- ;; (cond
- ;; ((and (= (charset-chars feature-name) 94)
- ;; (= (charset-dimension feature-name) 2))
- ;; (www-format-value-as-CCS-94x94 value))
- ;; (t
- ;; (www-format-value-as-CCS-default value)))
- ;; )
- ;; (t
- ;; (www-format-value-as-S-exp value)))
- (www-format-apply-value format nil value nil nil without-tags)
+(defun www-format-value (object feature-name
+ &optional value format without-tags)
+ (unless value
+ (setq value (www-char-feature object feature-name)))
+ (www-format-apply-value object feature-name
+ format nil value nil nil without-tags)
)
t 'literal))
(goto-char (point-min))
- (while (re-search-forward "&UU\\+\\([0-9A-F]+\\);" nil t)
- (setq code (string-to-int (match-string 1) 16))
+ (while (re-search-forward "&\\(UU\\+\\|U-\\)\\([0-9A-F]+\\);" nil t)
+ (setq code (string-to-int (match-string 2) 16))
(replace-match
(format "<img alt=\"UU+%04X\" src=\"http://www.unicode.org/cgi-bin/refglyph?24-%04X\">"
code
((eq format 'S-exp) "S")
(t "s"))))
-(defun www-format-apply-value (format props value
+(defun www-format-apply-value (object feature-name
+ format props value
&optional uri-char uri-feature
without-tags)
(let (ret)
(format "%s" value)
without-tags))
)
+ ((eq format 'wiki-text)
+ (if without-tags
+ (www-xml-format-list value)
+ (www-format-eval-list value object feature-name nil uri-char))
+ )
((eq format 'S-exp)
(www-format-encode-string
(format (www-format-props-to-string props format)
((eq format 'space-separated-ids)
(www-format-value-as-ids value without-tags))
(t
- (setq format 'default)
+ ;; (setq format 'default)
(www-format-encode-string
(format (www-format-props-to-string props 'default)
value)
(cond
((symbolp format)
(www-format-apply-value
+ char feature-name
format nil value
uri-char (www-uri-encode-feature-name feature-name))
)
(cond ((null (cdr format))
(setq format (car format))
(www-format-apply-value
+ char feature-name
(car format) (nth 1 format) value
uri-char (www-uri-encode-feature-name feature-name))
)
(plist-get (nth 1 exp) :format)
lang uri-char value)
(www-format-apply-value
+ char feature-name
(car exp) (nth 1 exp) value
uri-char (www-uri-encode-feature-name feature-name)))
)
(www-format-eval-unit format-list char feature-name lang uri-char)))
+;;; @ XML generator
+;;;
+
+(defun www-xml-format-props (props)
+ (let ((dest "")
+ key val)
+ (while props
+ (setq key (pop props)
+ val (pop props))
+ (if (symbolp key)
+ (setq key (symbol-name key)))
+ (if (eq (aref key 0) ?:)
+ (setq key (substring key 1)))
+ (setq dest
+ (format "%s %s=\"%s\""
+ dest key
+ (www-format-encode-string
+ (format "%s" val) 'without-tags))))
+ dest))
+
+(defun www-xml-format-unit (format-unit)
+ (let (name props children ret)
+ (cond
+ ((stringp format-unit)
+ (mapconcat (lambda (c)
+ (cond
+ ((eq c ?&) "&")
+ ;; ((eq c ?<) "&lt;")
+ ;; ((eq c ?>) "&gt;")
+ (t
+ (char-to-string c))))
+ (www-format-encode-string format-unit 'without-tags)
+ "")
+ )
+ ((consp format-unit)
+ (setq name (car format-unit)
+ props (nth 1 format-unit)
+ children (nthcdr 2 format-unit))
+ (when (eq name 'link)
+ (setq ret (plist-get props :ref))
+ (unless (stringp ret)
+ (setq props (plist-remprop (copy-list props) :ref))
+ (setq children
+ (cons (list* 'ref nil ret)
+ children))))
+ (if children
+ (format "<%s%s>%s</%s>"
+ name
+ (if props
+ (www-xml-format-props props)
+ "")
+ (www-xml-format-list children)
+ name)
+ (format "<%s%s/>"
+ name (www-xml-format-props props)))
+ )
+ (t
+ (format "%s" format-unit)))))
+
+(defun www-xml-format-list (format-list)
+ (if (atom format-list)
+ (www-xml-format-unit format-list)
+ (mapconcat #'www-xml-format-unit
+ format-list "")))
+
+
;;; @ HTML generator
;;;