metanorma-iec 1.0.3 → 1.0.8

data/spec/isodoc/section_spec.rb

@@ -12,16 +12,14 @@ RSpec.describe IsoDoc do
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
        <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -58,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>
@@ -169,16 +167,14 @@ OUTPUT
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
        </clause>
-       <patent-notice>
        <p>This is patent boilerplate</p>
-       </patent-notice>
        </introduction></preface><sections>
        <clause id="D" obligation="normative">
          <title>Scope</title>
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -215,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>
@@ -311,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_TITLE}
+      <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">
@@ -329,7 +362,7 @@ OUTPUT
    <div class="boilerplate_legal"/>
  </div>
 #{IEC_TITLE}
-               <div id="H"><h1>1&#160; Terms and definitions</h1>
+               <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>
        </div>
@@ -365,7 +398,7 @@ OUTPUT
           <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>
@@ -379,7 +412,8 @@ OUTPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
         <status>
-          <stage>60</stage>
+          <stage abbreviation="PPUB">60</stage>
+          <substage abbreviation="PPUB">60</substage>
         </status>
       </bibdata>
       <sections>
@@ -413,7 +447,8 @@ OUTPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
         <status>
-          <stage>30</stage>
+          <stage abbreviation="CD">30</stage>
+          <substage abbreviation="CD">00</substage>
         </status>
       </bibdata>
       <sections>

data/spec/isodoc/terms_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe IsoDoc 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>
-    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and definitions</title>
 
 <term id="paddy1"><preferred>paddy</preferred>
 <domain>rice</domain>
@@ -98,7 +98,7 @@ 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{<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>
+    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and definitions</title>
 
 <term id="paddy1"><preferred>paddy</preferred>
 <domain>rice</domain>

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"], [:rxl, "rxl"], [:xml, "xml"]]
+    [[:doc, "doc"], [:html, "html"], [:pdf, "pdf"], [:rxl, "rxl"], [:xml, "xml"]]
     OUTPUT
   end
 
@@ -57,7 +57,7 @@ RSpec.describe Metanorma::Iec::Processor do
  </p>
  <p class="zzSTDTitle1">&#xA0;</p>
  <div id="">
-   <h1 class="ForewordTitle">FOREWORD</h1>
+   <h1 class="ForewordTitle" id="toc0">FOREWORD</h1>
    <div class="boilerplate_legal"></div>
  </div>
  <p class="zzSTDTitle1">INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
@@ -67,7 +67,7 @@ RSpec.describe Metanorma::Iec::Processor do
    <b></b>
  </p>
  <p class="zzSTDTitle1">&#xA0;</p>
-             <div id="H"><h1>1&#xA0; Terms and definitions</h1>
+             <div id="H"><h1 id="toc1">1&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <h2 class="TermNum" id="J">1.1</h2>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>

data/spec/spec_helper.rb

@@ -160,8 +160,8 @@ BLANK_HDR = <<~"HDR"
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>60</stage>
-    <substage>60</substage>
+    <stage abbreviation="PPUB">60</stage>
+    <substage abbreviation="PPUB">60</substage>
   </status>
   <copyright>
     <from>#{Time.new.year}</from>
@@ -179,6 +179,7 @@ BLANK_HDR = <<~"HDR"
     <subcommittee/>
     <workgroup/>
   </editorialgroup>
+  <stagename>International standard</stagename>
   </ext>
 </bibdata>
 #{BOILERPLATE}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -217,6 +217,7 @@ files:
 - lib/asciidoctor/iec/basicdoc.rng
 - 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
@@ -240,7 +241,9 @@ files:
 - lib/isodoc/iec/i18n-en.yaml
 - lib/isodoc/iec/i18n-fr.yaml
 - lib/isodoc/iec/i18n-zh-Hans.yaml
+- lib/isodoc/iec/iec.international-standard.xsl
 - lib/isodoc/iec/metadata.rb
+- lib/isodoc/iec/pdf_convert.rb
 - lib/isodoc/iec/word_convert.rb
 - lib/metanorma-iec.rb
 - lib/metanorma/iec.rb
@@ -250,6 +253,7 @@ files:
 - spec/asciidoctor-iec/base_spec.rb
 - spec/asciidoctor-iec/blocks_spec.rb
 - spec/asciidoctor-iec/cleanup_spec.rb
+- spec/asciidoctor-iec/iev_spec.rb
 - spec/asciidoctor-iec/inline_spec.rb
 - spec/asciidoctor-iec/lists_spec.rb
 - spec/asciidoctor-iec/section_spec.rb
@@ -264,11 +268,19 @@ files:
 - spec/examples/rice.doc
 - spec/examples/rice.html
 - spec/examples/rice.xml
+- spec/examples/rice_img/rice_image1.png
+- spec/examples/rice_img/rice_image2.png
+- 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