RubyGems - metanorma-standoc - Versions diffs - 1.10.4.1 → 1.10.8 - Mend

metanorma-standoc 1.10.4.1 → 1.10.8

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 (61) hide show

checksums.yaml +4 -4
data/README.adoc +19 -23
data/lib/asciidoctor/standoc/base.rb +11 -13
data/lib/asciidoctor/standoc/basicdoc.rng +21 -4
data/lib/asciidoctor/standoc/blocks.rb +27 -22
data/lib/asciidoctor/standoc/blocks_notes.rb +17 -22
data/lib/asciidoctor/standoc/cleanup.rb +38 -71
data/lib/asciidoctor/standoc/cleanup_block.rb +5 -70
data/lib/asciidoctor/standoc/cleanup_image.rb +6 -7
data/lib/asciidoctor/standoc/cleanup_inline.rb +27 -98
data/lib/asciidoctor/standoc/cleanup_maths.rb +113 -21
data/lib/asciidoctor/standoc/cleanup_ref.rb +5 -0
data/lib/asciidoctor/standoc/cleanup_reqt.rb +56 -18
data/lib/asciidoctor/standoc/cleanup_section.rb +1 -0
data/lib/asciidoctor/standoc/cleanup_section_names.rb +31 -14
data/lib/asciidoctor/standoc/cleanup_table.rb +68 -0
data/lib/asciidoctor/standoc/cleanup_terms.rb +1 -1
data/lib/asciidoctor/standoc/cleanup_text.rb +73 -0
data/lib/asciidoctor/standoc/cleanup_xref.rb +107 -0
data/lib/asciidoctor/standoc/converter.rb +13 -0
data/lib/asciidoctor/standoc/isodoc.rng +241 -61
data/lib/asciidoctor/standoc/lists.rb +15 -15
data/lib/asciidoctor/standoc/macros.rb +14 -43
data/lib/asciidoctor/standoc/macros_note.rb +45 -0
data/lib/asciidoctor/standoc/macros_terms.rb +33 -15
data/lib/asciidoctor/standoc/reqt.rb +2 -2
data/lib/asciidoctor/standoc/reqt.rng +23 -2
data/lib/asciidoctor/standoc/table.rb +22 -20
data/lib/asciidoctor/standoc/terms.rb +9 -1
data/lib/asciidoctor/standoc/validate.rb +23 -14
data/lib/asciidoctor/standoc/validate_section.rb +5 -2
data/lib/metanorma/standoc/version.rb +1 -1
data/metanorma-standoc.gemspec +1 -1
data/spec/asciidoctor/base_spec.rb +0 -33
data/spec/asciidoctor/blank_spec.rb +37 -0
data/spec/asciidoctor/blocks_spec.rb +151 -30
data/spec/asciidoctor/cleanup_blocks_spec.rb +1018 -0
data/spec/asciidoctor/cleanup_sections_spec.rb +207 -0
data/spec/asciidoctor/cleanup_spec.rb +193 -1078
data/spec/asciidoctor/inline_spec.rb +36 -0
data/spec/asciidoctor/isobib_cache_spec.rb +8 -8
data/spec/asciidoctor/lists_spec.rb +6 -6
data/spec/asciidoctor/macros_plantuml_spec.rb +1 -1
data/spec/asciidoctor/macros_spec.rb +41 -26
data/spec/asciidoctor/refs_dl_spec.rb +1 -1
data/spec/asciidoctor/refs_spec.rb +220 -444
data/spec/asciidoctor/section_spec.rb +1 -1
data/spec/asciidoctor/validate_spec.rb +51 -0
data/spec/assets/xref_error.adoc +1 -0
data/spec/fixtures/datamodel_description_sections_tree.xml +24 -24
data/spec/spec_helper.rb +5 -7
data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml +231 -143
data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml +152 -0
data/spec/vcr_cassettes/isobib_get_123.yml +52 -36
data/spec/vcr_cassettes/isobib_get_123_1.yml +103 -71
data/spec/vcr_cassettes/isobib_get_123_1_fr.yml +112 -80
data/spec/vcr_cassettes/isobib_get_123_2001.yml +50 -34
data/spec/vcr_cassettes/isobib_get_124.yml +51 -35
data/spec/vcr_cassettes/rfcbib_get_rfc8341.yml +16 -16
data/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml +70 -46
metadata +11 -4

data/spec/asciidoctor/cleanup_sections_spec.rb CHANGED Viewed

@@ -1588,4 +1588,211 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+  it "adds variant titles" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Clause
+      Text
+      === Subclause
+      [.variant-title,type=toc]
+      Clause _A_ stem:[x]
+      [.variant-title,type=sub]
+      "A" 'B'
+      Text
+      [appendix]
+      == Clause
+      [.variant-title,type=toc]
+      Clause _A_ stem:[y]
+      Text
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>Text</p>
+             <clause id='_' inline-header='false' obligation='normative'>
+               <title>Subclause</title>
+               <variant-title type='sub'>&#8220;A&#8221; &#8216;B&#8217;</variant-title>
+               <variant-title type='toc'>
+                 Clause
+                 <em>A</em>
+                 <stem type='MathML'>
+                   <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                     <mi>x</mi>
+                   </math>
+                 </stem>
+               </variant-title>
+               <p id='_'>Text</p>
+             </clause>
+           </clause>
+         </sections>
+         <annex id='_' inline-header='false' obligation='normative'>
+           <title>Clause</title>
+           <variant-title type='toc'>
+             Clause
+             <em>A</em>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <mi>y</mi>
+               </math>
+             </stem>
+           </variant-title>
+           <p id='_'>Text</p>
+         </annex>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+  it "processes TOC clause" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Clause
+      Text
+      [type=toc]
+      === Table of contents
+      Text at the start
+      ==== Toc 1
+      * <<cl2>>
+      ** <<a1>>
+      ==== Toc 2
+      * <<cl2,some text>>
+      ** <<a1,some more text>>
+      [[cl2]]
+      == Clause2
+      [.variant-title,type=toc]
+      Clause _A_ stem:[x]
+      [.variant-title,type=sub]
+      "A" 'B'
+      Text
+      [[a1]]
+      [appendix]
+      == Clause
+      [.variant-title,type=toc]
+      Clause _A_ stem:[y]
+      Text
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>Text</p>
+             <clause id='_' type='toc' inline-header='false' obligation='normative'>
+               <title>Table of contents</title>
+               <p id='_'>Text at the start</p>
+               <clause id='_' inline-header='false' obligation='normative'>
+                 <title>Toc 1</title>
+                 <toc>
+                   <ul id='_'>
+                     <li>
+                       <p id='_'>
+                         <xref target='cl2'>
+                           Clause
+                           <em>A</em>
+                           <stem type='MathML'>
+                             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                               <mi>x</mi>
+                             </math>
+                           </stem>
+                         </xref>
+                       </p>
+                       <ul id='_'>
+                         <li>
+                           <p id='_'>
+                             <xref target='a1'>
+                               Clause
+                               <em>A</em>
+                               <stem type='MathML'>
+                                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                                   <mi>y</mi>
+                                 </math>
+                               </stem>
+                             </xref>
+                           </p>
+                         </li>
+                       </ul>
+                     </li>
+                   </ul>
+                 </toc>
+               </clause>
+               <clause id='_' inline-header='false' obligation='normative'>
+                 <title>Toc 2</title>
+                 <toc>
+                   <ul id='_'>
+                     <li>
+                       <p id='_'>
+                         <xref target='cl2'>some text</xref>
+                       </p>
+                       <ul id='_'>
+                         <li>
+                           <p id='_'>
+                             <xref target='a1'>some more text</xref>
+                           </p>
+                         </li>
+                       </ul>
+                     </li>
+                   </ul>
+                 </toc>
+               </clause>
+             </clause>
+           </clause>
+           <clause id='cl2' inline-header='false' obligation='normative'>
+             <title>Clause2</title>
+             <variant-title type='sub'>&#8220;A&#8221; &#8216;B&#8217;</variant-title>
+             <variant-title type='toc'>
+               Clause
+               <em>A</em>
+               <stem type='MathML'>
+                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                   <mi>x</mi>
+                 </math>
+               </stem>
+             </variant-title>
+             <p id='_'>Text</p>
+           </clause>
+         </sections>
+         <annex id='a1' inline-header='false' obligation='normative'>
+           <title>Clause</title>
+           <variant-title type='toc'>
+             Clause
+             <em>A</em>
+             <stem type='MathML'>
+               <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                 <mi>y</mi>
+               </math>
+             </stem>
+           </variant-title>
+           <p id='_'>Text</p>
+         </annex>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 end