metanorma-standoc 1.6.3 → 1.7.2

data/spec/asciidoctor-standoc/refs_dl_spec.rb

@@ -306,11 +306,11 @@ formattedref::
     <on>2014</on>
   </date>
   <date type="published">
-    <from>2014</from>
-    <to>2014</to>
+    <from>2014-04</from>
+    <to>2014-05</to>
   </date>
   <date type="accessed">
-    <on>2015</on>
+    <on>2015-05-20</on>
   </date>
   <contributor>
     <role type="publisher"><description>Publisher role</description></role>
@@ -624,11 +624,11 @@ series.formattedref.script:: Latn
     <on>2014</on>
   </date>
   <date type="published">
-    <from>2014</from>
-    <to>2014</to>
+    <from>2014-04</from>
+    <to>2014-05</to>
   </date>
   <date type="accessed">
-    <on>2015</on>
+    <on>2015-05-20</on>
   </date>
   <contributor>
     <role type="publisher"><description>Publisher role</description></role>

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -249,7 +249,7 @@ RSpec.describe Asciidoctor::Standoc do
                <docidentifier type='URN'>urn:iso:std:iso:123</docidentifier>
                <docnumber>123</docnumber>
                <date type='published'>
-                 <on>2001</on>
+                 <on>2001-05</on>
                </date>
                <contributor>
                  <role type='publisher'/>
@@ -292,7 +292,7 @@ RSpec.describe Asciidoctor::Standoc do
                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
-                     <on>2001</on>
+                     <on>2001-05</on>
                    </date>
                    <contributor>
                      <role type='publisher'/>
@@ -305,6 +305,13 @@ RSpec.describe Asciidoctor::Standoc do
                    <edition>3</edition>
                    <language>en</language>
                    <script>Latn</script>
+                    <abstract format='text/plain' language='en' script='Latn'>
+   This International Standard specifies procedures for sampling
+   natural rubber latex concentrate and for sampling syntheticrubber
+   latices and artificial latices. It is also suitable for sampling
+   rubber latex contained in drums, tank cars ortanks. The procedures
+   may also be used for sampling plastics dispersions.
+ </abstract>
                    <status>
                      <stage>90</stage>
                      <substage>93</substage>
@@ -350,7 +357,7 @@ RSpec.describe Asciidoctor::Standoc do
                <docidentifier type='URN'>urn:iso:std:iso:123</docidentifier>
                <docnumber>123</docnumber>
                <date type='published'>
-                 <on>2001</on>
+                 <on>2001-05</on>
                </date>
                <contributor>
                  <role type='publisher'/>
@@ -393,7 +400,7 @@ RSpec.describe Asciidoctor::Standoc do
                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
-                     <on>2001</on>
+                     <on>2001-05</on>
                    </date>
                    <contributor>
                      <role type='publisher'/>
@@ -406,6 +413,13 @@ RSpec.describe Asciidoctor::Standoc do
                    <edition>3</edition>
                    <language>en</language>
                    <script>Latn</script>
+                   <abstract format='text/plain' language='en' script='Latn'>
+   This International Standard specifies procedures for sampling
+   natural rubber latex concentrate and for sampling syntheticrubber
+   latices and artificial latices. It is also suitable for sampling
+   rubber latex contained in drums, tank cars ortanks. The procedures
+   may also be used for sampling plastics dispersions.
+ </abstract>
                    <status>
                      <stage>90</stage>
                      <substage>93</substage>
@@ -487,7 +501,7 @@ compris les éventuels amendements).
                <docidentifier type='URN'>urn:iso:std:iso:123</docidentifier>
                <docnumber>123</docnumber>
                <date type='published'>
-                 <on>2001</on>
+                 <on>2001-05</on>
                </date>
                <contributor>
                  <role type='publisher'/>
@@ -531,7 +545,7 @@ compris les éventuels amendements).
                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
-                     <on>2001</on>
+                     <on>2001-05</on>
                    </date>
                    <contributor>
                      <role type='publisher'/>
@@ -545,6 +559,15 @@ compris les éventuels amendements).
                    <language>en</language>
                    <language>fr</language>
                    <script>Latn</script>
+                   <abstract format='text/plain' language='fr' script='Latn'>
+  La présente Norme internationale spécifie des méthodes
+  d’échantillonnage pour des concentrés de latex de
+  caoutchoucnaturel et pour échantillonner des latex de caoutchouc
+  synthétique et des latex artificiels. Elle s’applique égalementà
+  l’échantillonnage de latex de caoutchouc contenus dans des fûts,
+  citernes routières ou de stockage. Lemode opératoire peut aussi
+  être utilisé pour l’échantillonnage de dispersions de plastiques.
+</abstract>
                    <status>
                      <stage>90</stage>
                      <substage>93</substage>
@@ -590,7 +613,7 @@ compris les éventuels amendements).
                <docidentifier type='URN'>urn:iso:std:iso:123</docidentifier>
                <docnumber>123</docnumber>
                <date type='published'>
-                 <on>2001</on>
+                 <on>2001-05</on>
                </date>
                <contributor>
                  <role type='publisher'/>
@@ -634,7 +657,7 @@ compris les éventuels amendements).
                    <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
-                     <on>2001</on>
+                     <on>2001-05</on>
                    </date>
                    <contributor>
                      <role type='publisher'/>
@@ -648,6 +671,15 @@ compris les éventuels amendements).
                    <language>en</language>
                    <language>fr</language>
                    <script>Latn</script>
+                   <abstract format='text/plain' language='fr' script='Latn'>
+  La présente Norme internationale spécifie des méthodes
+  d’échantillonnage pour des concentrés de latex de
+  caoutchoucnaturel et pour échantillonner des latex de caoutchouc
+  synthétique et des latex artificiels. Elle s’applique égalementà
+  l’échantillonnage de latex de caoutchouc contenus dans des fûts,
+  citernes routières ou de stockage. Lemode opératoire peut aussi
+  être utilisé pour l’échantillonnage de dispersions de plastiques.
+</abstract>
                    <status>
                      <stage>90</stage>
                      <substage>93</substage>
@@ -761,7 +793,7 @@ compris les éventuels amendements).
           <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:stage-90.93:ed-2:en</docidentifier>
           <docnumber>12382</docnumber>
           <date type="published">
-            <on>1992</on>
+            <on>1992-12</on>
           </date>
           <contributor>
             <role type="publisher"/>
@@ -809,7 +841,7 @@ compris les éventuels amendements).
           <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7:en</docidentifier>
           <docnumber>124</docnumber>
           <date type="published">
-            <on>2014</on>
+            <on>2014-03</on>
           </date>
           <contributor>
             <role type="publisher"/>
@@ -854,7 +886,7 @@ compris les éventuels amendements).
           <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:stage-90.93:ed-2:en</docidentifier>
           <docnumber>12382</docnumber>
           <date type="published">
-            <on>1992</on>
+            <on>1992-12</on>
           </date>
           <contributor>
             <role type="publisher"/>
@@ -903,7 +935,7 @@ compris les éventuels amendements).
           <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7:en</docidentifier>
           <docnumber>124</docnumber>
           <date type="published">
-            <on>2014</on>
+            <on>2014-03</on>
           </date>
           <contributor>
             <role type="publisher"/>
@@ -978,7 +1010,7 @@ compris les éventuels amendements).
                <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7:en</docidentifier>
                <docnumber>124</docnumber>
                <date type='published'>
-                 <on>2014</on>
+                 <on>2014-03</on>
                </date>
                <contributor>
                  <role type='publisher'/>
@@ -1461,53 +1493,68 @@ OUTPUT
       == Scope
 
       <<iso123>>
-
       <<iso123,clause=1>>
+      <<iso124>>
+      <<iso124,clause=1>>
 
       [bibliography]
       == Normative References
 
-      * [[[iso123,repo:(a/b,ISO 123)]]] _Standard_
+      * [[[iso123,repo:(ab/ISO 123)]]] _Standard_
+      * [[[iso124,repo:(ab/ISO 124,id)]]] _Standard_
     INPUT
      #{BLANK_HDR}
-  <sections>
-    <clause id='_' inline-header='false' obligation='normative' type="scope">
-      <title>Scope</title>
-      <p id='_'>
-        <eref type='inline' bibitemid='iso123' citeas='ISO 123'/>
-      </p>
-      <p id='_'>
-        <eref type='inline' bibitemid='iso123' citeas='ISO 123'>
-          <localityStack>
-            <locality type='clause'>
-              <referenceFrom>1</referenceFrom>
-            </locality>
-          </localityStack>
-        </eref>
-      </p>
-    </clause>
-  </sections>
-  <bibliography>
-    <references id='_' normative='true' obligation='informative'>
-      <title>Normative references</title>
-      <p id='_'>
-        The following documents are referred to in the text in such a way that
-        some or all of their content constitutes requirements of this document.
-        For dated references, only the edition cited applies. For undated
-        references, the latest edition of the referenced document (including any
-        amendments) applies.
-      </p>
-      <bibitem id='iso123'>
-        <formattedref format='application/x-isodoc+xml'>
-          <em>Standard</em>
-        </formattedref>
-        <docidentifier type="ISO">ISO 123</docidentifier>
-        <docidentifier type="repository">a/b</docidentifier>
-        <docnumber>123</docnumber>
-      </bibitem>
-    </references>
-  </bibliography>
-</standard-document>
+<sections>
+           <clause id='_' type='scope' inline-header='false' obligation='normative'>
+             <title>Scope</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso123' citeas='ISO 123'/>
+               <eref type='inline' bibitemid='iso123' citeas='ISO 123'>
+                 <localityStack>
+                   <locality type='clause'>
+                     <referenceFrom>1</referenceFrom>
+                   </locality>
+                 </localityStack>
+               </eref>
+               <eref type='inline' bibitemid='iso124' citeas='id'/>
+               <eref type='inline' bibitemid='iso124' citeas='id'>
+                 <localityStack>
+                   <locality type='clause'>
+                     <referenceFrom>1</referenceFrom>
+                   </locality>
+                 </localityStack>
+               </eref>
+             </p>
+           </clause>
+         </sections>
+         <bibliography>
+           <references id='_' normative='true' obligation='informative'>
+             <title>Normative references</title>
+             <p id='_'>
+               The following documents are referred to in the text in such a way that
+               some or all of their content constitutes requirements of this document.
+               For dated references, only the edition cited applies. For undated
+               references, the latest edition of the referenced document (including any
+               amendments) applies.
+             </p>
+             <bibitem id='iso123'>
+               <formattedref format='application/x-isodoc+xml'>
+                 <em>Standard</em>
+               </formattedref>
+               <docidentifier type='ISO'>ISO 123</docidentifier>
+               <docidentifier type='repository'>ab/ISO 123</docidentifier>
+               <docnumber>123</docnumber>
+             </bibitem>
+             <bibitem id='iso124'>
+               <formattedref format='application/x-isodoc+xml'>
+                 <em>Standard</em>
+               </formattedref>
+               <docidentifier>id</docidentifier>
+               <docidentifier type='repository'>ab/ISO 124</docidentifier>
+             </bibitem>
+           </references>
+         </bibliography>
+       </standard-document>
     OUTPUT
     end
 

data/spec/asciidoctor-standoc/section_spec.rb

@@ -34,6 +34,11 @@ RSpec.describe Asciidoctor::Standoc do
 
       == Terms, Definitions, Symbols and Abbreviated Terms
 
+      [.boilerplate]
+      === Boilerplate
+
+      Boilerplate text
+
       [.nonterm]
       === Introduction
 
@@ -111,12 +116,12 @@ RSpec.describe Asciidoctor::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 id="term-term1">
   <preferred>Term1</preferred>
 </term>
 </terms>
 <clause id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title>
-  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+<p id='_'>Boilerplate text</p>
 <clause id="_" inline-header="false" obligation="normative">
   <title>Introduction</title>
   <clause id="_" inline-header="false" obligation="normative">
@@ -133,14 +138,14 @@ RSpec.describe Asciidoctor::Standoc do
   <title>Intro 4</title>
   <terms id="_" obligation="normative">
   <title>Intro 5</title>
-  <term id="_">
+  <term id="term-term1-1">
   <preferred>Term1</preferred>
 </term>
 </terms>
 </clause>
 <terms id="_" obligation="normative">
   <title>Normal Terms</title>
-  <term id="_">
+  <term id="term-term2">
   <preferred>Term2</preferred>
 </term>
 </terms>
@@ -317,7 +322,7 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document,
        the following terms and definitions apply.</p>
-         <term id="_" language="en" script="Latn">
+         <term id="term-term1" language="en" script="Latn">
          <preferred>Term1</preferred>
        </term>
        </terms>
@@ -339,14 +344,14 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Intro 4</title>
          <terms id="_" language="en" script="Latn" obligation="normative">
          <title>Intro 5</title>
-         <term id="_">
+         <term id="term-term1-1">
          <preferred>Term1</preferred>
        </term>
        </terms>
        </clause>
        <terms id="_" language="en" script="Latn" obligation="normative">
          <title>Normal Terms</title>
-         <term id="_">
+         <term id="term-term2">
          <preferred>Term2</preferred>
        </term>
        </terms>
@@ -468,7 +473,7 @@ RSpec.describe Asciidoctor::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 id='term-term1'>
         <preferred>Term1</preferred>
       </term>
     </terms>
@@ -477,7 +482,7 @@ RSpec.describe Asciidoctor::Standoc do
   <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
       <terms id='_' obligation='normative'>
         <title>Normal Terms</title>
-        <term id='_'>
+        <term id='term-term2'>
           <preferred>Term2</preferred>
         </term>
       </terms>
@@ -536,7 +541,7 @@ RSpec.describe Asciidoctor::Standoc do
     <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 id='term-term'>
         <preferred>Term</preferred>
       </term>
       <definitions id='_' obligation="normative" type="symbols">
@@ -565,7 +570,7 @@ RSpec.describe Asciidoctor::Standoc do
     <terms id='_' obligation='normative'>
       <title>Terms, definitions and abbreviated terms</title>
       <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-      <term id='_'>
+      <term id='term-term'>
         <preferred>Term</preferred>
       </term>
       <definitions id='_' obligation="normative" type="abbreviated_terms">
@@ -710,7 +715,7 @@ RSpec.describe Asciidoctor::Standoc do
        <terms id="_" obligation="normative">
           <title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions 
   given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
-  <term id="_">
+  <term id="term-term1">
   <preferred>Term1</preferred>
 </term>
        </terms></sections>

data/spec/asciidoctor-standoc/table_spec.rb

@@ -35,6 +35,152 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+  it "processes table widths" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    #{ASCIIDOC_BLANK_HDR}
+    [width=75%]
+    |===
+    |A
+    |B
+    |===
+
+    [width=75]
+    |===
+    |A
+    |B
+    |===
+
+    [width=575]
+    |===
+    |A
+    |B
+    |===
+
+    INPUT
+            #{BLANK_HDR}
+  <sections>
+    <table id='_' width='75%'>
+      <tbody>
+        <tr>
+          <td valign='top' align='left'>A</td>
+        </tr>
+        <tr>
+          <td valign='top' align='left'>B</td>
+        </tr>
+      </tbody>
+    </table>
+    <table id='_' width='75'>
+      <tbody>
+        <tr>
+          <td valign='top' align='left'>A</td>
+        </tr>
+        <tr>
+          <td valign='top' align='left'>B</td>
+        </tr>
+      </tbody>
+    </table>
+    <table id='_' width='575'>
+      <tbody>
+        <tr>
+          <td valign='top' align='left'>A</td>
+        </tr>
+        <tr>
+          <td valign='top' align='left'>B</td>
+        </tr>
+      </tbody>
+    </table>
+  </sections>
+</standard-document>
+
+    OUTPUT
+  end
+
+  it "processes column widths in tables" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      [cols=".<,.^,^.>"]
+      |===
+      |A |B |C
+
+      |1 |2 |3
+      |===
+
+      [cols="3"]
+      |===
+      |A |B |C
+
+      |1 |2 |3
+      |===
+
+
+      [cols="1,2,6"]
+      |===
+      |A |B |C
+
+      |1 |2 |3
+      |===
+    INPUT
+            #{BLANK_HDR}
+            <sections>
+           <table id='_'>
+             <thead>
+               <tr>
+                 <th valign='top' align='left'>A</th>
+                 <th valign='middle' align='left'>B</th>
+                 <th valign='bottom' align='center'>C</th>
+               </tr>
+             </thead>
+             <tbody>
+               <tr>
+                 <td valign='top' align='left'>1</td>
+                 <td valign='middle' align='left'>2</td>
+                 <td valign='bottom' align='center'>3</td>
+               </tr>
+             </tbody>
+           </table>
+            <table id='_'>
+             <thead>
+               <tr>
+                 <th valign='top' align='left'>A</th>
+                 <th valign='top' align='left'>B</th>
+                 <th valign='top' align='left'>C</th>
+               </tr>
+             </thead>
+             <tbody>
+               <tr>
+                 <td valign='top' align='left'>1</td>
+                 <td valign='top' align='left'>2</td>
+                 <td valign='top' align='left'>3</td>
+               </tr>
+             </tbody>
+           </table>
+           <table id='_'>
+             <colgroup>
+               <col width='11.1111%'/>
+               <col width='22.2222%'/>
+               <col width='66.6667%'/>
+             </colgroup>
+             <thead>
+               <tr>
+                 <th valign='top' align='left'>A</th>
+                 <th valign='top' align='left'>B</th>
+                 <th valign='top' align='left'>C</th>
+               </tr>
+             </thead>
+             <tbody>
+               <tr>
+                 <td valign='top' align='left'>1</td>
+                 <td valign='top' align='left'>2</td>
+                 <td valign='top' align='left'>3</td>
+               </tr>
+             </tbody>
+           </table>
+         </sections>
+       </standard-document>
+    OUTPUT
+  end
+
+
   it "inserts header rows in a table with a name and no header" do
         expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}