metanorma-standoc 1.10.5 → 1.11.0

data/spec/asciidoctor/inline_spec.rb

@@ -73,8 +73,8 @@ RSpec.describe Asciidoctor::Standoc do
       sub<sub><em>scr</em>ipt</sub>
       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
       mark
-      <admitted>alt</admitted>
-      <deprecates>deprecated</deprecates>
+      <admitted><expression><name>alt</name></expression></admitted>
+      <deprecates><expression><name>deprecated</name></expression></deprecates>
       <domain>domain</domain>
       <strike>strike</strike>
       <underline>underline</underline>
@@ -480,4 +480,40 @@ RSpec.describe Asciidoctor::Standoc do
     expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to(output)
   end
+
+  it "processes format-specific inline pass" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      pass-format:rfc,html[<abc>X &gt; Y</abc>]
+    INPUT
+    output = <<~OUTPUT
+       #{BLANK_HDR}
+      <sections>
+      <p id='_'>
+      <passthrough formats='rfc,html'>&lt;abc&gt;X &gt; Y&lt;/abc&gt;</passthrough>
+      </p>
+      </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes Metanorma XML inline pass" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      +<abc>X &gt;+ +++Y+++ pass:c[</abc>]
+    INPUT
+    output = <<~OUTPUT
+       #{BLANK_HDR}
+      <sections>
+      <p id='_'>&lt;abc&gt;X &gt; Y &lt;/abc&gt;</p>
+      </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/asciidoctor/lists_spec.rb

@@ -73,7 +73,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{ASCIIDOC_BLANK_HDR}
       [[id]]
-      [keep-with-next=true,keep-lines-together=true]
+      [keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       * First
       * Second
       +
@@ -84,7 +84,7 @@ RSpec.describe Asciidoctor::Standoc do
       --
 
       [[id1]]
-      [keep-with-next=true,keep-lines-together=true]
+      [keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       [loweralpha]
       . First
       . Second
@@ -103,7 +103,7 @@ RSpec.describe Asciidoctor::Standoc do
       [arabic]
       ... E
       ... F
-      [keep-with-next=true,keep-lines-together=true]
+      [keep-with-next=true,keep-lines-together=true,tag=X,multilingual-rendering=common]
       Notes1::
       Notes::  Note 1.
       +
@@ -117,14 +117,14 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
     expect(xmlpp(strip_guid(output))).to be_equivalent_to xmlpp(<<~"OUTPUT")
                   #{BLANK_HDR}
-             <sections><ul id="id" keep-with-next="true" keep-lines-together="true">
+             <sections><ul id="id" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common' >
                <li>
                  <p id="_">First</p>
                </li>
                <li><p id="_">Second</p><p id="_">entry1</p>
              <p id="_">entry2</p></li>
              </ul>
-             <ol id="id1" type="alphabet"  keep-with-next="true" keep-lines-together="true">
+             <ol id="id1" type="alphabet"  keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common' >
                <li>
                  <p id="_">First</p>
                </li>
@@ -164,7 +164,7 @@ RSpec.describe Asciidoctor::Standoc do
                </li>
                <li>
                  <p id="_">F</p>
-                 <dl id="_"  keep-with-next="true" keep-lines-together="true">
+                 <dl id="_"  keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
                <dt>Notes1</dt>
                <dd/>
                <dt>Notes</dt>

data/spec/asciidoctor/macros_plantuml_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe Asciidoctor::Standoc do
       :novalid:
       :no-isobib:
       :imagesdir: spec/assets
+      :data-uri-image: false
 
       [plantuml]
       ....
@@ -100,6 +101,7 @@ RSpec.describe Asciidoctor::Standoc do
         :novalid:
         :no-isobib:
         :imagesdir: spec/assets
+        :data-uri-image: false
 
         [lutaml_diagram]
         ....
@@ -135,7 +137,7 @@ RSpec.describe Asciidoctor::Standoc do
     end
 
     context "when inline macro, path supplied as the second arg" do
-      let(:example_file) { fixtures_path('diagram_definitions.lutaml') }
+      let(:example_file) { fixtures_path("diagram_definitions.lutaml") }
       let(:input) do
         <<~TEXT
           = Document title
@@ -145,6 +147,7 @@ RSpec.describe Asciidoctor::Standoc do
           :novalid:
           :no-isobib:
           :imagesdir: spec/assets
+          :data-uri-image: false
 
           lutaml_diagram::#{example_file}[]
 
@@ -201,7 +204,7 @@ RSpec.describe Asciidoctor::Standoc do
                   <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'>Mandatory / Optional / Conditional</th>
                     <th valign='top' align='left'>Max Occur</th>
                     <th valign='top' align='left'>Data Type</th>
                   </tr>
@@ -345,6 +348,38 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes the PlantUML macro with mismatched delimiters" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [plantuml]
+      ....
+      @startuml
+      Alice -> Bob: Authentication Request
+      Bob --> Alice: Authentication Response
+
+      Alice -> Bob: Another authentication Request
+      Alice <-- Bob: another authentication Response
+      ....
+    INPUT
+    expect { Asciidoctor.convert(input, *OPTIONS) }
+      .to output(%r{@startuml without matching @enduml in PlantUML!}).to_stderr
+    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</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