metanorma-standoc 1.10.0 → 1.10.3.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>
@@ -1931,11 +1981,11 @@ RSpec.describe Asciidoctor::Standoc do
           <definitions id='L' obligation="normative">
             <title>Symbols and abbreviated terms</title>
             <dl id='_'>
-            <dt>m</dt>
+            <dt id="symbol-m">m</dt>
       <dd>
         <p id='_'>Definition 7</p>
       </dd>
-      <dt>
+      <dt id="symbol-_-n-">
         <stem type='MathML'>
           <math xmlns='http://www.w3.org/1998/Math/MathML'>
             <mi>n</mi>
@@ -1945,23 +1995,23 @@ RSpec.describe Asciidoctor::Standoc do
       <dd>
         <p id='_'>Definition 6</p>
       </dd>
-              <dt>x</dt>
+              <dt id="symbol-x">x</dt>
               <dd>
                 <p id='_'>Definition 5</p>
               </dd>
-              <dt>x_m_</dt>
+              <dt  id='symbol-x_m_'>x_m_</dt>
               <dd>
                 <p id='_'>Definition 4</p>
               </dd>
-              <dt>x_1_</dt>
+              <dt id='symbol-x_1_'>x_1_</dt>
               <dd>
                 <p id='_'>Definition 3</p>
               </dd>
-              <dt>Xa</dt>
+              <dt id='symbol-xa'>Xa</dt>
               <dd>
                 <p id='_'>Definition 2</p>
               </dd>
-              <dt>α</dt>
+              <dt  id='symbol-&#945;'>α</dt>
               <dd>
                 <p id='_'>Definition 1</p>
               </dd>
@@ -1993,11 +2043,11 @@ RSpec.describe Asciidoctor::Standoc do
           <definitions id='L' obligation="normative">
             <title>Symbols and abbreviated terms</title>
             <dl id='_'>
-              <dt>x</dt>
+              <dt  id='symbol-x'>x</dt>
               <dd>
                 <p id='_'>Definition 5</p>
               </dd>
-              <dt><stem type='MathML'>
+              <dt  id='symbol-_-xm-'><stem type='MathML'>
               <math xmlns='http://www.w3.org/1998/Math/MathML'>
         <msub>
           <mrow>
@@ -2012,7 +2062,7 @@ RSpec.describe Asciidoctor::Standoc do
               <dd>
                 <p id='_'>Definition 4</p>
               </dd>
-              <dt><stem type='MathML'>
+              <dt  id='symbol-_-x1-'><stem type='MathML'>
                <math xmlns='http://www.w3.org/1998/Math/MathML'>
          <msub>
            <mrow>
@@ -2027,11 +2077,11 @@ RSpec.describe Asciidoctor::Standoc do
               <dd>
                 <p id='_'>Definition 3</p>
               </dd>
-              <dt>xa</dt>
+              <dt  id='symbol-xa'>xa</dt>
               <dd>
                 <p id='_'>Definition 2</p>
               </dd>
-              <dt>
+              <dt  id='symbol-_-&#945;-'>
               <stem type='MathML'>
         <math xmlns='http://www.w3.org/1998/Math/MathML'>
           <mi>α</mi>

data/spec/asciidoctor/macros_json2text_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe 'Json2Text macros' do
+RSpec.describe "Json2Text macros" do
   it_behaves_like "structured data 2 text preprocessor" do
     let(:extention) { "json" }
     def transform_to_type(data)

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