metanorma-standoc 1.11.0.1 → 1.11.4

data/spec/asciidoctor/datamodel/attributes_table_preprocessor_spec.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
-  describe '#process' do
-    context 'when simple models without relations' do
+  describe "#process" do
+    context "when simple models without relations" do
       let(:datamodel_file) do
-        examples_path('datamodel/address_class_profile.adoc')
+        examples_path("datamodel/address_class_profile.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/address_class_profile.xml')
+        examples_path("datamodel/address_class_profile.xml")
       end
       let(:output) do
         [
           BLANK_HDR,
-          File.read(fixtures_path('macros_datamodel/address_class_profile.xml'))
+          File.read(fixtures_path("macros_datamodel/address_class_profile.xml")),
         ]
           .join
       end
@@ -27,7 +27,7 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
         end
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,
@@ -37,18 +37,18 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
       end
     end
 
-    context 'when complex relations' do
+    context "when complex relations" do
       let(:datamodel_file) do
-        examples_path('datamodel/address_component_profile.adoc')
+        examples_path("datamodel/address_component_profile.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/address_component_profile.xml')
+        examples_path("datamodel/address_component_profile.xml")
       end
       let(:output) do
-        path = fixtures_path('macros_datamodel/address_component_profile.xml')
+        path = fixtures_path("macros_datamodel/address_component_profile.xml")
         [
           BLANK_HDR,
-          File.read(path)
+          File.read(path),
         ]
           .join("\n")
       end
@@ -56,14 +56,14 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
       after do
         %w[doc html xml err].each do |extention|
           path = examples_path(
-            "datamodel/address_component_profile.#{extention}"
+            "datamodel/address_component_profile.#{extention}",
           )
           FileUtils.rm_f(path)
           FileUtils.rm_f("address_component_profile.#{extention}")
         end
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,
@@ -73,32 +73,32 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor do
       end
     end
 
-    context 'when missing definition' do
+    context "when missing definition" do
       let(:datamodel_file) do
-        examples_path('datamodel/blank_definition_profile.adoc')
+        examples_path("datamodel/blank_definition_profile.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/blank_definition_profile.xml')
+        examples_path("datamodel/blank_definition_profile.xml")
       end
       let(:output) do
-        path = fixtures_path('macros_datamodel/blank_definition_profile.xml')
+        path = fixtures_path("macros_datamodel/blank_definition_profile.xml")
         [
           BLANK_HDR,
-          File.read(path)
+          File.read(path),
         ].join("\n")
       end
 
       after do
         %w[doc html xml err].each do |extention|
           path = examples_path(
-            "datamodel/blank_definition_profile.#{extention}"
+            "datamodel/blank_definition_profile.#{extention}",
           )
           FileUtils.rm_f(path)
           FileUtils.rm_f("blank_definition_profile.#{extention}")
         end
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,

data/spec/asciidoctor/datamodel/diagram_preprocessor_spec.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
-  describe '#process' do
-    context 'when simple models without relations' do
+  describe "#process" do
+    context "when simple models without relations" do
       let(:datamodel_file) do
-        examples_path('datamodel/common_models_diagram.adoc')
+        examples_path("datamodel/common_models_diagram.adoc")
       end
       let(:result_file) do
-        examples_path('datamodel/common_models_diagram.xml')
+        examples_path("datamodel/common_models_diagram.xml")
       end
       let(:output) do
         [
           BLANK_HDR,
           File.read(
-            fixtures_path('macros_datamodel/common_models_diagram.xml')
-          )
+            fixtures_path("macros_datamodel/common_models_diagram.xml"),
+          ),
         ].join
       end
 
@@ -26,10 +26,10 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
           FileUtils.rm_f(path)
           FileUtils.rm_f("common_models_diagram.#{extention}")
         end
-        FileUtils.rm_rf('common_models_diagram_htmlimages')
+        FileUtils.rm_rf("common_models_diagram_htmlimages")
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,
@@ -39,13 +39,13 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
       end
     end
 
-    context 'when complex relations' do
-      let(:datamodel_file) { examples_path('datamodel/top_down_diagram.adoc') }
-      let(:result_file) { examples_path('datamodel/top_down_diagram.xml') }
+    context "when complex relations" do
+      let(:datamodel_file) { examples_path("datamodel/top_down_diagram.adoc") }
+      let(:result_file) { examples_path("datamodel/top_down_diagram.xml") }
       let(:output) do
         [
           BLANK_HDR,
-          File.read(fixtures_path('macros_datamodel/top_down_diagram.xml'))
+          File.read(fixtures_path("macros_datamodel/top_down_diagram.xml")),
         ].join("\n")
       end
 
@@ -55,11 +55,11 @@ RSpec.describe Asciidoctor::Standoc::Datamodel::DiagramPreprocessor do
           FileUtils.rm_f(path)
           FileUtils.rm_f("top_down_diagram.#{extention}")
         end
-        FileUtils.rm_rf(examples_path('datamodel/plantuml'))
-        FileUtils.rm_rf('top_down_diagram_htmlimages')
+        FileUtils.rm_rf(examples_path("datamodel/plantuml"))
+        FileUtils.rm_rf("top_down_diagram_htmlimages")
       end
 
-      it 'correctly renders input' do
+      it "correctly renders input" do
         Asciidoctor.convert_file(datamodel_file,
                                  backend: :standoc,
                                  safe: :safe,

data/spec/asciidoctor/inline_spec.rb

@@ -294,9 +294,9 @@ RSpec.describe Asciidoctor::Standoc do
       http://example.com[Link]
       http://example.com[Link,title="tip"]
       link:++https://asciidoctor.org/now_this__link_works.html++[]
-      http://example.com[Link,updatetype=true]
+      http://example.com[Link,update-type=true]
       link:../example[updatetype=true]
-      link:../example[Link,updatetype=true]
+      link:../example[Link,update-type=true]
     INPUT
     output = <<~OUTPUT
            #{BLANK_HDR}
@@ -306,9 +306,9 @@ RSpec.describe Asciidoctor::Standoc do
       <link target="http://example.com">Link</link>
       <link target="http://example.com" alt="tip">Link</link>
       <link target='https://asciidoctor.org/now_this__link_works.html'/>
-      <link target="http://example.com" updatetype="true">Link</link>
-      <link target="../example" updatetype="true"/>
-      <link target="../example" updatetype="true">Link</link></p>
+      <link target="http://example.com" update-type="true">Link</link>
+      <link target="../example" update-type="true"/>
+      <link target="../example" update-type="true">Link</link></p>
       </p>
       </sections>
       </standard-document>
@@ -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/isobib_cache_spec.rb

@@ -716,29 +716,25 @@ RSpec.describe Asciidoctor::Standoc do
 
   def mock_isobib_get_123
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO 123", "2001",
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("ISO 123", "2001", anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_DATED))
   end
 
   def mock_isobib_get_123_undated
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO 123", nil,
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("ISO 123", nil, anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_UNDATED))
   end
 
   def mock_isobib_get_124
     expect(RelatonIso::IsoBibliography).to receive(:get)
-      .with("ISO 124", "2014",
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("ISO 124", "2014", anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(ISO_124_DATED))
   end
 
   def mock_ietfbib_get_123
     expect(RelatonIetf::IetfBibliography).to receive(:get)
-      .with("RFC 123", nil,
-            { lang: "en", title: "<em>Standard</em>", usrlbl: nil })
+      .with("RFC 123", nil, anything)
       .and_return(RelatonIsoBib::XMLParser.from_xml(IETF_123_SHORT))
   end
 end

data/spec/asciidoctor/macros_spec.rb

@@ -1562,7 +1562,7 @@ RSpec.describe Asciidoctor::Standoc do
               <tt>missing</tt>
             </strong>
           </related>
-                    <definition><verbaldefinition>
+                    <definition><verbal-definition>
                       <p id='_'>paragraph</p>
                       <p id='_'>
                         <concept>
@@ -1620,7 +1620,7 @@ RSpec.describe Asciidoctor::Standoc do
                         </concept>
                          is a term
                       </p>
-                    </verbaldefinition></definition>
+                    </verbal-definition></definition>
                   </term>
                 </terms>
               </sections>

data/spec/asciidoctor/refs_dl_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Asciidoctor::Standoc do
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
-        <fetched>#{Date.today}</fetched>
+        <fetched/>
         <title type='title-main' format='text/plain'>Standard</title>
         <title type='main' format='text/plain'>Standard</title>
          <docidentifier type="ISO">ISO 123</docidentifier>
@@ -304,7 +304,7 @@ formattedref::
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="ISOTC211" type="standard">
-  <fetched>2019-06-30</fetched>
+  <fetched/>
   <title type="main" format="text/plain">Geographic information</title>
   <title type="subtitle" format="text/plain" language="en" script="Latn">Geographic information subtitle</title>
   <title type='title-main' format='text/plain'>Other Title</title>
@@ -624,7 +624,7 @@ series.formattedref.script:: Latn
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="ISOTC211" type="standard">
-  <fetched>2019-06-30</fetched>
+  <fetched/>
   <title type="main" format="text/plain">Geographic information</title>
   <title type="subtitle" format="text/plain" language="en" script="Latn">Geographic information subtitle</title>
   <uri type="src">https://www.iso.org/standard/53798.html</uri>
@@ -827,7 +827,7 @@ OUTPUT
          <docidentifier>B</docidentifier>
        </bibitem>
        <bibitem id='iso123' type='standard'>
-         <fetched>#{Date.today.to_s}</fetched>
+         <fetched/>
          <title type='title-main' format='text/plain'>Standard</title>
          <title type='main' format='text/plain'>Standard</title>
          <docidentifier type='ISO'>ISO 123</docidentifier>