RubyGems - isodoc - Versions diffs - 0.7.0 → 0.7.1 - Mend

isodoc 0.7.0 → 0.7.1

Files changed (49) hide show

checksums.yaml +4 -4
data/Gemfile.lock +5 -5
data/README.adoc +34 -22
data/isodoc.gemspec +1 -1
data/lib/isodoc.rb +3 -1
data/lib/isodoc/blocks.rb +1 -1
data/lib/isodoc/cleanup.rb +1 -1
data/lib/isodoc/convert.rb +9 -8
data/lib/isodoc/{comments.rb → htmlconvert/comments.rb} +1 -1
data/lib/isodoc/htmlconvert/convert.rb +13 -0
data/lib/isodoc/{footnotes.rb → htmlconvert/footnotes.rb} +1 -1
data/lib/isodoc/{html.rb → htmlconvert/html.rb} +29 -4
data/lib/isodoc/i18n-en.yaml +5 -5
data/lib/isodoc/i18n.rb +6 -2
data/lib/isodoc/inline.rb +8 -8
data/lib/isodoc/iso/convert.rb +4 -0
data/lib/isodoc/iso/html/style-human.scss +3 -3
data/lib/isodoc/iso/html/style-iso.scss +2 -2
data/lib/isodoc/iso/html/wordstyle.scss +27 -0
data/lib/isodoc/iso/wordconvert.rb +5 -2
data/lib/isodoc/iso2wordhtml.rb +15 -16
data/lib/isodoc/lists.rb +1 -1
data/lib/isodoc/metadata.rb +66 -49
data/lib/isodoc/references.rb +21 -11
data/lib/isodoc/section.rb +3 -3
data/lib/isodoc/table.rb +1 -1
data/lib/isodoc/terms.rb +1 -1
data/lib/isodoc/utils.rb +20 -21
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/wordconvert/comments.rb +122 -117
data/lib/isodoc/wordconvert/convert.rb +5 -2
data/lib/isodoc/wordconvert/footnotes.rb +14 -1
data/lib/isodoc/wordconvert/postprocess.rb +7 -2
data/lib/isodoc/wordconvert/wordconvertmodule.rb +12 -1
data/lib/isodoc/xref_gen.rb +12 -2
data/lib/isodoc/xref_sect_gen.rb +5 -4
data/spec/isodoc/blocks_spec.rb +1 -1
data/spec/isodoc/footnotes_spec.rb +3 -3
data/spec/isodoc/i18n_spec.rb +10 -10
data/spec/isodoc/inline_spec.rb +2 -2
data/spec/isodoc/iso_spec.rb +79 -0
data/spec/isodoc/metadata_spec.rb +12 -4
data/spec/isodoc/postproc_spec.rb +7 -7
data/spec/isodoc/ref_spec.rb +7 -19
data/spec/isodoc/section_spec.rb +19 -84
data/spec/isodoc/terms_spec.rb +1 -1
data/spec/isodoc/xref_spec.rb +14 -14
data/spec/spec_helper.rb +3 -3
metadata +9 -8

data/lib/isodoc/xref_sect_gen.rb CHANGED Viewed

@@ -1,10 +1,10 @@
 module IsoDoc
-  class Convert
+  class Common
     def back_anchor_names(docxml)
       docxml.xpath(ns("//annex")).each_with_index do |c, i|
         annex_names(c, (65 + i).chr.to_s)
       end
-      docxml.xpath(ns("//bibitem")).each do |ref|
+      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
         reference_names(ref)
       end
     end
@@ -14,7 +14,7 @@ module IsoDoc
       n = 0
       n = section_names(d.at(ns("//clause[title = 'Scope']")), n, 1)
       n = section_names(d.at(ns(
-        "//references[title = 'Normative References']")), n, 1)
+        "//references[title = 'Normative References' or title = 'Normative references']")), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
       n = section_names(d.at(ns("//sections/symbols-abbrevs")), n, 1)
@@ -27,7 +27,8 @@ module IsoDoc
     def middle_section_asset_names(d)
       middle_sections = "//clause[title = 'Scope'] | "\
         "//foreword | //introduction | "\
-        "//references[title = 'Normative References'] | //sections/terms | "\
+        "//references[title = 'Normative References' or title = 'Normative references'] | "\
+        "//sections/terms | "\
         "//sections/symbols-abbrevs | //clause[parent::sections]"
       sequential_asset_names(d.xpath(ns(middle_sections)))
     end

data/spec/isodoc/blocks_spec.rb CHANGED Viewed

@@ -563,7 +563,7 @@ World</p>
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div><h1>1.&#160; Terms and Definitions</h1><p>For the purposes of this document,
+               <div><h1>1.&#160; Terms and definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>

data/spec/isodoc/footnotes_spec.rb CHANGED Viewed

@@ -114,15 +114,15 @@ RSpec.describe IsoDoc do
     html = File.read("test.html").sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")
     expect(html).to be_equivalent_to <<~"OUTPUT"
             <body lang="EN-US" link="blue" vlink="#954F72" xml:lang="EN-US">
-            <div class="WordSection1">
+            <div class="title-section">
               <p>&#xA0;</p>
             </div>
             <br />
-            <div class="WordSection2">
+            <div class="prefatory-section">
               <p>&#xA0;</p>
             </div>
             <br />
-            <main class="WordSection3"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
               <br />
               <div>
                  <h1 class="ForewordTitle">Foreword</h1>

data/spec/isodoc/i18n_spec.rb CHANGED Viewed

@@ -92,10 +92,10 @@ RSpec.describe IsoDoc do
                  <p id="E">Text</p>
                </div>
                <div>
-                 <h1>2.&#160; Normative References</h1>
+                 <h1>2.&#160; Normative references</h1>
                  <p>There are no normative references in this document.</p>
                </div>
-               <div id="H"><h1>3.&#160; Terms and Definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>3.&#160; Terms and definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -111,11 +111,11 @@ RSpec.describe IsoDoc do
           <p class="TermNum" id="J">3.1.1</p>
           <p class="Terms" style="text-align:left;">Term2</p>
-        </div><div id="K"><h2>3.2. Symbols and Abbreviated Terms</h2>
+        </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
           <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
         </div></div>
                <div id="L" class="Symbols">
-                 <h1>4.&#160; Symbols and Abbreviated Terms</h1>
+                 <h1>4.&#160; Symbols and abbreviated terms</h1>
                  <dl>
                    <dt>
                      <p>Symbol</p>
@@ -249,10 +249,10 @@ RSpec.describe IsoDoc do
                  <p id="E">Text</p>
                </div>
                <div>
-                 <h1>2.&#160; Normative References</h1>
+                 <h1>2.&#160; Normative references</h1>
                  <p>There are no normative references in this document.</p>
                </div>
-               <div id="H"><h1>3.&#160; Terms and Definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>3.&#160; Terms and definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -268,11 +268,11 @@ RSpec.describe IsoDoc do
           <p class="TermNum" id="J">3.1.1</p>
           <p class="Terms" style="text-align:left;">Term2</p>
-        </div><div id="K"><h2>3.2. Symbols and Abbreviated Terms</h2>
+        </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
           <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
         </div></div>
                <div id="L" class="Symbols">
-                 <h1>4.&#160; Symbols and Abbreviated Terms</h1>
+                 <h1>4.&#160; Symbols and abbreviated terms</h1>
                  <dl>
                    <dt>
                      <p>Symbol</p>
@@ -424,7 +424,7 @@ RSpec.describe IsoDoc do
           <p class="TermNum" id="J">3.1.1</p>
           <p class="Terms" style="text-align:left;">Term2</p>
-        </div><div id="K"><h2>3.2. Symbols and Abbreviated Terms</h2>
+        </div><div id="K"><h2>3.2. Symboles et termes abr&#233;g&#233;s</h2>
           <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
         </div></div>
                <div id="L" class="Symbols">
@@ -592,7 +592,7 @@ RSpec.describe IsoDoc do
                 <p class="TermNum" id="J">3.1.1</p>
                 <p class="Terms" style="text-align:left;">Term2</p>
-              </div><div id="K"><h2>3.2. Symbols and Abbreviated Terms</h2>
+              </div><div id="K"><h2>3.2. &#31526;&#21495;&#12289;&#20195;&#21495;&#21644;&#32553;&#30053;&#35821;</h2>
                 <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
               </div></div>
                <div id="L" class="Symbols">

data/spec/isodoc/inline_spec.rb CHANGED Viewed

@@ -180,7 +180,7 @@ RSpec.describe IsoDoc do
                </div>
                <p class="zzSTDTitle1"/>
                <div>
-                 <h1>1.&#160; Normative References</h1>
+                 <h1>1.&#160; Normative references</h1>
                  <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
@@ -243,7 +243,7 @@ RSpec.describe IsoDoc do
                </div>
                <p class="zzSTDTitle1"/>
                <div>
-                 <h1>1.&#160; Normative References</h1>
+                 <h1>1.&#160; Normative references</h1>
                  <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>

data/spec/isodoc/iso_spec.rb CHANGED Viewed

@@ -86,4 +86,83 @@ RSpec.describe IsoDoc do
     expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
   end
+  it "does not include IEV in references" do
+    expect(IsoDoc::Iso::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
+  <eref bibitemid="IEV"/>
+  <eref bibitemid="ISO20483"/>
+  </p>
+    </foreword></preface>
+    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+          <bibitem type="international-standard" id="IEV">
+  <title format="text/plain" language="en" script="Latn">Electropedia:
+  The World's Online Electrotechnical Vocabulary</title>
+  <source type="src">http://www.electropedia.org</source>
+  <docidentifier>IEV</docidentifier>
+  <date type="published"> <on>2018</on> </date>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+      <uri>www.iec.ch</uri>
+    </organization>
+  </contributor>
+  <language>en</language> <language>fr</language>
+  <script>Latn</script>
+  <copyright>
+    <from>2018</from>
+    <owner>
+      <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+      <uri>www.iec.ch</uri>
+      </organization>
+    </owner>
+  </copyright>
+  <relation type="updates">
+    <bibitem>
+      <formattedref>IEC 60050</formattedref>
+    </bibitem>
+  </relation>
+</bibitem>
+<bibitem id="ISO20483" type="standard">
+  <title format="text/plain">Cereals and pulses</title>
+  <docidentifier>ISO 20483</docidentifier>
+  <date type="published"><from>2013</from><to>2014</to></date>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+    </organization>
+  </contributor>
+</bibitem>
+</references>
+</bibliography>
+    </iso-standard>
+    INPUT
+    #{HTML_HDR}
+                 <br/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
+         <a href="#IEV">IEV: 2018</a>
+         <a href="#ISO20483">ISO 20483: 2013&#8211;2014</a>
+         </p>
+             </div>
+             <p class="zzSTDTitle1"/>
+             <div>
+               <h1>1.&#160; Normative references</h1>
+               <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+               <p id="ISO20483" class="NormRef">ISO 20483: 2013&#8211;2014, <i> Cereals and pulses</i></p>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+end
 end

data/spec/isodoc/metadata_spec.rb CHANGED Viewed

@@ -3,7 +3,11 @@ require "nokogiri"
 RSpec.describe IsoDoc do
   it "processes IsoXML metadata" do
-    expect(Hash[IsoDoc::Convert.new({}).info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+    c = IsoDoc::Convert.new({})
+    arr = c.convert_init(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    INPUT
+  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="international-standard">
   <title>
@@ -65,12 +69,16 @@ RSpec.describe IsoDoc do
 </version>
 </iso-standard>
 INPUT
-       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" ( 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stageabbr=>"PreCD3", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
+       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stageabbr=>"PreCD3", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
 OUTPUT
   end
   it "processes IsoXML metadata" do
-    expect(Hash[IsoDoc::Convert.new({}).info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+        c = IsoDoc::Convert.new({})
+    arr = c.convert_init(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    INPUT
+  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="international-standard">
   <title>
@@ -135,7 +143,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" ( 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"30", :stageabbr=>"CD", :tc=>"ABC 34", :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"30", :stageabbr=>"CD", :tc=>"ABC 34", :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end

data/spec/isodoc/postproc_spec.rb CHANGED Viewed

@@ -223,7 +223,7 @@ RSpec.describe IsoDoc do
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
-               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1><p class="MsoNormal">For the purposes of this document,
+               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and definitions</h1><p class="MsoNormal">For the purposes of this document,
            the following terms and definitions apply.</p>
        <p class="MsoNormal">ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -261,8 +261,8 @@ Content-Location: file:///C:/Doc/test_files/header.html
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
-Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiAxMDAwLTE6IEVORCBET0MgSUQK
-CkZJTEVOQU1FOiB0ZXN0Cgo=
+Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiB7eyBkb2NudW1iZXIgfX06IEVO
+RCBET0MgSUQKCkZJTEVOQU1FOiB7eyBmaWxlbmFtZSB9fQoK
     OUTPUT
   end
@@ -368,10 +368,10 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
         </sections>
         </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<main class="WordSection3">/m, '<main class="WordSection3">').
+    html = File.read("test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
     expect(html).to be_equivalent_to <<~"OUTPUT"
-           <main class="WordSection3"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+           <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <p class="zzSTDTitle1"></p>
              <div>
                <h1>1.&#xA0; Clause 4</h1>
@@ -413,11 +413,11 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
        </foreword></preface>
         </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<main class="WordSection3">/m, '<main class="WordSection3">').
+    html = File.read("test.html").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
     expect(`ls _images`).to match(/\.png$/)
     expect(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")).to be_equivalent_to <<~"OUTPUT"
-           <main class="WordSection3"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+           <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <br />
              <div>
                <h1 class="ForewordTitle">Foreword</h1>

data/spec/isodoc/ref_spec.rb CHANGED Viewed

@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
 </bibitem>
 <bibitem id="ISO16634" type="standard">
   <title format="text/plain">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
-  <docidentifier>ISO 16634:All Parts</docidentifier>
+  <docidentifier>ISO 16634</docidentifier>
   <date type="published"><on>--</on></date>
   <contributor>
     <role type="publisher"/>
@@ -33,6 +33,7 @@ RSpec.describe IsoDoc do
     </organization>
   </contributor>
   <note format="text/plain" reference="1">ISO DATE: Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+  <allParts>true</allParts>
 </bibitem>
 <bibitem id="ISO20483" type="standard">
   <title format="text/plain">Cereals and pulses</title>
@@ -88,10 +89,10 @@ RSpec.describe IsoDoc do
                </div>
                <p class="zzSTDTitle1"/>
                <div>
-                 <h1>1.&#160; Normative References</h1>
+                 <h1>1.&#160; Normative references</h1>
                  <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
-                 <p id="ISO16634" class="NormRef">ISO 16634:All Parts: --<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i> Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
+                 <p id="ISO16634" class="NormRef">ISO 16634: -- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i> Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
                  <p id="ISO20483" class="NormRef">ISO 20483: 2013&#8211;2014, <i> Cereals and pulses</i></p>
                  <p id="ref1" class="Biblio">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
                </div>
@@ -111,7 +112,7 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
-   it "processes empty IsoXML Normative References" do
+   it "processes empty IsoXML Normative references" do
     expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
@@ -119,23 +120,10 @@ RSpec.describe IsoDoc do
     </bibliography>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-                    </head>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
+      #{HTML_HDR}
                <p class="zzSTDTitle1"/>
                <div>
-                 <h1>1.&#160; Normative References</h1>
+                 <h1>1.&#160; Normative references</h1>
                  <p>There are no normative references in this document.</p>
                </div>
              </div>

data/spec/isodoc/section_spec.rb CHANGED Viewed

@@ -89,10 +89,10 @@ RSpec.describe IsoDoc do
                   <p id="E">Text</p>
                 </div>
                 <div>
-                  <h1>2.&#160; Normative References</h1>
+                  <h1>2.&#160; Normative references</h1>
                   <p>There are no normative references in this document.</p>
                 </div>
-                <div id="H"><h1>3.&#160; Terms and Definitions</h1><p>For the purposes of this document,
+                <div id="H"><h1>3.&#160; Terms and definitions</h1><p>For the purposes of this document,
             the following terms and definitions apply.</p>
         <p>ISO and IEC maintain terminological databases for use in
         standardization at the following addresses:</p>
@@ -108,11 +108,11 @@ RSpec.describe IsoDoc do
            <p class="TermNum" id="J">3.1.1</p>
            <p class="Terms" style="text-align:left;">Term2</p>
-         </div><div id="K"><h2>3.2. Symbols and Abbreviated Terms</h2>
+         </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
            <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
          </div></div>
                 <div id="L" class="Symbols">
-                  <h1>4.&#160; Symbols and Abbreviated Terms</h1>
+                  <h1>4.&#160; Symbols and abbreviated terms</h1>
                   <dl>
                     <dt>
                       <p>Symbol</p>
@@ -257,10 +257,10 @@ OUTPUT
                  <p id="E">Text</p>
                </div>
                <div>
-                 <h1>2.<span style="mso-tab-count:1">&#160; </span>Normative References</h1>
+                 <h1>2.<span style="mso-tab-count:1">&#160; </span>Normative references</h1>
                  <p>There are no normative references in this document.</p>
                </div>
-               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -276,11 +276,11 @@ OUTPUT
           <p class="TermNum" id="J">3.1.1</p>
           <p class="Terms" style="text-align:left;">Term2</p>
-        </div><div id="K"><h2>3.2. Symbols and Abbreviated Terms</h2>
+        </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
           <table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">Symbol</p></td><td valign="top">Definition</td></tr></table>
         </div></div>
                <div id="L" class="Symbols">
-                 <h1>4.<span style="mso-tab-count:1">&#160; </span>Symbols and Abbreviated Terms</h1>
+                 <h1>4.<span style="mso-tab-count:1">&#160; </span>Symbols and abbreviated terms</h1>
                  <table class="dl">
                    <tr>
                      <td valign="top" align="left">
@@ -337,22 +337,9 @@ OUTPUT
         </sections>
         </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-                     </head>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
+    #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div id="H"><h1>1.&#160; Terms and Definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>1.&#160; Terms and definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -398,27 +385,14 @@ OUTPUT
 </bibliography>
         </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-                     </head>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
+    #{HTML_HDR}
                <p class="zzSTDTitle1"/>
                <div>
-                 <h1>1.&#160; Normative References</h1>
+                 <h1>1.&#160; Normative references</h1>
                  <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
                </div>
-               <div id="H"><h1>2.&#160; Terms and Definitions</h1><p>For the purposes of this document, the terms and definitions
+               <div id="H"><h1>2.&#160; Terms and definitions</h1><p>For the purposes of this document, the terms and definitions
          given in ISO 712 and the following apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -463,27 +437,14 @@ OUTPUT
 </bibliography>
         </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-                     </head>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
+    #{HTML_HDR}
                <p class="zzSTDTitle1"/>
                <div>
-                 <h1>1.&#160; Normative References</h1>
+                 <h1>1.&#160; Normative references</h1>
                  <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
                </div>
-               <div id="H"><h1>2.&#160; Terms and Definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>2.&#160; Terms and definitions</h1><p>For the purposes of this document,
          the terms and definitions given in ISO 712, ISO 712 and ISO 712 apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -511,22 +472,9 @@ OUTPUT
         </sections>
         </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-                     </head>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
+    #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div id="H"><h1>1.&#160; Terms and Definitions</h1><p>No terms and definitions are listed in this document.</p>
+               <div id="H"><h1>1.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -557,20 +505,7 @@ OUTPUT
        </sections>
       </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-                     </head>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
+    #{HTML_HDR}
                <p class="zzSTDTitle1"/>
                <div id="M">
                  <h1>1.&#160; Clause 4</h1>