X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=est-format.el;h=75493a9734a66bffc0d1dfead09a55abf02d0050;hb=d1e966abdea0032bd1a78b264e97b1402c03c022;hp=b9278abcfe55a8240b2ae2cd23e1a09b4483a867;hpb=ddeaac2017c624ecb802f6216440f1504962cdc4;p=chise%2Fest.git

diff --git a/est-format.el b/est-format.el
index b9278ab..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))
@@ -159,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
@@ -236,7 +238,7 @@
        ((memq name '(div
 		     a ul ol p
 		     span
-		     input))
+		     input img))
 	)
        (t
 	(when (eq output-format 'html)