(est-eval-value-as-journal-volume): Use `<-journal/volume',

`<-journal/volume*volume' and `<-journal/volume*number' if they are
found.

diff --git a/est-eval.el b/est-eval.el
index 748197a..a4cd06f 100644 (file)
--- a/est-eval.el
+++ b/est-eval.el
@@ -104,7 +104,8 @@
 ;;         ))
 
 (defun est-eval-value-as-journal-volume (value)
-  (let ((journal (car (concord-object-get value '<-volume)))
+  (let ((journal (car (or (concord-object-get value '<-journal/volume)
+                         (concord-object-get value '<-volume))))
        volume-type number-type
        year)
     (setq volume-type (concord-object-get journal 'volume/type/code)
@@ -122,11 +123,13 @@
            " "
            (ruimoku-format-volume
             volume-type
-            (concord-object-get value '<-volume*volume)
+            (or (concord-object-get value '<-journal/volume*volume)
+                (concord-object-get value '<-volume*volume))
             year 'cjk)
            (ruimoku-format-volume
             number-type
-            (concord-object-get value '<-volume*number)
+            (or (concord-object-get value '<-journal/volume*number)
+                (concord-object-get value '<-volume*number))
             year 'cjk))
     ))