metanorma-standoc 1.10.4.1 → 1.10.8

data/spec/asciidoctor/inline_spec.rb

@@ -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/isobib_cache_spec.rb

@@ -88,14 +88,14 @@ ISO_124_DATED = <<~XML.freeze
          <ext>
            <doctype>international-standard</doctype>
            <editorialgroup>
-             <technical-committee number="45" type="TC">ISO/TC 45/SC 3Raw materials (including latex) for use in the rubber industry</technical-committee>
+           <technical-committee number='45' type='TC' identifier='ISO/TC 45/SC 3'>Raw materials (including latex) for use in the rubber industry</technical-committee>
            </editorialgroup>
            <ics>
              <code>83.040.10</code>
              <text>Latex and raw rubber</text>
            </ics>
            <structuredidentifier type="ISO">
-             <project-number>ISO 124</project-number>
+             <project-number part="">ISO 124</project-number>
            </structuredidentifier>
          </ext>
        </bibdata>
@@ -186,14 +186,14 @@ ISO_123_UNDATED = <<~XML.freeze
         <ext>
           <doctype>international-standard</doctype>
           <editorialgroup>
-            <technical-committee number="45" type="TC">ISO/TC 45/SC 3Raw materials (including latex) for use in the rubber industry</technical-committee>
+          <technical-committee number='45' type='TC' identifier='ISO/TC 45/SC 3'>Raw materials (including latex) for use in the rubber industry</technical-committee>
           </editorialgroup>
           <ics>
             <code>83.040.10</code>
             <text>Latex and raw rubber</text>
           </ics>
           <structuredidentifier type="ISO">
-            <project-number>ISO 123</project-number>
+            <project-number part="">ISO 123</project-number>
           </structuredidentifier>
         </ext>
       </bibdata>
@@ -227,9 +227,9 @@ ISO_123_DATED = <<~XML.freeze
            <script>Latn</script>
            <abstract format='text/plain' language='en' script='Latn'>
     This International Standard specifies procedures for sampling natural rubber
-    latex concentrate and for sampling syntheticrubber latices and artificial
+    latex concentrate and for sampling synthetic rubber latices and artificial
     latices. It is also suitable for sampling rubber latex contained in drums,
-    tank cars ortanks. The procedures may also be used for sampling plastics
+    tank cars or tanks. The procedures may also be used for sampling plastics
     dispersions.
   </abstract>
            <status>
@@ -253,14 +253,14 @@ ISO_123_DATED = <<~XML.freeze
            <ext>
              <doctype>international-standard</doctype>
              <editorialgroup>
-               <technical-committee number="45" type="TC">ISO/TC 45/SC 3Raw materials (including latex) for use in the rubber industry</technical-committee>
+             <technical-committee number='45' type='TC' identifier='ISO/TC 45/SC 3'>Raw materials (including latex) for use in the rubber industry</technical-committee>
              </editorialgroup>
              <ics>
                <code>83.040.10</code>
                <text>Latex and raw rubber</text>
              </ics>
              <structuredidentifier type="ISO">
-               <project-number>ISO 123</project-number>
+               <project-number part="">ISO 123</project-number>
              </structuredidentifier>
            </ext>
          </bibdata>

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

@@ -201,7 +201,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>

data/spec/asciidoctor/macros_spec.rb

@@ -175,7 +175,8 @@ RSpec.describe Asciidoctor::Standoc do
       term:[blah,word]
       {{blah,term,word}}
       {{blah,term,word,xref}}
-      {{blah,term,word,xref,option="noital,noref"}}
+      {{blah,term,word,xref,options="noital,noref,nolinkmention,nolinkref"}}
+      {{blah,term,word,xref,options="ital,ref,linkmention,linkref"}}
 
       [[clause1]]
       == Clause
@@ -283,7 +284,17 @@ RSpec.describe Asciidoctor::Standoc do
                    <tt>blah</tt>
                  </strong>
                </concept>
-               <concept ital='false' ref='false'>
+               <concept ital='false' ref='false' linkmention='false' linkref='false'>
+                 <strong>
+                   term
+                   <tt>blah</tt>
+                   , display
+                   <tt>term</tt>
+                    not resolved via ID
+                   <tt>blah</tt>
+                 </strong>
+               </concept>
+               <concept ital='true' ref='true' linkmention='true' linkref='true'>
                  <strong>
                    term
                    <tt>blah</tt>
@@ -323,8 +334,8 @@ RSpec.describe Asciidoctor::Standoc do
       {{<<Clause2>>,word}}
       {{<<Clause2>>,word,term}}
       {{<<Clause2>>,word,term,xref}}
-      {{<<Clause2>>,word,term,xref,option="noital,noref"}}
-      {{<<Clause2>>,word,term,xref,option="ital,ref"}}
+      {{<<Clause2>>,word,term,xref,options="noital,noref,nolinkmention,nolinkref"}}
+      {{<<Clause2>>,word,term,xref,options="ital,ref,linkmention,linkref"}}
 
       == Terms and definitions
       === Clause1
@@ -398,12 +409,12 @@ RSpec.describe Asciidoctor::Standoc do
                  <renderterm>term</renderterm>
                  <xref target='Clause2'>xref</xref>
                </concept>
-                <concept ital='false' ref='false'>
+                <concept ital='false' ref='false' linkmention='false' linkref='false'>
                   <refterm>word</refterm>
                   <renderterm>term</renderterm>
                   <xref target='Clause2'>xref</xref>
                 </concept>
-                <concept ital='true' ref='true'>
+                <concept ital='true' ref='true' linkmention='true' linkref='true'>
                  <refterm>word</refterm>
                  <renderterm>term</renderterm>
                  <xref target='Clause2'>xref</xref>
@@ -678,7 +689,7 @@ RSpec.describe Asciidoctor::Standoc do
         <definitions id='clause1' obligation='normative'>
           <title>Symbols and abbreviated terms</title>
           <dl id='_'>
-            <dt id='symbol-_-_x_-'>
+            <dt id='symbol-_-__x230a_x__x230b_-'>
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mo>&#8970;</mo>
@@ -700,7 +711,7 @@ RSpec.describe Asciidoctor::Standoc do
                  function.
               </p>
             </dd>
-            <dt id='symbol-_-_x_--1'>
+            <dt id='symbol-_-__x2308_x__x2309_-'>
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mo>&#8968;</mo>
@@ -1073,7 +1084,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
         #{BLANK_HDR}
         <sections>
-        <form id='_' name='N1' action='/action_page.php' class="checkboxes">
+        <form id='N0' name='N1' action='/action_page.php' class="checkboxes">
         <p id='_'>
           <label for='fname'>First name:</label>
           <br/>
@@ -1147,6 +1158,9 @@ RSpec.describe Asciidoctor::Standoc do
       [[clause1Ab]]
       ==== Clause 1Ab
 
+      [.variant-title,type=toc]
+      1Ab Clause
+
       [[clause1B]]
       === Clause 1B
 
@@ -1173,6 +1187,7 @@ RSpec.describe Asciidoctor::Standoc do
                   </clause>
                   <clause id='clause1Ab' inline-header='false' obligation='normative'>
                     <title>Clause 1Ab</title>
+                    <variant-title type='toc'>1Ab Clause</variant-title>
                   </clause>
                 </clause>
                 <clause id='clause1B' inline-header='false' obligation='normative'>
@@ -1196,7 +1211,7 @@ RSpec.describe Asciidoctor::Standoc do
                 <xref target='clause1Aa'>Clause 1Aa</xref>
               </li>
               <li>
-                <xref target='clause1Ab'>Clause 1Ab</xref>
+                <xref target='clause1Ab'>1Ab Clause</xref>
               </li>
             </ul>
           </li>
@@ -1596,44 +1611,44 @@ RSpec.describe Asciidoctor::Standoc do
         [lutaml_uml_datamodel_description,#{example_file}]
         --
         [.diagram_include_block, base_path="requirements/"]
-        ...
+        .....
         Diagram text
-        ...
+        .....
 
         [.include_block, package="Another", base_path="spec/fixtures/"]
-        ...
+        .....
         my text
-        ...
+        .....
 
         [.include_block, base_path="spec/fixtures/"]
-        ...
+        .....
         my text
-        ...
+        .....
 
         [.before]
-        ...
+        .....
         mine text
-        ...
+        .....
 
         [.before, package="Another"]
-        ...
+        .....
         text before Another package
-        ...
+        .....
 
         [.after, package="Another"]
-        ...
+        .....
         text after Another package
-        ...
+        .....
 
         [.after, package="CityGML"]
-        ...
+        .....
         text after CityGML package
-        ...
+        .....
 
         [.after]
-        ...
+        .....
         footer text
-        ...
+        .....
         --
       TEXT
     end

data/spec/asciidoctor/refs_dl_spec.rb

@@ -821,7 +821,7 @@ OUTPUT
        <title>Subsection</title>
      </clause>
      <references id='_' obligation='informative'  normative="true">
-       <title>Normative references</title>
+       <title>Normative References</title>
        <bibitem id='A'>
          <formattedref format='application/x-isodoc+xml'>Title</formattedref>
          <docidentifier>B</docidentifier>