version bump

metanorma · Dec 23, 2019 · 21a22a8 · 21a22a8
1 parent 1830506
commit 21a22a8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/lib/asciidoctor/iso/basicdoc.rng b/lib/asciidoctor/iso/basicdoc.rng
@@ -52,9 +52,9 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="BasicBlock"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="note"/>
     </zeroOrMore>
@@ -567,6 +567,7 @@
       <ref name="pagebreak"/>
       <ref name="bookmark"/>
       <ref name="image"/>
+      <ref name="index"/>
     </choice>
   </define>
   <define name="PureTextElement">
@@ -691,6 +692,17 @@
       <empty/>
     </element>
   </define>
+  <define name="index">
+    <element name="index">
+      <attribute name="primary"/>
+      <optional>
+        <attribute name="secondary"/>
+      </optional>
+      <optional>
+        <attribute name="tertiary"/>
+      </optional>
+    </element>
+  </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->
   <define name="bookmark">
     <element name="bookmark">

diff --git a/lib/asciidoctor/iso/isodoc.rng b/lib/asciidoctor/iso/isodoc.rng
@@ -207,9 +207,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -244,9 +244,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -289,9 +289,9 @@
       </optional>
       <choice>
         <group>
-          <optional>
+          <zeroOrMore>
             <ref name="BasicBlock"/>
-          </optional>
+          </zeroOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>

diff --git a/lib/asciidoctor/iso/isostandard.rng b/lib/asciidoctor/iso/isostandard.rng
@@ -76,10 +76,12 @@
     <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>
@@ -397,6 +399,7 @@
         </optional>
         <choice>
           <ref name="image"/>
+          <ref name="pre"/>
           <oneOrMore>
             <ref name="subfigure"/>
           </oneOrMore>

diff --git a/lib/metanorma/iso/version.rb b/lib/metanorma/iso/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.11".freeze
+    VERSION = "1.3.12".freeze
   end
 end