metanorma-standoc 2.1.1 → 2.1.4

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>
@@ -1299,7 +1299,7 @@ RSpec.describe Metanorma::Standoc do
              <sourcecode id='L__xf6_we'>
                <name>
                  See
-                 <eref type='inline' bibitemid='L__xf6_wner2016' citeas='L&amp;#xf6;wner et al. 2016'/>
+                 <eref type='inline' bibitemid='L__xf6_wner2016' citeas='Löwner et al. 2016'/>
                </name>
                ABC
              </sourcecode>
@@ -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>
@@ -165,6 +167,38 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes the macro for editorial notes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      EDITOR: Note1
+
+      [EDITOR]
+      ====
+      Note2
+      ====
+
+      [EDITOR]
+      Note3
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note1</p>
+           </admonition>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note2</p>
+           </admonition>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note3</p>
+           </admonition>
+         </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes the Metanorma::Standoc concept and related macros" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -818,7 +852,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 +1360,7 @@ RSpec.describe Metanorma::Standoc do
            <from>2022</from>
          </copyright>
          <ext>
-           <doctype>article</doctype>
+           <doctype>standard</doctype>
          </ext>
          <relation type='derivedFrom'>
            <bibitem>
@@ -1340,7 +1374,7 @@ RSpec.describe Metanorma::Standoc do
                <from>2022</from>
              </copyright>
              <ext>
-               <doctype>article</doctype>
+               <doctype>standard</doctype>
              </ext>
            </bibitem>
          </relation>
@@ -1384,7 +1418,7 @@ RSpec.describe Metanorma::Standoc do
             <from>2022</from>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
           <relation type='derivedFrom'>
             <bibitem>
@@ -1398,7 +1432,7 @@ RSpec.describe Metanorma::Standoc do
                 <from>2022</from>
               </copyright>
               <ext>
-                <doctype>article</doctype>
+                <doctype>standard</doctype>
               </ext>
             </bibitem>
           </relation>
@@ -1436,7 +1470,7 @@ RSpec.describe Metanorma::Standoc do
              <from>2022</from>
            </copyright>
            <ext>
-             <doctype>article</doctype>
+             <doctype>standard</doctype>
            </ext>
            <relation type='derivedFrom'>
              <bibitem>
@@ -1450,7 +1484,7 @@ RSpec.describe Metanorma::Standoc do
                  <from>2022</from>
                </copyright>
                <ext>
-                 <doctype>article</doctype>
+                 <doctype>standard</doctype>
                </ext>
                <relation type='derivedFrom'>
                  <bibitem>
@@ -1464,7 +1498,7 @@ RSpec.describe Metanorma::Standoc do
                      <from>2022</from>
                    </copyright>
                    <ext>
-                     <doctype>article</doctype>
+                     <doctype>standard</doctype>
                    </ext>
                    <relation type='derivedFrom'>
                       <bibitem>
@@ -1478,7 +1512,7 @@ RSpec.describe Metanorma::Standoc do
                           <from>2022</from>
                         </copyright>
                         <ext>
-                          <doctype>article</doctype>
+                          <doctype>standard</doctype>
                         </ext>
                       </bibitem>
                     </relation>
@@ -1494,7 +1528,7 @@ RSpec.describe Metanorma::Standoc do
                           <from>2022</from>
                         </copyright>
                         <ext>
-                          <doctype>article</doctype>
+                          <doctype>standard</doctype>
                         </ext>
                       </bibitem>
                     </relation>
@@ -1557,7 +1591,7 @@ RSpec.describe Metanorma::Standoc do
            <from>2022</from>
          </copyright>
          <ext>
-           <doctype>article</doctype>
+           <doctype>standard</doctype>
          </ext>
                     <relation type='derivedFrom'>
              <bibitem>
@@ -1607,12 +1641,13 @@ RSpec.describe Metanorma::Standoc do
                  </owner>
                </copyright>
                <ext>
-                 <doctype>article</doctype>
+                 <doctype>standard</doctype>
                  <editorialgroup>
-                   <technical-committee/>
-                   <subcommittee/>
-                   <workgroup/>
+                   <agency>ISO</agency>
                  </editorialgroup>
+                 <approvalgroup>
+           <agency>ISO</agency>
+         </approvalgroup>
                  <stagename>International standard</stagename>
                </ext>
              </bibitem>

data/spec/metanorma/refs_dl_spec.rb

@@ -43,7 +43,6 @@ RSpec.describe Metanorma::Standoc do
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
-        <fetched/>
         <title type='title-main' format='text/plain'>Standard</title>
         <title type='main' format='text/plain'>Standard</title>
          <docidentifier type="ISO">ISO 123</docidentifier>
@@ -102,6 +101,7 @@ RSpec.describe Metanorma::Standoc do
       docid::
         type::: ISO
         id::: TC211
+        primary::: true
       docnumber:: 211
       edition:: 1
       language::
@@ -256,6 +256,7 @@ RSpec.describe Metanorma::Standoc do
       ==== Relation
       type:: updates
       bibitem::
+        title::: Geographic information
         formattedref::: ISO 19115:2003
         bib_locality:::
           type:::: page
@@ -267,6 +268,7 @@ RSpec.describe Metanorma::Standoc do
       bibitem::
         type::: standard
         formattedref::: ISO 19115:2003/Cor 1:2006
+        title::: Geographic information
 
       ==== Series
       type:: main
@@ -289,6 +291,7 @@ RSpec.describe Metanorma::Standoc do
 
       ==== Series
       type:: alt
+      title:: seriestitle
       formattedref::
         content::: serieref
         language::: en
@@ -317,7 +320,7 @@ RSpec.describe Metanorma::Standoc do
         <uri type="src">https://www.iso.org/standard/53798.html</uri>
         <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:53798:en</uri>
         <uri type="rss">https://www.iso.org/contents/data/standard/05/37/53798.detail.rss</uri>
-        <docidentifier type="ISO">TC211</docidentifier>
+        <docidentifier type='ISO' primary='true'>TC211</docidentifier>
         <docnumber>211</docnumber>
         <date type="issued">
           <on>2014</on>
@@ -417,12 +420,14 @@ RSpec.describe Metanorma::Standoc do
         </copyright>
         <relation type="updates">
           <bibitem>
-            <formattedref format="text/plain">ISO 19115:2003</formattedref>
+            <title type='title-main' format='text/plain'>Geographic information</title>
+            <title type='main' format='text/plain'>Geographic information</title>
             </bibitem>
         </relation>
         <relation type="updates">
           <bibitem type="standard">
-            <formattedref format="text/plain">ISO 19115:2003/Cor 1:2006</formattedref>
+          <title type='title-main' format='text/plain'>Geographic information</title>
+          <title type='main' format='text/plain'>Geographic information</title>
           </bibitem>
         </relation>
         <series type="main">
@@ -437,6 +442,7 @@ RSpec.describe Metanorma::Standoc do
         </series>
         <series type="alt">
           <formattedref format="text/plain" language="en" script="Latn">serieref</formattedref>
+          <title format='text/plain'>seriestitle</title>
         </series>
         <medium>
           <form>medium form</form>
@@ -596,6 +602,7 @@ RSpec.describe Metanorma::Standoc do
       contributor.role:: author
       relation::
       relation.type:: updates
+      relation.bibitem.title:: Geographic information
       relation.bibitem.formattedref:: ISO 19115:2003
       relation.bibitem.bib_locality.type:: page
       relation.bibitem.bib_locality.reference_from:: 7
@@ -603,6 +610,7 @@ RSpec.describe Metanorma::Standoc do
       relation::
       relation.type:: updates
       relation.bibitem.type:: standard
+      relation.bibitem.title:: Geographic information
       relation.bibitem.formattedref:: ISO 19115:2003/Cor 1:2006
       series::
       series.type:: main
@@ -622,6 +630,7 @@ RSpec.describe Metanorma::Standoc do
       series.partnumber:: part5678
       series::
       series.type:: alt
+      series.title:: seriestitle
       series.formattedref.content:: serieref
       series.formattedref.language:: en
       series.formattedref.script:: Latn
@@ -740,12 +749,14 @@ RSpec.describe Metanorma::Standoc do
         </copyright>
         <relation type="updates">
           <bibitem>
-            <formattedref format="text/plain">ISO 19115:2003</formattedref>
+            <title type='title-main' format='text/plain'>Geographic information</title>
+            <title type='main' format='text/plain'>Geographic information</title>
           </bibitem>
         </relation>
         <relation type="updates">
           <bibitem type="standard">
-            <formattedref format="text/plain">ISO 19115:2003/Cor 1:2006</formattedref>
+          <title type='title-main' format='text/plain'>Geographic information</title>
+          <title type='main' format='text/plain'>Geographic information</title>
           </bibitem>
         </relation>
         <series type="main">
@@ -760,6 +771,7 @@ RSpec.describe Metanorma::Standoc do
         </series>
         <series type="alt">
           <formattedref format="text/plain" language="en" script="Latn">serieref</formattedref>
+          <title format='text/plain'>seriestitle</title>
         </series>
         <medium>
           <form>medium form</form>
@@ -842,7 +854,6 @@ RSpec.describe Metanorma::Standoc do
                <docidentifier>B</docidentifier>
              </bibitem>
              <bibitem id='iso123' type='standard'>
-               <fetched/>
                <title type='title-main' format='text/plain'>Standard</title>
                <title type='main' format='text/plain'>Standard</title>
                <docidentifier type='ISO'>ISO 123</docidentifier>