lib/asciidoctor/vsd/isostandard.rng in metanorma-vsd-0.5.7 vs lib/asciidoctor/vsd/isostandard.rng in metanorma-vsd-0.5.8

@@ -4,11 +4,13 @@
     <start>
       <ref name="iso-standard"/>
     </start>
     <define name="organization">
       <element name="organization">
-        <ref name="orgname"/>
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
         <optional>
           <ref name="abbreviation"/>
         </optional>
         <optional>
           <ref name="uri"/>
@@ -72,15 +74,17 @@
       </element>
     </define>
     <define name="sections">
       <element name="sections">
         <ref name="clause"/>
-        <choice>
-          <ref name="term-clause"/>
-          <ref name="terms"/>
-        </choice>
         <optional>
+          <choice>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
+        </optional>
+        <optional>
           <ref name="definitions"/>
         </optional>
         <oneOrMore>
           <ref name="clause"/>
         </oneOrMore>
@@ -393,9 +397,10 @@
         <optional>
           <ref name="tname"/>
         </optional>
         <choice>
           <ref name="image"/>
+          <ref name="pre"/>
           <oneOrMore>
             <ref name="subfigure"/>
           </oneOrMore>
         </choice>
         <zeroOrMore>