metanorma-standoc 2.0.7 → 2.1.2

data/spec/metanorma/macros_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe Metanorma::Standoc do
       inherit:[<<ref1>>]
       autonumber:table[3]
       add:[a <<clause>>] del:[B]
+      identifier:[a http://example.com]
 
       [bibliography]
       == Bibliography
@@ -36,6 +37,7 @@ RSpec.describe Metanorma::Standoc do
                       <xref target='clause'/>
                     </add>
                     <del>B</del>
+                    <identifier>a http://example.com</identifier>
         </foreword>
       </preface>
       <sections> </sections>
@@ -818,7 +820,7 @@ RSpec.describe Metanorma::Standoc do
     output = <<~OUTPUT
            #{BLANK_HDR}
            <sections><review reviewer="(Unknown)" id="_" date="#{Date.today}T00:00:00Z">
-        <p id="_"/>
+        <p id="_">Note1</p>
       </review>
       <review reviewer="(Unknown)" id="_" date="#{Date.today}T00:00:00Z">
         <p id="_">Note2</p>
@@ -1326,7 +1328,7 @@ RSpec.describe Metanorma::Standoc do
            <from>2022</from>
          </copyright>
          <ext>
-           <doctype>article</doctype>
+           <doctype>standard</doctype>
          </ext>
          <relation type='derivedFrom'>
            <bibitem>
@@ -1340,7 +1342,7 @@ RSpec.describe Metanorma::Standoc do
                <from>2022</from>
              </copyright>
              <ext>
-               <doctype>article</doctype>
+               <doctype>standard</doctype>
              </ext>
            </bibitem>
          </relation>
@@ -1384,7 +1386,7 @@ RSpec.describe Metanorma::Standoc do
             <from>2022</from>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
           <relation type='derivedFrom'>
             <bibitem>
@@ -1398,7 +1400,7 @@ RSpec.describe Metanorma::Standoc do
                 <from>2022</from>
               </copyright>
               <ext>
-                <doctype>article</doctype>
+                <doctype>standard</doctype>
               </ext>
             </bibitem>
           </relation>
@@ -1436,7 +1438,7 @@ RSpec.describe Metanorma::Standoc do
              <from>2022</from>
            </copyright>
            <ext>
-             <doctype>article</doctype>
+             <doctype>standard</doctype>
            </ext>
            <relation type='derivedFrom'>
              <bibitem>
@@ -1450,7 +1452,7 @@ RSpec.describe Metanorma::Standoc do
                  <from>2022</from>
                </copyright>
                <ext>
-                 <doctype>article</doctype>
+                 <doctype>standard</doctype>
                </ext>
                <relation type='derivedFrom'>
                  <bibitem>
@@ -1464,7 +1466,7 @@ RSpec.describe Metanorma::Standoc do
                      <from>2022</from>
                    </copyright>
                    <ext>
-                     <doctype>article</doctype>
+                     <doctype>standard</doctype>
                    </ext>
                    <relation type='derivedFrom'>
                       <bibitem>
@@ -1478,7 +1480,7 @@ RSpec.describe Metanorma::Standoc do
                           <from>2022</from>
                         </copyright>
                         <ext>
-                          <doctype>article</doctype>
+                          <doctype>standard</doctype>
                         </ext>
                       </bibitem>
                     </relation>
@@ -1494,7 +1496,7 @@ RSpec.describe Metanorma::Standoc do
                           <from>2022</from>
                         </copyright>
                         <ext>
-                          <doctype>article</doctype>
+                          <doctype>standard</doctype>
                         </ext>
                       </bibitem>
                     </relation>
@@ -1557,7 +1559,7 @@ RSpec.describe Metanorma::Standoc do
            <from>2022</from>
          </copyright>
          <ext>
-           <doctype>article</doctype>
+           <doctype>standard</doctype>
          </ext>
                     <relation type='derivedFrom'>
              <bibitem>
@@ -1607,12 +1609,19 @@ RSpec.describe Metanorma::Standoc do
                  </owner>
                </copyright>
                <ext>
-                 <doctype>article</doctype>
+                 <doctype>standard</doctype>
                  <editorialgroup>
+                   <agency>ISO</agency>
                    <technical-committee/>
                    <subcommittee/>
                    <workgroup/>
                  </editorialgroup>
+                 <approvalgroup>
+           <agency>ISO</agency>
+           <technical-committee/>
+           <subcommittee/>
+           <workgroup/>
+         </approvalgroup>
                  <stagename>International standard</stagename>
                </ext>
              </bibitem>

data/spec/metanorma/refs_dl_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 require "relaton_iso"
 
 RSpec.describe Metanorma::Standoc do
-    it "processes simple dl reference" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes simple dl reference" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -36,6 +36,7 @@ RSpec.describe Metanorma::Standoc do
           completename::::: Jack
 
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
       <sections>
       </sections><bibliography><references id="_" obligation="informative" normative="true">
@@ -69,10 +70,12 @@ RSpec.describe Metanorma::Standoc do
       </bibliography>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes complex dl reference" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       == Clause
@@ -292,6 +295,7 @@ RSpec.describe Metanorma::Standoc do
         script::: Latn
 
     INPUT
+    output = <<~OUTPUT
             #{BLANK_HDR}
             <sections>
         <clause id='_' inline-header='false' obligation='normative'>
@@ -455,10 +459,12 @@ RSpec.describe Metanorma::Standoc do
       </bibitem></references></bibliography>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes complex dl reference with dot path keys" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -621,6 +627,7 @@ RSpec.describe Metanorma::Standoc do
       series.formattedref.script:: Latn
 
     INPUT
+    output = <<~OUTPUT
             #{BLANK_HDR}
             <sections>
             </sections><bibliography><references id="_" obligation="informative" normative="true">
@@ -775,10 +782,12 @@ RSpec.describe Metanorma::Standoc do
       </bibitem></references></bibliography>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes mix of dl and default references" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       == Section
@@ -818,6 +827,7 @@ RSpec.describe Metanorma::Standoc do
           completename::::: Jack
 
     INPUT
+    output = <<~OUTPUT
                 #{BLANK_HDR}
            <sections>
          <clause id='_' inline-header='false' obligation='normative'>
@@ -864,5 +874,7 @@ RSpec.describe Metanorma::Standoc do
        </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 end

data/spec/metanorma/refs_spec.rb

@@ -1665,9 +1665,6 @@ RSpec.describe Metanorma::Standoc do
               <bibitem id='iso123' type='standard'>
                      <fetched/>
                      <title format='text/plain' language='en' script='Latn'>Network Configuration Access Control Model</title>
-                     <uri type='xml'>
-                       https://raw.githubusercontent.com/relaton/relaton-data-ietf/master/data/reference.RFC.8341.xml
-                     </uri>
                      <uri type='src'>https://www.rfc-editor.org/info/rfc8341</uri>
                      <docidentifier type='RFC' primary="true">RFC 8341</docidentifier>
                      <docidentifier type='RFC' scope='anchor'>RFC8341</docidentifier>
@@ -1725,9 +1722,6 @@ RSpec.describe Metanorma::Standoc do
                    <bibitem id='iso124' type='standard'>
                      <fetched/>
                      <title format='text/plain' language='en' script='Latn'>Network Configuration Access Control Model</title>
-                     <uri type='xml'>
-                       https://raw.githubusercontent.com/relaton/relaton-data-ietf/master/data/reference.RFC.8341.xml
-                     </uri>
                      <uri type='src'>https://www.rfc-editor.org/info/rfc8341</uri>
                      <docidentifier type='RFC' primary="true">RFC 8341</docidentifier>
                      <docidentifier type='metanorma'>[1]</docidentifier>
@@ -1912,7 +1906,7 @@ RSpec.describe Metanorma::Standoc do
                 <from>#{Date.today.year}</from>
               </copyright>
               <ext>
-              <doctype>article</doctype>
+              <doctype>standard</doctype>
               </ext>
             </bibdata>
             <sections>

data/spec/metanorma/table_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Metanorma::Standoc do
   it "processes basic tables" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       .Table Name
       |===
@@ -11,6 +11,7 @@ RSpec.describe Metanorma::Standoc do
       h|1 |2 |3
       |===
     INPUT
+    output = <<~OUTPUT
            #{BLANK_HDR}
       <sections>
         <table id="_">
@@ -33,10 +34,12 @@ RSpec.describe Metanorma::Standoc do
       </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes table widths" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [width=75%]
       |===
@@ -57,6 +60,7 @@ RSpec.describe Metanorma::Standoc do
       |===
 
     INPUT
+    output = <<~OUTPUT
                   #{BLANK_HDR}
         <sections>
           <table id='_' width='75%'>
@@ -93,10 +97,12 @@ RSpec.describe Metanorma::Standoc do
       </standard-document>
 
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes column widths in tables" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [cols=".<,.^,^.>"]
       |===
@@ -120,6 +126,7 @@ RSpec.describe Metanorma::Standoc do
       |1 |2 |3
       |===
     INPUT
+    output = <<~OUTPUT
            #{BLANK_HDR}
            <sections>
           <table id='_'>
@@ -178,10 +185,12 @@ RSpec.describe Metanorma::Standoc do
         </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "inserts header rows in a table with a name and no header" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=2]
       .Table Name
@@ -191,6 +200,7 @@ RSpec.describe Metanorma::Standoc do
       h|1 |2 |3
       |===
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
              <sections>
            <table id="_">
@@ -217,10 +227,12 @@ RSpec.describe Metanorma::Standoc do
          </sections>
          </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "inserts header rows in a table without a name and no header" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=2]
       |===
@@ -229,6 +241,7 @@ RSpec.describe Metanorma::Standoc do
       h|1 |2 |3
       |===
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
              <sections>
            <table id="_"><thead><tr>
@@ -253,10 +266,12 @@ RSpec.describe Metanorma::Standoc do
          </sections>
          </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes complex tables" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [cols="<.^,^.<,^.>,^,^",options="header,footer",headerrows=2,alt="An extensive summary, and illustration, of tables",subsequence="A",options="unnumbered",summary="This is an extremely long, convoluted summary",width=70%,number="3",keep-with-next=true,keep-lines-together=true]
       .Maximum _permissible_ mass fraction of defects
@@ -286,6 +301,7 @@ RSpec.describe Metanorma::Standoc do
       5+a| Live insects shall not be present. Dead insects shall be included in extraneous matter.
       |===
     INPUT
+    output = <<~OUTPUT
                   #{BLANK_HDR}
              <sections>
                <table id="_" alt="An extensive summary, and illustration, of tables" unnumbered="true" subsequence="A" summary="This is an extremely long, convoluted summary" width="70%" number="3" keep-with-next="true" keep-lines-together="true">
@@ -452,5 +468,7 @@ RSpec.describe Metanorma::Standoc do
              </sections>
              </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 end

data/spec/spec_helper.rb

@@ -161,7 +161,7 @@ BLANK_HDR = <<~"HDR".freeze
       <from>#{Time.new.year}</from>
     </copyright>
     <ext>
-    <doctype>article</doctype>
+    <doctype>standard</doctype>
     </ext>
   </bibdata>
 HDR