RubyGems - metanorma-standoc - Versions diffs - 1.10.0 → 1.10.3.1 - Mend

metanorma-standoc 1.10.0 → 1.10.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

checksums.yaml +4 -4
data/lib/asciidoctor/standoc/base.rb +0 -1
data/lib/asciidoctor/standoc/blocks.rb +1 -1
data/lib/asciidoctor/standoc/cleanup.rb +62 -2
data/lib/asciidoctor/standoc/cleanup_block.rb +0 -1
data/lib/asciidoctor/standoc/cleanup_boilerplate.rb +2 -2
data/lib/asciidoctor/standoc/cleanup_footnotes.rb +0 -1
data/lib/asciidoctor/standoc/cleanup_maths.rb +0 -1
data/lib/asciidoctor/standoc/cleanup_section.rb +0 -1
data/lib/asciidoctor/standoc/converter.rb +3 -0
data/lib/asciidoctor/standoc/datamodel/diagram_preprocessor.rb +22 -21
data/lib/asciidoctor/standoc/front.rb +0 -1
data/lib/asciidoctor/standoc/front_contributor.rb +0 -1
data/lib/asciidoctor/standoc/isodoc.rng +44 -7
data/lib/asciidoctor/standoc/macros.rb +25 -5
data/lib/asciidoctor/standoc/macros_plantuml.rb +3 -3
data/lib/asciidoctor/standoc/macros_terms.rb +34 -7
data/lib/asciidoctor/standoc/ref.rb +60 -56
data/lib/asciidoctor/standoc/section.rb +19 -12
data/lib/asciidoctor/standoc/term_lookup_cleanup.rb +59 -18
data/lib/asciidoctor/standoc/utils.rb +0 -1
data/lib/asciidoctor/standoc/validate.rb +4 -3
data/lib/isodoc/html/html_titlepage.html +81 -0
data/lib/isodoc/html/htmlstyle.css +983 -0
data/lib/isodoc/html/htmlstyle.scss +714 -0
data/lib/isodoc/html/scripts.html +71 -0
data/lib/metanorma/standoc/processor.rb +16 -7
data/lib/metanorma/standoc/version.rb +1 -1
data/metanorma-standoc.gemspec +1 -1
data/spec/asciidoctor/blocks_spec.rb +2 -2
data/spec/asciidoctor/cleanup_sections_spec.rb +899 -864
data/spec/asciidoctor/cleanup_spec.rb +64 -14
data/spec/asciidoctor/macros_json2text_spec.rb +1 -1
data/spec/asciidoctor/macros_plantuml_spec.rb +165 -104
data/spec/asciidoctor/macros_spec.rb +396 -75
data/spec/asciidoctor/validate_spec.rb +12 -2
data/spec/support/shared_examples/structured_data_2_text_preprocessor.rb +34 -34
data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml +50 -50
data/spec/vcr_cassettes/isobib_get_123.yml +12 -12
data/spec/vcr_cassettes/isobib_get_123_1.yml +23 -23
data/spec/vcr_cassettes/isobib_get_123_1_fr.yml +34 -34
data/spec/vcr_cassettes/isobib_get_123_2001.yml +13 -13
data/spec/vcr_cassettes/isobib_get_124.yml +12 -12
data/spec/vcr_cassettes/rfcbib_get_rfc8341.yml +14 -14
data/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml +46 -46
metadata +8 -4

data/spec/asciidoctor/macros_spec.rb CHANGED Viewed

@@ -174,6 +174,8 @@ RSpec.describe Asciidoctor::Standoc do
       {{blah,word}}
       term:[blah,word]
       {{blah,term,word}}
+      {{blah,term,word,xref}}
+      {{blah,term,word,xref,option="noital,noref"}}
       [[clause1]]
       == Clause
@@ -271,6 +273,26 @@ RSpec.describe Asciidoctor::Standoc do
                   <tt>blah</tt>
                 </strong>
               </concept>
+              <concept>
+                 <strong>
+                   term
+                   <tt>blah</tt>
+                   , display
+                   <tt>term</tt>
+                    not resolved via ID
+                   <tt>blah</tt>
+                 </strong>
+               </concept>
+               <concept ital='false' ref='false'>
+                 <strong>
+                   term
+                   <tt>blah</tt>
+                   , display
+                   <tt>term</tt>
+                    not resolved via ID
+                   <tt>blah</tt>
+                 </strong>
+               </concept>
           </p>
         </foreword>
       </preface>
@@ -286,6 +308,137 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
+  it "processes the Asciidoctor::Standoc concept macros for acronyms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      {{Clause1}}
+      {{Clause1,Clause 1}}
+      {{Clause 2}}
+      {{Clause 2,Clause 1}}
+      {{<<Clause2>>,Clause 2}}
+      symbol:[Clause1]
+      symbol:[Clause1,word]
+      symbol:[Clause 2]
+      symbol:[Clause 2,word]
+      {{<<Clause2>>,word}}
+      {{<<Clause2>>,word,term}}
+      {{<<Clause2>>,word,term,xref}}
+      {{<<Clause2>>,word,term,xref,option="noital,noref"}}
+      {{<<Clause2>>,word,term,xref,option="ital,ref"}}
+      == Terms and definitions
+      === Clause1
+      == Symbols and Abbreviated Terms
+      Clause1:: A
+      [[Clause2]]Clause 2:: C
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+       <preface>
+                 <foreword id='_' obligation='informative'>
+                   <title>Foreword</title>
+                   <p id='_'>
+                                  <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>Clause1</renderterm>
+                 <xref target='term-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>Clause 1</renderterm>
+                 <xref target='term-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 2</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 1</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 2</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>Clause1</renderterm>
+                 <xref target='symbol-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>word</renderterm>
+                 <xref target='symbol-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 2</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>word</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>word</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>term</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>term</renderterm>
+                 <xref target='Clause2'>xref</xref>
+               </concept>
+                <concept ital='false' ref='false'>
+                  <refterm>word</refterm>
+                  <renderterm>term</renderterm>
+                  <xref target='Clause2'>xref</xref>
+                </concept>
+                <concept ital='true' ref='true'>
+                 <refterm>word</refterm>
+                 <renderterm>term</renderterm>
+                 <xref target='Clause2'>xref</xref>
+               </concept>
+                   </p>
+                 </foreword>
+               </preface>
+               <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-clause1'>
+                     <preferred>Clause1</preferred>
+                   </term>
+                 </terms>
+                 <definitions id='_' obligation='normative'>
+                   <title>Symbols and abbreviated terms</title>
+                   <dl id='_'>
+                     <dt id="symbol-clause1">Clause1</dt>
+                     <dd>
+                       <p id='_'>A</p>
+                     </dd>
+                     <dt id='Clause2'>Clause 2</dt>
+                     <dd>
+                       <p id='_'>C</p>
+                     </dd>
+                   </dl>
+                 </definitions>
+               </sections>
+             </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
   it "processes the concept macros with xrefs" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -510,6 +663,75 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
+  it "processes the concept macros with disambiguation for math symbols" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [[clause1]]
+      == Symbols and Abbreviated Terms
+      stem:[|~ x ~|]:: A function that returns the smallest integer greater than or equal to stem:[x]; also known as the _ceiling_ function.
+      stem:[|__ x __|]:: A function that returns the largest integer less than or equal to stem:[x]; also known as the _floor_ function.
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+            <sections>
+        <definitions id='clause1' obligation='normative'>
+          <title>Symbols and abbreviated terms</title>
+          <dl id='_'>
+            <dt id='symbol-_-_x_-'>
+              <stem type='MathML'>
+                <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                  <mo>&#8970;</mo>
+                  <mi>x</mi>
+                  <mo>&#8971;</mo>
+                </math>
+              </stem>
+            </dt>
+            <dd>
+              <p id='_'>
+                A function that returns the largest integer less than or equal to
+                <stem type='MathML'>
+                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                    <mi>x</mi>
+                  </math>
+                </stem>
+                ; also known as the
+                <em>floor</em>
+                 function.
+              </p>
+            </dd>
+            <dt id='symbol-_-_x_--1'>
+              <stem type='MathML'>
+                <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                  <mo>&#8968;</mo>
+                  <mi>x</mi>
+                  <mo>&#8969;</mo>
+                </math>
+              </stem>
+            </dt>
+            <dd>
+              <p id='_'>
+                A function that returns the smallest integer greater than or equal
+                to
+                <stem type='MathML'>
+                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                    <mi>x</mi>
+                  </math>
+                </stem>
+                ; also known as the
+                <em>ceiling</em>
+                 function.
+              </p>
+            </dd>
+          </dl>
+        </definitions>
+      </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
   it "processes the TODO custom admonition" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -813,7 +1035,7 @@ RSpec.describe Asciidoctor::Standoc do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
-      [form,id=N0,name=N1,action="/action_page.php"]
+      [form,id=N0,name=N1,action="/action_page.php",class="checkboxes"]
       --
       label:fname[First name:] +
       input:text[id=fname,name=fname] +
@@ -851,7 +1073,7 @@ RSpec.describe Asciidoctor::Standoc do
     output = <<~OUTPUT
         #{BLANK_HDR}
         <sections>
-        <form id='_' name='N1' action='/action_page.php'>
+        <form id='_' name='N1' action='/action_page.php' class="checkboxes">
         <p id='_'>
           <label for='fname'>First name:</label>
           <br/>
@@ -909,6 +1131,105 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
+  it "processes ToC form macros" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [[clause1]]
+      == Clause 1
+      [[clause1A]]
+      === Clause 1A
+      [[clause1Aa]]
+      ==== Clause 1Aa
+      [[clause1Ab]]
+      ==== Clause 1Ab
+      [[clause1B]]
+      === Clause 1B
+      [[clause1Ba]]
+      ==== Clause 1Ba
+      [[clause2]]
+      == Clause 2
+      And introducing:
+      toc:["//clause[@id = 'clause1'\\]/clause/title","//clause[@id = 'clause1'\\]/clause/clause/title:2"]
+      toc:["//clause[@id = 'clause1'\\]/clause/title"]
+    INPUT
+    output = <<~OUTPUT
+                  #{BLANK_HDR}
+                  <sections>
+              <clause id='clause1' inline-header='false' obligation='normative'>
+                <title>Clause 1</title>
+                <clause id='clause1A' inline-header='false' obligation='normative'>
+                  <title>Clause 1A</title>
+                  <clause id='clause1Aa' inline-header='false' obligation='normative'>
+                    <title>Clause 1Aa</title>
+                  </clause>
+                  <clause id='clause1Ab' inline-header='false' obligation='normative'>
+                    <title>Clause 1Ab</title>
+                  </clause>
+                </clause>
+                <clause id='clause1B' inline-header='false' obligation='normative'>
+                  <title>Clause 1B</title>
+                  <clause id='clause1Ba' inline-header='false' obligation='normative'>
+                    <title>Clause 1Ba</title>
+                  </clause>
+                </clause>
+              </clause>
+              <clause id='clause2' inline-header='false' obligation='normative'>
+                <title>Clause 2</title>
+                <p id='_'>And introducing: </p>
+      <toc>
+        <ul id='_'>
+          <li>
+            <xref target='clause1A'>Clause 1A</xref>
+          </li>
+          <li>
+            <ul id='_'>
+              <li>
+                <xref target='clause1Aa'>Clause 1Aa</xref>
+              </li>
+              <li>
+                <xref target='clause1Ab'>Clause 1Ab</xref>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <xref target='clause1B'>Clause 1B</xref>
+          </li>
+          <li>
+            <ul id='_'>
+              <li>
+                <xref target='clause1Ba'>Clause 1Ba</xref>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </toc>
+      <toc>
+        <ul id='_'>
+          <li>
+            <xref target='clause1A'>Clause 1A</xref>
+          </li>
+          <li>
+            <xref target='clause1B'>Clause 1B</xref>
+          </li>
+        </ul>
+      </toc>
+              </clause>
+            </sections>
+                  </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
   describe "term inline macros" do
     subject(:convert) do
       xmlpp(
@@ -1139,79 +1460,79 @@ RSpec.describe Asciidoctor::Standoc do
       end
       let(:output) do
         <<~XML
-          #{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-name-identity'>
-               <preferred>name identity</preferred>
-             </term>
-             <term id='name-check'>
-               <preferred>name check</preferred>
-               <definition>
-                 <p id='_'>paragraph</p>
-                 <p id='_'>
-                   <concept>
-                     <refterm>name check</refterm>
-                     <renderterm>name check</renderterm>
-                     <xref target='name-check'/>
-                   </concept>
-                    is a term
-                 </p>
-                 <p id='_'>
-                   <concept>
-                     <refterm>name identity</refterm>
-                     <renderterm>name identity</renderterm>
-                     <xref target='term-name-identity'/>
-                   </concept>
-                    is a term
-                 </p>
-                 <p id='_'>
-                   Moreover,
-                   <concept>
-                     <strong>
-                       term
-                       <tt>missing</tt>
-                        not resolved via ID
-                       <tt>missing</tt>
-                     </strong>
-                   </concept>
-                    is a term
-                 </p>
-                 <p id='_'>
-                   <concept>
-                     <refterm>name check</refterm>
-                     <renderterm>name check</renderterm>
-                     <xref target='name-check'/>
-                   </concept>
-                    is a term
-                 </p>
-                 <p id='_'>
-                   <concept>
-                     <refterm>name identity</refterm>
-                     <renderterm>name identity</renderterm>
-                     <xref target='term-name-identity'/>
-                   </concept>
-                    is a term
-                 </p>
-                 <p id='_'>
-                   Moreover,
-                   <concept>
-                     <strong>
-                       term
-                       <tt>missing</tt>
-                        not resolved via ID
-                       <tt>missing</tt>
-                     </strong>
-                   </concept>
-                    is a term
-                 </p>
-               </definition>
-             </term>
-           </terms>
-         </sections>
-       </standard-document>
+             #{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-name-identity'>
+                  <preferred>name identity</preferred>
+                </term>
+                <term id='name-check'>
+                  <preferred>name check</preferred>
+                  <definition>
+                    <p id='_'>paragraph</p>
+                    <p id='_'>
+                      <concept>
+                        <refterm>name check</refterm>
+                        <renderterm>name check</renderterm>
+                        <xref target='name-check'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      <concept>
+                        <refterm>name identity</refterm>
+                        <renderterm>name identity</renderterm>
+                        <xref target='term-name-identity'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      Moreover,
+                      <concept>
+                        <strong>
+                          term
+                          <tt>missing</tt>
+                           not resolved via ID
+                          <tt>missing</tt>
+                        </strong>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      <concept>
+                        <refterm>name check</refterm>
+                        <renderterm>name check</renderterm>
+                        <xref target='name-check'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      <concept>
+                        <refterm>name identity</refterm>
+                        <renderterm>name identity</renderterm>
+                        <xref target='term-name-identity'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      Moreover,
+                      <concept>
+                        <strong>
+                          term
+                          <tt>missing</tt>
+                           not resolved via ID
+                          <tt>missing</tt>
+                        </strong>
+                      </concept>
+                       is a term
+                    </p>
+                  </definition>
+                </term>
+              </terms>
+            </sections>
+          </standard-document>
         XML
       end