lib/asciidoctor/rsd/biblio.rng in asciidoctor-rsd-0.2.5 vs lib/asciidoctor/rsd/biblio.rng in asciidoctor-rsd-0.2.6

@@ -440,13 +440,13 @@
       <ref name="abstract"/>
     </optional>
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
   </define>
   <define name="btitle">
@@ -487,14 +487,35 @@
           <value>confirmed</value>
           <value>updated</value>
           <value>issued</value>
         </choice>
       </attribute>
-      <ref name="bfrom"/>
-      <optional>
-        <ref name="bto"/>
-      </optional>
+      <!-- ( ( bfrom, bto? ) | date_on ) -->
+      <choice>
+        <group>
+          <element name="from">
+            <choice>
+              <data type="gYear"/>
+              <data type="date"/>
+            </choice>
+          </element>
+          <optional>
+            <element name="to">
+              <choice>
+                <data type="gYear"/>
+                <data type="date"/>
+              </choice>
+            </element>
+          </optional>
+        </group>
+        <element name="on">
+          <choice>
+            <data type="gYear"/>
+            <data type="date"/>
+          </choice>
+        </element>
+      </choice>
     </element>
   </define>
   <define name="bfrom">
     <element name="from">
       <choice>
@@ -503,9 +524,17 @@
       </choice>
     </element>
   </define>
   <define name="bto">
     <element name="to">
+      <choice>
+        <data type="gYear"/>
+        <data type="date"/>
+      </choice>
+    </element>
+  </define>
+  <define name="date_on">
+    <element name="on">
       <choice>
         <data type="gYear"/>
         <data type="date"/>
       </choice>
     </element>