isodoc 0.5.9 → 0.6.0

data/spec/isodoc/iso_spec.rb

@@ -0,0 +1,89 @@
+require "spec_helper"
+
+RSpec.describe IsoDoc do
+  system "rm -f test.html"
+  it "processes isodoc as ISO: HTML output" do
+    IsoDoc::Iso::Convert.new({}).convert_file(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    html = File.read("test.html", encoding: "utf-8")
+    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+  end
+
+  it "processes isodoc as ISO: alt HTML output" do
+  system "rm -f test.html"
+    IsoDoc::Iso::Convert.new({alt: true}).convert_file(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    html = File.read("test.html", encoding: "utf-8")
+    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+  end
+
+  it "processes isodoc as ISO: Chinese HTML output" do
+  system "rm -f test.html"
+    IsoDoc::Iso::Convert.new({script: "Hans"}).convert_file(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    html = File.read("test.html", encoding: "utf-8")
+    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+  end
+
+  it "processes isodoc as ISO: user nominated fonts" do
+  system "rm -f test.html"
+    IsoDoc::Iso::Convert.new({bodyfont: "Zapf Chancery", headerfont: "Comic Sans", monospacefont: "Andale Mono"}).convert_file(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    html = File.read("test.html", encoding: "utf-8")
+    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: Andale Mono;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
+  end
+
+  it "processes isodoc as ISO: Word output" do
+  system "rm -f test.doc"
+    IsoDoc::Iso::WordConvert.new({}).convert_file(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    html = File.read("test.doc", encoding: "utf-8")
+    expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html).to match(%r[Quote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+  end
+
+end

data/spec/isodoc/lists_spec.rb

@@ -16,15 +16,7 @@ RSpec.describe IsoDoc do
 </foreword></preface>
 </iso-standard>
     INPUT
-              <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
+    #{HTML_HDR}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
@@ -37,14 +29,9 @@ RSpec.describe IsoDoc do
          </li>
        </ul>
                </div>
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
            </body>
-         </head>
        </html>
     OUTPUT
   end
@@ -71,15 +58,7 @@ RSpec.describe IsoDoc do
 </foreword></preface>
 </iso-standard>
     INPUT
-              <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
+    #{HTML_HDR}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
@@ -99,14 +78,9 @@ RSpec.describe IsoDoc do
          </ol>
        </ol>
                </div>
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
            </body>
-         </head>
        </html>
     OUTPUT
   end
@@ -129,15 +103,7 @@ RSpec.describe IsoDoc do
 </foreword></preface>
 </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
+    #{HTML_HDR}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
@@ -153,14 +119,9 @@ RSpec.describe IsoDoc do
          </li>
        </ol>
                </div>
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
            </body>
-         </head>
        </html>
     OUTPUT
   end
@@ -183,15 +144,7 @@ RSpec.describe IsoDoc do
 </foreword></preface>
 </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
+    #{HTML_HDR}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
@@ -215,14 +168,9 @@ RSpec.describe IsoDoc do
   <p class="Note"><span class="note_label">NOTE</span>&#160; This is a note</p>
 </div>
                </div>
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
            </body>
-         </head>
        </html>
     OUTPUT
   end
@@ -248,6 +196,7 @@ RSpec.describe IsoDoc do
            <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>
@@ -294,7 +243,6 @@ RSpec.describe IsoDoc do
                 <p class="zzSTDTitle1"/>
               </div>
             </body>
-          </head>
         </html>
     OUTPUT
   end

data/spec/isodoc/postproc_spec.rb

@@ -45,6 +45,8 @@ RSpec.describe IsoDoc do
     expect(File.exist?("spec/assets/iso.html")).to be true
     html = File.read("spec/assets/iso.html")
     expect(html).to match(/another empty stylesheet/)
+    expect(html).to match(%r{https://use.fontawesome.com})
+    expect(html).to match(%r{libs/jquery})
   end
 
   it "generates Word output docs with null configuration from file" do
@@ -71,7 +73,8 @@ RSpec.describe IsoDoc do
     expect(html).to match(/a third empty stylesheet/)
     expect(html).to match(/an empty html cover page/)
     expect(html).to match(/an empty html intro page/)
-    expect(html).to match(/This is a script/)
+    expect(html).to match(/This is > a script/)
+    expect(html).not_to match(/CDATA/)
     expect(html).to match(%r{Enkonduko</h1>})
   end
 
@@ -345,33 +348,35 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
         </sections>
         </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
-      sub(%r{<script type="text/x-mathjax-config">.*$}m, "")
+    html = File.read("test.html").sub(/^.*<main class="WordSection3">/m, '<main class="WordSection3">').
+      sub(%r{</main>.*$}m, "</main>")
     expect(html).to be_equivalent_to <<~"OUTPUT"
-           <div class="WordSection3">
-               <p class="zzSTDTitle1"></p>
-               <div>
-                 <h1>1.&#xA0; Clause 4</h1>
-                 <a href="#ftn3" epub:type="footnote" id="_footnote1">
-                   <sup>1</sup>
-                 </a>
-                 <div id="N">
-
-                <h2>1.1. Introduction to this<a href="#ftn2" epub:type="footnote" id="_footnote2"><sup>2</sup></a></h2>
+           <main class="WordSection3"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
+             <p class="zzSTDTitle1"></p>
+             <div>
+               <h1>1.&#xA0; Clause 4</h1>
+               <a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
+                 <sup>1</sup>
+               </a>
+               <div id="N">
+
+                <h2>1.1. Introduction to this<a rel="footnote" href="#fn:2" epub:type="footnote" id="fnref:2"><sup>2</sup></a></h2>
               </div>
-                 <div id="O">
+               <div id="O">
                 <h2>1.2. Clause 4.2</h2>
-                <p>A<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
+                <p>A<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
               </div>
-               </div>
-               <aside id="ftn3" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a href="#_footnote1">1) </a>This is a footnote.</p>
-       </aside>
-               <aside id="ftn2" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a href="#_footnote2">2) </a>Formerly denoted as 15 % (m/m).</p>
-       </aside>
-
              </div>
+             <aside id="fn:3" class="footnote">
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
+                 <sup>1</sup>
+               </a>This is a footnote.</p>
+       <a href="#fnref:1">&#x21A9;</a></aside>
+             <aside id="fn:2" class="footnote">
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:2" epub:type="footnote" id="fnref:2"><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
+       <a href="#fnref:2">&#x21A9;</a></aside>
+
+           </main>
     OUTPUT
   end
 
@@ -388,68 +393,27 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
        </foreword></preface>
         </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
-      sub(%r{<div class="WordSection3">.*$}m, "")
+    html = File.read("test.html").sub(/^.*<main class="WordSection3">/m, '<main class="WordSection3">').
+      sub(%r{</main>.*$}m, "</main>")
     expect(`ls _images`).to match(/\.png$/)
     expect(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png")).to be_equivalent_to <<~"OUTPUT"
-        <div class="WordSection2">
-        <br />
-        <div>
-          <h1 class="ForewordTitle">Foreword</h1>
-          <div id="_" class="figure">
-
-           <img src="_images/_.png" width="800" height="673" />
-<p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
-        </div>
-        <p>&#xA0;</p>
-      </div>
-      <br />
-    OUTPUT
-
-  end
-
-  it "populates HTML ToC" do
-    system "rm -f test.html"
-    IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", htmlintropage: "spec/assets/htmlintro.html"}).convert_file(<<~"INPUT", "test", false)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <sections>
-               <clause inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
-
-         <title>Introduction<bookmark id="Q"/> to this<fn reference="1">
-  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
-</fn></title>
-       </clause>
-       <clause id="O" inline-header="false" obligation="normative">
-         <title>Clause 4.2</title>
-         <p>A<fn reference="1">
-  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
-</fn></p>
-       </clause></clause>
-               <clause inline-header="false" obligation="normative"><title>Clause 5</title></clause>
-        </sections>
-        </iso-standard>
-
-    INPUT
-    html = File.read("test.html").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
-      sub(%r{<div class="WordSection3">.*$}m, "")
-    expect(html.gsub(/"#[a-f0-9-]+"/, "#_")).to be_equivalent_to <<~"OUTPUT"
-       <div class="WordSection2">
-     
-       /* an empty html intro page */
-     
-       <ul><li><a href=#_>2.&#xA0; Clause 4</a></li><ul><li><a href=#_>1.1. Introduction to this</a></li><li><a href=#_>1.2. Clause 4.2</a></li></ul><li><a href=#_>2.&#xA0; Clause 5</a></li></ul>
-     
-     
-     
-               <p>&#xA0;</p>
-             </div>
+           <main class="WordSection3"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <br />
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <div id="_" class="figure">
 
+                  <img src="_images/_.png" width="800" height="673" />
+       <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
+             </div>
+             <p class="zzSTDTitle1"></p>
+           </main>
     OUTPUT
+
   end
 
   it "processes IsoXML terms for HTML" do
-        system "rm -f test.doc"
+    system "rm -f test.doc"
     system "rm -f test.html"
     IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert_file(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -501,10 +465,10 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
 </sections>
 </iso-standard>
     INPUT
-        expect(File.exist?("test.html")).to be true
+    expect(File.exist?("test.html")).to be true
     html = File.read("test.html")
     expect(html).to match(%r{<h2 class="TermNum" id="paddy1">1\.1</h2>})
     expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2</h2>})
-end
+  end
 
 end

data/spec/isodoc/ref_spec.rb

@@ -76,15 +76,7 @@ RSpec.describe IsoDoc do
 </bibliography>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection2">
+    #{HTML_HDR}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
@@ -94,16 +86,12 @@ RSpec.describe IsoDoc do
          <a href="#ref10">[10]</a>
          </p>
                </div>
-               <p>&#160;</p>
-             </div>
-             <br/>
-             <div class="WordSection3">
                <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="ISO712">ISO 712, <i> Cereals and cereal products</i></p>
-                 <p id="ISO16634">ISO 16634:All Parts: --<a href="#ftn1" epub:type="footnote"><sup>1</sup></a>, <i> Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
+                 <p id="ISO16634">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">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>
@@ -114,12 +102,11 @@ RSpec.describe IsoDoc do
                  <p id="ref10" class="Biblio">[10]&#160; <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>
                  <p id="ref11" class="Biblio">[3]&#160; IETF RFC 10,<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>
-               <aside class="footnote" id="ftn1">
+               <aside id="fn:1" class="footnote">
          <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
        </aside>
              </div>
            </body>
-         </head>
        </html>
     OUTPUT
   end 
@@ -135,6 +122,7 @@ RSpec.describe IsoDoc do
            <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>
@@ -152,7 +140,6 @@ RSpec.describe IsoDoc do
                </div>
              </div>
            </body>
-         </head>
        </html>
     OUTPUT
    end