(est-eval-value-as-domain-list): Treat `zob1959' in `source' as the

same as `zob1968'.

diff --git a/est-eval.el b/est-eval.el
index 5624e6a..3f733c5 100644 (file)
--- a/est-eval.el
+++ b/est-eval.el
@@ -19,8 +19,8 @@
        ((eq spec 09) (concat value "&GT-53119;分"))
        ((eq spec 10) (concat value "冊"))
        ((eq spec 11) (concat value "分冊"))
-       ((eq spec 12) (concat value "&J90-3C21;"))
-       ((eq spec 13) (concat value "&GT-18140;号"))
+       ((eq spec 12) (concat value "&HD-JA-3C21;"))
+       ((eq spec 13) (concat value "&MJ013520;号"))
        ((eq spec 14) (concat value "特&GT-56392;号"))
        ((eq spec 15) (concat value "本"))
        ((eq spec 16) (concat value "分"))
@@ -79,8 +79,8 @@
 ;;         ((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)) "&J90-3C21;"))
-;;         ((string= spec "13") `((decimal (:feature ,feature)) "&GT-18140;号"))
+;;         ((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 "15") `((decimal (:feature ,feature)) "本"))
 ;;         ((string= spec "16") `((decimal (:feature ,feature)) "分"))
@@ -469,7 +469,7 @@
                                   '=id item 'article@ruimoku)
                                  (intern unit)))))
                      )
-                    ((eq source 'zob1968)
+                    ((memq source '(zob1959 zob1968))
                      (if (and (symbolp item)
                               (setq num (symbol-name item))
                               (string-match