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

diff --git a/est-format.el b/est-format.el
index bd507be..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
@@ -285,7 +306,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)
     )))