metanorma-standoc 2.0.3 → 2.0.5.1

data/spec/metanorma/macros_spec.rb

@@ -748,7 +748,7 @@ RSpec.describe Metanorma::Standoc do
         <definitions id='clause1' obligation='normative'>
           <title>Symbols and abbreviated terms</title>
           <dl id='_'>
-            <dt id='symbol-_-__x230a_x__x230b_-'>
+            <dt id='symbol-__x230a_-x-__x230b_'>
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mo>&#8970;</mo>
@@ -770,7 +770,7 @@ RSpec.describe Metanorma::Standoc do
                  function.
               </p>
             </dd>
-            <dt id='symbol-_-__x2308_x__x2309_-'>
+            <dt id='symbol-__x2308_-x-__x2309_'>
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mo>&#8968;</mo>
@@ -1364,8 +1364,70 @@ RSpec.describe Metanorma::Standoc do
       embed::spec/assets/a1.adoc[]
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR}
-               <sections>
+      <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='#{Metanorma::Standoc::VERSION}'>
+         <bibdata type='standard'>
+           <title language='en' format='text/plain'>Document title</title>
+           <language>en</language>
+           <script>Latn</script>
+           <status>
+             <stage>published</stage>
+           </status>
+           <copyright>
+             <from>2022</from>
+           </copyright>
+           <ext>
+             <doctype>article</doctype>
+           </ext>
+           <relation type='derivedFrom'>
+             <bibitem>
+               <title language='en' format='text/plain'>A2</title>
+               <language>en</language>
+               <script>Latn</script>
+               <status>
+                 <stage>published</stage>
+               </status>
+               <copyright>
+                 <from>2022</from>
+               </copyright>
+               <ext>
+                 <doctype>article</doctype>
+               </ext>
+               <relation type='derivedFrom'>
+                 <bibitem>
+                   <title language='en' format='text/plain'>A3</title>
+                   <language>en</language>
+                   <script>Latn</script>
+                   <status>
+                     <stage>published</stage>
+                   </status>
+                   <copyright>
+                     <from>2022</from>
+                   </copyright>
+                   <ext>
+                     <doctype>article</doctype>
+                   </ext>
+                 </bibitem>
+               </relation>
+               <relation type='derivedFrom'>
+                 <bibitem>
+                   <title language='en' format='text/plain'>A3a</title>
+                   <language>en</language>
+                   <script>Latn</script>
+                   <status>
+                     <stage>published</stage>
+                   </status>
+                   <copyright>
+                     <from>2022</from>
+                   </copyright>
+                   <ext>
+                     <doctype>article</doctype>
+                   </ext>
+                 </bibitem>
+               </relation>
+             </bibitem>
+           </relation>
+         </bibdata>
+         <sections>
            <clause id='clause1' inline-header='false' obligation='normative'>
              <title>Clause</title>
            </clause>
@@ -1381,6 +1443,10 @@ RSpec.describe Metanorma::Standoc do
              <title>Clause 3</title>
              <p id='_'>X</p>
            </clause>
+           <clause id='_' inline-header='false' obligation='normative'>
+              <title>Clause 3a</title>
+              <p id='_'>X</p>
+            </clause>
            <clause id='_' inline-header='false' obligation='normative'>
              <title>Clause 4</title>
              <p id='_'>X</p>
@@ -1392,6 +1458,142 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes std-link macro" do
+    VCR.use_cassette "std-link" do
+      input = <<~INPUT
+        #{ISOBIB_BLANK_HDR}
+
+        [[clause1]]
+        == Clause
+
+        std-link:[ISO 131]
+        std-link:[iso:std:iso:13485:en,droploc%clause=4,text]
+      INPUT
+      output = <<~OUTPUT
+         #{BLANK_HDR}
+                  <sections>
+            <clause id='clause1' inline-header='false' obligation='normative'>
+              <title>Clause</title>
+              <p id='_'>
+                <eref type='inline' bibitemid='_' citeas='ISO 131'/>
+                <eref type='inline' droploc='true' bibitemid='_' citeas='iso:std:iso:13485:en'>
+                  <localityStack>
+                    <locality type='clause'>
+                      <referenceFrom>4</referenceFrom>
+                    </locality>
+                  </localityStack>
+                  text
+                </eref>
+              </p>
+            </clause>
+          </sections>
+          <bibliography>
+            <references hidden='true' normative='true'>
+              <bibitem id='_' type='standard' hidden="true">
+                <fetched/>
+                <title type='title-intro' format='text/plain' language='en' script='Latn'>Acoustics</title>
+                <title type='title-main' format='text/plain' language='en' script='Latn'>Expression of physical and subjective magnitudes of sound or noise in air</title>
+                <title type='main' format='text/plain' language='en' script='Latn'>
+                  Acoustics — Expression of physical and subjective magnitudes of sound
+                  or noise in air
+                </title>
+                <uri type='src'>https://www.iso.org/standard/3944.html</uri>
+                <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
+                <docidentifier type='ISO' primary='true'>ISO 131</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1:en</docidentifier>
+                <docnumber>131</docnumber>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                    <abbreviation>ISO</abbreviation>
+                    <uri>www.iso.org</uri>
+                  </organization>
+                </contributor>
+                <edition>1</edition>
+                <language>en</language>
+                <script>Latn</script>
+                <status>
+                  <stage>95</stage>
+                  <substage>99</substage>
+                </status>
+                <copyright>
+                  <from>1979</from>
+                  <owner>
+                    <organization>
+                      <name>ISO</name>
+                    </organization>
+                  </owner>
+                </copyright>
+                <relation type='obsoletes'>
+                  <bibitem type='standard'>
+                    <formattedref format='text/plain'>ISO/R 357:1963</formattedref>
+                  </bibitem>
+                </relation>
+                <relation type='instance'>
+                  <bibitem type='standard'>
+                    <fetched/>
+                    <title type='title-intro' format='text/plain' language='en' script='Latn'>Acoustics</title>
+                    <title type='title-main' format='text/plain' language='en' script='Latn'>Expression of physical and subjective magnitudes of sound or noise in air</title>
+                    <title type='main' format='text/plain' language='en' script='Latn'>
+                      Acoustics — Expression of physical and subjective magnitudes of
+                      sound or noise in air
+                    </title>
+                    <uri type='src'>https://www.iso.org/standard/3944.html</uri>
+                    <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
+                    <docidentifier type='ISO' primary='true'>ISO 131:1979</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1:en</docidentifier>
+                    <docnumber>131</docnumber>
+                    <date type='published'>
+                      <on>1979-11</on>
+                    </date>
+                    <contributor>
+                      <role type='publisher'/>
+                      <organization>
+                        <name>International Organization for Standardization</name>
+                        <abbreviation>ISO</abbreviation>
+                        <uri>www.iso.org</uri>
+                      </organization>
+                    </contributor>
+                    <edition>1</edition>
+                    <language>en</language>
+                    <script>Latn</script>
+                    <status>
+                      <stage>95</stage>
+                      <substage>99</substage>
+                    </status>
+                    <copyright>
+                      <from>1979</from>
+                      <owner>
+                        <organization>
+                          <name>ISO</name>
+                        </organization>
+                      </owner>
+                    </copyright>
+                    <relation type='obsoletes'>
+                      <bibitem type='standard'>
+                        <formattedref format='text/plain'>ISO/R 357:1963</formattedref>
+                      </bibitem>
+                    </relation>
+                    <place>Geneva</place>
+                  </bibitem>
+                </relation>
+                <place>Geneva</place>
+              </bibitem>
+              <bibitem id='_' hidden="true">
+                <formattedref format='application/x-isodoc+xml'/>
+                <docidentifier type='ISO'>iso:std:iso:13485:en</docidentifier>
+                <docnumber>13485:en</docnumber>
+              </bibitem>
+            </references>
+          </bibliography>
+        </standard-document>
+      OUTPUT
+      expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))
+                  .gsub(%r{ bibitemid="_[^"]+"}, ' bibitemid="_"')))
+        .to be_equivalent_to xmlpp(output)
+    end
+  end
 
   describe "term inline macros" do
     subject(:convert) do

data/spec/metanorma/processor_spec.rb

@@ -23,13 +23,16 @@ RSpec.describe Metanorma::Standoc::Processor do
   end
 
   it "generates IsoDoc XML from a blank document" do
-    expect(processor.input_to_isodoc(<<~"INPUT", "test")).to be_equivalent_to <<~"OUTPUT"
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
     INPUT
+    output = <<~"OUTPUT"
           #{BLANK_HDR}
       <sections/>
       </iso-standard>
     OUTPUT
+    expect(processor.input_to_isodoc(input, "test"))
+      .to be_equivalent_to output
   end
 
   it "generates HTML from IsoDoc XML" do
@@ -45,16 +48,17 @@ RSpec.describe Metanorma::Standoc::Processor do
        </sections>
        </iso-standard>
     INPUT
-    expect(File.read("test.html", encoding: "utf-8").gsub(%r{^.*<main}m, "<main").gsub(
-             %r{</main>.*}m, "</main>"
-           )).to be_equivalent_to <<~"OUTPUT"
-                 <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
-                   <p class="zzSTDTitle1"></p>
-                   <div id="H"><h1>Terms, Definitions, Symbols and Abbreviated Terms</h1><h2 class="TermNum" id="J"></h2>
-               <p class="Terms" style="text-align:left;">Term2</p>
-             </div>
-                 </main>
-           OUTPUT
+    expect(File.read("test.html", encoding: "utf-8")
+      .gsub(%r{^.*<main}m, "<main")
+      .gsub(%r{</main>.*}m, "</main>"))
+      .to be_equivalent_to <<~"OUTPUT"
+            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+              <p class="zzSTDTitle1"></p>
+              <div id="H"><h1>Terms, Definitions, Symbols and Abbreviated Terms</h1><h2 class="TermNum" id="J"></h2>
+          <p class="Terms" style="text-align:left;">Term2</p>
+        </div>
+            </main>
+      OUTPUT
   end
 
   it "generates HTML from IsoDoc XML" do
@@ -70,8 +74,8 @@ RSpec.describe Metanorma::Standoc::Processor do
        </sections>
        </iso-standard>
     INPUT
-    expect(File.read("test.doc",
-                     encoding: "utf-8")).to match(/Terms, Definitions, Symbols and Abbreviated Terms/)
+    expect(File.read("test.doc", encoding: "utf-8"))
+      .to match(/Terms, Definitions, Symbols and Abbreviated Terms/)
   end
 
   it "generates XML from IsoDoc XML" do

data/spec/metanorma/refs_spec.rb

@@ -2496,12 +2496,12 @@ RSpec.describe Metanorma::Standoc do
       * [[[iso124,(*A*.footnote:[hello])XYZ]]] _Standard_
     INPUT
     output = <<~OUTPUT
-         #{BLANK_HDR}
+      #{BLANK_HDR}
          <preface>
            <foreword id='_' obligation='informative'>
              <title>Foreword</title>
              <p id='_'>
-               <eref type='inline' bibitemid='iso124' citeas='[&amp;#x3c;strong&amp;#x3e;A&amp;#x3c;/strong&amp;#x3e;.&amp;#x3c;fn reference=&amp;#x22;1&amp;#x22;&amp;#x3e;&amp;#xa;  &amp;#x3c;p&amp;#x3e;hello&amp;#x3c;/p&amp;#x3e;&amp;#xa;&amp;#x3c;/fn&amp;#x3e;]'/>
+               <eref type='inline' bibitemid='iso124' citeas='[&amp;#x3c;strong&amp;#x3e;A&amp;#x3c;/strong&amp;#x3e;.&amp;#x3c;fn reference=&amp;#x22;1&amp;#x22;&amp;#x3e;&amp;#x3c;p&amp;#x3e;hello&amp;#x3c;/p&amp;#x3e;&amp;#xa;&amp;#x3c;/fn&amp;#x3e;]'/>
              </p>
            </foreword>
          </preface>
@@ -2532,6 +2532,133 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes combinations of crossreferences" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Section
+
+      <<ref1,clause=3;to!clause=5>>
+      <<ref1,from!clause=3;to!clause=5,text>>
+      <<ref1,clause=3;clause=5>>
+      <<ref1,clause=3;and!clause=5>>
+      <<ref1,clause=3;or!clause=5,text>>
+      <<ref1,from!clause=3;to!clause=5;and!clause=8;to!clause=10>>
+
+      [bibliography]
+      == Bibliography
+
+      * [[[ref1,XYZ]]] _Standard_
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+            <sections>
+          <clause id='_' inline-header='false' obligation='normative'>
+            <title>Section</title>
+            <p id='_'>
+              <eref type='inline' bibitemid='ref1' citeas='XYZ'>
+                <localityStack connective='from'>
+                  <locality type='clause'>
+                    <referenceFrom>3</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='to'>
+                  <locality type='clause'>
+                    <referenceFrom>5</referenceFrom>
+                  </locality>
+                </localityStack>
+              </eref>
+              <eref type='inline' bibitemid='ref1' citeas='XYZ'>
+                <localityStack connective='from'>
+                  <locality type='clause'>
+                    <referenceFrom>3</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='to'>
+                  <locality type='clause'>
+                    <referenceFrom>5</referenceFrom>
+                  </locality>
+                </localityStack>
+                text
+              </eref>
+              <eref type='inline' bibitemid='ref1' citeas='XYZ'>
+                <localityStack connective='and'>
+                  <locality type='clause'>
+                    <referenceFrom>3</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='and'>
+                  <locality type='clause'>
+                    <referenceFrom>5</referenceFrom>
+                  </locality>
+                </localityStack>
+              </eref>
+              <eref type='inline' bibitemid='ref1' citeas='XYZ'>
+                <localityStack connective='and'>
+                  <locality type='clause'>
+                    <referenceFrom>3</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='and'>
+                  <locality type='clause'>
+                    <referenceFrom>5</referenceFrom>
+                  </locality>
+                </localityStack>
+              </eref>
+              <eref type='inline' bibitemid='ref1' citeas='XYZ'>
+                <localityStack connective='and'>
+                  <locality type='clause'>
+                    <referenceFrom>3</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='or'>
+                  <locality type='clause'>
+                    <referenceFrom>5</referenceFrom>
+                  </locality>
+                </localityStack>
+                text
+              </eref>
+              <eref type='inline' bibitemid='ref1' citeas='XYZ'>
+                <localityStack connective='from'>
+                  <locality type='clause'>
+                    <referenceFrom>3</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='to'>
+                  <locality type='clause'>
+                    <referenceFrom>5</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='and'>
+                  <locality type='clause'>
+                    <referenceFrom>8</referenceFrom>
+                  </locality>
+                </localityStack>
+                <localityStack connective='to'>
+                  <locality type='clause'>
+                    <referenceFrom>10</referenceFrom>
+                  </locality>
+                </localityStack>
+              </eref>
+            </p>
+          </clause>
+        </sections>
+        <bibliography>
+          <references id='_' normative='false' obligation='informative'>
+            <title>Bibliography</title>
+            <bibitem id='ref1'>
+              <formattedref format='application/x-isodoc+xml'>
+                <em>Standard</em>
+              </formattedref>
+              <docidentifier>XYZ</docidentifier>
+            </bibitem>
+          </references>
+        </bibliography>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   private
 
   def mock_isobib_get_123

data/spec/metanorma/validate_spec.rb

@@ -478,6 +478,114 @@ RSpec.describe Metanorma::Standoc do
     expect(File.exist?("test.xml")).to be false
   end
 
+  it "does not warn and abort if columns and rows not out of bounds" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        == Clause
+
+        [cols="1,1,1,1"]
+        |===
+        3.2+| a | a
+
+        | a
+        | a | a | a | a
+        |===
+      INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.not_to raise_error(SystemExit)
+    rescue SystemExit
+    end
+    expect(File.read("test.err"))
+      .not_to include "Table exceeds maximum number of columns defined"
+    expect(File.read("test.err"))
+      .not_to include "Table rows in table are inconsistent: check rowspan"
+  end
+
+  xit "warns and aborts if columns out of bounds against colgroup" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        [cols="1,1,1,1"]
+        |===
+        5+| a
+
+        | a 4+| a
+        | a | a |a |a
+        |===
+      INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+    rescue SystemExit
+    end
+    expect(File.read("test.err"))
+      .to include "Table exceeds maximum number of columns defined (4)"
+    expect(File.read("test.err"))
+      .not_to include "Table rows in table are inconsistent: check rowspan"
+  end
+
+  xit "warns and aborts if columns out of bounds against cell count per row" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        |===
+        2.3+| a | a
+
+        | a | a | a
+        | a | a | a
+        |===
+      INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+    rescue SystemExit
+    end
+    expect(File.read("test.err"))
+      .to include "Table exceeds maximum number of columns defined (3)"
+    expect(File.read("test.err"))
+      .not_to include "Table rows in table are inconsistent: check rowspan"
+  end
+
+  it "warns and aborts if rows out of bounds" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        |===
+        .4+| a | a | a | a
+
+        | a | a | a
+        | a | a | a
+        |===
+      INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(SystemExit)
+    rescue SystemExit
+    end
+    expect(File.read("test.err"))
+      .not_to include "Table exceeds maximum number of columns defined"
+    expect(File.read("test.err"))
+      .to include "Table rows in table are inconsistent: check rowspan"
+  end
+
   it "err file succesfully created for docfile path" do
     FileUtils.rm_rf "test"
     FileUtils.mkdir_p "test"