metanorma-standoc 1.10.2 → 1.10.4.1

data/spec/asciidoctor/cleanup_spec.rb

@@ -316,6 +316,56 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "ignores tags when applying smartquotes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      "((ppt))",
+
+      "((ppm))", "((ppt))"
+
+      "((ppm))"&#xa0;
+
+      ....
+      ((ppm))",
+      ....
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+                   <sections>
+                              <p id='_'>
+                 &#8220;ppt&#8221;,
+                 <index>
+                   <primary>ppt</primary>
+                 </index>
+               </p>
+               <p id='_'>
+                 &#8220;ppm&#8221;,
+                 <index>
+                   <primary>ppm</primary>
+                 </index>
+                  &#8220;ppt&#8221;
+                 <index>
+                   <primary>ppt</primary>
+                 </index>
+               </p>
+               <p id='_'>
+        &#8220;ppm
+        <index>
+          <primary>ppm</primary>
+        </index>
+        &#8220;&#160;
+      </p>
+      <figure id='_'>
+        <pre id='_'>((ppm))",</pre>
+      </figure>
+            </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "removes empty text elements" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -486,7 +536,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
              #{BLANK_HDR}
           <sections><formula id="_">
-        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi></math></stem>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mo>%</mo><mi>r</mi><mo>=</mo><mn>1</mn><mo>%</mo></math></stem>
       <note id="_">
         <p id="_">That formula does not do much</p>
       </note></formula>
@@ -517,7 +567,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
              #{BLANK_HDR}
           <sections><formula id="_">
-        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi></math></stem></formula>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mo>%</mo><mi>r</mi><mo>=</mo><mn>1</mn><mo>%</mo></math></stem></formula>
       <note id="_">
         <p id="_">That formula does not do much</p>
       </note>
@@ -2050,6 +2100,90 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "moves metadata deflist to correct location" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      == Clause
+
+      [.requirement,subsequence="A",inherit="/ss/584/2015/level/1 &amp; /ss/584/2015/level/2"]
+      ====
+      [%metadata]
+      model:: ogc
+      type:: class
+      label:: http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules[*req/core*]
+      subject:: Encoding of logical models
+      inherit:: urn:iso:dis:iso:19156:clause:7.2.2
+      inherit:: urn:iso:dis:iso:19156:clause:8
+      inherit:: http://www.opengis.net/doc/IS/GML/3.2/clause/2.4
+      inherit:: O&M Abstract model, OGC 10-004r3, clause D.3.4
+      inherit:: http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used
+      inherit:: <<ref2>>
+      inherit:: <<ref3>>
+      classification:: priority:P0
+      classification:: domain:Hydrology,Groundwater
+      classification:: control-class:Technical
+      obligation:: recommendation,requirement
+
+      I recommend this
+      ====
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+            <sections>
+        <clause id='_' inline-header='false' obligation='normative'>
+          <title>Clause</title>
+          <requirement id='_' subsequence='A'>
+            <label>
+              <link target='http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules'>
+                <strong>req/core</strong>
+              </link>
+            </label>
+            <subject>Encoding of logical models</subject>
+            <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
+            <inherit>urn:iso:dis:iso:19156:clause:7.2.2</inherit>
+            <inherit>urn:iso:dis:iso:19156:clause:8</inherit>
+            <inherit>
+              <link target='http://www.opengis.net/doc/IS/GML/3.2/clause/2.4'/>
+            </inherit>
+            <inherit>O&amp;M Abstract model, OGC 10-004r3, clause D.3.4</inherit>
+            <inherit>
+              <link target='http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used'/>
+            </inherit>
+            <inherit>
+              <xref target='ref2'/>
+            </inherit>
+            <inherit>
+              <xref target='ref3'/>
+            </inherit>
+            <classification>
+              <tag>control-class</tag>
+              <value>Technical</value>
+            </classification>
+            <classification>
+              <tag>domain</tag>
+              <value>Groundwater</value>
+            </classification>
+            <classification>
+              <tag>domain</tag>
+              <value>Hydrology</value>
+            </classification>
+            <classification>
+              <tag>priority</tag>
+              <value>P0</value>
+            </classification>
+            <description>
+              <p id='_'>I recommend this</p>
+            </description>
+          </requirement>
+        </clause>
+      </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "moves inherit macros to correct location" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor/macros_plantuml_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
   it "processes the PlantUML macro" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)).gsub(%r{plantuml/plantuml[^./]+\.}, "plantuml/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -36,24 +36,27 @@ RSpec.describe Asciidoctor::Standoc do
       @enduml
       ....
     INPUT
-       #{BLANK_HDR}
-       <sections><figure id="_">
-  <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-<figure id="_">
-  <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-<figure id="_">
-  <image src="plantuml/filename.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-        </sections>
-
-       </standard-document>
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+             <sections><figure id="_">
+        <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      <figure id="_">
+        <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      <figure id="_">
+        <image src="plantuml/filename.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+              </sections>
+             </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))
+      .gsub(%r{plantuml/plantuml[^./]+\.}, "plantuml/_.")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the PlantUML macro with imagesdir" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)).gsub(%r{spec/assets/[^./]+\.}, "spec/assets/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       = Document title
       Author
       :docfile: test.adoc
@@ -72,18 +75,22 @@ RSpec.describe Asciidoctor::Standoc do
       Alice <-- Bob: another authentication Response
       @enduml
       ....
-   INPUT
-          #{BLANK_HDR}
-          <sections>
-  <figure id="_">
-  <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-</sections>
-</standard-document>
-OUTPUT
-    end
+    INPUT
+    output = <<~OUTPUT
+                #{BLANK_HDR}
+                <sections>
+        <figure id="_">
+        <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))
+      .gsub(%r{spec/assets/[^./]+\.}, "spec/assets/_.")))
+      .to be_equivalent_to xmlpp(output)
+  end
 
-  context 'when lutaml_diagram' do
+  context "when lutaml_diagram" do
     let(:input) do
       <<~"OUTPUT"
         = Document title
@@ -106,13 +113,13 @@ OUTPUT
     end
     let(:output) do
       <<~"OUTPUT"
-      #{BLANK_HDR}
-        <sections>
-        <figure id="_">
-        <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-        </figure>
-        </sections>
-        </standard-document>
+        #{BLANK_HDR}
+          <sections>
+          <figure id="_">
+          <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+          </figure>
+          </sections>
+          </standard-document>
       OUTPUT
     end
 
@@ -120,12 +127,54 @@ OUTPUT
       expect(
         xmlpp(
           strip_guid(Asciidoctor.convert(input, *OPTIONS))
-                      .gsub(%r{".+spec\/assets\/lutaml\/[^.\/]+\.}, %q("spec/assets/_.))))
-        .to(be_equivalent_to xmlpp(output))
+                      .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
+
+          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
     end
   end
 
-  context 'when lutaml_uml_attributes_table' do
+  context "when lutaml_uml_attributes_table" do
     let(:example_file) { fixtures_path("diagram_definitions.lutaml") }
     let(:input) do
       <<~"OUTPUT"
@@ -142,59 +191,61 @@ OUTPUT
     end
     let(:output) do
       <<~"OUTPUT"
-      #{BLANK_HDR}
-        <sections>
-          <clause id='_' inline-header='false' obligation='normative'>
-            <title>AttributeProfile</title>
-            <table id='_'>
-              <name>AttributeProfile attributes</name>
-              <thead>
-                <tr>
-                  <th valign='top' align='left'>Name</th>
-                  <th valign='top' align='left'>Definition</th>
-                  <th valign='top' align='left'>Mandatory/ Optional/ Conditional</th>
-                  <th valign='top' align='left'>Max Occur</th>
-                  <th valign='top' align='left'>Data Type</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td valign='top' align='left'>addressClassProfile</td>
-                  <td valign='top' align='left'>TODO: enum ‘s definition</td>
-                  <td valign='top' align='left'>O</td>
-                  <td valign='top' align='left'>1</td>
-                  <td valign='top' align='left'>
-                    <tt>CharacterString</tt>
-                  </td>
-                </tr>
-                <tr>
-                  <td valign='top' align='left'>imlicistAttributeProfile</td>
-                  <td valign='top' align='left'>this is attribute definition with multiply lines</td>
-                  <td valign='top' align='left'>O</td>
-                  <td valign='top' align='left'>1</td>
-                  <td valign='top' align='left'>
-                    <tt>CharacterString</tt>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </clause>
-        </sections>
-        </standard-document>
+        #{BLANK_HDR}
+          <sections>
+            <clause id='_' inline-header='false' obligation='normative'>
+              <title>AttributeProfile</title>
+              <table id='_'>
+                <name>AttributeProfile attributes</name>
+                <thead>
+                  <tr>
+                    <th valign='top' align='left'>Name</th>
+                    <th valign='top' align='left'>Definition</th>
+                    <th valign='top' align='left'>Mandatory/ Optional/ Conditional</th>
+                    <th valign='top' align='left'>Max Occur</th>
+                    <th valign='top' align='left'>Data Type</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td valign='top' align='left'>addressClassProfile</td>
+                    <td valign='top' align='left'></td>
+                    <td valign='top' align='left'>O</td>
+                    <td valign='top' align='left'>1</td>
+                    <td valign='top' align='left'>
+                      <tt>CharacterString</tt>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td valign='top' align='left'>imlicistAttributeProfile</td>
+                    <td valign='top' align='left'>this is attribute definition with multiply lines</td>
+                    <td valign='top' align='left'>O</td>
+                    <td valign='top' align='left'>1</td>
+                    <td valign='top' align='left'>
+                      <tt>CharacterString</tt>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </clause>
+          </sections>
+          </standard-document>
       OUTPUT
     end
 
     it "processes the lutaml_uml_attributes_table macro" do
       expect(
         xmlpp(
-          strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+          strip_guid(Asciidoctor.convert(input, *OPTIONS)),
+        ),
+      )
         .to(be_equivalent_to(xmlpp(output)))
     end
   end
 
   it "processes the PlantUML macro with PlantUML disabled" do
     mock_plantuml_disabled
-    expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to output(%r{PlantUML not installed}).to_stderr
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -208,9 +259,11 @@ OUTPUT
       @enduml
       ....
     INPUT
+    expect { Asciidoctor.convert(input, *OPTIONS) }
+      .to output(%r{PlantUML not installed}).to_stderr
 
     mock_plantuml_disabled
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -224,23 +277,26 @@ OUTPUT
       @enduml
       ....
     INPUT
-       #{BLANK_HDR}
-       <sections>
-         <sourcecode id="_" lang="plantuml">@startuml
-Alice -&gt; Bob: Authentication Request
-Bob --&gt; Alice: Authentication Response
-
-Alice -&gt; Bob: Another authentication Request
-Alice &lt;-- Bob: another authentication Response
-@enduml</sourcecode>
-        </sections>
-       </standard-document>
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+             <sections>
+               <sourcecode id="_" lang="plantuml">@startuml
+      Alice -&gt; Bob: Authentication Request
+      Bob --&gt; Alice: Authentication Response
+
+      Alice -&gt; Bob: Another authentication Request
+      Alice &lt;-- Bob: another authentication Response
+      @enduml</sourcecode>
+              </sections>
+             </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the PlantUML macro with localdir unwritable" do
     mock_localdir_unwritable
-    expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to output(%r{not writable for PlantUML}).to_stderr
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -254,9 +310,11 @@ Alice &lt;-- Bob: another authentication Response
       @enduml
       ....
     INPUT
+    expect { Asciidoctor.convert(input, *OPTIONS) }
+      .to output(%r{not writable for PlantUML}).to_stderr
 
     mock_localdir_unwritable
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -270,26 +328,29 @@ Alice &lt;-- Bob: another authentication Response
       @enduml
       ....
     INPUT
-       #{BLANK_HDR}
-       <sections>
-         <sourcecode id="_" lang="plantuml">@startuml
-Alice -&gt; Bob: Authentication Request
-Bob --&gt; Alice: Authentication Response
-
-Alice -&gt; Bob: Another authentication Request
-Alice &lt;-- Bob: another authentication Response
-@enduml</sourcecode>
-        </sections>
-       </standard-document>
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+             <sections>
+               <sourcecode id="_" lang="plantuml">@startuml
+      Alice -&gt; Bob: Authentication Request
+      Bob --&gt; Alice: Authentication Response
+
+      Alice -&gt; Bob: Another authentication Request
+      Alice &lt;-- Bob: another authentication Response
+      @enduml</sourcecode>
+              </sections>
+             </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   private
 
   def mock_plantuml_disabled
-    expect(Asciidoctor::Standoc::PlantUMLBlockMacroBackend).to receive(:plantuml_installed?) do
+    expect(Asciidoctor::Standoc::PlantUMLBlockMacroBackend)
+      .to receive(:plantuml_installed?) do
       raise "PlantUML not installed"
-      false
     end
   end