RubyGems - isodoc - Versions diffs - 1.3.0 → 1.5.0 - Mend

isodoc 1.3.0 → 1.5.0

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

checksums.yaml +4 -4
data/.github/workflows/rake.yml +14 -0
data/isodoc.gemspec +2 -2
data/lib/isodoc-yaml/i18n-en.yaml +55 -0
data/lib/isodoc-yaml/i18n-fr.yaml +56 -0
data/lib/isodoc/convert.rb +2 -1
data/lib/isodoc/function/inline_simple.rb +10 -1
data/lib/isodoc/function/section.rb +1 -1
data/lib/isodoc/function/table.rb +10 -0
data/lib/isodoc/function/to_word_html.rb +4 -2
data/lib/isodoc/function/utils.rb +4 -4
data/lib/isodoc/gem_tasks.rb +4 -0
data/lib/isodoc/html_function/html.rb +7 -0
data/lib/isodoc/html_function/mathvariant_to_plain.rb +82 -0
data/lib/isodoc/html_function/postprocess.rb +32 -19
data/lib/isodoc/metadata_contributor.rb +4 -3
data/lib/isodoc/presentation_function/inline.rb +5 -1
data/lib/isodoc/presentation_function/section.rb +9 -0
data/lib/isodoc/presentation_xml_convert.rb +2 -0
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_function/inline.rb +2 -2
data/lib/isodoc/word_function/postprocess.rb +38 -80
data/lib/isodoc/word_function/postprocess_cover.rb +55 -0
data/lib/isodoc/word_function/table.rb +10 -0
data/lib/isodoc/xref.rb +1 -0
data/lib/isodoc/xref/xref_counter.rb +44 -12
data/lib/isodoc/xref/xref_gen.rb +18 -0
data/lib/isodoc/xref/xref_sect_gen.rb +34 -27
data/spec/isodoc/blocks_spec.rb +26 -73
data/spec/isodoc/cleanup_spec.rb +0 -1
data/spec/isodoc/inline_spec.rb +14 -14
data/spec/isodoc/metadata_spec.rb +3 -1
data/spec/isodoc/postproc_spec.rb +441 -3
data/spec/isodoc/presentation_xml_spec.rb +5 -5
data/spec/isodoc/table_spec.rb +28 -0
data/spec/isodoc/xref_spec.rb +455 -2
metadata +9 -8

data/spec/isodoc/presentation_xml_spec.rb CHANGED

@@ -37,7 +37,7 @@ it "localises numbers in MathML" do
   <preface>
     <p>
-      <stem type='MathML'>30,000</stem>
+      30,000
       <stem type='MathML'>
         <math xmlns='http://www.w3.org/1998/Math/MathML'>
           <mi>P</mi>
@@ -248,7 +248,7 @@ end
           <preface>
             <p>
-              <stem type='MathML'>30,000</stem>
+              30,000
               <stem type='MathML'>
                 <math xmlns='http://www.w3.org/1998/Math/MathML'>
                   <mi>P</mi>
@@ -382,7 +382,7 @@ it "localises numbers in MathML in French" do
         <language>fr</language>
         </bibdata>
         <preface>
-        <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
+        <p><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math>
         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
         </preface>
    </iso-standard>
@@ -395,7 +395,7 @@ it "localises numbers in MathML in French" do
   <preface>
     <p>
-      <stem type='MathML'>30&#x202F;000</stem>
+      30&#x202F;000
       <stem type='MathML'>
         <math xmlns='http://www.w3.org/1998/Math/MathML'>
           <mi>P</mi>
@@ -506,7 +506,7 @@ it "customises localisation of numbers" do
          <preface>
            <p>
-             <stem type='MathML'>30'000</stem>
+             30'000
              <stem type='MathML'>
                <math xmlns='http://www.w3.org/1998/Math/MathML'>
                  <mi>P</mi>

data/spec/isodoc/table_spec.rb CHANGED

@@ -8,6 +8,13 @@ RSpec.describe IsoDoc do
     <foreword>
       <table id="tableD-1" alt="tool tip" summary="long desc" width="70%" keep-with-next="true" keep-lines-together="true">
   <name>Repeatability and reproducibility of <em>husked</em> rice yield<fn reference="1"><p>X</p></fn></name>
+  <colgroup>
+  <col width="30%"/>
+  <col width="20%"/>
+  <col width="20%"/>
+  <col width="20%"/>
+  <col width="10%"/>
+  </colgroup>
   <thead>
     <tr>
       <td rowspan="2" align="left">Description</td>
@@ -77,6 +84,13 @@ RSpec.describe IsoDoc do
                    <p>X</p>
                  </fn>
                </name>
+                <colgroup>
+   <col width='30%'/>
+   <col width='20%'/>
+   <col width='20%'/>
+   <col width='20%'/>
+   <col width='10%'/>
+ </colgroup>
                <thead>
                  <tr>
                    <td rowspan='2' align='left'>Description</td>
@@ -165,6 +179,13 @@ html = <<~OUTPUT
                <caption>
                <span style="display:none">long desc</span>
                </caption>
+                <colgroup>
+   <col style='width: 30%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 10%;'/>
+ </colgroup>
                  <thead>
                    <tr>
                      <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;" scope="col">Description</td>
@@ -259,6 +280,13 @@ html = <<~OUTPUT
                </p>
                <div align='center' class='table_container'>
                  <table id='tableD-1' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;page-break-after: avoid;page-break-inside: avoid;' title='tool tip' summary='long desc' width='70%'>
+                 <colgroup>
+  <col width='30%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='10%'/>
+</colgroup>
                    <thead>
                      <tr>
                        <td rowspan='2' align='left' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>Description</td>

data/spec/isodoc/xref_spec.rb CHANGED

@@ -2547,6 +2547,151 @@ OUTPUT
     OUTPUT
   end
+  it "cross-references bookmarks" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N"/>
+    <xref target="note1"/>
+    <xref target="note2"/>
+    <xref target="AN"/>
+    <xref target="Anote1"/>
+    <xref target="Anote2"/>
+    </p>
+    </foreword>
+    <introduction id="intro">
+    <p id="N01">
+  <bookmark id="N1"/>
+</p>
+  <clause id="xyz"><title>Preparatory</title>
+     <p id="N02" type="arabic">
+  <bookmark id="N2"/>
+</p>
+</clause>
+    </introduction>
+    </preface>
+    <sections>
+    <clause id="scope" type="scope"><title>Scope</title>
+    <p id="N0" type="roman">
+  <bookmark id="N"/>
+</p>
+    </clause>
+    <terms id="terms"/>
+    <clause id="widgets"><title>Widgets</title>
+    <clause id="widgets1">
+    <p id="note1l" type="alphabet">
+  <bookmark id="note1"/>
+</p>
+    <p id="note2l" type="roman_upper">
+  <bookmark id="note2"/>
+</p>
+    </clause>
+    </clause>
+    </sections>
+    <annex id="annex1">
+    <clause id="annex1a">
+    <p id="ANl" type="alphabet_upper">
+  <bookmark id="AN"/>
+</p>
+    </clause>
+    <clause id="annex1b">
+    <p id="Anote1l" type="roman" start="4">
+  <bookmark id="Anote1"/>
+</p>
+    <p id="Anote2l">
+  <bookmark id="Anote2"/>
+</p>
+    </clause>
+    </annex>
+    </iso-standard>
+    INPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword>
+             <p>
+               <xref target='N1'>Introduction</xref>
+               <xref target='N2'>Preparatory</xref>
+               <xref target='N'>Clause 1</xref>
+               <xref target='note1'>Clause 3.1</xref>
+               <xref target='note2'>Clause 3.1</xref>
+               <xref target='AN'>Annex A.1</xref>
+               <xref target='Anote1'>Annex A.2</xref>
+               <xref target='Anote2'>Annex A.2</xref>
+             </p>
+           </foreword>
+           <introduction id='intro'>
+             <p id='N01'>
+               <bookmark id='N1'/>
+             </p>
+             <clause id='xyz'>
+               <title depth='2'>Preparatory</title>
+               <p id='N02' type='arabic'>
+                 <bookmark id='N2'/>
+               </p>
+             </clause>
+           </introduction>
+         </preface>
+         <sections>
+           <clause id='scope' type='scope'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Scope
+             </title>
+             <p id='N0' type='roman'>
+               <bookmark id='N'/>
+             </p>
+           </clause>
+           <terms id='terms'>
+             <title>2.</title>
+           </terms>
+           <clause id='widgets'>
+             <title depth='1'>
+               3.
+               <tab/>
+               Widgets
+             </title>
+             <clause id='widgets1'>
+               <title>3.1.</title>
+               <p id='note1l' type='alphabet'>
+                 <bookmark id='note1'/>
+               </p>
+               <p id='note2l' type='roman_upper'>
+                 <bookmark id='note2'/>
+               </p>
+             </clause>
+           </clause>
+         </sections>
+         <annex id='annex1'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (informative)
+           </title>
+           <clause id='annex1a'>
+             <title>A.1.</title>
+             <p id='ANl' type='alphabet_upper'>
+               <bookmark id='AN'/>
+             </p>
+           </clause>
+           <clause id='annex1b'>
+             <title>A.2.</title>
+             <p id='Anote1l' type='roman' start='4'>
+               <bookmark id='Anote1'/>
+             </p>
+             <p id='Anote2l'>
+               <bookmark id='Anote2'/>
+             </p>
+           </clause>
+         </annex>
+       </iso-standard>
+OUTPUT
+end
    it "realises subsequences" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -2665,6 +2810,31 @@ INPUT
     <xref target="N12"/>
     <xref target="N13"/>
     </p>
+    <p>
+    <xref target="S1"/>
+    <xref target="S2"/>
+    <xref target="S3"/>
+    <xref target="S4"/>
+    <xref target="S12"/>
+    <xref target="S13"/>
+    <xref target="S14"/>
+    <xref target="S15"/>
+    <xref target="S16"/>
+    <xref target="S17"/>
+    <xref target="S18"/>
+    <xref target="S19"/>
+    <xref target="S20"/>
+    <xref target="S21"/>
+    <xref target="S22"/>
+    <xref target="S23"/>
+    <xref target="S24"/>
+    <xref target="S25"/>
+    <xref target="S26"/>
+    <xref target="S27"/>
+    <xref target="S28"/>
+    <xref target="S29"/>
+    <xref target="S30"/>
+    </p>
     </foreword>
         <introduction id="intro">
         <figure id="N1"> <name>Split-it-right sample divider</name>
@@ -2707,6 +2877,83 @@ INPUT
            <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
         </figure>
   </introduction>
+  </preface>
+  <sections>
+  <clause id='S1' number='1bis' type='scope' inline-header='false' obligation='normative'>
+             <title>Scope</title>
+             <p id='_'>Text</p>
+           </clause>
+           <terms id='S3' number='3bis' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <term id='S4' number='4bis'>
+               <preferred>Term1</preferred>
+             </term>
+           </terms>
+           <definitions id='S12' number='12bis' type='abbreviated_terms' obligation='normative'>
+             <title>Abbreviated terms</title>
+           </definitions>
+           <clause id='S13' number='13bis' inline-header='false' obligation='normative'>
+             <title>Clause 4</title>
+             <clause id='S14' number='14bis' inline-header='false' obligation='normative'>
+               <title>Introduction</title>
+             </clause>
+             <clause id='S15' inline-header='false' obligation='normative'>
+               <title>Clause A</title>
+             </clause>
+             <clause id='S16' inline-header='false' obligation='normative'>
+               <title>Clause B</title>
+             </clause>
+             <clause id='S17' number='0' inline-header='false' obligation='normative'>
+               <title>Clause C</title>
+             </clause>
+             <clause id='S18' inline-header='false' obligation='normative'>
+               <title>Clause D</title>
+             </clause>
+             <clause id='S19' inline-header='false' obligation='normative'>
+               <title>Clause E</title>
+             </clause>
+             <clause id='S20' number='a' inline-header='false' obligation='normative'>
+               <title>Clause F</title>
+             </clause>
+             <clause id='S21' inline-header='false' obligation='normative'>
+               <title>Clause G</title>
+             </clause>
+             <clause id='S22' number='B' inline-header='false' obligation='normative'>
+               <title>Clause H</title>
+             </clause>
+             <clause id='S23' inline-header='false' obligation='normative'>
+               <title>Clause I</title>
+             </clause>
+           </clause>
+           <clause id='S24' number='16bis' inline-header='false' obligation='normative'>
+             <title>Terms and Definitions</title>
+           </clause>
+         </sections>
+         <annex id='S25' obligation='normative'>
+         <title>First Annex</title>
+         </annex>
+         <annex id='S26' number='17bis' inline-header='false' obligation='normative'>
+           <title>Annex</title>
+           <clause id='S27' number='18bis' inline-header='false' obligation='normative'>
+             <title>Annex A.1</title>
+           </clause>
+         </annex>
+         <annex id='S28' inline-header='false' obligation='normative'>
+         <title>Another Annex</title>
+         </annex>
+         <bibliography>
+           <references id='S2' number='2bis' normative='true' obligation='informative'>
+             <title>Normative references</title>
+             <p id='_'>There are no normative references in this document.</p>
+           </references>
+           <clause id='S29' number='19bis' obligation='informative'>
+             <title>Bibliography</title>
+             <references id='S30' number='20bis' normative='false' obligation='informative'>
+               <title>Bibliography Subsection</title>
+             </references>
+           </clause>
+         </bibliography>
   </iso-standard>
 INPUT
 <?xml version='1.0'?>
@@ -2716,7 +2963,7 @@ INPUT
       <p>
         <xref target='N1'>Figure 1</xref>
 <xref target='N2'>Figure A</xref>
-<xref target='N3'>Figure 2</xref>
+<xref target='N3'>Figure B</xref>
 <xref target='N4'>Figure 7</xref>
 <xref target='N5'>Figure 8</xref>
 <xref target='N6'>Figure 9a</xref>
@@ -2728,6 +2975,31 @@ INPUT
 <xref target='N12'>Figure A.2</xref>
 <xref target='N13'>Figure 100</xref>
       </p>
+       <p>
+   <xref target='S1'>Clause 1bis</xref>
+   <xref target='S2'>Clause 2bis</xref>
+   <xref target='S3'>Clause 3bis</xref>
+   <xref target='S4'>Clause 3bis.4bis</xref>
+   <xref target='S12'>Clause 12bis</xref>
+   <xref target='S13'>Clause 13bis</xref>
+   <xref target='S14'>Clause 13bis.14bis</xref>
+   <xref target='S15'>Clause 13bis.14bit</xref>
+   <xref target='S16'>Clause 13bis.14biu</xref>
+   <xref target='S17'>Clause 13bis.0</xref>
+   <xref target='S18'>Clause 13bis.1</xref>
+   <xref target='S19'>Clause 13bis.2</xref>
+   <xref target='S20'>Clause 13bis.a</xref>
+   <xref target='S21'>Clause 13bis.b</xref>
+   <xref target='S22'>Clause 13bis.B</xref>
+   <xref target='S23'>Clause 13bis.C</xref>
+   <xref target='S24'>Clause 16bis</xref>
+   <xref target='S25'>Annex A</xref>
+   <xref target='S26'>Annex 17bis</xref>
+   <xref target='S27'>Annex 17bis.18bis</xref>
+   <xref target='S28'>Annex 17bit</xref>
+   <xref target='S29'>Bibliography</xref>
+   <xref target='S30'>Bibliography Subsection</xref>
+ </p>
     </foreword>
     <introduction id='intro'>
       <figure id='N1'>
@@ -2739,7 +3011,7 @@ INPUT
         <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
       </figure>
       <figure id='N3'>
-        <name>Figure 2&#xA0;&#x2014; Split-it-right sample divider</name>
+        <name>Figure B&#xA0;&#x2014; Split-it-right sample divider</name>
         <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
       </figure>
       <figure id='N4' number='7'>
@@ -2785,8 +3057,189 @@ INPUT
     </introduction>
   </preface>
+  <sections>
+           <clause id='S1' number='1bis' type='scope' inline-header='false' obligation='normative'>
+             <title depth='1'>
+               1bis.
+               <tab/>
+               Scope
+             </title>
+             <p id='_'>Text</p>
+           </clause>
+           <terms id='S3' number='3bis' obligation='normative'>
+             <title depth='1'>
+               3bis.
+               <tab/>
+               Terms and definitions
+             </title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <term id='S4' number='4bis'>
+               <name>3bis.4bis.</name>
+               <preferred>Term1</preferred>
+             </term>
+           </terms>
+           <definitions id='S12' number='12bis' type='abbreviated_terms' obligation='normative'>
+             <title depth='1'>
+               12bis.
+               <tab/>
+               Abbreviated terms
+             </title>
+           </definitions>
+           <clause id='S13' number='13bis' inline-header='false' obligation='normative'>
+             <title depth='1'>
+               13bis.
+               <tab/>
+               Clause 4
+             </title>
+             <clause id='S14' number='14bis' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.14bis.
+                 <tab/>
+                 Introduction
+               </title>
+             </clause>
+             <clause id='S15' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.14bit.
+                 <tab/>
+                 Clause A
+               </title>
+             </clause>
+             <clause id='S16' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.14biu.
+                 <tab/>
+                 Clause B
+               </title>
+             </clause>
+             <clause id='S17' number='0' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.0.
+                 <tab/>
+                 Clause C
+               </title>
+             </clause>
+             <clause id='S18' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.1.
+                 <tab/>
+                 Clause D
+               </title>
+             </clause>
+             <clause id='S19' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.2.
+                 <tab/>
+                 Clause E
+               </title>
+             </clause>
+             <clause id='S20' number='a' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.a.
+                 <tab/>
+                 Clause F
+               </title>
+             </clause>
+             <clause id='S21' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.b.
+                 <tab/>
+                 Clause G
+               </title>
+             </clause>
+             <clause id='S22' number='B' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.B.
+                 <tab/>
+                 Clause H
+               </title>
+             </clause>
+             <clause id='S23' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.C.
+                 <tab/>
+                 Clause I
+               </title>
+             </clause>
+           </clause>
+           <clause id='S24' number='16bis' inline-header='false' obligation='normative'>
+             <title depth='1'>
+               16bis.
+               <tab/>
+               Terms and Definitions
+             </title>
+           </clause>
+         </sections>
+         <annex id='S25' obligation='normative'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>First Annex</strong>
+           </title>
+         </annex>
+         <annex id='S26' number='17bis' inline-header='false' obligation='normative'>
+           <title>
+             <strong>Annex 17bis</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Annex</strong>
+           </title>
+           <clause id='S27' number='18bis' inline-header='false' obligation='normative'>
+             <title depth='2'>
+               17bis.18bis.
+               <tab/>
+               Annex A.1
+             </title>
+           </clause>
+         </annex>
+         <annex id='S28' inline-header='false' obligation='normative'>
+           <title>
+             <strong>Annex 17bit</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Another Annex</strong>
+           </title>
+         </annex>
+         <bibliography>
+           <references id='S2' number='2bis' normative='true' obligation='informative'>
+             <title depth='1'>
+               2bis.
+               <tab/>
+               Normative references
+             </title>
+             <p id='_'>There are no normative references in this document.</p>
+           </references>
+           <clause id='S29' number='19bis' obligation='informative'>
+             <title depth='1'>Bibliography</title>
+             <references id='S30' number='20bis' normative='false' obligation='informative'>
+               <title depth='2'>Bibliography Subsection</title>
+             </references>
+           </clause>
+         </bibliography>
 </iso-standard>
 OUTPUT
       end
+ it "realises roman counter for xrefs" do
+   a = IsoDoc::XrefGen::Counter.new(0, numerals: :roman)
+   a.increment({})
+   expect(a.print).to eq "I"
+   a.increment({})
+   expect(a.print).to eq "II"
+   a.increment({})
+   expect(a.print).to eq "III"
+   a.increment({})
+   expect(a.print).to eq "IV"
+   a.increment({})
+   expect(a.print).to eq "V"
+    end
 end