metanorma-iec 2.0.6 → 2.1.0

data/spec/isodoc/ref_spec.rb

@@ -71,7 +71,7 @@ RSpec.describe IsoDoc::Iec do
 
       </references><references id="_bibliography" obligation="informative" normative="false">
         <title>Bibliography</title>
-      <bibitem id="ISBN" type="ISBN">
+      <bibitem id="ISBN" type="book">
         <title format="text/plain">Chemicals for analytical laboratory use</title>
         <docidentifier type="ISBN">ISBN</docidentifier>
         <docidentifier type="metanorma">[1]</docidentifier>
@@ -82,7 +82,7 @@ RSpec.describe IsoDoc::Iec do
           </organization>
         </contributor>
       </bibitem>
-      <bibitem id="ISSN" type="ISSN">
+      <bibitem id="ISSN" type="journal">
         <title format="text/plain">Instruments for analytical laboratory use</title>
         <docidentifier type="ISSN">ISSN</docidentifier>
         <docidentifier type="metanorma">[2]</docidentifier>
@@ -145,44 +145,18 @@ RSpec.describe IsoDoc::Iec do
               <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder="2"><title depth="1">1<tab/>Normative References</title>
               <p>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>
           <bibitem id="ISO712" type="standard">
-            <title format="text/plain">Cereals or cereal products</title>
-            <title type="main" format="text/plain">Cereals and cereal products</title>
+            <formattedref><em><span class='stddocTitle'>Cereals and cereal products</span></em></formattedref>
             <docidentifier type="ISO">ISO 712</docidentifier>
             <docidentifier type="metanorma">[110]</docidentifier>
-            <contributor>
-              <role type="publisher"/>
-              <organization>
-                <name>International Organization for Standardization</name>
-              </organization>
-            </contributor>
           </bibitem>
           <bibitem id="ISO16634" type="standard">
-            <title language="x" format="text/plain">Cereals, pulses, milled cereal products, xxxx, oilseeds and animal feeding stuffs</title>
-            <title language="en" format="text/plain">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+            <formattedref><em><span class='stddocTitle'>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</span></em></formattedref>
             <docidentifier type="ISO">ISO 16634:-- (all parts)</docidentifier>
-            <date type="published"><on>--</on></date>
-            <contributor>
-              <role type="publisher"/>
-              <organization>
-                <abbreviation>ISO</abbreviation>
-              </organization>
-            </contributor>
             <note format="text/plain" reference="1" type="Unpublished-Status">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
-            <extent type="part">
-            <referenceFrom>all</referenceFrom>
-            </extent>
-
           </bibitem>
           <bibitem id="ISO20483" type="standard">
-            <title format="text/plain">Cereals and pulses</title>
+            <formattedref><em><span class='stddocTitle'>Cereals and pulses</span></em></formattedref>
             <docidentifier type="ISO">ISO 20483:2013-2014</docidentifier>
-            <date type="published"><from>2013</from><to>2014</to></date>
-            <contributor>
-              <role type="publisher"/>
-              <organization>
-                <name>International Organization for Standardization</name>
-              </organization>
-            </contributor>
           </bibitem>
           <bibitem id="ref1">
             <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
@@ -190,52 +164,32 @@ RSpec.describe IsoDoc::Iec do
           </bibitem>
           <note><name>NOTE</name><p>This is an annotation of ISO 20483:2013-2014</p></note>
               <bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
-
-
           </references><references id="_bibliography" obligation="informative" normative="false" displayorder="3">
             <title depth="1">Bibliography</title>
-          <bibitem id="ISBN" type="ISBN">
-            <title format="text/plain">Chemicals for analytical laboratory use</title>
+          <bibitem id="ISBN" type="book">
+            <formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
             <docidentifier type="ISBN">ISBN</docidentifier>
             <docidentifier type="metanorma">[1]</docidentifier>
-            <contributor>
-              <role type="publisher"/>
-              <organization>
-                <abbreviation>ISBN</abbreviation>
-              </organization>
-            </contributor>
           </bibitem>
-          <bibitem id="ISSN" type="ISSN">
-            <title format="text/plain">Instruments for analytical laboratory use</title>
+          <bibitem id="ISSN" type="journal">
+            <formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
             <docidentifier type="ISSN">ISSN</docidentifier>
             <docidentifier type="metanorma">[2]</docidentifier>
-            <contributor>
-              <role type="publisher"/>
-              <organization>
-                <abbreviation>ISSN</abbreviation>
-              </organization>
-            </contributor>
           </bibitem>
           <note><name>NOTE</name><p>This is an annotation of document ISSN.</p></note>
           <note><name>NOTE</name><p>This is another annotation of document ISSN.</p></note>
           <bibitem id="ISO3696" type="standard">
-            <title format="text/plain">Water for analytical laboratory use</title>
-            <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
+            <formattedref><em><span class='stddocTitle'>Water for analytical laboratory use</span></em></formattedref>
+            <docidentifier type='metanorma-ordinal'>[3]</docidentifier>
             <docidentifier type="ISO">ISO 3696</docidentifier>
-            <contributor>
-              <role type="publisher"/>
-              <organization>
-                <abbreviation>ISO</abbreviation>
-              </organization>
-            </contributor>
           </bibitem>
           <bibitem id="ref10">
             <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
             <docidentifier type="metanorma">[10]</docidentifier>
           </bibitem>
           <bibitem id="ref11">
-            <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
-            <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
+            <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
+            <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
             <docidentifier type="IETF">IETF RFC 10</docidentifier>
           </bibitem>
           <bibitem id="ref12">
@@ -243,8 +197,6 @@ RSpec.describe IsoDoc::Iec do
             <docidentifier type="metanorma">[Citn]</docidentifier>
             <docidentifier type="IETF">IETF RFC 20</docidentifier>
           </bibitem>
-
-
           </references>
           </bibliography>
               </iso-standard>
@@ -318,11 +270,11 @@ RSpec.describe IsoDoc::Iec do
               <h1 class='Section3'>Bibliography</h1>
               <p id='ISBN' class='Biblio'>
                 [1]&#160;
-                <i>Chemicals for analytical laboratory use</i>
+                <i>Chemicals for analytical laboratory use</i>. ISBN.
               </p>
               <p id='ISSN' class='Biblio'>
                 [2]&#160;
-                <i>Instruments for analytical laboratory use</i>
+                <i>Instruments for analytical laboratory use</i>. ISSN.
               </p>
               <div class='Note'>
                 <p>
@@ -337,7 +289,7 @@ RSpec.describe IsoDoc::Iec do
                 </p>
               </div>
               <p id='ISO3696' class='Biblio'>
-                [1]&#160; ISO 3696,
+                [3]&#160; ISO 3696,
                 <i>Water for analytical laboratory use</i>
               </p>
               <p id='ref10' class='Biblio'>
@@ -354,8 +306,8 @@ RSpec.describe IsoDoc::Iec do
                 )
               </p>
               <p id='ref11' class='Biblio'>
-                [2]&#160; IETF RFC 10,
-                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+                [4]&#160; IETF RFC 10,
+                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>.
               </p>
               <p id='ref12' class='Biblio'>
                 Citn&#160; IETF RFC 20, CitationWorks. 2019.

data/spec/metanorma/base_spec.rb

@@ -357,7 +357,7 @@ RSpec.describe Metanorma::Iec do
            <?xml version="1.0" encoding="UTF-8"?>
             <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
                      <bibdata type='standard'>
-          <docidentifier type='ISO'>ISO/IEC/IETF/2CDTS 1000-1-1 ED 1</docidentifier>
+          <docidentifier type='ISO'>IEC/IETF/ISO/2CDTS 1000-1-1 ED 1</docidentifier>
           <docidentifier type='iso-tc'>2000</docidentifier>
           <docnumber>1000</docnumber>
           <contributor>
@@ -443,7 +443,7 @@ RSpec.describe Metanorma::Iec do
               <workgroup/>
             </editorialgroup>
             <structuredidentifier>
-              <project-number part='1' subpart='1'>ISO/IEC/IETF 1000</project-number>
+              <project-number part='1' subpart='1'>IEC/IETF/ISO 1000</project-number>
             </structuredidentifier>
             <stagename>Committee draft</stagename>
           </ext>

data/spec/metanorma/blocks_spec.rb

@@ -132,7 +132,7 @@ RSpec.describe Metanorma::Iec do
         <title>Terms and definitions</title>
         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
         #{TERMS_BOILERPLATE}
-        <term id="term-term1">
+        <term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
         <termnote id="_">
         <p id="_">This is a note</p>
@@ -254,7 +254,7 @@ RSpec.describe Metanorma::Iec do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
          #{TERMS_BOILERPLATE}
-         <term id="term-term1">
+         <term id="term-Term1">
          <preferred><expression><name>Term1</name></expression></preferred>
          <termexample id="_">
          <p id="_">This is an example</p>

data/spec/metanorma/cleanup_spec.rb

@@ -127,7 +127,7 @@ RSpec.describe Metanorma::Iec do
           <p id='_'>So am I</p>
         </li>
       </ul>
-             <term id="term-time">
+             <term id="term-Time">
              <preferred><expression><name>Time</name></expression></preferred>
                <definition><verbal-definition><p id="_">This paragraph is extraneous</p></verbal-definition></definition>
              </term></terms>

data/spec/metanorma/iev_spec.rb

@@ -164,7 +164,7 @@ RSpec.describe Metanorma::Iec do
             <title>Terms and definitions</title>
             <terms id='_' obligation='normative'>
               <title>General</title>
-              <term id='term-term-1'>
+              <term id='term-Term-1'>
                 <preferred><expression><name>Term 1</name></expression></preferred>
               </term>
             </terms>

data/spec/metanorma/inline_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
 RSpec.describe Metanorma::Iec do
-   before(:all) do
-  @blank_hdr = blank_hdr_gen
-end
+  before(:all) do
+    @blank_hdr = blank_hdr_gen
+  end
 
   it "processes breaks" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       Line break +
       line break
@@ -15,47 +15,56 @@ end
 
       <<<
     INPUT
-            #{@blank_hdr}
-       <sections><p id="_">Line break<br/>
-       line break</p>
-       <hr/>
-       <pagebreak/></sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections><p id="_">Line break<br/>
+      line break</p>
+      <hr/>
+      <pagebreak/></sections>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes links" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       mailto:fred@example.com
       http://example.com[]
       http://example.com[Link]
     INPUT
-            #{@blank_hdr}
-       <sections>
-         <p id="_">mailto:fred@example.com
-       <link target="http://example.com"/>
-       <link target="http://example.com">Link</link></p>
-       </sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections>
+        <p id="_">mailto:fred@example.com
+      <link target="http://example.com"/>
+      <link target="http://example.com">Link</link></p>
+      </sections>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
-    it "processes bookmarks" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes bookmarks" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       Text [[bookmark]] Text
     INPUT
-            #{@blank_hdr}
-       <sections>
-         <p id="_">Text <bookmark id="bookmark"/> Text</p>
-       </sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections>
+        <p id="_">Text <bookmark id="bookmark"/> Text</p>
+      </sections>
+      </iec-standard>
     OUTPUT
-    end
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 
-    it "processes crossreferences" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes crossreferences" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [[reference]]
       == Section
@@ -65,22 +74,25 @@ end
       Inline Reference with Text to <<reference,text>>
       Footnoted Reference with Text to <<reference,fn: text>>
     INPUT
-       #{@blank_hdr}
-        <sections>
-         <clause id="reference" inline-header="false" obligation="normative">
-         <title>Section</title>
-         <p id="_">Inline Reference to <xref target="reference"/>
-       Footnoted Reference to <xref target="reference"/>
-       Inline Reference with Text to <xref target="reference">text</xref>
-       Footnoted Reference with Text to <xref target="reference">text</xref></p>
-       </clause>
-       </sections>
-       </iec-standard>
-      OUTPUT
-    end
+    output = <<~OUTPUT
+      #{@blank_hdr}
+       <sections>
+        <clause id="reference" inline-header="false" obligation="normative">
+        <title>Section</title>
+        <p id="_">Inline Reference to <xref target="reference"/>
+      Footnoted Reference to <xref target="reference"/>
+      Inline Reference with Text to <xref target="reference">text</xref>
+      Footnoted Reference with Text to <xref target="reference">text</xref></p>
+      </clause>
+      </sections>
+      </iec-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 
-    it "processes bibliographic anchors" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes bibliographic anchors" do
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -89,41 +101,45 @@ end
       * [[[ISO713]]] Reference
 
     INPUT
-            #{@blank_hdr}
-       <sections>
+    output = <<~OUTPUT
+           #{@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>
-         <bibitem id="ISO712">
-         <formattedref format="application/x-isodoc+xml">Reference</formattedref>
-         <docidentifier>x</docidentifier>
-       </bibitem>
-         <bibitem id="ISO713">
-         <formattedref format="application/x-isodoc+xml">Reference</formattedref>
-         <docidentifier>ISO713</docidentifier>
-         <docnumber>713</docnumber>
-       </bibitem>
-       </references>
-       </bibliography>
-       </iec-standard>
+      </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>
+        <bibitem id="ISO712">
+        <formattedref format="application/x-isodoc+xml">Reference</formattedref>
+        <docidentifier>x</docidentifier>
+      </bibitem>
+        <bibitem id="ISO713">
+        <formattedref format="application/x-isodoc+xml">Reference</formattedref>
+        <docidentifier>ISO713</docidentifier>
+        <docnumber>713</docnumber>
+      </bibitem>
+      </references>
+      </bibliography>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes footnotes" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       Hello!footnote:[Footnote text]
     INPUT
-            #{@blank_hdr}
-       <sections>
-         <p id="_">Hello!<fn reference="1">
-         <p id="_">Footnote text</p>
-       </fn></p>
-       </sections>
-       </iec-standard>
+    output = <<~OUTPUT
+           #{@blank_hdr}
+      <sections>
+        <p id="_">Hello!<fn reference="1">
+        <p id="_">Footnote text</p>
+      </fn></p>
+      </sections>
+      </iec-standard>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
-
-
 end