metanorma-standoc 1.6.4 → 1.7.3

data/spec/asciidoctor-standoc/refs_dl_spec.rb

@@ -142,7 +142,7 @@ copyright::
      abbreviation:::: ISO
      url:::: www.iso.org
    from::: 2014
-   to::: 2020
+   to::: #{Time.now.year}
 link::
   type::: src
   content::: https://www.iso.org/standard/53798.html
@@ -389,7 +389,7 @@ home run record in 1998.</note>
   </status>
   <copyright>
     <from>2014</from>
-    <to>2020</to>
+    <to>#{Time.now.year}</to>
     <owner>
       <organization>
         <name>International Organization for Standardization</name>
@@ -507,7 +507,7 @@ copyright.owner.name:: International Organization for Standardization
 copyright.owner.abbreviation:: ISO
 copyright.owner.url:: www.iso.org
 copyright.from:: 2014
-copyright.to:: 2020
+copyright.to:: #{Time.now.year}
 link::
 link.type:: src
 link.content:: https://www.iso.org/standard/53798.html
@@ -707,7 +707,7 @@ home run record in 1998.</note>
   </status>
   <copyright>
     <from>2014</from>
-    <to>2020</to>
+    <to>#{Time.now.year}</to>
     <owner>
       <organization>
         <name>International Organization for Standardization</name>

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>
@@ -181,6 +186,144 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+   it "processes sections with number attributes" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      [number=1bis]
+      == Scope
+
+      Text
+
+      [number=2bis]
+      == Normative References
+
+      [number=3bis]
+      == Terms and Definitions
+
+      [number=4bis]
+      === Term1
+
+      [number=5bis]
+      == Terms, Definitions, Symbols and Abbreviated Terms
+
+      [.nonterm,number=6bis]
+      === Introduction
+
+      [number=7bis]
+      ==== Intro 1
+
+      [number=8bis]
+      === Intro 2
+
+      [number=9bis]
+      === Symbols and Abbreviated Terms
+
+      [.nonterm,number=10bis]
+      ==== General
+
+      [number=11bis]
+      ==== Symbols
+
+      [number=12bis]
+      == Abbreviated Terms
+
+      [number=13bis]
+      == Clause 4
+
+      [number=14bis]
+      === Introduction
+
+      [number=15bis]
+      === Clause 4.2
+
+      [number=16bis]
+      == Terms and Definitions
+
+      [appendix,number=17bis]
+      == Annex
+
+      [number=18bis]
+      === Annex A.1
+
+      [bibliography,number=19bis]
+      == Bibliography
+
+      [number=20bis]
+      === Bibliography Subsection
+    INPUT
+    #{BLANK_HDR}
+         <sections>
+           <clause id='_' number='1bis' type='scope' inline-header='false' obligation='normative'>
+             <title>Scope</title>
+             <p id='_'>Text</p>
+           </clause>
+           <terms id='_' number='3bis' 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' number='4bis'>
+               <preferred>Term1</preferred>
+             </term>
+           </terms>
+           <terms id='_' number='5bis' 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>
+             <clause id='_' number='6bis' inline-header='false' obligation='normative'>
+               <title>Introduction</title>
+               <clause id='_' number='7bis' inline-header='false' obligation='normative'>
+                 <title>Intro 1</title>
+               </clause>
+             </clause>
+             <term id='term-intro-2' number='8bis'>
+               <preferred>Intro 2</preferred>
+             </term>
+             <definitions id='_' number='9bis' obligation='normative'>
+               <title>Symbols and abbreviated terms</title>
+               <clause id='_' number='10bis' inline-header='false' obligation='normative'>
+                 <title>General</title>
+               </clause>
+               <definitions id='_' number='11bis' type='symbols' obligation='normative'>
+                 <title>Symbols</title>
+               </definitions>
+             </definitions>
+           </terms>
+           <definitions id='_' number='12bis' type='abbreviated_terms' obligation='normative'>
+             <title>Abbreviated terms</title>
+           </definitions>
+           <clause id='_' number='13bis' inline-header='false' obligation='normative'>
+             <title>Clause 4</title>
+             <clause id='_' number='14bis' inline-header='false' obligation='normative'>
+               <title>Introduction</title>
+             </clause>
+             <clause id='_' number='15bis' inline-header='false' obligation='normative'>
+               <title>Clause 4.2</title>
+             </clause>
+           </clause>
+           <clause id='_' number='16bis' inline-header='false' obligation='normative'>
+             <title>Terms and Definitions</title>
+           </clause>
+         </sections>
+         <annex id='_' number='17bis' inline-header='false' obligation='normative'>
+           <title>Annex</title>
+           <clause id='_' number='18bis' inline-header='false' obligation='normative'>
+             <title>Annex A.1</title>
+           </clause>
+         </annex>
+         <bibliography>
+           <references id='_' number='2bis' normative='true' obligation='informative'>
+             <title>Normative references</title>
+             <p id='_'>There are no normative references in this document.</p>
+           </references>
+           <clause id='_' number='19bis' obligation='informative'>
+             <title>Bibliography</title>
+             <references id='_' number='20bis' normative='false' obligation='informative'>
+               <title>Bibliography Subsection</title>
+             </references>
+           </clause>
+         </bibliography>
+       </standard-document>
+       OUTPUT
+   end
+
     it "processes sections with language and script attributes" do
       expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -317,7 +460,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 +482,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 +611,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 +620,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 +679,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 +708,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 +853,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}

data/spec/fixtures/diagram_definitions.lutaml

@@ -3,20 +3,20 @@ diagram MyView {
 
   enum AddressClassProfile {
     imlicistAttributeProfile: CharacterString [0..1] {
-      definition
+      definition {
         this is multiline with `ascidoc`
         comments
         and list
-      end definition
+      }
     }
   }
 
   class AttributeProfile {
     +addressClassProfile: CharacterString [0..1]
     imlicistAttributeProfile: CharacterString [0..1] {
-      definition this is attribute definition
+      definition { this is attribute definition
       with multiply lines
-      end definition
+      }
     }
   }
 }