metanorma-standoc 2.0.3 → 2.0.4

data/lib/metanorma/standoc/table.rb

@@ -19,9 +19,7 @@ module Metanorma
           xml.table **attr_code(table_attrs(node)) do |xml_table|
             colgroup(node, xml_table)
             table_name(node, xml_table)
-            %i(head body foot).reject do |tblsec|
-              node.rows[tblsec].empty?
-            end
+            %i(head body foot).reject { |tblsec| node.rows[tblsec].empty? }
             table_head_body_and_foot node, xml_table
           end
         end
@@ -50,12 +48,12 @@ module Metanorma
         end
       end
 
-      def table_cell1(cell, thd)
-        thd << if cell.style == :asciidoc
-                 cell.content
-               else
-                 cell.text
-               end
+      def table_cell1(cell)
+        if cell.style == :asciidoc
+          cell.content
+        else
+          cell.text
+        end
       end
 
       def table_cell(node, xml_tr, tblsec)
@@ -65,7 +63,7 @@ module Metanorma
         cell_tag = "td"
         cell_tag = "th" if tblsec == :head || node.style == :header
         xml_tr.send cell_tag, **attr_code(cell_attributes) do |thd|
-          table_cell1(node, thd)
+          thd << table_cell1(node)
         end
       end
 

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -162,7 +162,8 @@ module Metanorma
       def normalize_ref_id(term)
         t = term.dup
         t.xpath(".//index").map(&:remove)
-        Metanorma::Utils::to_ncname(t.text.downcase.gsub(/[[:space:]]/, "-"))
+        Metanorma::Utils::to_ncname(t.text.strip.downcase
+          .gsub(/[[:space:]]+/, "-"))
       end
 
       def unique_text_id(text, prefix)

data/lib/metanorma/standoc/utils.rb

@@ -32,7 +32,9 @@ module Metanorma
         doc = ::Nokogiri::XML.parse(NOKOHEAD)
         fragment = doc.fragment("")
         ::Nokogiri::XML::Builder.with fragment, &block
-        fragment.to_xml(encoding: "US-ASCII", indent: 0).lines.map do |l|
+        fragment.to_xml(encoding: "US-ASCII", indent: 0,
+                        save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+          .lines.map do |l|
           l.gsub(/>\n$/, ">").gsub(/\s*\n$/m, " ").gsub("–", "\u0096")
             .gsub("—", "\u0097").gsub("–", "\u0096")
             .gsub("—", "\u0097")

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.0.3".freeze
+    VERSION = "2.0.4".freeze
   end
 end

data/spec/metanorma/base_spec.rb

@@ -1051,7 +1051,7 @@ QU1FOiB0ZXN0Cgo=
       .new(:standoc, header_footer: true)
       .doc_extract_attributes(node)
 
-    expect(options.dig(:mn2pdf, :font_manifest))
+    expect(options[:font_manifest])
       .to eq(node[Metanorma::Standoc::Base::FONTS_MANIFEST])
   end
 

data/spec/metanorma/cleanup_spec.rb

@@ -282,7 +282,7 @@ RSpec.describe Metanorma::Standoc do
               </localityStack>
               the reference,xyz</eref>
        <eref type='inline' bibitemid='iso216' citeas='ISO 216'>
-         <localityStack>
+         <localityStack connective="and">
            <locality type='whole'/>
            <locality type='clause'>
              <referenceFrom>3</referenceFrom>
@@ -298,7 +298,7 @@ RSpec.describe Metanorma::Standoc do
            <referenceFrom>the reference</referenceFrom>
            </locality>
          </localityStack>
-         <localityStack>
+         <localityStack connective="and">
            <locality type='whole'/>
            <locality type='clause'>
              <referenceFrom>3</referenceFrom>
@@ -1116,7 +1116,7 @@ RSpec.describe Metanorma::Standoc do
       <dd>
         <p id='_'>Definition 7</p>
       </dd>
-      <dt id="symbol-_-n-">
+      <dt id="symbol-n">
         <stem type='MathML'>
           <math xmlns='http://www.w3.org/1998/Math/MathML'>
             <mi>n</mi>
@@ -1178,7 +1178,7 @@ RSpec.describe Metanorma::Standoc do
               <dd>
                 <p id='_'>Definition 5</p>
               </dd>
-              <dt  id='symbol-_-xm-'><stem type='MathML'>
+              <dt  id='symbol-x-m'><stem type='MathML'>
               <math xmlns='http://www.w3.org/1998/Math/MathML'>
         <msub>
           <mrow>
@@ -1193,7 +1193,7 @@ RSpec.describe Metanorma::Standoc do
               <dd>
                 <p id='_'>Definition 4</p>
               </dd>
-              <dt  id='symbol-_-x1-'><stem type='MathML'>
+              <dt  id='symbol-x-1'><stem type='MathML'>
                <math xmlns='http://www.w3.org/1998/Math/MathML'>
          <msub>
            <mrow>
@@ -1212,7 +1212,7 @@ RSpec.describe Metanorma::Standoc do
               <dd>
                 <p id='_'>Definition 2</p>
               </dd>
-              <dt  id='symbol-_-__x3b1_-'>
+              <dt  id='symbol-__x3b1_'>
               <stem type='MathML'>
         <math xmlns='http://www.w3.org/1998/Math/MathML'>
           <mi>α</mi>
@@ -1829,13 +1829,13 @@ RSpec.describe Metanorma::Standoc do
            </ext>
          </bibdata>
          <preface>
-           <note id='_f91b621e-d8cb-30bf-eef6-7d0150204829'>
+           <note id='_2cfe95f6-7ad6-aa57-8207-6f7d7928aa8e'>
              <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'>
+           <foreword id='_96b556cb-657c-985b-351b-ed70d8bd6fdd' obligation='informative'>
              <title>Foreword</title>
              <p id='_d2f825bf-3e18-6143-8777-34e59928d48c'>Foreword</p>
            </foreword>
@@ -1845,7 +1845,7 @@ RSpec.describe Metanorma::Standoc do
            </introduction>
          </preface>
          <sections>
-           <admonition id='_068def71-3ec8-0395-8853-0e2d3ef5b841' type='important'>
+           <admonition id='_6abb9105-854c-e79c-c351-73a56d6ca81f' 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'>
@@ -1858,7 +1858,7 @@ RSpec.describe Metanorma::Standoc do
     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)
+    expect(xmlpp(input1))
       .to be_equivalent_to xmlpp(output)
   end
 

data/spec/metanorma/cleanup_terms_spec.rb

@@ -728,7 +728,7 @@ RSpec.describe Metanorma::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-_-t90-'>
+            <term id='term-t90'>
               <preferred>
                 <letter-symbol>
                   <name>

data/spec/metanorma/inline_spec.rb

@@ -444,6 +444,37 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to(output)
   end
 
+  it "processes combinations of crossreferences" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Section
+
+      <<ref1;to!ref2>>
+      <<from!ref1;to!ref2,text>>
+      <<ref1;ref2>>
+      <<ref1;and!ref2>>
+      <<ref1;or!ref2,text>>
+      <<from!ref1;to!ref2;and!ref3;to!ref4>>
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+       <sections>
+       <clause id="_" inline-header="false" obligation="normative">
+       <title>Section</title>
+       <p id="_"><xref target="ref1"><location target="ref1" connective="from"/><location target="ref2" connective="to"/></xref>
+       <xref target="ref1"><location target="ref1" connective="from"/><location target="ref2" connective="to"/>text</xref>
+       <xref target="ref1"><location target="ref1" connective="and"/><location target="ref2" connective="and"/></xref>
+       <xref target="ref1"><location target="ref1" connective="and"/><location target="ref2" connective="and"/></xref>
+       <xref target="ref1"><location target="ref1" connective="and"/><location target="ref2" connective="or"/>text</xref>
+       <xref target="ref1"><location target="ref1" connective="from"/><location target="ref2" connective="to"/><location target="ref3" connective="and"/><location target="ref4" connective="to"/></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}

data/spec/metanorma/macros_plantuml_spec.rb

@@ -129,51 +129,50 @@ RSpec.describe Metanorma::Standoc do
       expect(
         xmlpp(
           strip_guid(Asciidoctor.convert(input, *OPTIONS))
-                      .gsub(%r{".+spec/assets/lutaml/[^./]+\.},
-                            '"spec/assets/_.'),
+                      .gsub(%r{"[^".]+spec/assets/lutaml/[^./"]+\.png},
+                            '"spec/assets/_.png'),
         ),
-      )
-        .to(be_equivalent_to(xmlpp(output)))
+      ).to(be_equivalent_to(xmlpp(output)))
     end
+  end
 
-    context "when inline macro, path supplied as the second arg" do
-      let(:example_file) { fixtures_path("diagram_definitions.lutaml") }
-      let(:input) do
-        <<~TEXT
-          = Document title
-          Author
-          :docfile: test.adoc
-          :nodoc:
-          :novalid:
-          :no-isobib:
-          :imagesdir: spec/assets
-          :data-uri-image: false
-
-          lutaml_diagram::#{example_file}[]
-
-        TEXT
-      end
-      let(:output) do
-        <<~TEXT
-          #{BLANK_HDR}
-          <sections>
-          <figure id="_">
-          <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-          </figure>
-          </sections>
-          </standard-document>
-        TEXT
-      end
-
-      it "correctly renders input" do
-        expect(
-          xmlpp(
-            strip_guid(Asciidoctor.convert(input, *OPTIONS))
-                        .gsub(%r{".+spec/assets/lutaml/[^./]+\.},
-                              '"spec/assets/_.'),
-          ),
-        ).to(be_equivalent_to(xmlpp(output)))
-      end
+  context "when inline macro, path supplied as the second arg" do
+    let(:example_file) { fixtures_path("diagram_definitions.lutaml") }
+    let(:input) do
+      <<~TEXT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+        :novalid:
+        :no-isobib:
+        :imagesdir: spec/assets
+        :data-uri-image: false
+
+        lutaml_diagram::#{example_file}[]
+
+      TEXT
+    end
+    let(:output) do
+      <<~TEXT
+        #{BLANK_HDR}
+        <sections>
+        <figure id="_">
+        <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+        </figure>
+        </sections>
+        </standard-document>
+      TEXT
+    end
+
+    it "correctly renders input" do
+      expect(
+        xmlpp(
+          strip_guid(Asciidoctor.convert(input, *OPTIONS))
+                      .gsub(%r{"[^".]+spec/assets/lutaml/[^./"]+\.png},
+                            '"spec/assets/_.png'),
+        ),
+      ).to(be_equivalent_to(xmlpp(output)))
     end
   end
 

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>
@@ -1392,6 +1392,142 @@ RSpec.describe Metanorma::Standoc do
       .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

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