metanorma-standoc 1.10.7 → 1.11.1

data/spec/asciidoctor/cleanup_spec.rb

@@ -213,141 +213,6 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes stem-only terms as admitted" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === stem:[t_90]
-
-      stem:[t_91]
-
-      Time
-    INPUT
-    output = <<~OUTPUT
-             #{BLANK_HDR}
-                    <sections>
-               <terms id="_" 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-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-               <mrow>
-        <mi>t</mi>
-      </mrow>
-      <mrow>
-        <mn>90</mn>
-      </mrow>
-      </msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-      <mrow>
-        <mi>t</mi>
-      </mrow>
-      <mrow>
-        <mn>91</mn>
-      </mrow>
-      </msub></math></stem></admitted>
-             <definition><p id="_">Time</p></definition></term>
-             </terms>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  it "moves term domains out of the term definition paragraph" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-      == Terms and Definitions
-
-      === Tempus
-
-      domain:[relativity] Time
-
-      === Tempus1
-
-      Time2
-
-      domain:[relativity2]
-    INPUT
-    output = <<~OUTPUT
-             #{BLANK_HDR}
-                    <sections>
-               <terms id="_" 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-tempus">
-               <preferred>Tempus</preferred>
-               <domain>relativity</domain><definition><p id="_"> Time</p></definition>
-             </term>
-             <term id='term-tempus1'>
-        <preferred>Tempus1</preferred>
-        <domain>relativity2</domain>
-        <definition>
-          <p id='_'>Time2</p>
-          <p id='_'> </p>
-        </definition>
-      </term>
-             </terms>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
-  it "permits multiple blocks in term definition paragraph" do
-    input = <<~INPUT
-      = Document title
-      Author
-      :docfile: test.adoc
-      :nodoc:
-      :novalid:
-      :stem:
-
-      == Terms and Definitions
-
-      === stem:[t_90]
-
-      [stem]
-      ++++
-      t_A
-      ++++
-
-      This paragraph is extraneous
-    INPUT
-    output = <<~OUTPUT
-             #{BLANK_HDR}
-                    <sections>
-               <terms id="_" 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-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-                <mrow>
-         <mi>t</mi>
-       </mrow>
-       <mrow>
-         <mn>90</mn>
-       </mrow>
-      </msub></math></stem></preferred><definition><formula id="_">
-               <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
-               <mrow>
-        <mi>t</mi>
-      </mrow>
-      <mrow>
-        <mi>A</mi>
-      </mrow>
-      </msub></math></stem>
-             </formula>
-             <p id="_">This paragraph is extraneous</p></definition>
-             </term>
-             </terms>
-             </sections>
-             </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
   it "converts xrefs to references into erefs" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -548,6 +413,8 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Term1
 
+      Definition 0
+
       [.source]
       <<ISO2191,section=1>>
     INPUT
@@ -558,8 +425,9 @@ RSpec.describe Asciidoctor::Standoc do
         <title>Terms and definitions</title>
         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
         <term id="term-term1">
-        <preferred>Term1</preferred>
-        <termsource status="identical">
+        <preferred><expression><name>Term1</name></expression></preferred>
+        <definition><verbaldefinition><p id='_'>Definition 0</p></verbaldefinition></definition>
+        <termsource status="identical" type="authoritative">
         <origin bibitemid="ISO2191" type="inline" citeas="">
         <localityStack>
        <locality type="section"><referenceFrom>1</referenceFrom></locality>
@@ -630,57 +498,6 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "rearranges term note, term example, term source" do
-    input = <<~INPUT
-      #{ASCIIDOC_BLANK_HDR}
-
-      == Terms and definitions
-
-      === Term
-
-      [.source]
-      <<ISO2191,section=1>>
-
-      NOTE: Note
-
-      [example]
-      Example 1
-
-      NOTE: Note 2
-
-      [example]
-      Example 2
-    INPUT
-    output = <<~OUTPUT
-      #{BLANK_HDR}
-      <sections>
-      <terms id="_" 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-term"><preferred>Term</preferred>
-      <termnote id="_">
-        <p id="_">Note</p>
-      </termnote><termnote id="_">
-        <p id="_">Note 2</p>
-      </termnote><termexample id="_">
-        <p id="_">Example 1</p>
-      </termexample><termexample id="_">
-        <p id="_">Example 2</p>
-      </termexample><termsource status="identical">
-        <origin bibitemid="ISO2191" type="inline" citeas="">
-        <localityStack>
-       <locality type="section"><referenceFrom>1</referenceFrom></locality>
-        </localityStack>
-       </origin>
-      </termsource></term>
-      </terms>
-      </sections>
-      </standard-document>
-    OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to xmlpp(output)
-  end
-
   it "separates IEV citations by top-level clause" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
     FileUtils.mv File.expand_path("~/.relaton/cache"),
@@ -690,8 +507,6 @@ RSpec.describe Asciidoctor::Standoc do
                  File.expand_path("~/.iev.pstore1"), force: true
     FileUtils.rm_rf "relaton/cache"
     FileUtils.rm_rf "test.iev.pstore"
-    # mock_iecbib_get_iec60050_102_01
-    # mock_iecbib_get_iec60050_103_01
     # mock_iev
     VCR.use_cassette "separates_iev_citations_by_top_level_clause" do
       input = <<~INPUT
@@ -704,16 +519,22 @@ RSpec.describe Asciidoctor::Standoc do
         == Terms and definitions
         === Automation1
 
+        Definition 1
+
         [.source]
         <<iev,clause="103-01-02">>
 
         === Automation2
 
+        Definition 2
+
         [.source]
         <<iev,clause="102-01-02">>
 
         === Automation3
 
+        Definition 3
+
         [.source]
         <<iev,clause="103-01-02">>
       INPUT
@@ -723,8 +544,9 @@ RSpec.describe Asciidoctor::Standoc do
         <terms id="_" 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-automation1">
-          <preferred>Automation1</preferred>
-          <termsource status="identical">
+          <preferred><expression><name>Automation1</name></expression></preferred>
+          <definition><verbaldefinition><p id='_'>Definition 1</p></verbaldefinition></definition>
+          <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
           <localityStack>
         <locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality>
@@ -733,8 +555,9 @@ RSpec.describe Asciidoctor::Standoc do
         </termsource>
         </term>
         <term id="term-automation2">
-          <preferred>Automation2</preferred>
-          <termsource status="identical">
+          <preferred><expression><name>Automation2</name></expression></preferred>
+          <definition><verbaldefinition><p id='_'>Definition 2</p></verbaldefinition></definition>
+          <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-102" type="inline" citeas="IEC 60050-102:2007">
           <localityStack>
         <locality type="clause"><referenceFrom>102-01-02</referenceFrom></locality>
@@ -743,8 +566,9 @@ RSpec.describe Asciidoctor::Standoc do
         </termsource>
         </term>
         <term id="term-automation3">
-          <preferred>Automation3</preferred>
-          <termsource status="identical">
+          <preferred><expression><name>Automation3</name></expression></preferred>
+          <definition><verbaldefinition><p id='_'>Definition 3</p></verbaldefinition></definition>
+          <termsource status="identical" type="authoritative">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
           <localityStack>
         <locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality>
@@ -755,7 +579,7 @@ RSpec.describe Asciidoctor::Standoc do
           <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
           <bibitem type="standard" id="IEC60050-102">
-          <fetched>#{Date.today}</fetched>
+          <fetched/>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 102: Mathematics — General concepts and linear algebra</title>
           <title type='main' format='text/plain' language='en' script='Latn'>International Electrotechnical Vocabulary (IEV) — Part 102: Mathematics — General concepts and linear algebra</title>
@@ -794,7 +618,7 @@ RSpec.describe Asciidoctor::Standoc do
           </copyright>
           <place>Geneva</place>
         </bibitem><bibitem type="standard" id="IEC60050-103">
-          <fetched>#{Date.today}</fetched>
+          <fetched/>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 103: Mathematics — Functions</title>
           <title type="main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV) — Part 103: Mathematics — Functions</title>
@@ -962,23 +786,23 @@ RSpec.describe Asciidoctor::Standoc do
   it "cleans up nested mathvariant instances" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
-      
+
       stem:[sf "unitsml(cd)"]
     INPUT
     output = <<~OUTPUT
-             <sections>
-         <p id='_'>
-           <stem type='MathML'>
-             <math xmlns='http://www.w3.org/1998/Math/MathML'>
-               <mstyle mathvariant='sans-serif'>
-                 <mrow xref='U_NISTu7'>
-                   <mi mathvariant='sans-serif'>cd</mi>
-                 </mrow>
-               </mstyle>
-             </math>
-           </stem>
-         </p>
-       </sections>
+            <sections>
+        <p id='_'>
+          <stem type='MathML'>
+            <math xmlns='http://www.w3.org/1998/Math/MathML'>
+              <mstyle mathvariant='sans-serif'>
+                <mrow xref='U_NISTu7'>
+                  <mi mathvariant='sans-serif'>cd</mi>
+                </mrow>
+              </mstyle>
+            </math>
+          </stem>
+        </p>
+      </sections>
     OUTPUT
     expect(xmlpp(strip_guid(Nokogiri::XML(
       Asciidoctor.convert(input, *OPTIONS),
@@ -1463,7 +1287,7 @@ RSpec.describe Asciidoctor::Standoc do
              <xref target='L__xf6_we'/>
              <sourcecode id='L__xf6_we'>
                <name>
-                 See 
+                 See
                  <eref type='inline' bibitemid='L__xf6_wner2016' citeas='L&#246;wner et al. 2016'/>
                </name>
                ABC
@@ -1965,89 +1789,84 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  private
+  it "creates content-based GUIDs" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
 
-  def mock_mathml_italicise(string)
-    allow_any_instance_of(::Asciidoctor::Standoc::Cleanup)
-      .to receive(:mathml_mi_italics).and_return(string)
-  end
+      .Foreword
+      Foreword
 
-  def mock_iecbib_get_iec60050_103_01
-    expect(Iecbib::IecBibliography).to receive(:get)
-      .with("IEC 60050-103", nil, { keep_year: true }) do
-      IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
-        <bibitem type="standard" id="IEC60050-103">
-           <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
-           <docidentifier>IEC 60050-103:2009</docidentifier>
-           <date type="published">
-             <on>2009</on>
-           </date>
-           <contributor>
-             <role type="publisher"/>
-             <organization>
-               <name>International Electrotechnical Commission</name>
-               <abbreviation>IEC</abbreviation>
-               <uri>www.iec.ch</uri>
-             </organization>
-           </contributor>
+      [NOTE,beforeclauses=true]
+      ====
+      Note which is very important <<a>>
+      ====
+
+      == Introduction
+      Introduction
+
+      == Scope
+      Scope statement
+
+      [IMPORTANT,beforeclauses=true]
+      ====
+      Notice which is very important
+      ====
+    INPUT
+    output = <<~OUTPUT
+      <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>
-           <language>fr</language>
            <script>Latn</script>
            <status>
-             <stage>60</stage>
+             <stage>published</stage>
            </status>
            <copyright>
-             <from>2018</from>
-             <owner>
-               <organization>
-                 <name>International Electrotechnical Commission</name>
-                 <abbreviation>IEC</abbreviation>
-                 <uri>www.iec.ch</uri>
-               </organization>
-             </owner>
+             <from>2021</from>
            </copyright>
-         </bibitem>
-      OUTPUT
-    end
+           <ext>
+             <doctype>article</doctype>
+           </ext>
+         </bibdata>
+         <preface>
+           <note id='_f91b621e-d8cb-30bf-eef6-7d0150204829'>
+             <p id='_76d95913-a379-c60f-5144-1f09655cafa6'>
+               Note which is very important
+               <xref target='_76d95913-a379-c60f-5144-1f09655cafa6'/>
+             </p>
+           </note>
+           <foreword id='_0826616f-13a4-0634-baee-5003c5534175' obligation='informative'>
+             <title>Foreword</title>
+             <p id='_d2f825bf-3e18-6143-8777-34e59928d48c'>Foreword</p>
+           </foreword>
+           <introduction id='_introduction' obligation='informative'>
+             <title>Introduction</title>
+             <p id='_272021ab-1bfa-78ae-e860-ed770e36f3d2'>Introduction</p>
+           </introduction>
+         </preface>
+         <sections>
+           <admonition id='_068def71-3ec8-0395-8853-0e2d3ef5b841' type='important'>
+             <p id='_69ec375e-c992-5be3-76dd-a2311f9bb6cc'>Notice which is very important</p>
+           </admonition>
+           <clause id='_scope' type='scope' inline-header='false' obligation='normative'>
+             <title>Scope</title>
+             <p id='_fdcef9f1-c898-da99-eff6-f3e6abde7799'>Scope statement</p>
+           </clause>
+         </sections>
+       </standard-document>
+    OUTPUT
+    input1 = xmlpp(Asciidoctor.convert(input, *OPTIONS))
+      .sub(/<p id='([^']+)'>(\s+)Note which is very important(\s+)<xref target='a'/,
+           "<p id='\\1'>\\2Note which is very important\\3<xref target='\\1'")
+    expect(input1)
+      .to be_equivalent_to xmlpp(output)
   end
 
-  def mock_iecbib_get_iec60050_102_01
-    expect(Iecbib::IecBibliography).to receive(:get)
-      .with("IEC 60050-102", nil, { keep_year: true }) do
-      IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
-        <bibitem type="standard" id="IEC60050-102">
-           <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
-           <docidentifier>IEC 60050-102:2007</docidentifier>
-           <date type="published">
-             <on>2007</on>
-           </date>
-           <contributor>
-             <role type="publisher"/>
-             <organization>
-               <name>International Electrotechnical Commission</name>
-               <abbreviation>IEC</abbreviation>
-               <uri>www.iec.ch</uri>
-             </organization>
-           </contributor>
-           <language>en</language>
-           <language>fr</language>
-           <script>Latn</script>
-           <status>
-             <stage>60</stage>
-           </status>
-           <copyright>
-             <from>2018</from>
-             <owner>
-               <organization>
-                 <name>International Electrotechnical Commission</name>
-                 <abbreviation>IEC</abbreviation>
-                 <uri>www.iec.ch</uri>
-               </organization>
-             </owner>
-           </copyright>
-         </bibitem>
-      OUTPUT
-    end
+  private
+
+  def mock_mathml_italicise(string)
+    allow_any_instance_of(::Asciidoctor::Standoc::Cleanup)
+      .to receive(:mathml_mi_italics).and_return(string)
   end
 
   def mock_iev