RubyGems - metanorma-iso - Versions diffs - 2.1.1 → 2.1.4 - Mend

metanorma-iso 2.1.1 → 2.1.4

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

checksums.yaml +4 -4
data/lib/html2doc/lists.rb +145 -10
data/lib/isodoc/iso/base_convert.rb +10 -0
data/lib/isodoc/iso/html/html_iso_titlepage.html +2 -0
data/lib/isodoc/iso/html/isodoc-dis.css +173 -257
data/lib/isodoc/iso/html/isodoc-dis.scss +173 -249
data/lib/isodoc/iso/html/isodoc.css +38 -13
data/lib/isodoc/iso/html/isodoc.scss +38 -12
data/lib/isodoc/iso/html/style-human.css +14 -1
data/lib/isodoc/iso/html/style-human.scss +10 -1
data/lib/isodoc/iso/html/style-iso.css +35 -23
data/lib/isodoc/iso/html/style-iso.scss +31 -23
data/lib/isodoc/iso/html/word_iso_intro-dis.html +1 -6
data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +24 -13
data/lib/isodoc/iso/html/word_iso_titlepage-prf.html +58 -0
data/lib/isodoc/iso/html/word_iso_titlepage.html +6 -2
data/lib/isodoc/iso/html_convert.rb +5 -0
data/lib/isodoc/iso/i18n-en.yaml +32 -4
data/lib/isodoc/iso/i18n-fr.yaml +29 -3
data/lib/isodoc/iso/i18n-ru.yaml +32 -4
data/lib/isodoc/iso/i18n-zh-Hans.yaml +32 -3
data/lib/isodoc/iso/i18n.rb +1 -1
data/lib/isodoc/iso/iso.amendment.xsl +750 -307
data/lib/isodoc/iso/iso.international-standard.xsl +750 -307
data/lib/isodoc/iso/metadata.rb +63 -63
data/lib/isodoc/iso/presentation_bibdata.rb +74 -0
data/lib/isodoc/iso/presentation_xml_convert.rb +15 -4
data/lib/isodoc/iso/presentation_xref.rb +8 -2
data/lib/isodoc/iso/sections.rb +1 -1
data/lib/isodoc/iso/word_cleanup.rb +3 -0
data/lib/isodoc/iso/word_convert.rb +6 -3
data/lib/isodoc/iso/word_dis_cleanup.rb +243 -0
data/lib/isodoc/iso/word_dis_convert.rb +47 -108
data/lib/isodoc/iso/xref.rb +34 -6
data/lib/metanorma/iso/base.rb +14 -1
data/lib/metanorma/iso/biblio.rng +134 -39
data/lib/metanorma/iso/boilerplate-fr.xml +3 -0
data/lib/metanorma/iso/boilerplate-ru.xml +3 -0
data/lib/metanorma/iso/boilerplate.xml +3 -0
data/lib/metanorma/iso/cleanup.rb +53 -13
data/lib/metanorma/iso/front.rb +38 -6
data/lib/metanorma/iso/front_id.rb +2 -0
data/lib/metanorma/iso/isodoc.rng +32 -0
data/lib/metanorma/iso/isostandard.rng +32 -12
data/lib/metanorma/iso/validate_section.rb +0 -12
data/lib/metanorma/iso/version.rb +1 -1
data/spec/isodoc/amd_spec.rb +4 -30
data/spec/isodoc/blocks_spec.rb +499 -2
data/spec/isodoc/i18n_spec.rb +145 -80
data/spec/isodoc/iso_spec.rb +50 -169
data/spec/isodoc/metadata_spec.rb +223 -83
data/spec/isodoc/postproc_spec.rb +41 -5
data/spec/isodoc/section_spec.rb +9 -9
data/spec/isodoc/word_dis_spec.rb +1332 -146
data/spec/isodoc/xref_spec.rb +87 -13
data/spec/metanorma/amd_spec.rb +39 -23
data/spec/metanorma/base_spec.rb +174 -44
data/spec/metanorma/blocks_spec.rb +21 -0
data/spec/metanorma/cleanup_spec.rb +196 -196
data/spec/metanorma/lists_spec.rb +2 -2
data/spec/metanorma/section_spec.rb +2 -2
data/spec/metanorma/validate_spec.rb +8 -19
data/spec/spec_helper.rb +10 -7
data/spec/vcr_cassettes/withdrawn_iso.yml +30 -30
metadata +6 -8
data/docs/asciiiso-syntax.adoc +0 -307
data/docs/guidance.adoc +0 -487
data/docs/navigation.adoc +0 -23
data/docs/quickstart.adoc +0 -179
data/lib/isodoc/iso/presentation_inline.rb +0 -90

data/spec/isodoc/blocks_spec.rb CHANGED Viewed

@@ -1,6 +1,183 @@
 require "spec_helper"
 RSpec.describe IsoDoc do
+  it "processes examples" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface>
+          <foreword>
+            <example id="samplecode">
+              <name>Title</name>
+              <p>Hello</p>
+            </example>
+          </foreword>
+        </preface>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <?xml version='1.0'?>
+      <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
+        <preface>
+          <foreword displayorder="1">
+            <example id="samplecode">
+              <name>EXAMPLE — Title</name>
+              <p>Hello</p>
+            </example>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+            <br/>
+            <div>
+              <h1 class="ForewordTitle">Foreword</h1>
+              <div id="samplecode" class="example">
+                <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span>&#160; Hello</p>
+              </div>
+            </div>
+            <p class="zzSTDTitle1"/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    word = <<~OUTPUT
+          <body lang="EN-US" link="blue" vlink="#954F72">
+        <div class="WordSection1">
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection2">
+          <p>
+            <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+          </p>
+          <div>
+            <h1 class="ForewordTitle">Foreword</h1>
+            <div id="samplecode" class="example">
+              <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
+            </div>
+          </div>
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection3">
+          <p class="zzSTDTitle1"/>
+        </div>
+        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
+        <div class="colophon"/>
+      </body>
+    OUTPUT
+    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
+    expect(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
+    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
+    expect(xmlpp(output
+      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
+  end
+  it "processes sequences of examples" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface>
+          <foreword>
+            <example id="samplecode">
+              <quote>Hello</quote>
+            </example>
+            <example id="samplecode2">
+              <name>Title</name>
+              <p>Hello</p>
+            </example>
+          </foreword>
+        </preface>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <?xml version='1.0'?>
+      <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
+        <preface>
+          <foreword displayorder="1">
+            <example id="samplecode">
+              <name>EXAMPLE 1</name>
+              <quote>Hello</quote>
+            </example>
+            <example id="samplecode2">
+              <name>EXAMPLE 2 — Title</name>
+              <p>Hello</p>
+            </example>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+            <br/>
+            <div>
+              <h1 class="ForewordTitle">Foreword</h1>
+              <div id="samplecode" class="example">
+                <p><span class="example_label">EXAMPLE  1</span>&#160; </p>
+                 <div class="Quote">Hello</div>
+              </div>
+              <div id="samplecode2" class="example">
+                <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span>&#160; Hello</p>
+              </div>
+            </div>
+            <p class="zzSTDTitle1"/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    word = <<~OUTPUT
+          <body lang="EN-US" link="blue" vlink="#954F72">
+        <div class="WordSection1">
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection2">
+          <p>
+            <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+          </p>
+          <div>
+            <h1 class="ForewordTitle">Foreword</h1>
+            <div id="samplecode" class="example">
+              <p><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#160; </span></p>
+              <div class="Quote">Hello</div>
+            </div>
+            <div id="samplecode2" class="example">
+              <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
+            </div>
+          </div>
+          <p>&#160;</p>
+        </div>
+        <p>
+          <br clear="all" class="section"/>
+        </p>
+        <div class="WordSection3">
+          <p class="zzSTDTitle1"/>
+        </div>
+        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
+        <div class="colophon"/>
+      </body>
+    OUTPUT
+    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
+    expect(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
+    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
+    expect(xmlpp(output
+      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
+  end
   it "processes admonitions" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -105,6 +282,75 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(output)
   end
+  it "processes editorial notes" do
+    input = <<~INPUT
+       <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="editorial">
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f2">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f3">Para 2.</p>
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
+          <preface><foreword displayorder="1">
+          <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="editorial">
+                         <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>EDITORIAL NOTE —
+                 Only use paddy or parboiled rice for the
+                 determination of husked rice yield.
+               </p>
+        <p id="_e94663cc-2473-4ccc-9a72-983a74d989f3">Para 2.</p>
+      </admonition>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                   <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
+                 <p>EDITORIAL NOTE —
+                    Only use paddy or parboiled rice for the
+                   determination of husked rice yield.
+                 </p>
+                 <p id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
+               </div>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    word = <<~OUTPUT
+        <div class='WordSection2'>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='zzHelp'>
+          <p>EDITORIAL NOTE — Only use paddy or parboiled rice for the determination of husked rice yield. </p>
+          <p class='ForewordText' id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
+        </div>
+      </div>
+      <p> </p>
+      </div>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::Iso::WordConvert.new({})
+      .convert("test", presxml, true))
+      .at("//div[@class = 'WordSection2']").to_xml))
+      .to be_equivalent_to xmlpp(word)
+  end
   it "renders figures" do
     input = <<~INPUT
       <iso-standard xmlns='http://riboseinc.com/isoxml'>
@@ -618,8 +864,8 @@ RSpec.describe IsoDoc do
   end
   it "processes formulae with single definition list entry" do
-    output = IsoDoc::Iso::HtmlConvert.new({}).convert("test",
-                                                      <<~"INPUT", true)
+    output = IsoDoc::Iso::HtmlConvert.new({})
+.convert("test", <<~"INPUT", true)
                                                         <iso-standard xmlns="http://riboseinc.com/isoxml">
                                                           <preface>
                                                             <foreword>
@@ -674,4 +920,255 @@ RSpec.describe IsoDoc do
       </html>
     OUTPUT
   end
+  it "adds ordered list classes for HTML" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+        <ol>
+        <li><p>A</p></li>
+        <li><p>B</p></li>
+        <li><ol>
+        <li>C</li>
+        <li>D</li>
+        <li><ol>
+        <li>E</li>
+        <li>F</li>
+        <li><ol>
+        <li>G</li>
+        <li>H</li>
+        <li><ol>
+        <li>I</li>
+        <li>J</li>
+        <li><ol>
+        <li>K</li>
+        <li>L</li>
+        <li>M</li>
+        </ol></li>
+        <li>N</li>
+        </ol></li>
+        <li>O</li>
+        </ol></li>
+        <li>P</li>
+        </ol></li>
+        <li>Q</li>
+        </ol></li>
+        <li>R</li>
+        </ol>
+      </foreword></preface>
+      </iso-standard>
+    INPUT
+        presxml = <<~INPUT
+               <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword displayorder='1'>
+             <ol type='alphabet'>
+               <li>
+                 <p>A</p>
+               </li>
+               <li>
+                 <p>B</p>
+               </li>
+               <li>
+                 <ol type='arabic'>
+                   <li>C</li>
+                   <li>D</li>
+                   <li>
+                     <ol type='roman'>
+                       <li>E</li>
+                       <li>F</li>
+                       <li>
+                         <ol type='alphabet_upper'>
+                           <li>G</li>
+                           <li>H</li>
+                           <li>
+                             <ol type='roman_upper'>
+                               <li>I</li>
+                               <li>J</li>
+                               <li>
+                                 <ol type='alphabet'>
+                                   <li>K</li>
+                                   <li>L</li>
+                                   <li>M</li>
+                                 </ol>
+                               </li>
+                               <li>N</li>
+                             </ol>
+                           </li>
+                           <li>O</li>
+                         </ol>
+                       </li>
+                       <li>P</li>
+                     </ol>
+                   </li>
+                   <li>Q</li>
+                 </ol>
+               </li>
+               <li>R</li>
+             </ol>
+           </foreword>
+         </preface>
+       </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                    <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+                              <ol type='a' class='alphabet'>
+                 <li>
+                   <p>A</p>
+                 </li>
+                 <li>
+                   <p>B</p>
+                 </li>
+                 <li>
+                   <ol type='1' class='arabic'>
+                     <li>C</li>
+                     <li>D</li>
+                     <li>
+                       <ol type='i' class='roman'>
+                         <li>E</li>
+                         <li>F</li>
+                         <li>
+                           <ol type='A' class='alphabet_upper'>
+                             <li>G</li>
+                             <li>H</li>
+                             <li>
+                               <ol type='I' class='roman_upper'>
+                                 <li>I</li>
+                                 <li>J</li>
+                                 <li>
+                                   <ol type='a' class='alphabet'>
+                                     <li>K</li>
+                                     <li>L</li>
+                                     <li>M</li>
+                                   </ol>
+                                 </li>
+                                 <li>N</li>
+                               </ol>
+                             </li>
+                             <li>O</li>
+                           </ol>
+                         </li>
+                         <li>P</li>
+                       </ol>
+                     </li>
+                     <li>Q</li>
+                   </ol>
+                 </li>
+                 <li>R</li>
+               </ol>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
+  end
+  it "processes ordered lists with start" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+      <ol start="4">
+      <li>List</li>
+      </ol>
+      </foreword></preface>
+      </iso-standard>
+    INPUT
+    presxml = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type='presentation'>
+         <preface>
+           <foreword displayorder='1'>
+             <ol start='4' type='alphabet'>
+               <li>List</li>
+             </ol>
+           </foreword>
+         </preface>
+       </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                    <br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <ol type='a' start='4'  class='alphabet'>
+                 <li>List</li>
+               </ol>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    word = <<~OUTPUT
+      <div class='WordSection2'>
+        <p>
+          <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+        </p>
+        <div>
+          <h1 class='ForewordTitle'>Foreword</h1>
+          <ol type='a' start='4'>
+            <li>List</li>
+          </ol>
+        </div>
+        <p> </p>
+      </div>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
+    expect(xmlpp(Nokogiri::XML(IsoDoc::Iso::WordConvert.new({})
+      .convert("test", presxml, true))
+      .at("//div[@class = 'WordSection2']").to_xml))
+      .to be_equivalent_to xmlpp(word)
+  end
+  it "ignores intervening ul in numbering ol" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+      <ul>
+      <li>A</li>
+      <li>
+      <ol>
+      <li>List</li>
+      </ol>
+      </li>
+      </ul>
+      </foreword></preface>
+      </iso-standard>
+    INPUT
+    presxml = <<~INPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword displayorder='1'>
+             <ul>
+               <li>A</li>
+               <li>
+                 <ol type='alphabet'>
+                   <li>List</li>
+                 </ol>
+               </li>
+             </ul>
+           </foreword>
+         </preface>
+       </iso-standard>
+    INPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true)))
+      .to be_equivalent_to xmlpp(presxml)
+  end
 end