metanorma-iec 1.0.5 → 1.1.0

data/spec/isodoc/section_spec.rb

@@ -56,11 +56,11 @@ RSpec.describe IsoDoc do
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -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>
@@ -211,11 +211,11 @@ OUTPUT
               <appendix id="Q2" inline-header="false" obligation="normative">
          <title>An Appendix</title>
        </appendix>
-       </annex><bibliography><references id="R" obligation="informative">
+       </annex><bibliography><references id="R" obligation="informative" normative="true">
          <title>Normative References</title>
        </references><clause id="S" obligation="informative">
          <title>Bibliography</title>
-         <references id="T" obligation="informative">
+         <references id="T" obligation="informative" normative="false">
          <title>Bibliography Subsection</title>
        </references>
        </clause>
@@ -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>
@@ -307,6 +307,43 @@ OUTPUT
 OUTPUT
   end
 
+  it "processes subclauses with and without titles" do
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <sections>
+       <clause id="D" obligation="normative">
+         <title>Scope</title>
+<clause id="D1" obligation="normative">
+         <title>Scope 1</title>
+         </clause>
+<clause id="D2" obligation="normative">
+         </clause>
+       </clause>
+       </sections>
+       </iso-standard>
+INPUT
+    #{HTML_HDR}
+    <div id=''>
+  <h1 class='ForewordTitle'>FOREWORD</h1>
+  <div class='boilerplate_legal'/>
+</div>
+#{IEC_TITLE1}
+      <div id='D'>
+        <h1>1&#160; Scope</h1>
+        <div id='D1'>
+          <h2>1.1&#160; Scope 1</h2>
+        </div>
+        <div id='D2'>
+          <h2>1.2&#160; </h2>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+OUTPUT
+    end
+
+
   it "processes simple terms & definitions" do
         expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
                <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -324,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>
@@ -354,14 +391,14 @@ 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">
           <h2>1.1&#160; Introduction</h2>
         </div>
                  <div id="O">
-          <span class="zzMoveToFollowing"><b>1.2&#160; Clause 4.2 </b></span>
+          <span class="zzMoveToFollowing"><b>1.2&#160; Clause 4.2&#160; </b></span>
         </div>
                </div>
              </div>
@@ -397,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"/>
@@ -432,7 +469,7 @@ OUTPUT
             </div>
             <p><br clear="all" class="section"/></p>
             <div class="WordSection3">
-              #{IEC_TITLE}
+              #{IEC_TITLE1}
             </div>
           </body>
       OUTPUT
@@ -459,7 +496,7 @@ OUTPUT
        <p>Boilerplate</p>
                 </div>
 </div>
-               #{IEC_TITLE}
+               #{IEC_TITLE1}
              </div>
            </body>
        </html>
@@ -484,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.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-06-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
@@ -244,7 +244,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
@@ -273,12 +275,14 @@ files:
 - spec/examples/rice_img/rice_image3_1.png
 - spec/examples/rice_img/rice_image3_2.png
 - spec/examples/rice_img/rice_image3_3.png
+- spec/isodoc/blocks_spec.rb
 - spec/isodoc/i18n_spec.rb
 - spec/isodoc/iev_spec.rb
 - spec/isodoc/inline_spec.rb
 - spec/isodoc/iso_spec.rb
 - spec/isodoc/metadata_spec.rb
 - spec/isodoc/postproc_spec.rb
+- spec/isodoc/ref_spec.rb
 - spec/isodoc/section_spec.rb
 - spec/isodoc/terms_spec.rb
 - spec/metanorma/processor_spec.rb
@@ -287,7 +291,7 @@ homepage: https://github.com/metanorma/metanorma-iec
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -302,9 +306,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: []