metanorma-iso 1.5.3 → 1.5.8

data/spec/isodoc/amd_spec.rb

@@ -66,9 +66,9 @@ RSpec.describe IsoDoc do
   <preface>
     <foreword>
       <p>
-        <xref target='N'>[N]</xref>
-<xref target='note1'>[note1]</xref>
-<xref target='note2'>[note2]</xref>
+        <xref target='N'>[scope], Note</xref>
+<xref target='note1'>[widgets1], Note 1</xref>
+<xref target='note2'>[widgets1], Note 2</xref>
 <xref target='AN'>A.1, Note</xref>
 <xref target='Anote1'>A.2, Note 1</xref>
 <xref target='Anote2'>A.2, Note 2</xref>
@@ -86,7 +86,7 @@ RSpec.describe IsoDoc do
         </p>
       </note>
       <p>
-       <xref target='N'>[n]</xref>
+       <xref target='N'>Note</xref>
       </p>
     </clause>
     <terms id='terms'/>
@@ -94,22 +94,22 @@ RSpec.describe IsoDoc do
       <title depth="1">Widgets</title>
       <clause id='widgets1' inline-header="true">
         <note id='note1'>
-          <name>NOTE</name>
+          <name>NOTE 1</name>
           <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
             These results are based on a study carried out on three different
             types of kernel.
           </p>
         </note>
         <note id='note2'>
-          <name>NOTE</name>
+          <name>NOTE 2</name>
           <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
             These results are based on a study carried out on three different
             types of kernel.
           </p>
         </note>
         <p>
-        <xref target='note1'>[note1]</xref>
-<xref target='note2'>[note2]</xref>
+        <xref target='note1'>Note 1</xref>
+<xref target='note2'>Note 2</xref>
         </p>
       </clause>
     </clause>
@@ -229,8 +229,8 @@ RSpec.describe IsoDoc do
              <title>Foreword</title>
              <p id='A'>
                This is a preamble
-               <xref target='C'>[C]</xref>
-               <xref target='C1'>[C1]</xref>
+               <xref target='C'>0.1</xref>
+               <xref target='C1'>0.2</xref>
                <xref target='D'>[D]</xref>
                <xref target='H'>[H]</xref>
                <xref target='I'>[I]</xref>
@@ -250,7 +250,7 @@ RSpec.describe IsoDoc do
            <introduction id='B' obligation='informative'>
              <title depth="1">Introduction</title>
              <clause id='C' inline-header='false' obligation='informative'>
-               <title depth="1">Introduction Subsection</title>
+               <title depth="2">Introduction Subsection</title>
              </clause>
              <clause id='C1' inline-header='true' obligation='informative'>Text</clause>
            </introduction>
@@ -435,7 +435,7 @@ RSpec.describe IsoDoc do
            <introduction id='B' obligation='informative'>
              <title depth='1'>Introduction</title>
              <clause id='C' inline-header='false' obligation='informative'>
-               <title depth='1'>Introduction Subsection</title>
+               <title depth='2'>Introduction Subsection</title>
              </clause>
            </introduction>
            <clause id='B1'>
@@ -548,7 +548,7 @@ RSpec.describe IsoDoc do
       <div class='Section3' id='B'>
         <h1 class='IntroTitle'>Introduction</h1>
         <div id='C'>
-          <h1>Introduction Subsection</h1>
+          <h2>Introduction Subsection</h2>
         </div>
       </div>
       <br/>

data/spec/isodoc/iso_spec.rb

@@ -271,7 +271,7 @@ end
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="samplecode" class="example">
                  <p><span class="example_label">EXAMPLE  1</span>&#160; </p>
-                  <div class="Quote">Hello<p class="QuoteAttribution"/></div>
+                  <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>
@@ -330,7 +330,7 @@ end
 
 
   it "processes sequences of examples (Word)" do
-    expect(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns='http://riboseinc.com/isoxml'>
   <preface>
     <foreword>
@@ -361,7 +361,7 @@ end
                <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<p class="QuoteAttribution"/></div>
+                 <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>

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

data/spec/isodoc/ref_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
-   it "processes IsoXML bibliographies (Presentation XML)" do
+   it "processes IsoXML bibliographies" do
      input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>

data/spec/metanorma/processor_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iso::Processor do
 
   it "registers output formats against metanorma" do
     expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
-    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:isosts, "sts.xml"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
     OUTPUT
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -327,6 +327,7 @@ files:
 - lib/isodoc/iso/init.rb
 - lib/isodoc/iso/iso.amendment.xsl
 - lib/isodoc/iso/iso.international-standard.xsl
+- lib/isodoc/iso/isosts_convert.rb
 - lib/isodoc/iso/metadata.rb
 - lib/isodoc/iso/pdf_convert.rb
 - lib/isodoc/iso/presentation_xml_convert.rb