metanorma-iec 1.2.9 → 1.2.14

data/spec/asciidoctor-iec/blocks_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
+  before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
   it "processes open blocks" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -12,7 +16,7 @@ RSpec.describe Asciidoctor::Iec do
       z
       --
     INPUT
-        #{BLANK_HDR}
+        #{@blank_hdr}
        <sections><p id="_">x</p>
        <p id="_">y</p>
        <p id="_">z</p></sections>
@@ -34,7 +38,7 @@ RSpec.describe Asciidoctor::Iec do
       <mml:math><mml:msub xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">F</mml:mi> </mml:mrow> </mml:mrow> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">&#x0391;</mml:mi> </mml:mrow> </mml:mrow> </mml:msub> </mml:math>
       ++++
     INPUT
-            #{BLANK_HDR}
+            #{@blank_hdr}
        <sections>
          <formula id="_">
          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi></math></stem>
@@ -62,7 +66,7 @@ RSpec.describe Asciidoctor::Iec do
       For further information on the Foreword, see *ISO/IEC Directives, Part 2, 2016, Clause 12.*
       ****
       INPUT
-              #{BLANK_HDR}
+              #{@blank_hdr}
        <sections><p id="foreword">Foreword</p>
        </sections>
        </iec-standard>
@@ -107,7 +111,7 @@ RSpec.describe Asciidoctor::Iec do
 
       NOTE: This is a note
       INPUT
-              #{BLANK_HDR}
+              #{@blank_hdr}
        <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
@@ -130,7 +134,7 @@ RSpec.describe Asciidoctor::Iec do
       #{ASCIIDOC_BLANK_HDR}
       NOTE: This is a note
       INPUT
-              #{BLANK_HDR}
+              #{@blank_hdr}
        <sections>
          <note id="_">
          <p id="_">This is a note</p>
@@ -148,7 +152,7 @@ RSpec.describe Asciidoctor::Iec do
       LITERAL
       ....
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
 <sections>
   <figure id="_">
   <pre id="_">LITERAL</pre>
@@ -163,7 +167,7 @@ RSpec.describe Asciidoctor::Iec do
       #{ASCIIDOC_BLANK_HDR}
       CAUTION: Only use paddy or parboiled rice for the determination of husked rice yield.
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
        <sections>
          <admonition id="_" type="caution">
          <p id="_">Only use paddy or parboiled rice for the determination of husked rice yield.</p>
@@ -188,7 +192,7 @@ RSpec.describe Asciidoctor::Iec do
       . Celery makes them sad.
       ====
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
       <sections>
          <admonition id="_" type="safety precautions"><name>Safety Precautions</name><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
        <ol id="_">
@@ -218,7 +222,7 @@ RSpec.describe Asciidoctor::Iec do
       [example]
       This is an example
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
@@ -247,7 +251,7 @@ RSpec.describe Asciidoctor::Iec do
       Amen
       ====
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
        <sections>
          <example id="_"><p id="_">This is an example</p>
        <p id="_">Amen</p></example>
@@ -263,7 +267,7 @@ RSpec.describe Asciidoctor::Iec do
 
       == Section 1
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
              <preface><foreword id="_" obligation="informative">
          <title>FOREWORD</title>
          <p id="_">This is a preamble</p>
@@ -282,7 +286,7 @@ RSpec.describe Asciidoctor::Iec do
       image::spec/examples/rice_images/rice_image1.png[]
 
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
               <sections>
          <figure id="_">
          <name>Split-it-right sample divider</name>
@@ -300,7 +304,7 @@ RSpec.describe Asciidoctor::Iec do
       image::spec/examples/rice_images/rice_image1.png[]
 
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
               <sections>
          <figure id="_">
          <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="4" width="3"/>
@@ -317,7 +321,7 @@ RSpec.describe Asciidoctor::Iec do
       image::spec/examples/rice_images/rice_image1.png[]
 
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
               <sections>
          <figure id="_">
          <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="4" width="auto"/>
@@ -333,7 +337,7 @@ RSpec.describe Asciidoctor::Iec do
       [align=right]
       This para is right-aligned.
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
       <sections>
          <p align="right" id="_">This para is right-aligned.</p>
        </sections>
@@ -349,7 +353,7 @@ RSpec.describe Asciidoctor::Iec do
       Block quotation
       ____
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
        <sections>
          <quote id="_">
          <source type="inline" bibitemid="ISO7301" citeas=""><localityStack><locality type="section"><referenceFrom>1</referenceFrom></locality></localityStack></source>
@@ -372,7 +376,7 @@ RSpec.describe Asciidoctor::Iec do
       end
       --
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
        <sections>
          <sourcecode lang="ruby" id="_">puts "Hello, world."
        %w{a b c}.each do |x|
@@ -396,7 +400,7 @@ RSpec.describe Asciidoctor::Iec do
       <1> This is one callout
       <2> This is another callout
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
               <sections><sourcecode lang="ruby" id="_">puts "Hello, world." <callout target="_">1</callout>
        %w{a b c}.each do |x|
          puts x <callout target="_">2</callout>
@@ -420,7 +424,7 @@ RSpec.describe Asciidoctor::Iec do
       [.source]
       <<ISO2191,section=1>>
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
        <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
@@ -452,7 +456,7 @@ RSpec.describe Asciidoctor::Iec do
       [.source]
       <<ISO2191,section=1>>, with adjustments
       INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
             <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>

data/spec/asciidoctor-iec/cleanup_spec.rb

@@ -1,12 +1,92 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Iec do
+   before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
+  it "moves note from TC/SC officers to metadata" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      == {blank}
+
+      [NOTE]
+      .Note from TC/SC Officers
+      ====
+      This FDIS is the result of the discussion between the IEC SC21A experts WG 3 during the meeting held in
+      Chicago (USA) on April 9th
+
+      This document is also of interest for ISO/ TC114/ WG1 Requirements for Watch batteries
+      ====
+    INPUT
+    <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
+<bibdata type="standard">
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+    </organization>
+  </contributor>
+  <language>en</language>
+  <script>Latn</script>
+  <status>
+    <stage abbreviation="PPUB">60</stage>
+    <substage abbreviation="PPUB">60</substage>
+  </status>
+  <copyright>
+    <from>#{Time.new.year}</from>
+    <owner>
+      <organization>
+        <name>International Electrotechnical Commission</name>
+        <abbreviation>IEC</abbreviation>
+      </organization>
+    </owner>
+  </copyright>
+  <ext>
+    <doctype>article</doctype>
+    <horizontal>false</horizontal>
+  <editorialgroup>
+    <technical-committee/>
+    <subcommittee/>
+    <workgroup/>
+  </editorialgroup>
+  <stagename>International standard</stagename>
+  <tc-sc-officers-note>
+  <p id='_'>
+    This FDIS is the result of the discussion between the IEC SC21A
+    experts WG 3 during the meeting held in Chicago (USA) on April 9th
+  </p>
+  <p id='_'>
+    This document is also of interest for ISO/ TC114/ WG1 Requirements for
+    Watch batteries
+  </p>
+</tc-sc-officers-note>
+  </ext>
+</bibdata>
+#{boilerplate(Nokogiri::XML(BLANK_HDR + "</iec-standard>"))}
+              <sections>
+         <clause id="_" inline-header="false" obligation="normative">
+
+       </clause>
+       </sections>
+       </iec-standard>
+    OUTPUT
+  end
+
   it "removes empty text elements" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == {blank}
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
               <sections>
          <clause id="_" inline-header="false" obligation="normative">
 
@@ -27,7 +107,7 @@ RSpec.describe Asciidoctor::Iec do
 
       Time
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
@@ -75,7 +155,7 @@ RSpec.describe Asciidoctor::Iec do
 
       This paragraph is extraneous
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
               <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
@@ -104,7 +184,7 @@ RSpec.describe Asciidoctor::Iec do
     OUTPUT
   end
 
-  it "strips any initial boilerplate from terms and definitions" do
+  it "keeps any initial boilerplate from terms and definitions" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
@@ -117,13 +197,18 @@ RSpec.describe Asciidoctor::Iec do
 
       This paragraph is extraneous
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
               <sections>
          <terms id="_" obligation="normative"><title>Terms and definitions</title>
          <p id="_">For the purposes of this document, 
        the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
-
+<p id='_'>I am boilerplate</p>
+<ul id='_'>
+  <li>
+    <p id='_'>So am I</p>
+  </li>
+</ul>
        <term id="term-time">
        <preferred>Time</preferred>
          <definition><p id="_">This paragraph is extraneous</p></definition>
@@ -142,7 +227,7 @@ RSpec.describe Asciidoctor::Iec do
       == Clause
       * [[[iso216,ISO 216]]], _Reference_
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
        <preface>
        <foreword id="_" obligation="informative">
          <title>FOREWORD</title>
@@ -179,7 +264,7 @@ RSpec.describe Asciidoctor::Iec do
       [.source]
       <<ISO2191,section=1>>
       INPUT
-              #{BLANK_HDR}
+              #{@blank_hdr}
        <sections>
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
@@ -211,7 +296,7 @@ RSpec.describe Asciidoctor::Iec do
 
       * [[[iso216,ISO 216]]], _Reference_
     INPUT
-      #{BLANK_HDR}
+      #{@blank_hdr}
       <sections></sections>
       <bibliography><references id="_" obligation="informative" normative="true"><title>Normative references</title>
       <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
@@ -238,7 +323,7 @@ RSpec.describe Asciidoctor::Iec do
       #{ASCIIDOC_BLANK_HDR}
       Paragraph
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
        <sections>
          <p id="_">Paragraph</p>
        </sections>
@@ -254,7 +339,7 @@ RSpec.describe Asciidoctor::Iec do
       NOTE: This note has no ID
       ====
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
        <sections>
          <example id="_">
          <note id="_">
@@ -275,7 +360,7 @@ RSpec.describe Asciidoctor::Iec do
 
       footnote:[This is another footnote to a figure]
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
        <sections><figure id="_">
          <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
        <fn reference="a">
@@ -302,7 +387,7 @@ RSpec.describe Asciidoctor::Iec do
 
       Text
     INPUT
-       #{BLANK_HDR}
+       #{@blank_hdr}
        <sections><clause id="_" inline-header="false" obligation="normative">
          <title>Clause</title>
          <p id="_">Text</p>
@@ -344,7 +429,7 @@ RSpec.describe Asciidoctor::Iec do
     ====== Clause 5B
 
     INPUT
-    #{BLANK_HDR}
+    #{@blank_hdr}
     <sections>
   <clause id="_" inline-header="false" obligation="normative">
   <title>Clause1</title>

data/spec/asciidoctor-iec/iev_spec.rb

@@ -2,6 +2,12 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Asciidoctor::Iec do
+before(:all) do
+  @boilerplate = boilerplate(Nokogiri::XML(BLANK_HDR + "</iec-standard>"))
+end
+
+
+
   it "generates reference boilerplate for IEV" do
      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
@@ -43,7 +49,7 @@ RSpec.describe Asciidoctor::Iec do
              <substage abbreviation="PPUB">60</substage>
            </status>
            <copyright>
-             <from>2020</from>
+             <from>#{Time.now.year}</from>
              <owner>
                <organization>
                  <name>International Electrotechnical Commission</name>
@@ -65,7 +71,7 @@ RSpec.describe Asciidoctor::Iec do
                    <stagename>International standard</stagename>
            </ext>
          </bibdata>
-         #{BOILERPLATE}
+         #{@boilerplate}
          <sections> </sections>
          <bibliography>
            <references id='_' obligation='informative' normative="true">
@@ -122,7 +128,7 @@ INPUT
       <substage abbreviation="PPUB">60</substage>
     </status>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>International Electrotechnical Commission</name>
@@ -144,7 +150,7 @@ INPUT
       <stagename>International standard</stagename>
     </ext>
   </bibdata>
-           #{BOILERPLATE}
+           #{@boilerplate}
   <sections>
     <clause id='_' obligation='normative'>
       <title>Terms and definitions</title>
@@ -201,7 +207,7 @@ OUTPUT
              <substage abbreviation='PPUB'>60</substage>
            </status>
            <copyright>
-             <from>2020</from>
+             <from>#{Time.now.year}</from>
              <owner>
                <organization>
                  <name>International Electrotechnical Commission</name>
@@ -223,7 +229,7 @@ OUTPUT
              <stagename>International standard</stagename>
            </ext>
          </bibdata>
-         #{BOILERPLATE}
+         #{@boilerplate}
          <preface>
            <introduction id='_' obligation='informative'>
              <title>INTRODUCTION&lt;br/&gt;Principles and rules followed</title>