X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=est-format.el;h=75493a9734a66bffc0d1dfead09a55abf02d0050;hp=bd507be1b3ab67d03ab166de8f3b235d76d80af5;hb=6affa02e43474d5d04728d45495bd8a2a17c3d1e;hpb=34bf1a43990028de6b04ab768e18cbf2c2745744

diff --git a/est-format.el b/est-format.el
index bd507be..75493a9 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
@@ -63,7 +62,8 @@
 	    props (nth 1 format-unit)
 	    children (nthcdr 2 format-unit))
       (cond
-       ((eq name 'list)
+       ((or (eq name 'list)
+	    (eq name 'image-list))
 	(cond
 	 ((or (eq output-format 'plain-text)
 	      (eq output-format 'wiki-text))
@@ -132,6 +132,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 +159,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
@@ -216,7 +238,7 @@
        ((memq name '(div
 		     a ul ol p
 		     span
-		     input))
+		     input img))
 	)
        (t
 	(when (eq output-format 'html)
@@ -285,7 +307,7 @@
    (t
     (mapconcat (lambda (unit)
 		 (est-format-unit
-		  unit output-format without-edit as-property separator))
+		  unit output-format without-edit as-property))
 	       format-list separator)
     )))