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

diff --git a/est-eval.el b/est-eval.el
index ece6364..3635eaf 100644
--- a/est-eval.el
+++ b/est-eval.el
@@ -17,13 +17,13 @@
 	((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 "&HD-JA-3C21;"))
-	((eq spec 13) (concat value "&MJ013520;号"))
-	((eq spec 14) (concat value "特&GT-56392;号"))
+	((eq spec 12) (concat value "次"))
+	((eq spec 13) (concat value "月号"))
+	((eq spec 14) (concat value "特集号"))
 	((eq spec 15) (concat value "本"))
 	((eq spec 16) (concat value "分"))
 	((eq spec 51) (concat "Vol." value))
@@ -75,15 +75,15 @@
 ;;         ((string= spec "03") `((decimal (:feature ,feature)) "号"))
 ;;         ((string= spec "04") `((decimal (:feature ,feature)) "&HD-JA-4A54;"))
 ;;         ((string= spec "05") `((decimal (:feature ,feature)) "&HD-JA-4A53;"))
-;;         ((string= spec "06") `((decimal (:feature ,feature)) "&GT-56392;"))
+;;         ((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)) "&HD-JA-3C21;"))
-;;         ((string= spec "13") `((decimal (:feature ,feature)) "&MJ013520;号"))
-;;         ((string= spec "14") `((decimal (:feature ,feature)) "特&GT-56392;号"))
+;;         ((string= spec "12") `((decimal (:feature ,feature)) "次"))
+;;         ((string= spec "13") `((decimal (:feature ,feature)) "月号"))
+;;         ((string= spec "14") `((decimal (:feature ,feature)) "特集号"))
 ;;         ((string= spec "15") `((decimal (:feature ,feature)) "本"))
 ;;         ((string= spec "16") `((decimal (:feature ,feature)) "分"))
 ;;         ((string= spec "51") `("Vol." ((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)
@@ -525,7 +533,8 @@
 			    (list (est-eval-value-as-object (intern unit))))
 		      ))
 		    (list* 'res-link
-			   (list :source source :item item)
+			   (list :separator " "
+				 :source source :item item)
 			   source-objs)
 		    )
 		   (t
@@ -696,7 +705,8 @@
   (unless format
     (setq format (www-feature-value-format feature-name)))
   (if (and (consp value)
-	   est-eval-list-feature-items-limit)
+	   est-eval-list-feature-items-limit
+	   (not (eq feature-name 'sources)))
       (let ((ret (condition-case nil
 		     (nthcdr est-eval-list-feature-items-limit value)
 		   (error nil nil))))