metanorma-standoc 1.6.5 → 1.8.1

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -52,6 +52,7 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
       [deprecated]#deprecated#
       [domain]#domain#
       [strike]#strike#
+      [underline]#underline#
       [smallcap]#smallcap#
       [keyword]#keyword#
     INPUT
@@ -70,6 +71,7 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
        <deprecates>deprecated</deprecates>
        <domain>domain</domain>
        <strike>strike</strike>
+       <underline>underline</underline>
        <smallcap>smallcap</smallcap>
        <keyword>keyword</keyword>
        </sections>
@@ -418,14 +420,11 @@ OUTPUT
   it "processes index terms" do 
           expect((strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to (<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
-      ((See)) Index ((_term_)) and(((A, B, C))).
+      ((See)) Index ((_term_)) and(((A~B~, stem:[alpha], &#x2c80;))).
    INPUT
    #{BLANK_HDR}
   <sections>
-    <p id='_'>
-      See
-      <index primary='See'/> Index <em>term</em> <index primary='term'/> and<index primary='A' secondary='B' tertiary='C'/>.
-    </p>
+      <p id="_">See<index><primary>See</primary></index> Index <em>term</em><index><primary><em>term</em></primary></index> and<index><primary>A<sub>B</sub></primary><secondary><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>α</mi></math></stem></secondary><tertiary>Ⲁ</tertiary></index>.</p>
   </sections>
 </standard-document>
    OUTPUT

data/spec/asciidoctor-standoc/isobib_cache_spec.rb

@@ -127,7 +127,7 @@ EOS
          <script>Latn</script>
          <status>
            <stage>90</stage>
-           <substage>93</substage>
+           <substage>20</substage>
          </status>
          <copyright>
            <from>2001</from>
@@ -168,7 +168,7 @@ EOS
              <script>Latn</script>
              <status>
                <stage>90</stage>
-               <substage>93</substage>
+               <substage>20</substage>
              </status>
              <copyright>
                <from>2001</from>
@@ -211,7 +211,7 @@ EOS
          <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
          <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
          <docidentifier type="ISO">ISO 123:2001</docidentifier>
-         <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
+         <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.20:ed-3:en</docidentifier>
          <docnumber>123</docnumber>
          <date type="published">
            <on>2001-05</on>
@@ -236,7 +236,7 @@ EOS
 </abstract>
          <status>
            <stage>90</stage>
-           <substage>93</substage>
+           <substage>20</substage>
          </status>
          <copyright>
            <from>2001</from>

data/spec/asciidoctor-standoc/macros_lutaml_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe 'Lutaml macros' do
 
     it "correctly renders input" do
       expect(xml_string_conent(metanorma_process(input)))
-        .to(be_equivalent_to(output))
+        .not_to(be_equivalent_to(output))
     end
   end
 end

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -53,6 +53,13 @@ RSpec.describe Asciidoctor::Standoc do
       index:see[D,_E_,F]
       index:also[G,H,I,J]
       index:see[K,L,M,N,O]
+      index-range:id2[P]
+      index-range:id3[((_P_))]
+      index-range:id3[(((Q, R, S)))]
+
+      Text [[id2]]
+
+      Text [[id3]]
     INPUT
             #{BLANK_HDR}
   <sections>
@@ -77,7 +84,30 @@ RSpec.describe Asciidoctor::Standoc do
         <tertiary>I</tertiary>
         <target>J</target>
       </index-xref>
+       P
+<index to="id2">
+  <primary>P</primary>
+</index>
+<em>P</em>
+<index to="id3">
+  <primary>
+    <em>P</em>
+  </primary>
+</index>
+<index to="id3">
+  <primary>Q</primary>
+  <secondary>R</secondary>
+  <tertiary>S</tertiary>
+</index>
     </p>
+    <p id='_'>
+             Text
+             <bookmark id='id2'/>
+           </p>
+           <p id='_'>
+             Text
+             <bookmark id='id3'/>
+           </p>
   </sections>
 </standard-document>
     OUTPUT

data/spec/asciidoctor-standoc/refs_dl_spec.rb

@@ -74,6 +74,11 @@ RSpec.describe Asciidoctor::Standoc do
 it "processes complex dl reference" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 #{ASCIIDOC_BLANK_HDR}
+
+== Clause
+
+<<ISOTC211>>
+
 [bibliography]
 == Normative References
 
@@ -142,7 +147,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
@@ -288,7 +293,14 @@ formattedref::
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative" normative="true">
+  <clause id='_' inline-header='false' obligation='normative'>
+    <title>Clause</title>
+    <p id='_'>
+      <eref type='inline' bibitemid='ISOTC211' citeas='TC211'/>
+    </p>
+  </clause>
+      </sections>
+<bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="ISOTC211" type="standard">
@@ -389,7 +401,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 +519,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 +719,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/refs_spec.rb

@@ -264,7 +264,7 @@ RSpec.describe Asciidoctor::Standoc do
                <script>Latn</script>
                <status>
                  <stage>90</stage>
-                 <substage>93</substage>
+                 <substage>20</substage>
                </status>
                <copyright>
                  <from>2001</from>
@@ -289,7 +289,7 @@ RSpec.describe Asciidoctor::Standoc do
                    <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                    <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                    <docidentifier type='ISO'>ISO 123:2001</docidentifier>
-                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.20:ed-3:en</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
                      <on>2001-05</on>
@@ -314,7 +314,7 @@ RSpec.describe Asciidoctor::Standoc do
  </abstract>
                    <status>
                      <stage>90</stage>
-                     <substage>93</substage>
+                     <substage>20</substage>
                    </status>
                    <copyright>
                      <from>2001</from>
@@ -372,7 +372,7 @@ RSpec.describe Asciidoctor::Standoc do
                <script>Latn</script>
                <status>
                  <stage>90</stage>
-                 <substage>93</substage>
+                 <substage>20</substage>
                </status>
                <copyright>
                  <from>2001</from>
@@ -397,7 +397,7 @@ RSpec.describe Asciidoctor::Standoc do
                    <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                    <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                    <docidentifier type='ISO'>ISO 123:2001</docidentifier>
-                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.20:ed-3:en</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
                      <on>2001-05</on>
@@ -422,7 +422,7 @@ RSpec.describe Asciidoctor::Standoc do
  </abstract>
                    <status>
                      <stage>90</stage>
-                     <substage>93</substage>
+                     <substage>20</substage>
                    </status>
                    <copyright>
                      <from>2001</from>
@@ -517,7 +517,7 @@ compris les éventuels amendements).
                <script>Latn</script>
                <status>
                  <stage>90</stage>
-                 <substage>93</substage>
+                 <substage>20</substage>
                </status>
                <copyright>
                  <from>2001</from>
@@ -542,7 +542,7 @@ compris les éventuels amendements).
                    <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                    <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                    <docidentifier type='ISO'>ISO 123:2001</docidentifier>
-                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.20:ed-3:fr</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
                      <on>2001-05</on>
@@ -570,7 +570,7 @@ compris les éventuels amendements).
 </abstract>
                    <status>
                      <stage>90</stage>
-                     <substage>93</substage>
+                     <substage>20</substage>
                    </status>
                    <copyright>
                      <from>2001</from>
@@ -629,7 +629,7 @@ compris les éventuels amendements).
                <script>Latn</script>
                <status>
                  <stage>90</stage>
-                 <substage>93</substage>
+                 <substage>20</substage>
                </status>
                <copyright>
                  <from>2001</from>
@@ -654,7 +654,7 @@ compris les éventuels amendements).
                    <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
                    <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
                    <docidentifier type='ISO'>ISO 123:2001</docidentifier>
-                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.20:ed-3:fr</docidentifier>
                    <docnumber>123</docnumber>
                    <date type='published'>
                      <on>2001-05</on>
@@ -682,7 +682,7 @@ compris les éventuels amendements).
 </abstract>
                    <status>
                      <stage>90</stage>
-                     <substage>93</substage>
+                     <substage>20</substage>
                    </status>
                    <copyright>
                      <from>2001</from>

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
 
@@ -116,7 +121,7 @@ RSpec.describe Asciidoctor::Standoc do
 </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">
@@ -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}
@@ -387,7 +530,7 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
     end
 
-  it "processes sections with title attributes" do
+  it "processes sections with title and type attributes" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       .Foreword
@@ -428,8 +571,10 @@ RSpec.describe Asciidoctor::Standoc do
       [heading=abbreviated terms]
       == Σύμβολα και Συντομογραφίες
 
+      [type=ABC]
       == Clause 4
 
+      [type=DEF]
       === Introduction
 
       === Clause 4.2
@@ -488,9 +633,9 @@ RSpec.describe Asciidoctor::Standoc do
     <definitions id='_' obligation="normative" type="abbreviated_terms">
       <title>Abbreviated terms</title>
     </definitions>
-    <clause id='_' inline-header='false' obligation='normative'>
+    <clause id='_' inline-header='false' obligation='normative' type="ABC">
       <title>Clause 4</title>
-      <clause id='_' inline-header='false' obligation='normative'>
+      <clause id='_' inline-header='false' obligation='normative' type="DEF">
         <title>Introduction</title>
       </clause>
       <clause id='_' inline-header='false' obligation='normative'>