metanorma-iso 2.1.1 → 2.1.2

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.1".freeze
+    VERSION = "2.1.2".freeze
   end
 end

data/spec/isodoc/amd_spec.rb

@@ -745,11 +745,7 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
+      {:agency=>"ISO",
       :createddate=>"2016-05-01",
       :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
@@ -779,13 +775,8 @@ RSpec.describe IsoDoc do
       :edition=>"2",
       :editorialgroup=>["A 1", "B 2", "C 3"],
       :ics=>"1, 2, 3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"en",
-      :obsoleteddate=>"XXX",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization",
-      :receiveddate=>"XXX",
       :revdate=>"2000-01-01",
       :revdate_monthyear=>"January 2000",
       :sc=>"B 2",
@@ -795,13 +786,9 @@ RSpec.describe IsoDoc do
       :stage_int=>10,
       :stageabbr=>"NWIP",
       :statusabbr=>"PreNWIP3",
+      :substage_int=>"20",
       :tc=>"A 1",
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>true,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"C 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input), nil)))
@@ -910,11 +897,7 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
+      {:agency=>"ISO",
       :createddate=>"2016-05-01",
       :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
@@ -944,13 +927,8 @@ RSpec.describe IsoDoc do
       :edition=>"2",
       :editorialgroup=>["A 1", "B 2", "C 3"],
       :ics=>"1, 2, 3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"fr",
-      :obsoleteddate=>"XXX",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization",
-      :receiveddate=>"XXX",
       :revdate=>"2000-01-01",
       :revdate_monthyear=>"Janvier 2000",
       :sc=>"B 2",
@@ -960,13 +938,9 @@ RSpec.describe IsoDoc do
       :stage_int=>10,
       :stageabbr=>"NWIP",
       :statusabbr=>"PreNWIP3",
+      :substage_int=>"20",
       :tc=>"A 1",
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>true,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"C 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input), nil)))

data/spec/isodoc/blocks_spec.rb

@@ -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'>
+                 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>
+                    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> 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