metanorma-iec 2.0.8 → 2.1.2

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,51 +164,31 @@ 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>
+            <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>
+            <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>
@@ -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>
@@ -355,7 +307,7 @@ RSpec.describe IsoDoc::Iec do
               </p>
               <p id='ref11' class='Biblio'>
                 [4]&#160; IETF RFC 10,
-                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+                <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/isodoc/section_spec.rb

@@ -69,69 +69,69 @@ RSpec.describe IsoDoc do
     INPUT
 
     presxml = <<~OUTPUT
-        <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-        <preface>
-        <foreword obligation="informative" displayorder="1">
-           <title>Foreword</title>
-           <p id="A">This is a preamble</p>
-         </foreword>
-          <introduction id="B" obligation="informative" displayorder="2"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
-           <title depth="2">0.1<tab/>Introduction Subsection</title>
-         </clause>
-         <p>This is patent boilerplate</p>
-         </introduction></preface><sections>
-         <clause id="D" obligation="normative" type="scope" displayorder="3">
-           <title depth="1">1<tab/>Scope</title>
-           <p id="E">Text</p>
-         </clause>
-      
-         <clause id="H" obligation="normative" displayorder="5"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
-           <title depth="2">3.1<tab/>Normal Terms</title>
-           <term id="J"><name>3.1.1</name>
-           <preferred>Term2</preferred>
-         </term>
-         </terms>
-         <definitions id="K"><title>3.2</title>
-           <dl>
-           <dt>Symbol</dt>
-           <dd>Definition</dd>
-           </dl>
-         </definitions>
-         </clause>
-         <definitions id="L" displayorder="6"><title>4</title>
-           <dl>
-           <dt>Symbol</dt>
-           <dd>Definition</dd>
-           </dl>
-         </definitions>
-         <clause id="M" inline-header="false" obligation="normative" displayorder="7"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
-           <title depth="2">5.1<tab/>Introduction</title>
-         </clause>
-         <clause id="O" inline-header="false" obligation="normative">
-           <title depth="2">5.2<tab/>Clause 4.2</title>
-         </clause></clause>
-      
-         </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
-           <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
-           <clause id="Q" inline-header="false" obligation="normative">
-           <title depth="2">A.1<tab/>Annex A.1</title>
-           <clause id="Q1" inline-header="false" obligation="normative">
-           <title depth="3">A.1.1<tab/>Annex A.1a</title>
-           </clause>
-         </clause>
-                <appendix id="Q2" inline-header="false" obligation="normative">
-           <title depth="2">Appendix 1<tab/>An Appendix</title>
-         </appendix>
-         </annex><bibliography><references id="R" obligation="informative" normative="true" displayorder="4">
-           <title depth="1">2<tab/>Normative References</title>
-         </references><clause id="S" obligation="informative" displayorder="9">
-           <title depth="1">Bibliography</title>
-           <references id="T" obligation="informative" normative="false">
-           <title depth="2">Bibliography Subsection</title>
-         </references>
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <preface>
+      <foreword obligation="informative" displayorder="1">
+         <title>Foreword</title>
+         <p id="A">This is a preamble</p>
+       </foreword>
+        <introduction id="B" obligation="informative" displayorder="2"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
+         <title depth="2">0.1<tab/>Introduction Subsection</title>
+       </clause>
+       <p>This is patent boilerplate</p>
+       </introduction></preface><sections>
+       <clause id="D" obligation="normative" type="scope" displayorder="3">
+         <title depth="1">1<tab/>Scope</title>
+         <p id="E">Text</p>
+       </clause>
+
+       <clause id="H" obligation="normative" displayorder="5"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
+         <title depth="2">3.1<tab/>Normal Terms</title>
+         <term id="J"><name>3.1.1</name>
+         <preferred>Term2</preferred>
+       </term>
+       </terms>
+       <definitions id="K"><title>3.2</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       </clause>
+       <definitions id="L" displayorder="6"><title>4</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       <clause id="M" inline-header="false" obligation="normative" displayorder="7"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+         <title depth="2">5.1<tab/>Introduction</title>
+       </clause>
+       <clause id="O" inline-header="false" obligation="normative">
+         <title depth="2">5.2<tab/>Clause 4.2</title>
+       </clause></clause>
+
+       </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
+         <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+         <clause id="Q" inline-header="false" obligation="normative">
+         <title depth="2">A.1<tab/>Annex A.1</title>
+         <clause id="Q1" inline-header="false" obligation="normative">
+         <title depth="3">A.1.1<tab/>Annex A.1a</title>
          </clause>
-         </bibliography>
-         </iso-standard>
+       </clause>
+              <appendix id="Q2" inline-header="false" obligation="normative">
+         <title depth="2">Appendix 1<tab/>An Appendix</title>
+       </appendix>
+       </annex><bibliography><references id="R" obligation="informative" normative="true" displayorder="4">
+         <title depth="1">2<tab/>Normative References</title>
+       </references><clause id="S" obligation="informative" displayorder="9">
+         <title depth="1">Bibliography</title>
+         <references id="T" obligation="informative" normative="false">
+         <title depth="2">Bibliography Subsection</title>
+       </references>
+       </clause>
+       </bibliography>
+       </iso-standard>
     OUTPUT
 
     html = <<~OUTPUT
@@ -305,13 +305,18 @@ RSpec.describe IsoDoc do
             <div class="colophon"/>
           </body>
     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(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(word)
+    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(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(word)
   end
 
   it "processes subclauses with and without titles" do
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
             <iso-standard xmlns="http://riboseinc.com/isoxml">
              <sections>
              <clause id="D" obligation="normative">
@@ -325,6 +330,7 @@ RSpec.describe IsoDoc do
              </sections>
              </iso-standard>
     INPUT
+    output = <<~OUTPUT
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <sections>
           <clause id='D' obligation='normative' displayorder="1">
@@ -347,10 +353,12 @@ RSpec.describe IsoDoc do
         </sections>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes simple terms & definitions" 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="H" obligation="normative"><title>1<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
@@ -362,6 +370,7 @@ RSpec.describe IsoDoc do
        </sections>
        </iso-standard>
     INPUT
+    output = <<~OUTPUT
           #{HTML_HDR}
                       <div id="">
          <h1 class="ForewordTitle">FOREWORD</h1>
@@ -376,10 +385,12 @@ RSpec.describe IsoDoc do
                  </body>
              </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", input, true)))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes inline section headers" 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>
              <clause id="M" inline-header="false" obligation="normative"><title>1<tab/>Clause 4</title>
@@ -392,6 +403,7 @@ RSpec.describe IsoDoc do
              </sections>
             </iso-standard>
     INPUT
+    output = <<~OUTPUT
           #{HTML_HDR}
           <div id="">
         <h1 class="ForewordTitle">FOREWORD</h1>
@@ -411,10 +423,12 @@ RSpec.describe IsoDoc do
                  </body>
              </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", input, true)))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "adds colophon to published standard (Word)" do
-    expect(xmlpp(IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
         <status>
@@ -426,30 +440,34 @@ RSpec.describe IsoDoc do
       </sections>
       </iso-standard>
     INPUT
-              <body lang="EN-US" link="blue" vlink="#954F72">
-                <div class="WordSection2">
-                <p>
-      <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-            </p>
-            #{IEC_TITLE}
-                <div id="">
-      <h1 class="ForewordTitle">FOREWORD</h1>
-      <div class="boilerplate_legal"/>
-            </div>
-                  <p>&#160;</p>
-                </div>
-                <p><br clear="all" class="section"/></p>
-                <div class="WordSection3">
-                #{IEC_TITLE1}
-                </div>
-                <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
-                <div class="colophon"/>
-              </body>
+    output = <<~OUTPUT
+          <body lang='EN-US' link='blue' vlink='#954F72'>
+        <div class='WordSection1'>
+          <p>&#xa0;</p>
+        </div>
+        <p>
+          <br clear='all' class='section'/>
+        </p>
+        <div class='WordSection2'>
+          <p>&#xa0;</p>
+        </div>
+        <p>
+          <br clear='all' class='section'/>
+        </p>
+        <div class='WordSection3'>
+          <p class='zzSTDTitle'/>
+        </div>
+        <br clear='all' style='page-break-before:left;mso-break-type:section-break'/>
+        <div class='colophon'/>
+      </body>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::WordConvert.new({}).convert("test", input, true)
+      .sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "does not add colophon to draft standard (Word)" do
-    expect(xmlpp(IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
         <status>
@@ -461,6 +479,7 @@ RSpec.describe IsoDoc do
       </sections>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
                <body lang="EN-US" link="blue" vlink="#954F72">
                  <div class="WordSection2">
                     <p>
@@ -479,10 +498,15 @@ RSpec.describe IsoDoc do
                  </div>
                </body>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::WordConvert.new({})
+      .convert("test", input, true)
+      .sub(/^.*<body /m, "<body ")
+      .sub(%r{</body>.*$}m, "</body>")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "adds boilerplate to foreword" 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">
       <bibdata>
         <ext><doctype>International Standard</doctype></ext>
@@ -495,6 +519,7 @@ RSpec.describe IsoDoc do
       <sections/>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
           #{HTML_HDR}
           <div id="">
         <h1 class="ForewordTitle">FOREWORD</h1>
@@ -507,10 +532,12 @@ RSpec.describe IsoDoc do
                  </body>
              </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({})
+    .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "does not add boilerplate to foreword in amendments" 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">
       <bibdata>
         <ext><doctype>Amendment</doctype></ext>
@@ -523,6 +550,7 @@ RSpec.describe IsoDoc do
       <sections/>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
           #{HTML_HDR}
           <div id="">
         <h1 class="ForewordTitle">FOREWORD</h1>
@@ -532,5 +560,7 @@ RSpec.describe IsoDoc do
                  </body>
              </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 end

data/spec/metanorma/base_spec.rb

@@ -165,8 +165,9 @@ RSpec.describe Metanorma::Iec do
             </bibitem>
           </relation>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
             <editorialgroup>
+              <agency>IEC</agency>
               <technical-committee number='1' type='A'>TC</technical-committee>
               <technical-committee number='11' type='A1'>TC1</technical-committee>
               <subcommittee number='2' type='B'>SC</subcommittee>
@@ -357,7 +358,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>
@@ -438,12 +439,15 @@ RSpec.describe Metanorma::Iec do
             <horizontal>true</horizontal>
             <function>emc</function>
             <editorialgroup>
+              <agency>IEC</agency>
+              <agency>IETF</agency>
+              <agency>ISO</agency>
               <technical-committee/>
               <subcommittee/>
               <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>
@@ -673,8 +677,9 @@ RSpec.describe Metanorma::Iec do
           </owner>
         </copyright>
         <ext>
-          <doctype>article</doctype>
+          <doctype>standard</doctype>
           <editorialgroup>
+            <agency>IEC</agency>
             <technical-committee/>
             <subcommittee/>
             <workgroup/>
@@ -876,8 +881,9 @@ RSpec.describe Metanorma::Iec do
           </owner>
         </copyright>
         <ext>
-          <doctype>article</doctype>
+          <doctype>standard</doctype>
           <editorialgroup>
+            <agency>IEC</agency>
             <technical-committee/>
             <subcommittee/>
             <workgroup/>
@@ -943,8 +949,9 @@ RSpec.describe Metanorma::Iec do
           </owner>
         </copyright>
         <ext>
-          <doctype>article</doctype>
+          <doctype>standard</doctype>
           <editorialgroup>
+            <agency>IEC</agency>
             <technical-committee/>
             <subcommittee/>
             <workgroup/>

data/spec/metanorma/cleanup_spec.rb

@@ -54,6 +54,7 @@ RSpec.describe Metanorma::Iec do
         <ext>
           <doctype>article</doctype>
         <editorialgroup>
+          <agency>IEC</agency>
           <technical-committee/>
           <subcommittee/>
           <workgroup/>

data/spec/metanorma/iev_spec.rb

@@ -60,6 +60,7 @@ RSpec.describe Metanorma::Iec do
                    <doctype>article</doctype>
                             <subdoctype>vocabulary</subdoctype>
                    <editorialgroup>
+                     <agency>IEC</agency>
                      <technical-committee/>
                      <subcommittee/>
                      <workgroup/>
@@ -148,6 +149,7 @@ RSpec.describe Metanorma::Iec do
             <doctype>article</doctype>
                             <subdoctype>vocabulary</subdoctype>
             <editorialgroup>
+              <agency>IEC</agency>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>
@@ -230,6 +232,7 @@ RSpec.describe Metanorma::Iec do
                <doctype>article</doctype>
                         <subdoctype>vocabulary</subdoctype>
                <editorialgroup>
+                 <agency>IEC</agency>
                  <technical-committee/>
                  <subcommittee/>
                  <workgroup/>