metanorma-iec 1.0.8 → 1.1.3

data/spec/isodoc/iso_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe IsoDoc::Iec do
                  <p><span class="example_label">EXAMPLE</span>&#160; Hello</p>
                </div>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
            </div>
          </body>
        </html>
@@ -120,7 +120,7 @@ RSpec.describe IsoDoc::Iec do
                  <p><span class="example_label">EXAMPLE  2</span>&#160; Hello</p>
                </div>
              </div>
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
            </div>
          </body>
        </html>
@@ -156,7 +156,7 @@ RSpec.describe IsoDoc::Iec do
              <br clear="all" class="section"/>
            </p>
            <div class="WordSection3">
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
            </div>
            <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
            <div class="colophon"/>
@@ -200,7 +200,7 @@ RSpec.describe IsoDoc::Iec do
              <br clear="all" class="section"/>
            </p>
            <div class="WordSection3">
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
            </div>
            <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
            <div class="colophon"/>

data/spec/isodoc/metadata_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe IsoDoc::Iec::Metadata do
     <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
     <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
     <title type="title-part" language="fr" format="text/plain">Riz</title>
-  <docidentifier type="iso">ISO/PreCD3 17301-1</docidentifier>
+  <docidentifier type="ISO">ISO/PreCD3 17301-1</docidentifier>
   <docidentifier type="iso-tc">17301</docidentifier>
   <docnumber>1730</docnumber>
   <date type="published"><on>2011</on></date>
@@ -139,7 +139,7 @@ OUTPUT
     <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
     <title type="title-part" language="fr" format="text/plain">Riz</title>
   </title>
-  <docidentifier type="iso">ISO/IEC/CD 17301-1-3</docidentifier>
+  <docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
   <docidentifier type="iso-tc">17301</docidentifier>
   <contributor>
     <role type="author"/>

data/spec/isodoc/postproc_spec.rb

@@ -123,7 +123,7 @@ RSpec.describe IsoDoc do
       sub(%r{<br.*$}m, "")
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <div class="WordSection3">
-    #{IEC_TITLE.gsub(/\&#160;/, "&#xA0;")}
+    #{IEC_TITLE1.gsub(/\&#160;/, "&#xA0;")}
                <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1 class="main">1<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1>
        <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
@@ -228,7 +228,7 @@ RSpec.describe IsoDoc do
       sub(%r{<br[^>]*>\s*<div class="colophon">.*$}m, "")
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
          <div class="WordSection3">
-    #{IEC_TITLE.gsub(/\&#160;/, "&#xA0;")}
+    #{IEC_TITLE1.gsub(/\&#160;/, "&#xA0;")}
              <p class="MsoNormal">
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
              </p>
@@ -274,7 +274,7 @@ RSpec.describe IsoDoc do
       sub(%r{<br[^>]*>\s*<div class="colophon">.*$}m, "")
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
        <div class="WordSection3">
-    #{IEC_TITLE.gsub(/\&#160;/, "&#xA0;")}
+    #{IEC_TITLE1.gsub(/\&#160;/, "&#xA0;")}
              <p class="MsoNormal">
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
              </p>

data/spec/isodoc/ref_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe IsoDoc::Iec do
       <abbreviation>ISO</abbreviation>
     </organization>
   </contributor>
-  <note format="text/plain" reference="1">ISO DATE: Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+  <note format="text/plain" reference="1" type="ISO DATE">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
   <extent type="part">
   <referenceFrom>all</referenceFrom>
   </extent>
@@ -139,7 +139,7 @@ RSpec.describe IsoDoc::Iec do
           <a href='#zip_ffs'>[5]</a>
         </p>
       </div>
-      #{IEC_TITLE}
+      #{IEC_TITLE1}
       <div>
         <h1>1&#160; Normative references</h1>
         <p>
@@ -178,7 +178,7 @@ RSpec.describe IsoDoc::Iec do
           <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
           )
         </p>
-        <div id='' class='Note'>
+        <div class='Note'>
           <p>
             <span class='note_label'>NOTE</span>
             &#160; This is an annotation of ISO 20483:2013-2014
@@ -197,13 +197,13 @@ RSpec.describe IsoDoc::Iec do
           [2],
           <i>Instruments for analytical laboratory use</i>
         </p>
-        <div id='' class='Note'>
+        <div class='Note'>
           <p>
             <span class='note_label'>NOTE</span>
             &#160; This is an annotation of document ISSN.
           </p>
         </div>
-        <div id='' class='Note'>
+        <div class='Note'>
           <p>
             <span class='note_label'>NOTE</span>
             &#160; This is another annotation of document ISSN.

data/spec/isodoc/section_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe IsoDoc do
          </div>
                   <p>This is patent boilerplate</p>
                 </div>
-                #{IEC_TITLE}
+                #{IEC_TITLE1}
                 <div id="D">
                   <h1>1&#160; Scope</h1>
                   <p id="E">Text</p>
@@ -243,7 +243,7 @@ OUTPUT
              </div>
              <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
-             #{IEC_TITLE}
+             #{IEC_TITLE1}
                <div id="D">
                  <h1>1<span style="mso-tab-count:1">&#160; </span>Scope</h1>
                  <p id="E">Text</p>
@@ -327,7 +327,7 @@ INPUT
   <h1 class='ForewordTitle'>FOREWORD</h1>
   <div class='boilerplate_legal'/>
 </div>
-#{IEC_TITLE}
+#{IEC_TITLE1}
       <div id='D'>
         <h1>1&#160; Scope</h1>
         <div id='D1'>
@@ -361,7 +361,7 @@ OUTPUT
    <h1 class="ForewordTitle">FOREWORD</h1>
    <div class="boilerplate_legal"/>
  </div>
-#{IEC_TITLE}
+#{IEC_TITLE1}
                <div id="H"><h1>1&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <p class="TermNum" id="J">1.1</p>
          <p class="Terms" style="text-align:left;">Term2</p>
@@ -391,7 +391,7 @@ OUTPUT
   <h1 class="ForewordTitle">FOREWORD</h1>
   <div class="boilerplate_legal"/>
 </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
                <div id="M">
                  <h1>1&#160; Clause 4</h1>
                  <div id="N">
@@ -434,7 +434,7 @@ OUTPUT
             </div>
             <p><br clear="all" class="section"/></p>
             <div class="WordSection3">
-            #{IEC_TITLE}
+            #{IEC_TITLE1}
             </div>
             <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
             <div class="colophon"/>
@@ -469,7 +469,7 @@ OUTPUT
             </div>
             <p><br clear="all" class="section"/></p>
             <div class="WordSection3">
-              #{IEC_TITLE}
+              #{IEC_TITLE1}
             </div>
           </body>
       OUTPUT
@@ -496,7 +496,7 @@ OUTPUT
        <p>Boilerplate</p>
                 </div>
 </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -521,7 +521,7 @@ OUTPUT
     <div id="">
   <h1 class="ForewordTitle">FOREWORD</h1>
 </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>

data/spec/isodoc/terms_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe IsoDoc do
         <h1 class="ForewordTitle">FOREWORD</h1>
         <div class="boilerplate_legal"/>
         </div>
-        #{IEC_TITLE}
+        #{IEC_TITLE1}
              <div id="_terms_and_definitions"><h1>1&#160; Terms and definitions</h1>
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
@@ -83,8 +83,8 @@ RSpec.describe IsoDoc do
          <li>A</li>
          </ul>
        </div>
-       <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
-       <div class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
+       <div id="_671a1994-4783-40d0-bc81-987d06ffb74e" class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
+       <div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
        <p>[TERMREF]
          <a href="#ISO7301">ISO 7301:2011, 3.1</a>
        [/TERMREF]</p></div>
@@ -95,7 +95,7 @@ OUTPUT
   end
   
   it "processes IsoXML terms (Word)" do
-    expect((IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div id="_terms_and_definitions">}m, '<div id="_terms_and_definitions">').sub(%r{<br[^>]*>\s*<div class="colophon"/>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect((IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div id="_terms_and_definitions">}m, '<div id="_terms_and_definitions">').sub(%r{</div>\s*<br[^>]*>\s*<div class="colophon"/>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
     <terms id="_terms_and_definitions" obligation="normative"><title>Terms and definitions</title>
@@ -145,8 +145,7 @@ OUTPUT
 </sections>
 </iso-standard>
     INPUT
-                 <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1>
-       <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
+    <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1><p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
        <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">&#160; </span>Foreign seeds, husks, bran, sand, dust.</p><ul>
@@ -164,18 +163,17 @@ OUTPUT
        [/TERMREF]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
-       <div class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
-       <div class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
-       <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-       <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><p><span class="example_label">EXAMPLE</span><span style="mso-tab-count:1">&#160; </span></p>
+       <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p><div id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><p><span class="example_label">EXAMPLE</span><span style="mso-tab-count:1">&#160; </span></p>
          <ul>
          <li>A</li>
          </ul>
-       </div>
+       </div><div id="_671a1994-4783-40d0-bc81-987d06ffb74e" class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><div id="_671a1994-4783-40d0-bc81-987d06ffb74f" class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
+
+
+
        <p>[TERMREF]
          <a href="#ISO7301">ISO 7301:2011, 3.1</a>
        [/TERMREF]</p></div>
-
 OUTPUT
   end
 end

data/spec/metanorma/processor_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iec::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"], [:pdf, "pdf"], [:rxl, "rxl"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:xml, "xml"]]
     OUTPUT
   end
 
@@ -35,7 +35,7 @@ RSpec.describe Metanorma::Iec::Processor do
 
   it "generates HTML from IsoDoc XML" do
     FileUtils.rm_f "test.xml"
-    processor.output(<<~"INPUT", "test.html", :html)
+    processor.output(<<~"INPUT", "test.xml", "test.html", :html)
                <iec-standard xmlns="http://riboseinc.com/isoxml">
        <sections>
        <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
@@ -60,9 +60,6 @@ RSpec.describe Metanorma::Iec::Processor do
    <h1 class="ForewordTitle" id="toc0">FOREWORD</h1>
    <div class="boilerplate_legal"></div>
  </div>
- <p class="zzSTDTitle1">INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
- <p class="zzSTDTitle1">____________</p>
- <p class="zzSTDTitle1">&#xA0;</p>
  <p class="zzSTDTitle1">
    <b></b>
  </p>

data/spec/spec_helper.rb

@@ -195,6 +195,13 @@ IEC_TITLE = <<~END
              <p class="zzSTDTitle1">&#160;</p>
 END
 
+IEC_TITLE1 = <<~END
+             <p class="zzSTDTitle1">
+               <b/>
+             </p>
+             <p class="zzSTDTitle1">&#160;</p>
+END
+
 HTML_HDR = <<~END
         <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
           <head/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -231,11 +245,14 @@ files:
 - lib/isodoc/iec/html/header.html
 - lib/isodoc/iec/html/html_iec_intro.html
 - lib/isodoc/iec/html/html_iec_titlepage.html
+- lib/isodoc/iec/html/htmlstyle.css
 - lib/isodoc/iec/html/htmlstyle.scss
+- lib/isodoc/iec/html/isodoc.css
 - lib/isodoc/iec/html/isodoc.scss
 - lib/isodoc/iec/html/scripts.html
 - lib/isodoc/iec/html/word_iec_intro.html
 - lib/isodoc/iec/html/word_iec_titlepage.html
+- lib/isodoc/iec/html/wordstyle.css
 - lib/isodoc/iec/html/wordstyle.scss
 - lib/isodoc/iec/html_convert.rb
 - lib/isodoc/iec/i18n-en.yaml
@@ -244,7 +261,9 @@ files:
 - lib/isodoc/iec/iec.international-standard.xsl
 - lib/isodoc/iec/metadata.rb
 - lib/isodoc/iec/pdf_convert.rb
+- lib/isodoc/iec/presentation_xml_convert.rb
 - lib/isodoc/iec/word_convert.rb
+- lib/isodoc/iec/xref.rb
 - lib/metanorma-iec.rb
 - lib/metanorma/iec.rb
 - lib/metanorma/iec/processor.rb
@@ -289,7 +308,7 @@ homepage: https://github.com/metanorma/metanorma-iec
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -304,9 +323,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.
 test_files: []