From edee2b5d373b1becfe70c6c02961c00ead07a2f1 Mon Sep 17 00:00:00 2001 From: MORIOKA Tomohiko Date: Tue, 13 Mar 2018 14:51:54 +0900 Subject: [PATCH] (est-eval-apply-value): Support new format `unordered-link-list'. (est-eval-list): Add new optional argument `list-props'. --- est-eval.el | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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))) -- 1.7.10.4