metanorma-standoc 2.0.1 → 2.0.4

data/spec/metanorma/macros_spec.rb

@@ -748,7 +748,7 @@ RSpec.describe Metanorma::Standoc do
         <definitions id='clause1' obligation='normative'>
           <title>Symbols and abbreviated terms</title>
           <dl id='_'>
-            <dt id='symbol-_-__x230a_x__x230b_-'>
+            <dt id='symbol-__x230a_-x-__x230b_'>
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mo>&#8970;</mo>
@@ -770,7 +770,7 @@ RSpec.describe Metanorma::Standoc do
                  function.
               </p>
             </dd>
-            <dt id='symbol-_-__x2308_x__x2309_-'>
+            <dt id='symbol-__x2308_-x-__x2309_'>
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mo>&#8968;</mo>
@@ -1304,6 +1304,231 @@ RSpec.describe Metanorma::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
+
+  it "processes std-link macro" do
+    VCR.use_cassette "std-link" do
+      input = <<~INPUT
+        #{ISOBIB_BLANK_HDR}
+
+        [[clause1]]
+        == Clause
+
+        std-link:[ISO 131]
+        std-link:[iso:std:iso:13485:en,droploc%clause=4,text]
+      INPUT
+      output = <<~OUTPUT
+         #{BLANK_HDR}
+                  <sections>
+            <clause id='clause1' inline-header='false' obligation='normative'>
+              <title>Clause</title>
+              <p id='_'>
+                <eref type='inline' bibitemid='_' citeas='ISO 131'/>
+                <eref type='inline' droploc='true' bibitemid='_' citeas='iso:std:iso:13485:en'>
+                  <localityStack>
+                    <locality type='clause'>
+                      <referenceFrom>4</referenceFrom>
+                    </locality>
+                  </localityStack>
+                  text
+                </eref>
+              </p>
+            </clause>
+          </sections>
+          <bibliography>
+            <references hidden='true' normative='true'>
+              <bibitem id='_' type='standard' hidden="true">
+                <fetched/>
+                <title type='title-intro' format='text/plain' language='en' script='Latn'>Acoustics</title>
+                <title type='title-main' format='text/plain' language='en' script='Latn'>Expression of physical and subjective magnitudes of sound or noise in air</title>
+                <title type='main' format='text/plain' language='en' script='Latn'>
+                  Acoustics — Expression of physical and subjective magnitudes of sound
+                  or noise in air
+                </title>
+                <uri type='src'>https://www.iso.org/standard/3944.html</uri>
+                <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
+                <docidentifier type='ISO' primary='true'>ISO 131</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1:en</docidentifier>
+                <docnumber>131</docnumber>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                    <abbreviation>ISO</abbreviation>
+                    <uri>www.iso.org</uri>
+                  </organization>
+                </contributor>
+                <edition>1</edition>
+                <language>en</language>
+                <script>Latn</script>
+                <status>
+                  <stage>95</stage>
+                  <substage>99</substage>
+                </status>
+                <copyright>
+                  <from>1979</from>
+                  <owner>
+                    <organization>
+                      <name>ISO</name>
+                    </organization>
+                  </owner>
+                </copyright>
+                <relation type='obsoletes'>
+                  <bibitem type='standard'>
+                    <formattedref format='text/plain'>ISO/R 357:1963</formattedref>
+                  </bibitem>
+                </relation>
+                <relation type='instance'>
+                  <bibitem type='standard'>
+                    <fetched/>
+                    <title type='title-intro' format='text/plain' language='en' script='Latn'>Acoustics</title>
+                    <title type='title-main' format='text/plain' language='en' script='Latn'>Expression of physical and subjective magnitudes of sound or noise in air</title>
+                    <title type='main' format='text/plain' language='en' script='Latn'>
+                      Acoustics — Expression of physical and subjective magnitudes of
+                      sound or noise in air
+                    </title>
+                    <uri type='src'>https://www.iso.org/standard/3944.html</uri>
+                    <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
+                    <docidentifier type='ISO' primary='true'>ISO 131:1979</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1:en</docidentifier>
+                    <docnumber>131</docnumber>
+                    <date type='published'>
+                      <on>1979-11</on>
+                    </date>
+                    <contributor>
+                      <role type='publisher'/>
+                      <organization>
+                        <name>International Organization for Standardization</name>
+                        <abbreviation>ISO</abbreviation>
+                        <uri>www.iso.org</uri>
+                      </organization>
+                    </contributor>
+                    <edition>1</edition>
+                    <language>en</language>
+                    <script>Latn</script>
+                    <status>
+                      <stage>95</stage>
+                      <substage>99</substage>
+                    </status>
+                    <copyright>
+                      <from>1979</from>
+                      <owner>
+                        <organization>
+                          <name>ISO</name>
+                        </organization>
+                      </owner>
+                    </copyright>
+                    <relation type='obsoletes'>
+                      <bibitem type='standard'>
+                        <formattedref format='text/plain'>ISO/R 357:1963</formattedref>
+                      </bibitem>
+                    </relation>
+                    <place>Geneva</place>
+                  </bibitem>
+                </relation>
+                <place>Geneva</place>
+              </bibitem>
+              <bibitem id='_' hidden="true">
+                <formattedref format='application/x-isodoc+xml'/>
+                <docidentifier type='ISO'>iso:std:iso:13485:en</docidentifier>
+                <docnumber>13485:en</docnumber>
+              </bibitem>
+            </references>
+          </bibliography>
+        </standard-document>
+      OUTPUT
+      expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))
+                  .gsub(%r{ bibitemid="_[^"]+"}, ' bibitemid="_"')))
+        .to be_equivalent_to xmlpp(output)
+    end
+  end
+
   describe "term inline macros" do
     subject(:convert) do
       xmlpp(
@@ -1433,6 +1658,67 @@ RSpec.describe Metanorma::Standoc do
       end
     end
 
+    context "terms with index terms" do
+      let(:input) do
+        <<~XML
+          #{ASCIIDOC_BLANK_HDR}
+
+          == Terms and Definitions
+
+          === name(((name)))
+
+          == Main
+
+          term:[name] is a term
+
+          {{name}} is a term
+        XML
+      end
+      let(:output) do
+        <<~XML
+          #{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-name'>
+                <preferred><expression><name>name
+           <index>
+               <primary>name</primary>
+             </index>
+           </name>
+                </expression></preferred>
+              </term>
+            </terms>
+            <clause id='_' inline-header='false' obligation='normative'>
+              <title>Main</title>
+              <p id='_'>
+              <concept>
+              <refterm>name</refterm>
+              <renderterm>name</renderterm>
+              <xref target='term-name'/>
+              </concept>
+              is a term
+              </p>
+              <p id='_'>
+              <concept>
+              <refterm>name</refterm>
+              <renderterm>name</renderterm>
+              <xref target='term-name'/>
+              </concept>
+              is a term
+              </p>
+            </clause>
+          </sections>
+          </standard-document>
+        XML
+      end
+
+      it "strips index terms in terms anchors" do
+        expect(convert).to(be_equivalent_to(xmlpp(output)))
+      end
+    end
+
     context "multiply exising ids in document" do
       let(:input) do
         <<~XML

data/spec/metanorma/processor_spec.rb

@@ -23,13 +23,16 @@ RSpec.describe Metanorma::Standoc::Processor do
   end
 
   it "generates IsoDoc XML from a blank document" do
-    expect(processor.input_to_isodoc(<<~"INPUT", "test")).to be_equivalent_to <<~"OUTPUT"
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
     INPUT
+    output = <<~"OUTPUT"
           #{BLANK_HDR}
       <sections/>
       </iso-standard>
     OUTPUT
+    expect(processor.input_to_isodoc(input, "test"))
+      .to be_equivalent_to output
   end
 
   it "generates HTML from IsoDoc XML" do
@@ -45,16 +48,17 @@ RSpec.describe Metanorma::Standoc::Processor do
        </sections>
        </iso-standard>
     INPUT
-    expect(File.read("test.html", encoding: "utf-8").gsub(%r{^.*<main}m, "<main").gsub(
-             %r{</main>.*}m, "</main>"
-           )).to be_equivalent_to <<~"OUTPUT"
-                 <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
-                   <p class="zzSTDTitle1"></p>
-                   <div id="H"><h1>Terms, Definitions, Symbols and Abbreviated Terms</h1><h2 class="TermNum" id="J"></h2>
-               <p class="Terms" style="text-align:left;">Term2</p>
-             </div>
-                 </main>
-           OUTPUT
+    expect(File.read("test.html", encoding: "utf-8")
+      .gsub(%r{^.*<main}m, "<main")
+      .gsub(%r{</main>.*}m, "</main>"))
+      .to be_equivalent_to <<~"OUTPUT"
+            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+              <p class="zzSTDTitle1"></p>
+              <div id="H"><h1>Terms, Definitions, Symbols and Abbreviated Terms</h1><h2 class="TermNum" id="J"></h2>
+          <p class="Terms" style="text-align:left;">Term2</p>
+        </div>
+            </main>
+      OUTPUT
   end
 
   it "generates HTML from IsoDoc XML" do
@@ -70,8 +74,8 @@ RSpec.describe Metanorma::Standoc::Processor do
        </sections>
        </iso-standard>
     INPUT
-    expect(File.read("test.doc",
-                     encoding: "utf-8")).to match(/Terms, Definitions, Symbols and Abbreviated Terms/)
+    expect(File.read("test.doc", encoding: "utf-8"))
+      .to match(/Terms, Definitions, Symbols and Abbreviated Terms/)
   end
 
   it "generates XML from IsoDoc XML" do