X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=est-format.el;h=176cbcb36d55071fd06c21dea7c449f6884e87d5;hb=aa419fd536c3c8bee29dfd0ff186d969b4ff8afe;hp=e40b97ee5600fab5a0628ca071ce247b0674d52c;hpb=02a70bfe16c5c0ca3f707b262ed9b436ba678d36;p=chise%2Fest.git diff --git a/est-format.el b/est-format.el index e40b97e..176cbcb 100644 --- a/est-format.el +++ b/est-format.el @@ -18,11 +18,10 @@ (setq dest (format "%s %s=\"%s\"" dest key - (www-format-encode-string - (format "%s" - (est-format-unit val 'without-tags - 'without-edit 'as-property)) - 'without-tags)))) + (format "%s" + (est-format-unit val 'without-tags + 'without-edit 'as-property)) + ))) dest)) (defun est-format-unit (format-unit @@ -132,6 +131,26 @@ children))) )) ) + ((eq name 'omitted) + (cond + ((eq output-format 'wiki-text) + (setq output-string "{{...}}") + ) + ((and (eq output-format 'html) + (setq object (plist-get props :object)) + (setq feature (plist-get props :feature))) + (setq children + (list + (list* 'a + (list :href + (concat (www-uri-make-object-url object) + (if est-hide-cgi-mode + "/feature=" + "&feature=") + (www-uri-encode-feature-name feature))) + children))) + )) + ) ((eq name 'feature-name) (setq name 'span) (when (eq output-format 'html) @@ -139,13 +158,15 @@ (setq feature (plist-get props :feature))) (setq children (list - (list* 'a - (list :href - (www-uri-make-feature-name-url - (est-object-genre object) - (www-uri-encode-feature-name feature) - (www-uri-encode-object object))) - children))))) + (list 'span + '(:class "feature-name") + (list* 'a + (list :href + (www-uri-make-feature-name-url + (est-object-genre object) + (www-uri-encode-feature-name feature) + (www-uri-encode-object object))) + children)))))) ) ((eq name 'value) (cond