metanorma-standoc 2.1.1 → 2.1.2

data/spec/metanorma/cleanup_sections_spec.rb

@@ -467,7 +467,7 @@ RSpec.describe Metanorma::Standoc do
                    <from>#{Time.now.year}</from>
                  </copyright>
                  <ext>
-                   <doctype>article</doctype>
+                   <doctype>standard</doctype>
                  </ext>
                </bibdata>
                <preface>
@@ -762,7 +762,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>
@@ -996,7 +996,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>
@@ -1233,7 +1233,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>
@@ -1467,7 +1467,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>

data/spec/metanorma/cleanup_spec.rb

@@ -1042,7 +1042,7 @@ RSpec.describe Metanorma::Standoc do
             </bibitem>
           </relation>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
         </bibdata>
         <sections> </sections>
@@ -1085,7 +1085,7 @@ RSpec.describe Metanorma::Standoc do
             <from>#{Date.today.year}</from>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
         </bibdata>
         <boilerplate>
@@ -1281,7 +1281,7 @@ RSpec.describe Metanorma::Standoc do
             <from>#{Time.now.year}</from>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
         </bibdata>
                  <sections>
@@ -1382,7 +1382,7 @@ RSpec.describe Metanorma::Standoc do
                    <from>#{Time.now.year}</from>
                  </copyright>
                  <ext>
-                   <doctype>article</doctype>
+                   <doctype>standard</doctype>
                  </ext>
                </bibdata>
                <sections> </sections>
@@ -1836,7 +1836,7 @@ RSpec.describe Metanorma::Standoc do
              <from>#{Time.now.year}</from>
            </copyright>
            <ext>
-             <doctype>article</doctype>
+             <doctype>standard</doctype>
            </ext>
          </bibdata>
          <preface>

data/spec/metanorma/cleanup_terms_spec.rb

@@ -1430,7 +1430,7 @@ RSpec.describe Metanorma::Standoc do
             <from>#{Time.now.year}</from>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
         </bibdata>
         <sections>

data/spec/metanorma/inline_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Metanorma::Standoc do
       <from>#{Date.today.year}</from>
       </copyright>
       <ext>
-      <doctype>article</doctype>
+      <doctype>standard</doctype>
       </ext>
       </bibdata>
       <sections>
@@ -685,13 +685,13 @@ RSpec.describe Metanorma::Standoc do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
-      pass-format:rfc,html[<abc>X &gt; Y</abc>]
+      pass-format:rfc,html[<abc>X &gt; Y</abc> http://www.example.com (c)]
     INPUT
     output = <<~OUTPUT
        #{BLANK_HDR}
       <sections>
       <p id='_'>
-      <passthrough formats='rfc,html'>&lt;abc&gt;X &gt; Y&lt;/abc&gt;</passthrough>
+      <passthrough formats='rfc,html'>&lt;abc&gt;X &gt; Y&lt;/abc&gt; http://www.example.com (c)</passthrough>
       </p>
       </sections>
       </standard-document>

data/spec/metanorma/lists_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe Metanorma::Standoc do
   it "processes simple lists" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{ASCIIDOC_BLANK_HDR}
+      .Unordered list
       * List 1
       * List 2
       * List 3
@@ -12,10 +13,12 @@ RSpec.describe Metanorma::Standoc do
       * [x] also checked
       * [ ] not checked
 
+      .Ordered list
       . List A
       . List B
       . List C
 
+      .Definition list
       List D:: List E
       List F:: List G
 
@@ -24,6 +27,7 @@ RSpec.describe Metanorma::Standoc do
         #{BLANK_HDR}
         <sections>
           <ul id='_'>
+            <name>Unordered list</name>
             <li>
               <p id='_'>List 1</p>
             </li>
@@ -41,7 +45,10 @@ RSpec.describe Metanorma::Standoc do
             </li>
             <li uncheckedcheckbox='true' checkedcheckbox='false'>
               <p id='_'>not checked</p>
+              </li>
+              </ul>
               <ol id='_' type='arabic'>
+                <name>Ordered list</name>
                 <li>
                   <p id='_'>List A</p>
                 </li>
@@ -50,7 +57,10 @@ RSpec.describe Metanorma::Standoc do
                 </li>
                 <li>
                   <p id='_'>List C</p>
+                  </li>
+                  </ol>
                   <dl id='_'>
+                    <name>Definition list</name>
                     <dt>List D</dt>
                     <dd>
                       <p id='_'>List E</p>
@@ -60,10 +70,6 @@ RSpec.describe Metanorma::Standoc do
                       <p id='_'>List G</p>
                     </dd>
                   </dl>
-                </li>
-              </ol>
-            </li>
-          </ul>
         </sections>
       </standard-document>
     OUTPUT

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_spec.rb

@@ -1906,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