metanorma-iso 1.5.0 → 1.5.5

data/lib/isodoc/iso/word_convert.rb

@@ -8,15 +8,19 @@ module IsoDoc
       def initialize(options)
         @libdir = File.dirname(__FILE__)
         super
+        @wordToClevels = options[:doctoclevels].to_i
+        @wordToClevels = 3 if @wordToClevels.zero?
+        @htmlToClevels = options[:htmltoclevels].to_i
+        @htmlToClevels = 3 if @htmlToClevels.zero?
       end
 
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Cambria",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
-                       '"Cambria",serif'),
-          monospacefont: '"Courier New",monospace',
+                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                                  '"Cambria",serif'),
+                                  monospacefont: '"Courier New",monospace',
         }
       end
 
@@ -24,16 +28,16 @@ module IsoDoc
         {
           htmlstylesheet: (options[:alt] ? html_doc_path("style-human.scss") :
                            html_doc_path("style-iso.scss")),
-          htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
-          htmlintropage: html_doc_path("html_iso_intro.html"),
-          scripts: html_doc_path("scripts.html"),
-          wordstylesheet: html_doc_path("wordstyle.scss"),
-          standardstylesheet: html_doc_path("isodoc.scss"),
-          header: html_doc_path("header.html"),
-          wordcoverpage: html_doc_path("word_iso_titlepage.html"),
-          wordintropage: html_doc_path("word_iso_intro.html"),
-          ulstyle: "l3", 
-          olstyle: "l2",
+        htmlcoverpage: html_doc_path("html_iso_titlepage.html"),
+        htmlintropage: html_doc_path("html_iso_intro.html"),
+        scripts: html_doc_path("scripts.html"),
+        wordstylesheet: html_doc_path("wordstyle.scss"),
+        standardstylesheet: html_doc_path("isodoc.scss"),
+        header: html_doc_path("header.html"),
+        wordcoverpage: html_doc_path("word_iso_titlepage.html"),
+        wordintropage: html_doc_path("word_iso_intro.html"),
+        ulstyle: "l3", 
+        olstyle: "l2",
         }
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.0".freeze
+    VERSION = "1.5.5".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -186,6 +186,7 @@ RSpec.describe Asciidoctor::ISO do
       :language: el
       :script: Grek
       :publisher: IEC,IETF,ISO
+      :copyright-holder: ISO,IETF
       :copyright-year: 2001
       :doctype: technical-report
     INPUT
@@ -248,8 +249,8 @@ RSpec.describe Asciidoctor::ISO do
            <from>2001</from>
            <owner>
              <organization>
-               <name>International Electrotechnical Commission</name>
-               <abbreviation>IEC</abbreviation>
+               <name>International Organization for Standardization</name>
+               <abbreviation>ISO</abbreviation>
              </organization>
            </owner>
          </copyright>
@@ -261,15 +262,6 @@ RSpec.describe Asciidoctor::ISO do
              </organization>
            </owner>
          </copyright>
-         <copyright>
-           <from>2001</from>
-           <owner>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </owner>
-         </copyright>
          <ext>
          <doctype>technical-report</doctype>
          <editorialgroup>

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -32,7 +32,19 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>91</mn></msub></math></stem></admitted>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mn>90</mn>
+</mrow>
+</msub></math></stem></preferred><admitted><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mn>91</mn>
+</mrow>
+</msub></math></stem></admitted>
        <definition><p id="_">Time</p></definition></term>
        </terms>
        </sections>
@@ -90,8 +102,20 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          #{TERM_BOILERPLATE}
-         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mn>90</mn></msub></math></stem></preferred><definition><formula id="_">
-         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>t</mi><mi>A</mi></msub></math></stem>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mn>90</mn>
+</mrow>
+</msub></math></stem></preferred><definition><formula id="_">
+         <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>t</mi>
+</mrow>
+<mrow>
+  <mi>A</mi>
+</mrow>
+</msub></math></stem>
        </formula><p id="_">This paragraph is extraneous</p></definition>
        </term>
        </terms>

data/spec/asciidoctor-iso/inline_spec.rb

@@ -28,7 +28,13 @@ RSpec.describe Asciidoctor::ISO do
        ‘single quote’
        super<sup>script</sup>
        sub<sub>script</sub>
-       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>a</mi><mn>90</mn></msub></math></stem>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>a</mi>
+</mrow>
+<mrow>
+  <mn>90</mn>
+</mrow>
+</msub></math></stem>
        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
        <admitted>alt</admitted>
        <deprecates>deprecated</deprecates>

data/spec/asciidoctor-iso/table_spec.rb

@@ -150,7 +150,13 @@ RSpec.describe Asciidoctor::ISO do
            <tr>
              <th rowspan="2" align="left">Defect</th>
              <th colspan="4" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
-       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mo>max</mo></msub></math></stem></th>
+       <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mrow>
+  <mi>w</mi>
+</mrow>
+<mrow>
+  <mo>max</mo>
+</mrow>
+</msub></math></stem></th>
            </tr>
          <tr>
              <th align="left">in husked rice</th>

data/spec/asciidoctor-iso/validate_spec.rb

@@ -3,6 +3,93 @@ require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
 
+it "Warns of missing scope" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "Scope clause missing"
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  == Scope
+  INPUT
+    expect(File.read("test.err")).not_to include "Scope clause missing"
+
+end
+
+it "Warns of missing normative references" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "Normative references missing"
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  [bibliography]
+  == Normative references
+  INPUT
+    expect(File.read("test.err")).not_to include "Normative references missing"
+
+end
+
+it "Warns of missing terms & definitions" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "Terms & definitions missing"
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: pizza
+
+  == Terms and definitions
+  === Term 1
+  INPUT
+    expect(File.read("test.err")).not_to include "Terms & definitions missing"
+
+end
+
+
 it "Warns of illegal doctype" do
     FileUtils.rm_f "test.err"
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)

data/spec/isodoc/postproc_spec.rb

@@ -215,7 +215,7 @@ RSpec.describe IsoDoc do
     expect(xmlpp("<div>" + word.gsub(/_Toc\d\d+/, "_Toc") )).to be_equivalent_to xmlpp(<<~'OUTPUT')
            <div>
        <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
-         \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
+         \o "1-3" \h \z \u <span style="mso-element:field-separator"></span></span>
        <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
        <a href="#_Toc">1 Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-tab-count:1 dotted">. </span>
@@ -705,4 +705,79 @@ expect((IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/wo
            expect(word).to include '<p class="zzWarning">This document is not an ISO International Standard'
 end
 
+      it "populates Word ToC" do
+    FileUtils.rm_f "test.doc"
+    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <sections>
+               <clause id="A" 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 id="P" inline-header="false" obligation="normative">
+<title>Clause 4.2.1</title>
+</clause>
+       </clause></clause>
+        </sections>
+        </iso-standard>
+    INPUT
+    word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
+      sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc"))).to be_equivalent_to xmlpp(<<~'OUTPUT')
+           <div class="WordSection2">
+       An empty word intro page. 
+
+       <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
+         \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
+       <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+       <a href="#_Toc">Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-tab-count:1 dotted">. </span>
+       </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-element:field-begin"></span></span>
+       <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc \h </span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
+       <p class="MsoToc2">
+         <span class="MsoHyperlink">
+           <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+       <a href="#_Toc">Introduction to this<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-tab-count:1 dotted">. </span>
+       </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-element:field-begin"></span></span>
+       <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc \h </span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span>
+         </span>
+       </p>
+       <p class="MsoToc2">
+         <span class="MsoHyperlink">
+           <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+       <a href="#_Toc">Clause 4.2<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-tab-count:1 dotted">. </span>
+       </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <span style="mso-element:field-begin"></span></span>
+       <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc \h </span>
+         <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
+<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span>
+         </span>
+       </p>
+       <p class="MsoToc1">
+         <span lang="EN-GB" xml:lang="EN-GB">
+           <span style="mso-element:field-end"></span>
+         </span>
+         <span lang="EN-GB" xml:lang="EN-GB">
+           <p class="MsoNormal">&#xA0;</p>
+         </span>
+       </p>
+               <p class="MsoNormal">&#xA0;</p>
+             </div>
+    OUTPUT
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing