(est-eval-value-as-domain-list): Fix problem about ranges.

(est-eval-feature-value): Don't omit items of `sources'.

diff --git a/est-eval.el b/est-eval.el
index ece6364..c7a1b3b 100644 (file)
--- a/est-eval.el
+++ b/est-eval.el
@@ -21,9 +21,9 @@
        ((eq spec 09) (concat value "&GT-53119;分"))
        ((eq spec 10) (concat value "冊"))
        ((eq spec 11) (concat value "分冊"))
        ((eq spec 09) (concat value "&GT-53119;分"))
        ((eq spec 10) (concat value "冊"))
        ((eq spec 11) (concat value "分冊"))

-       ((eq spec 12) (concat value "&HD-JA-3C21;"))
+       ((eq spec 12) (concat value "次"))

        ((eq spec 13) (concat value "&MJ013520;号"))
        ((eq spec 13) (concat value "&MJ013520;号"))

-       ((eq spec 14) (concat value "特&GT-56392;号"))
+       ((eq spec 14) (concat value "特集号"))

        ((eq spec 15) (concat value "本"))
        ((eq spec 16) (concat value "分"))
        ((eq spec 51) (concat "Vol." 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 "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 "10") `((decimal (:feature ,feature)) "冊"))
 ;;         ((string= spec "11") `((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 "10") `((decimal (:feature ,feature)) "冊"))
 ;;         ((string= spec "11") `((decimal (:feature ,feature)) "分冊"))

-;;         ((string= spec "12") `((decimal (:feature ,feature)) "&HD-JA-3C21;"))
+;;         ((string= spec "12") `((decimal (:feature ,feature)) "次"))

 ;;         ((string= spec "13") `((decimal (:feature ,feature)) "&MJ013520;号"))
 ;;         ((string= spec "13") `((decimal (:feature ,feature)) "&MJ013520;号"))

-;;         ((string= spec "14") `((decimal (:feature ,feature)) "特&GT-56392;号"))
+;;         ((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)))))
 ;;         ((string= spec "15") `((decimal (:feature ,feature)) "本"))
 ;;         ((string= spec "16") `((decimal (:feature ,feature)) "分"))
 ;;         ((string= spec "51") `("Vol." ((decimal (:feature ,feature)))))

@@ -525,7 +525,8 @@
                            (list (est-eval-value-as-object (intern unit))))
                      ))
                    (list* 'res-link
                            (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
                           source-objs)
                    )
                   (t

@@ -696,7 +697,8 @@
   (unless format
     (setq format (www-feature-value-format feature-name)))
   (if (and (consp value)
   (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))))
       (let ((ret (condition-case nil
                     (nthcdr est-eval-list-feature-items-limit value)
                   (error nil nil))))