metanorma-standoc 1.11.3 → 2.0.2

data/spec/{asciidoctor → metanorma}/inline_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe Asciidoctor::Standoc do
+RSpec.describe Metanorma::Standoc do
   it "handles spacing around markup" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -389,6 +389,61 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to(output)
   end
 
+  it "processes formatting within crossreferences" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [[reference]]
+      == Section
+
+      <<reference,_reference_>>
+      <<reference,_**reference**_>>
+      <<reference,_A_ stem:[x^2]>>
+      <<reference,_A_ footnote:[_B_]>>
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+      <sections>
+       <clause id="reference" inline-header="false" obligation="normative">
+       <title>Section</title>
+       <p id="_"><xref target="reference"><em>reference</em></xref>
+       <xref target="reference"><em><strong>reference</strong></em></xref>
+       <xref target="reference"><em>A</em> <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mrow><mi>x</mi></mrow><mrow><mn>2</mn></mrow></msup></math></stem></xref>
+       <xref target="reference"><em>A</em><fn reference="1"><p id="_"><em>B</em></p></fn></xref></p>
+       </clause>
+       </sections>
+      </standard-document>
+    OUTPUT
+    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(output)
+  end
+
+  it "processes formatting within crossreferences to non-existent anchor" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Section
+
+      <<reference,_reference_>>
+      <<reference,_**reference**_>>
+      <<reference,_A_ stem:[x^2]>>
+      <<reference,_A_ footnote:[_B_]>>
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+             <sections>
+       <clause id="_" inline-header="false" obligation="normative">
+       <title>Section</title>
+       <p id="_"><xref target="reference"><em>reference</em></xref>
+       <xref target="reference"><em><strong>reference</strong></em></xref>
+       <xref target="reference"><em>A</em> <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mrow><mi>x</mi></mrow><mrow><mn>2</mn></mrow></msup></math></stem></xref>
+       <xref target="reference"><em>A</em><fn reference="1"><p id="_"><em>B</em></p></fn></xref></p>
+       </clause>
+       </sections>
+       </standard-document>
+    OUTPUT
+    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(output)
+  end
+
   it "processes bibliographic anchors" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -423,6 +478,120 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to(output)
   end
 
+  it "processes formatting within bibliographic references" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Section
+
+      <<reference,_reference_>>
+      <<reference,_**reference**_>>
+      <<reference,_A_ stem:[x^2]>>
+      <<reference,_A_ footnote:[_B_]>>
+      <<reference,clause=3.4.2, ISO 9000:2005 footnote:[Superseded by ISO 9000:2015.]>>
+
+      [bibliography]
+      == Normative References
+
+      * [[[reference,ABC]]] Reference
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+             <sections><clause id="_" inline-header="false" obligation="normative">
+       <title>Section</title>
+       <p id="_"><eref type="inline" bibitemid="reference" citeas="ABC"><em>reference</em></eref>
+       <eref type="inline" bibitemid="reference" citeas="ABC"><em><strong>reference</strong></em></eref>
+       <eref type="inline" bibitemid="reference" citeas="ABC"><em>A</em> <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mrow><mi>x</mi></mrow><mrow><mn>2</mn></mrow></msup></math></stem></eref>
+       <eref type="inline" bibitemid="reference" citeas="ABC"><em>A</em><fn reference="1"><p id="_"><em>B</em></p></fn></eref>
+       <eref type="inline" bibitemid="reference" citeas="ABC"><localityStack><locality type="clause"><referenceFrom>3.4.2</referenceFrom></locality></localityStack>ISO 9000:2005<fn reference="2"><p id="_">Superseded by ISO 9000:2015.</p></fn></eref></p>
+       </clause>
+       </sections><bibliography><references id="_" normative="true" obligation="informative">
+       <title>Normative references</title><p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+       <bibitem id="reference">
+       <formattedref format="application/x-isodoc+xml">Reference</formattedref>
+       <docidentifier>ABC</docidentifier>
+       </bibitem>
+       </references></bibliography>
+       </standard-document>
+    OUTPUT
+    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(output)
+  end
+
+  it "processes formatting within term sources" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      === Term1
+
+      [.source]
+      <<reference,_reference_>>
+
+      [.source]
+      <<reference,_**reference**_>>
+
+      [.source]
+      <<reference,_A_ stem:[x^2]>>
+
+      [.source]
+      <<reference,_A_ footnote:[_B_]>>
+
+      [.source]
+      <<reference,clause=3.4.2, ISO 9000:2005 footnote:[Superseded by ISO 9000:2015.]>>
+
+      [bibliography]
+      == Normative References
+
+      * [[[reference,ABC]]] Reference
+    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-term1"><preferred><expression><name>Term1</name></expression><termsource status="identical" type="authoritative">
+       <origin bibitemid="reference" type="inline" citeas="ABC">
+       <em>reference</em>
+       </origin>
+       </termsource><termsource status="identical" type="authoritative">
+       <origin bibitemid="reference" type="inline" citeas="ABC">
+       <em>
+         <strong>reference</strong>
+       </em>
+       </origin>
+       </termsource><termsource status="identical" type="authoritative">
+       <origin bibitemid="reference" type="inline" citeas="ABC"><em>A</em> <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msup><mrow><mi>x</mi></mrow><mrow><mn>2</mn></mrow></msup></math></stem></origin>
+       </termsource><termsource status="identical" type="authoritative">
+       <origin bibitemid="reference" type="inline" citeas="ABC"><em>A</em><fn reference="1">
+         <p id="_">
+           <em>B</em>
+         </p>
+       </fn></origin>
+       </termsource><termsource status="identical" type="authoritative">
+       <origin bibitemid="reference" type="inline" citeas="ABC"><localityStack><locality type="clause"><referenceFrom>3.4.2</referenceFrom></locality></localityStack>ISO 9000:2005<fn reference="2">
+         <p id="_">Superseded by ISO 9000:2015.</p>
+       </fn></origin>
+       </termsource></preferred>
+
+
+
+       </term>
+       </terms>
+       </sections><bibliography><references id="_" normative="true" obligation="informative">
+       <title>Normative references</title><p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+       <bibitem id="reference">
+       <formattedref format="application/x-isodoc+xml">Reference</formattedref>
+       <docidentifier>ABC</docidentifier>
+
+       </bibitem>
+       </references></bibliography>
+       </standard-document>
+    OUTPUT
+    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(output)
+  end
+
   it "processes footnotes" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}

data/spec/{asciidoctor → metanorma}/isobib_cache_spec.rb

@@ -266,7 +266,7 @@ ISO_123_DATED = <<~XML.freeze
          </bibdata>
 XML
 
-RSpec.describe Asciidoctor::Standoc do
+RSpec.describe Metanorma::Standoc do
   it "does not activate biblio caches if isobib disabled" do
     FileUtils.rm_rf File.expand_path("~/.relaton-bib.pstore1")
     FileUtils.mv(File.expand_path("~/.relaton/cache"),

data/spec/{asciidoctor → metanorma}/lists_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe Asciidoctor::Standoc do
+RSpec.describe Metanorma::Standoc do
   it "processes simple lists" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{ASCIIDOC_BLANK_HDR}

data/spec/{asciidoctor → metanorma}/macros_plantuml_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe Asciidoctor::Standoc do
+RSpec.describe Metanorma::Standoc do
   it "processes the PlantUML macro" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -383,14 +383,14 @@ RSpec.describe Asciidoctor::Standoc do
   private
 
   def mock_plantuml_disabled
-    expect(Asciidoctor::Standoc::PlantUMLBlockMacroBackend)
+    expect(Metanorma::Standoc::PlantUMLBlockMacroBackend)
       .to receive(:plantuml_installed?) do
       raise "PlantUML not installed"
     end
   end
 
   def mock_localdir_unwritable
-    expect(Asciidoctor::Standoc::Utils).to receive(:localdir) do
+    expect(Metanorma::Standoc::Utils).to receive(:localdir) do
       "/"
     end.exactly(2).times
   end

data/spec/{asciidoctor → metanorma}/macros_spec.rb

@@ -1,11 +1,12 @@
 require "spec_helper"
 
-RSpec.describe Asciidoctor::Standoc do
-  it "processes the Asciidoctor::Standoc inline macros" do
+RSpec.describe Metanorma::Standoc do
+  it "processes the Metanorma::Standoc inline macros" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       preferred:[term0]
       alt:[term1]
+      admitted:[term1a]
       deprecated:[term2]
       domain:[term3]
       inherit:[<<ref1>>]
@@ -23,6 +24,7 @@ RSpec.describe Asciidoctor::Standoc do
           <title>Foreword</title>
           <preferred><expression><name>term0</name></expression></preferred>
           <admitted><expression><name>term1</name></expression></admitted>
+          <admitted><expression><name>term1a</name></expression></admitted>
           <deprecates><expression><name>term2</name></expression></deprecates>
           <domain>term3</domain>
           <inherit>
@@ -55,7 +57,7 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes the Asciidoctor::Standoc index macros" do
+  it "processes the Metanorma::Standoc index macros" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       index:also[]
@@ -127,7 +129,7 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes the Asciidoctor::Standoc variant macros" do
+  it "processes the Metanorma::Standoc variant macros" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == lang:en[English] lang:fr-Latn[Français]
@@ -163,7 +165,7 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes the Asciidoctor::Standoc concept and related macros" do
+  it "processes the Metanorma::Standoc concept and related macros" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
@@ -332,7 +334,7 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "processes the Asciidoctor::Standoc concept macros for acronyms" do
+  it "processes the Metanorma::Standoc concept macros for acronyms" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
@@ -1302,6 +1304,95 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes embed macro" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[clause1]]
+      == Clause 1
+
+      embed::spec/assets/xref_error.adoc[]
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+        <sections>
+          <clause id='clause1' inline-header='false' obligation='normative'>
+            <title>Clause 1</title>
+          </clause>
+          <clause id='_' inline-header='false' obligation='normative'>
+            <title>Clause</title>
+            <p id='_'>
+              <xref target='a'>b</xref>
+            </p>
+          </clause>
+        </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes embed macro with overwriting" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[clause1]]
+      == Clause
+
+      embed::spec/assets/xref_error.adoc[]
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+        <sections>
+          <clause id='clause1' inline-header='false' obligation='normative'>
+            <title>Clause</title>
+          </clause>
+        </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes recursive embed macro with includes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[clause1]]
+      == Clause
+
+      embed::spec/assets/a1.adoc[]
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+               <sections>
+           <clause id='clause1' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+           </clause>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause 1</title>
+             <p id='_'>X</p>
+           </clause>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause 2</title>
+             <p id='_'>X</p>
+           </clause>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause 3</title>
+             <p id='_'>X</p>
+           </clause>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause 4</title>
+             <p id='_'>X</p>
+           </clause>
+         </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+
   describe "term inline macros" do
     subject(:convert) do
       xmlpp(