metanorma-iec 1.1.1 → 1.2.2

data/spec/isodoc/terms_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "processes IsoXML terms" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
     <terms id="_terms_and_definitions" obligation="normative"><title>Terms and definitions</title>
@@ -23,13 +23,14 @@ RSpec.describe IsoDoc do
 </termexample>
 
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
 </termsource></term>
 
-<term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
+<term id="paddy">
+<preferred>paddy</preferred><admitted>paddy rice</admitted>
 <admitted>rough rice</admitted>
 <deprecates>cargo rice</deprecates>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
@@ -46,105 +47,113 @@ RSpec.describe IsoDoc do
   </ul>
 </termexample>
 <termsource status="identical">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
 </termsource></term>
 </terms>
 </sections>
 </iso-standard>
     INPUT
-    #{HTML_HDR}
-    <div id="">
-        <h1 class="ForewordTitle">FOREWORD</h1>
-        <div class="boilerplate_legal"/>
-        </div>
-        #{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>
-
-       <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>&#160; Foreign seeds, husks, bran, sand, dust.</p><ul>
-         <li>A</li>
-         </ul></div>
-       <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><p><span class="example_label">EXAMPLE 2</span>&#160; </p>
-         <ul>
-         <li>A</li>
-         </ul>
-       </div>
-
-       <p>[TERMREF]
-         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
-           [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-       [/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>
-       <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>&#160; </p>
-         <ul>
-         <li>A</li>
-         </ul>
-       </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>
-           </div>
-         </body>
-       </html>
-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{</div>\s*<br[^>]*>\s*<div class="colophon"/>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    presxml = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
-    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and definitions</title>
+    <terms id="_terms_and_definitions" obligation="normative"><title depth="1">1<tab/>Terms and definitions</title>
 
-<term id="paddy1"><preferred>paddy</preferred>
+<term id="paddy1">
+<name>1.1</name><preferred>paddy</preferred>
 <domain>rice</domain>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
 <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
+<name>EXAMPLE 1</name>
   <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
   <ul>
   <li>A</li>
   </ul>
 </termexample>
 <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+<name>EXAMPLE 2</name>
   <ul>
   <li>A</li>
   </ul>
 </termexample>
 
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
 </termsource></term>
 
-<term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
+<term id="paddy">
+<name>1.2</name>
+<preferred>paddy</preferred><admitted>paddy rice</admitted>
 <admitted>rough rice</admitted>
 <deprecates>cargo rice</deprecates>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
 <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
+<name>Note 1 to entry</name>
   <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>
 </termnote>
 <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
+<name>Note 2 to entry</name>
 <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>
 </termnote>
 <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
+<name>EXAMPLE</name>
   <ul>
   <li>A</li>
   </ul>
 </termexample>
 <termsource status="identical">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
 </termsource></term>
 </terms>
 </sections>
 </iso-standard>
     INPUT
+    html = <<~OUTPUT
+    #{HTML_HDR}
+    <div id="">
+        <h1 class="ForewordTitle">FOREWORD</h1>
+        <div class="boilerplate_legal"/>
+        </div>
+        #{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>
+
+       <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>&#160; Foreign seeds, husks, bran, sand, dust.</p><ul>
+         <li>A</li>
+         </ul></div>
+       <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><p><span class="example_label">EXAMPLE 2</span>&#160; </p>
+         <ul>
+         <li>A</li>
+         </ul>
+       </div>
+
+       <p>[TERMREF]
+         <a href="#ISO7301">ISO 7301:2011, 3.1</a>
+           [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+       [/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>
+       <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>&#160; </p>
+         <ul>
+         <li>A</li>
+         </ul>
+       </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>
+           </div>
+         </body>
+       </html>
+OUTPUT
+  
+    word = <<~OUTPUT
     <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>
@@ -152,6 +161,7 @@ OUTPUT
          <li>A</li>
          </ul></div>
        <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><p><span class="example_label">EXAMPLE 2</span><span style="mso-tab-count:1">&#160; </span></p>
+
          <ul>
          <li>A</li>
          </ul>
@@ -164,6 +174,7 @@ OUTPUT
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</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>
@@ -175,5 +186,8 @@ OUTPUT
          <a href="#ISO7301">ISO 7301:2011, 3.1</a>
        [/TERMREF]</p></div>
 OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iec::WordConvert.new({}).convert("test", presxml, 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(word)
   end
 end

data/spec/metanorma/processor_spec.rb

@@ -38,8 +38,9 @@ RSpec.describe Metanorma::Iec::Processor do
     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>
+       <terms id="H" obligation="normative"><title>1<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
          <term id="J">
+         <name>1.1</name>
          <preferred>Term2</preferred>
        </term>
         </terms>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-14 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.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.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
@@ -218,9 +232,6 @@ files:
 - lib/asciidoctor/iec/biblio.rng
 - lib/asciidoctor/iec/converter.rb
 - lib/asciidoctor/iec/front.rb
-- lib/asciidoctor/iec/i18n-en.yaml
-- lib/asciidoctor/iec/i18n-fr.yaml
-- lib/asciidoctor/iec/i18n-zh-Hans.yaml
 - lib/asciidoctor/iec/iec.rng
 - lib/asciidoctor/iec/iec_intro_en.xml
 - lib/asciidoctor/iec/iec_intro_fr.xml
@@ -231,17 +242,22 @@ 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
 - lib/isodoc/iec/i18n-fr.yaml
 - lib/isodoc/iec/i18n-zh-Hans.yaml
+- lib/isodoc/iec/i18n.rb
 - lib/isodoc/iec/iec.international-standard.xsl
+- lib/isodoc/iec/init.rb
 - lib/isodoc/iec/metadata.rb
 - lib/isodoc/iec/pdf_convert.rb
 - lib/isodoc/iec/presentation_xml_convert.rb

data/lib/asciidoctor/iec/i18n-en.yaml

@@ -1,12 +0,0 @@
-term_def_boilerplate: |
-      <p>ISO and IEC maintain terminological databases for use in
-      standardization at the following addresses:</p>
-
-      <ul>
-      <li> <p>IEC Electropedia: available at
-      <link target="http://www.electropedia.org"/>
-      </p> </li> 
-      <li> <p>ISO Online browsing platform: available at
-        <link target="http://www.iso.org/obp"/></p> </li>
-      </ul>
-

data/lib/asciidoctor/iec/i18n-fr.yaml

@@ -1,11 +0,0 @@
-term_def_boilerplate: |
-      <p>L'ISO et l'IEC tiennent à jour des bases de données terminologiques
-      destinées à être utilisées en normalisation, consultables aux adresses
-      suivantes:</p>
-      <ul>
-      <li> <p>IEC Electropedia: disponible à l'adresse
-        <link target="http://www.electropedia.org"/>
-      </p> </li> 
-      <li> <p>ISO Online browsing platform: disponible à l'adresse
-        <link target="http://www.iso.org/obp"/></p> </li>
-      </ul>

data/lib/asciidoctor/iec/i18n-zh-Hans.yaml

@@ -1,9 +0,0 @@
-term_def_boilerplate: |
-      <p>ISO和IEC用于标准化的术语数据库地址如下：</p>
-      <ul>
-      <li> <p>IEC Electropedia:
-        位于<link target="http://www.electropedia.org"/>
-      </p> </li> 
-      <li> <p>ISO在线浏览平台:
-        位于<link target="http://www.iso.org/obp"/></p></li>
-      </ul>