From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Tue, 13 Mar 2018 05:51:54 +0000 (+0900)
Subject: (est-eval-apply-value): Support new format `unordered-link-list'.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edee2b5d373b1becfe70c6c02961c00ead07a2f1;p=chise%2Fest.git

(est-eval-apply-value): Support new format `unordered-link-list'.
(est-eval-list): Add new optional argument `list-props'.
---

diff --git a/est-eval.el b/est-eval.el
index 25b8042..8076a43 100644
--- a/est-eval.el
+++ b/est-eval.el
@@ -14,7 +14,7 @@
 	((eq spec 02) (concat value "å·»"))
 	((eq spec 03) (concat value "号"))
 	((eq spec 04) (concat value "ç·¨"))
-	((eq spec 05) (concat value "&HD-JA-4A53;"))
+	((eq spec 05) (concat value "&MJ019590;"))
 	((eq spec 06) (concat value "集"))
 	((eq spec 07) (concat value "輯"))
 	((eq spec 08) (concat value "部"))
@@ -101,7 +101,7 @@
 ;;         ((string= spec "02") `((decimal (:feature ,feature)) "å·»"))
 ;;         ((string= spec "03") `((decimal (:feature ,feature)) "号"))
 ;;         ((string= spec "04") `((decimal (:feature ,feature)) "&AJ1-03620;"))
-;;         ((string= spec "05") `((decimal (:feature ,feature)) "&HD-JA-4A53;"))
+;;         ((string= spec "05") `((decimal (:feature ,feature)) "&MJ019590;"))
 ;;         ((string= spec "06") `((decimal (:feature ,feature)) "集"))
 ;;         ((string= spec "07") `((decimal (:feature ,feature)) "輯"))
 ;;         ((string= spec "08") `((decimal (:feature ,feature)) "部"))
@@ -774,6 +774,10 @@
 	 ((eq format 'wiki-text)
 	  (est-eval-list value object feature-name nil uri-object)
 	  )
+	 ((eq format 'unordered-link-list)
+	  (est-eval-list value object feature-name nil uri-object
+			 '(:subtype unordered-list :separator " "))
+	  )
 	 ((eq format 'S-exp)
 	  (est-eval-value-as-S-exp value)
 	  )
@@ -959,7 +963,7 @@
       exp)))))
 
 (defun est-eval-list (format-list object feature-name
-				  &optional lang uri-object)
+				  &optional lang uri-object list-props)
   (if (consp format-list)
       (let ((ret
 	     (mapcar
@@ -967,7 +971,7 @@
 		(est-eval-unit exp object feature-name lang uri-object nil))
 	      format-list)))
 	(if (cdr ret)
-	    (list* 'list nil ret)
+	    (list* 'list list-props ret)
 	  (car ret)))
     (est-eval-unit format-list object feature-name lang uri-object nil)))