metanorma-standoc 2.0.6 → 2.1.1

data/spec/metanorma/blocks_spec.rb

@@ -352,7 +352,7 @@ RSpec.describe Metanorma::Standoc do
            <terms id='_' obligation='normative'>
              <title>Terms and definitions</title>
              <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-             <term id='term-term1'>
+             <term id='term-Term1'>
                <preferred><expression><name>Term1</name></expression></preferred>
                <definition>
                  <verbal-definition>
@@ -423,7 +423,7 @@ RSpec.describe Metanorma::Standoc do
               <terms id="_" obligation="normative">
               <title>Terms and definitions</title>
               <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-              <term id="term-term1">
+              <term id="term-Term1">
               <preferred><expression><name>Term1</name></expression></preferred>
               <termnote id="_">
               <p id="_">This is a note</p>
@@ -498,7 +498,7 @@ RSpec.describe Metanorma::Standoc do
                     <sections>
         <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
       <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-      <term id="term-term1">
+      <term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
       </term>
       <definitions id="_" obligation="normative" type="symbols">
@@ -543,7 +543,7 @@ RSpec.describe Metanorma::Standoc do
                <note id='_'>
                  <p id='_'>Note 1</p>
                </note>
-               <term id='term-term11'>
+               <term id='term-Term11'>
                  <preferred>
                    <expression>
                      <name>Term11</name>
@@ -658,7 +658,7 @@ RSpec.describe Metanorma::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [CAUTION,type=Safety Precautions,keep-with-next="true",keep-lines-together="true",tag=X,multilingual-rendering=common]
+      [CAUTION,type=Safety Precautions,keep-with-next="true",keep-lines-together="true",tag=X,multilingual-rendering=common,notag=true]
       .Precautions
       ====
       While werewolves are hardy community members, keep in mind the following dietary concerns:
@@ -671,7 +671,7 @@ RSpec.describe Metanorma::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
       <sections>
-         <admonition id="ABC" type="safety precautions" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
+         <admonition id="ABC" type="safety precautions" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common' notag="true" unnumbered="true">
         <name>Precautions</name><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
        <ol id="_" type="arabic">
          <li>
@@ -709,7 +709,7 @@ RSpec.describe Metanorma::Standoc do
         <terms id="_" obligation="normative">
         <title>Terms and definitions</title>
       <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-        <term id="term-term1">
+        <term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
       <termexample id="ABC" tag='X' multilingual-rendering='common'>
         <p id="_">This is an example</p>
@@ -769,7 +769,7 @@ RSpec.describe Metanorma::Standoc do
                     #{BLANK_HDR}
       <sections>
         <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
-      <p id="_">For the purposes of this document, the following terms and definitions apply.</p><term id="term-term1">
+      <p id="_">For the purposes of this document, the following terms and definitions apply.</p><term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
       </term>
       <definitions id="_" obligation="normative" type="symbols">
@@ -907,6 +907,29 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "does not create subfigures if there is only one nested figure" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [[figureC-2]]
+      [.figure]
+      .Stages of gelatinization
+      ====
+      image::spec/examples/rice_images/rice_image3_1.png[]
+      ====
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+             <sections>
+        <figure id="figureC-2"><name>Stages of gelatinization</name>
+        <image src="spec/examples/rice_images/rice_image3_1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes figures within examples" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -948,6 +971,48 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes figures marked up as examples" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [[figureC-2]]
+      [.figure]
+      .Stages of gelatinization
+      ====
+      .Initial stages: No grains are fully gelatinized (ungelatinized starch granules are visible inside the kernels)
+      image::spec/examples/rice_images/rice_image3_1.png[]
+
+      Text
+
+      .Intermediate stages: Some fully gelatinized kernels are visible
+      image::spec/examples/rice_images/rice_image3_2.png[]
+
+      .Final stages: All kernels are fully gelatinized
+      image::spec/examples/rice_images/rice_image3_3.png[]
+      ====
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+             <sections>
+        <figure id="figureC-2"><name>Stages of gelatinization</name><figure id="_">
+        <name>Initial stages: No grains are fully gelatinized (ungelatinized starch granules are visible inside the kernels)</name>
+        <image src="spec/examples/rice_images/rice_image3_1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      <p id="_">Text</p>
+      <figure id="_">
+        <name>Intermediate stages: Some fully gelatinized kernels are visible</name>
+        <image src="spec/examples/rice_images/rice_image3_2.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      <figure id="_">
+        <name>Final stages: All kernels are fully gelatinized</name>
+        <image src="spec/examples/rice_images/rice_image3_3.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure></figure>
+      </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes images" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -1252,7 +1317,7 @@ RSpec.describe Metanorma::Standoc do
                <terms id="_" obligation="normative">
                <title>Terms and definitions</title><p id="_">For the purposes of this document,
              the following terms and definitions apply.</p>
-               <term id="term-term1">
+               <term id="term-Term1">
                <preferred><expression><name>Term1</name></expression></preferred>
                <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
                <termsource status="identical" type="authoritative">
@@ -1270,7 +1335,7 @@ RSpec.describe Metanorma::Standoc do
               </origin>
              </termsource>
              </term>
-             <term id='term-term2'>
+             <term id='term-Term2'>
         <preferred><expression><name>Term2</name></expression></preferred>
         <definition>
         <verbal-definition>
@@ -1327,7 +1392,7 @@ RSpec.describe Metanorma::Standoc do
                <title>Terms and definitions</title>
                <p id="_">For the purposes of this document,
              the following terms and definitions apply.</p>
-               <term id="term-term1">
+               <term id="term-Term1">
                <preferred><expression><name>Term1</name></expression></preferred>
                <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
                <termsource status="modified" type="authoritative">
@@ -1341,7 +1406,7 @@ RSpec.describe Metanorma::Standoc do
                </modification>
              </termsource>
              </term>
-             <term id='term-term2'>
+             <term id='term-Term2'>
         <preferred><expression><name>Term2</name></expression></preferred>
         <definition><verbal-definition>
           <p id='_'>Definition</p>
@@ -1363,8 +1428,7 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-
-    it "processes term source attributes" do
+  it "processes term source attributes" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
@@ -1384,53 +1448,53 @@ RSpec.describe Metanorma::Standoc do
       {{<<IEV:xyz>>}}, with adjustments
     INPUT
     output = <<~OUTPUT
-            #{BLANK_HDR}
-              <sections>
-    <terms id='_' obligation='normative'>
-      <title>Terms and definitions</title>
-      <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-      <term id='term-term1'>
-        <preferred>
-          <expression>
-            <name>Term1</name>
-          </expression>
-        </preferred>
-        <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
-        <termsource status='generalisation' type='authoritative'>
-          <origin bibitemid='ISO2191' type='inline' citeas=''>
-            <localityStack>
-              <locality type='section'>
-                <referenceFrom>1</referenceFrom>
-              </locality>
-            </localityStack>
-          </origin>
-          <modification>
-            <p id='_'>with adjustments</p>
-          </modification>
-        </termsource>
-      </term>
-      <term id='term-term2'>
-        <preferred>
-          <expression>
-            <name>Term2</name>
-          </expression>
-        </preferred>
-        <definition><verbal-definition>
-          <p id='_'>Definition</p>
-        </verbal-definition></definition>
-        <termsource status='modified' type='lineage'>
-          <origin citeas=''>
-            <termref base='IEV' target='xyz'/>
-          </origin>
-          <modification>
-            <p id='_'>with adjustments</p>
-          </modification>
-        </termsource>
-      </term>
-    </terms>
-  </sections>
-            </standard-document>
-OUTPUT
+                #{BLANK_HDR}
+                  <sections>
+        <terms id='_' obligation='normative'>
+          <title>Terms and definitions</title>
+          <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+          <term id='term-Term1'>
+            <preferred>
+              <expression>
+                <name>Term1</name>
+              </expression>
+            </preferred>
+            <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
+            <termsource status='generalisation' type='authoritative'>
+              <origin bibitemid='ISO2191' type='inline' citeas=''>
+                <localityStack>
+                  <locality type='section'>
+                    <referenceFrom>1</referenceFrom>
+                  </locality>
+                </localityStack>
+              </origin>
+              <modification>
+                <p id='_'>with adjustments</p>
+              </modification>
+            </termsource>
+          </term>
+          <term id='term-Term2'>
+            <preferred>
+              <expression>
+                <name>Term2</name>
+              </expression>
+            </preferred>
+            <definition><verbal-definition>
+              <p id='_'>Definition</p>
+            </verbal-definition></definition>
+            <termsource status='modified' type='lineage'>
+              <origin citeas=''>
+                <termref base='IEV' target='xyz'/>
+              </origin>
+              <modification>
+                <p id='_'>with adjustments</p>
+              </modification>
+            </termsource>
+          </term>
+        </terms>
+      </sections>
+                </standard-document>
+    OUTPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
@@ -1444,19 +1508,19 @@ OUTPUT
       ====
     INPUT
     output = <<~"OUTPUT"
-     #{BLANK_HDR}
-             <sections>
-        <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
-        <label>/ogc/recommendation/wfs/2</label>
-      <subject>user</subject>
-      <subject>developer, implementer</subject>
-      <inherit>/ss/584/2015/level/1</inherit>
-      <inherit>/ss/584/2015/level/2</inherit>
-        <description><p id="_">I recommend this</p>
-      </description>
-      </recommendation>
-             </sections>
-             </standard-document>
+      #{BLANK_HDR}
+              <sections>
+         <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
+         <label>/ogc/recommendation/wfs/2</label>
+       <subject>user</subject>
+       <subject>developer, implementer</subject>
+       <inherit>/ss/584/2015/level/1</inherit>
+       <inherit>/ss/584/2015/level/2</inherit>
+         <description><p id="_">I recommend this</p>
+       </description>
+       </recommendation>
+              </sections>
+              </standard-document>
     OUTPUT
 
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))

data/spec/metanorma/cleanup_blocks_spec.rb

@@ -985,6 +985,12 @@ RSpec.describe Metanorma::Standoc do
       ====
       Notice which is very important
       ====
+
+      [IMPORTANT,coverpage=true]
+      ====
+      Notice which is also very important
+      ====
+
     INPUT
     output = <<~OUTPUT
         #{BLANK_HDR}
@@ -992,6 +998,9 @@ RSpec.describe Metanorma::Standoc do
           <note id='_'>
             <p id='_'>Note which is very important</p>
           </note>
+          <admonition id='_' type='important' coverpage='true'>
+            <p id='_'>Notice which is also very important</p>
+          </admonition>
           <foreword id='_' obligation='informative'>
             <title>Foreword</title>
             <p id='_'>Foreword</p>

data/spec/metanorma/cleanup_sections_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Metanorma::Standoc do
           <p id='_'>So am I</p>
         </li>
       </ul>
-             <term id="term-time">
+             <term id="term-Time">
              <preferred><expression><name>Time</name></expression></preferred>
                <definition><verbal-definition><p id="_">This paragraph is extraneous</p></verbal-definition></definition>
              </term></terms>
@@ -520,7 +520,7 @@ RSpec.describe Metanorma::Standoc do
                      </fn>
                    </title>
                    <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-                   <term id='term-term1'>
+                   <term id='term-Term1'>
                      <preferred><expression><name>Term1</name></expression></preferred>
                    </term>
                  </terms>
@@ -795,7 +795,7 @@ RSpec.describe Metanorma::Standoc do
                   <terms id='_' obligation='normative'>
                     <title>Terms and definitions</title>
                     <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-                    <term id='term-term1'>
+                    <term id='term-Term1'>
                       <preferred><expression><name>Term1</name></expression></preferred>
                     </term>
                   </terms>
@@ -1032,7 +1032,7 @@ RSpec.describe Metanorma::Standoc do
                       Pour les besoins du présent document, les termes et définitions suivants
                       s’appliquent.
                     </p>
-                    <term id='term-term1'>
+                    <term id='term-Term1'>
                       <preferred><expression><name>Term1</name></expression></preferred>
                     </term>
                   </terms>
@@ -1266,7 +1266,7 @@ RSpec.describe Metanorma::Standoc do
                   <terms id='_' obligation='normative'>
                     <title>术语和定义</title>
                     <p id='_'>下列术语和定义适用于本文件。</p>
-                    <term id='term-term1'>
+                    <term id='term-Term1'>
                       <preferred><expression><name>Term1</name></expression></preferred>
                     </term>
                   </terms>
@@ -1500,7 +1500,7 @@ RSpec.describe Metanorma::Standoc do
                   <terms id='_' obligation='normative'>
                     <title>Terms and definitions</title>
                     <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-                    <term id='term-term1'>
+                    <term id='term-Term1'>
                       <preferred><expression><name>Term1</name></expression></preferred>
                     </term>
                   </terms>

data/spec/metanorma/cleanup_spec.rb

@@ -435,7 +435,7 @@ RSpec.describe Metanorma::Standoc do
         <terms id="_" obligation="normative">
         <title>Terms and definitions</title>
         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-        <term id="term-term1">
+        <term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
         <definition><verbal-definition><p id='_'>Definition 0</p></verbal-definition></definition>
         <termsource status="identical" type="authoritative">
@@ -554,7 +554,7 @@ RSpec.describe Metanorma::Standoc do
           <sections>
         <terms id="_" obligation="normative"><title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="term-automation1">
+         <term id="term-Automation1">
           <preferred><expression><name>Automation1</name></expression></preferred>
           <definition><verbal-definition><p id='_'>Definition 1</p></verbal-definition></definition>
           <termsource status="identical" type="authoritative">
@@ -565,7 +565,7 @@ RSpec.describe Metanorma::Standoc do
         </origin>
         </termsource>
         </term>
-        <term id="term-automation2">
+        <term id="term-Automation2">
           <preferred><expression><name>Automation2</name></expression></preferred>
           <definition><verbal-definition><p id='_'>Definition 2</p></verbal-definition></definition>
           <termsource status="identical" type="authoritative">
@@ -576,7 +576,7 @@ RSpec.describe Metanorma::Standoc do
         </origin>
         </termsource>
         </term>
-        <term id="term-automation3">
+        <term id="term-Automation3">
           <preferred><expression><name>Automation3</name></expression></preferred>
           <definition><verbal-definition><p id='_'>Definition 3</p></verbal-definition></definition>
           <termsource status="identical" type="authoritative">
@@ -1149,7 +1149,7 @@ RSpec.describe Metanorma::Standoc do
               <dd>
                 <p id='_'>Definition 3</p>
               </dd>
-              <dt id='symbol-xa'>Xa</dt>
+              <dt id='symbol-Xa'>Xa</dt>
               <dd>
                 <p id='_'>Definition 2</p>
               </dd>