X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fest.git;a=blobdiff_plain;f=est-eval.el;fp=est-eval.el;h=3635eafb67271e538590193d662e39b377cbbe80;hp=c7a1b3b0b1ea96c0139466a4be1539110de60329;hb=4aa39ce319ec73027b770bfdc751d80bca2cde36;hpb=b9262126891799cc1a7a65d89a40aea07336cc84

diff --git a/est-eval.el b/est-eval.el
index c7a1b3b..3635eaf 100644
--- a/est-eval.el
+++ b/est-eval.el
@@ -17,12 +17,12 @@
 	((eq spec 05) (concat value "&HD-JA-4A53;"))
 	((eq spec 06) (concat value "集"))
 	((eq spec 07) (concat value "輯"))
-	((eq spec 08) (concat value "&GT-53119;"))
-	((eq spec 09) (concat value "&GT-53119;分"))
+	((eq spec 08) (concat value "部"))
+	((eq spec 09) (concat value "部分"))
 	((eq spec 10) (concat value "冊"))
 	((eq spec 11) (concat value "分冊"))
 	((eq spec 12) (concat value "次"))
-	((eq spec 13) (concat value "&MJ013520;号"))
+	((eq spec 13) (concat value "月号"))
 	((eq spec 14) (concat value "特集号"))
 	((eq spec 15) (concat value "本"))
 	((eq spec 16) (concat value "分"))
@@ -77,12 +77,12 @@
 ;;         ((string= spec "05") `((decimal (:feature ,feature)) "&HD-JA-4A53;"))
 ;;         ((string= spec "06") `((decimal (:feature ,feature)) "集"))
 ;;         ((string= spec "07") `((decimal (:feature ,feature)) "輯"))
-;;         ((string= spec "08") `((decimal (:feature ,feature)) "&GT-53119;"))
-;;         ((string= spec "09") `((decimal (:feature ,feature)) "&GT-53119;分"))
+;;         ((string= spec "08") `((decimal (:feature ,feature)) "部"))
+;;         ((string= spec "09") `((decimal (:feature ,feature)) "部分"))
 ;;         ((string= spec "10") `((decimal (:feature ,feature)) "冊"))
 ;;         ((string= spec "11") `((decimal (:feature ,feature)) "分冊"))
 ;;         ((string= spec "12") `((decimal (:feature ,feature)) "次"))
-;;         ((string= spec "13") `((decimal (:feature ,feature)) "&MJ013520;号"))
+;;         ((string= spec "13") `((decimal (:feature ,feature)) "月号"))
 ;;         ((string= spec "14") `((decimal (:feature ,feature)) "特集号"))
 ;;         ((string= spec "15") `((decimal (:feature ,feature)) "本"))
 ;;         ((string= spec "16") `((decimal (:feature ,feature)) "分"))
@@ -426,10 +426,18 @@
 	(error (format "%s" value)))
     (format "%s" value)))
 
+;; (defun est-eval-value-as-ids (value)
+;;   (if (listp value)
+;;       (list 'ids nil (ideographic-structure-to-ids value))
+;;     (format "%s" value)))
 (defun est-eval-value-as-ids (value)
   (if (listp value)
-      (list 'ids nil (ideographic-structure-to-ids value))
-    (format "%s" value)))
+      (list* 'ids
+	     nil
+	     (mapcar #'est-eval-value-as-object
+		     (ideographic-structure-to-ids value))
+	     )
+    (est-eval-value-default value)))
 
 (defun est-eval-value-as-space-separated-ids (value)
   (if (listp value)