metanorma-iso 2.1.1 → 2.1.4

data/spec/isodoc/metadata_spec.rb

@@ -82,6 +82,11 @@ RSpec.describe IsoDoc::Iso::Metadata do
               <workgroup number="3">Rice Group</workgroup>
               <secretariat>GB</secretariat>
             </editorialgroup>
+            <approvalgroup>
+              <technical-committee number="34a">Food products A</technical-committee>
+              <subcommittee number="4a">Cereals and pulses A</subcommittee>
+              <workgroup number="3a">Rice Group A</workgroup>
+            </approvalgroup>
             <structuredidentifier>
               <project-number part="1">ISO/PreCD3 17301</project-number>
             </structuredidentifier>
@@ -94,9 +99,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
       {:accesseddate=>"2012",
       :activateddate=>"2013",
       :agency=>"ISO",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
+      :approvalgroup=>["TC 34a", "SC 4a", "WG 3a"],
       :createddate=>"2010&#x2013;2011",
       :docnumber=>"ISO/PreCD3 17301-1",
       :docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
@@ -120,14 +123,11 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :edition=>"2",
       :editorialgroup=>["TC 34", "SC 4", "WG 3"],
       :horizontal=>"true",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :keywords=>["kw2", "kw1"],
       :lang=>"en",
       :obsoleteddate=>"2014",
       :publisheddate=>"2011",
       :publisher=>"International Organization for Standardization",
-      :receiveddate=>"XXX",
       :revdate=>"2016-05-01",
       :revdate_monthyear=>"May 2016",
       :sc=>"SC 4",
@@ -137,14 +137,10 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :stage_int=>30,
       :stageabbr=>"CD",
       :statusabbr=>"PreCD3",
+      :substage_int=>"92",
       :tc=>"TC 34",
       :tc_docnumber=>["17301", "17302"],
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>true,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"WG 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input),
@@ -159,16 +155,9 @@ RSpec.describe IsoDoc::Iso::Metadata do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type="standard">
-          <title>
             <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
             <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
             <title type="title-part" language="en" format="text/plain">Rice</title>
-          </title>
-          <title>
-            <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
-            <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
-            <title type="title-part" language="fr" format="text/plain">Riz</title>
-          </title>
           <docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
           <docidentifier type="iso-with-lang">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
           <docidentifier type="iso-reference">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
@@ -218,6 +207,10 @@ RSpec.describe IsoDoc::Iso::Metadata do
               <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
               <workgroup number="3" type="GHI">Rice Group</workgroup>
             </editorialgroup>
+            <approvalgroup>
+              <technical-committee number="34" type="ABC">Food products</technical-committee>
+              <workgroup number="3" type="GHI">Rice Group</workgroup>
+            </approvalgroup>
             <ics><code>1.2.3</code></ics>
             <ics><code>1.2.3</code></ics>
             <structuredidentifier>
@@ -229,19 +222,11 @@ RSpec.describe IsoDoc::Iso::Metadata do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO/IEC",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
-      :createddate=>"XXX",
+      {:agency=>"ISO/IEC",
+      :approvalgroup=>["ABC 34", "GHI 3"],
       :docnumber=>"ISO/IEC/CD 17301-1-3",
       :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
       :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
-      :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&#xa0;&#x2014; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&#xa0;&#x2014; Partie&#xa0;1&#x2013;3: Riz",
-      :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
-      :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
-      :docsubtitlepart=>"Riz",
       :docsubtitlepartlabel=>"Partie&#xa0;1&#x2013;3",
       :doctitle=>"Cereals and pulses&#xa0;&#x2014; Specifications and test methods&#xa0;&#x2014; Part&#xa0;1&#x2013;3: Rice",
       :doctitleintro=>"Cereals and pulses",
@@ -253,29 +238,19 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :docyear=>"2016",
       :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
       :ics=>"1.2.3, 1.2.3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"en",
-      :obsoleteddate=>"XXX",
       :obsoletes=>"IEC 8121",
       :obsoletes_part=>"3.1",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization and International Electrotechnical Commission",
-      :receiveddate=>"XXX",
       :sc=>"DEF 4",
       :script=>"Latn",
-      :secretariat=>"XXX",
       :stage=>"60",
       :stage_int=>60,
       :statusabbr=>"IS",
+      :substage_int=>"92",
       :tc=>"ABC 34",
       :tc_docnumber=>["17301"],
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>false,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"GHI 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input),
@@ -294,16 +269,12 @@ RSpec.describe IsoDoc::Iso::Metadata do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type="standard">
-          <title>
             <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
             <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
             <title type="title-part" language="en" format="text/plain">Rice</title>
-          </title>
-          <title>
             <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
             <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
             <title type="title-part" language="fr" format="text/plain">Riz</title>
-          </title>
           <docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
           <docidentifier type="iso-with-lang">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
           <docidentifier type="iso-reference">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
@@ -365,12 +336,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO/IEC",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
-      :createddate=>"XXX",
+      {:agency=>"ISO/IEC",
       :docnumber=>"ISO/IEC/CD 17301-1-3",
       :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
       :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
@@ -389,29 +355,19 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :docyear=>"2016",
       :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
       :ics=>"1.2.3, 1.2.3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"fr",
-      :obsoleteddate=>"XXX",
       :obsoletes=>"IEC 8121",
       :obsoletes_part=>"3.1",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization et International Electrotechnical Commission",
-      :receiveddate=>"XXX",
       :sc=>"DEF 4",
       :script=>"Latn",
-      :secretariat=>"XXX",
       :stage=>"60",
       :stage_int=>60,
       :statusabbr=>"IS",
+      :substage_int=>"92",
       :tc=>"ABC 34",
       :tc_docnumber=>["17301"],
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>false,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"GHI 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input),
@@ -430,21 +386,15 @@ RSpec.describe IsoDoc::Iso::Metadata do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type="standard">
-          <title>
             <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
             <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
             <title type="title-part" language="en" format="text/plain">Rice</title>
-          </title>
-          <title>
             <title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
             <title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
             <title type="title-part" language="fr" format="text/plain">Riz</title>
-          </title>
-          <title>
             <title type="title-intro" language="ru" format="text/plain">Зерновые и бобовые</title>
             <title type="title-main" language="ru" format="text/plain">Технические характеристики и методы испытаний</title>
             <title type="title-part" language="ru" format="text/plain">Рис</title>
-          </title>
           <docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
           <docidentifier type="iso-with-lang">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
           <docidentifier type="iso-reference">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
@@ -506,12 +456,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO/IEC",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
-      :createddate=>"XXX",
+      {:agency=>"ISO/IEC",
       :docnumber=>"ISO/IEC/CD 17301-1-3",
       :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
       :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
@@ -530,32 +475,227 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :docyear=>"2016",
       :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
       :ics=>"1.2.3, 1.2.3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"ru",
-      :obsoleteddate=>"XXX",
       :obsoletes=>"IEC 8121",
       :obsoletes_part=>"3.1",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization &#x438; International Electrotechnical Commission",
-      :receiveddate=>"XXX",
       :sc=>"DEF 4",
       :script=>"Latn",
-      :secretariat=>"XXX",
       :stage=>"60",
       :stage_int=>60,
       :statusabbr=>"IS",
+      :substage_int=>"92",
       :tc=>"ABC 34",
       :tc_docnumber=>["17301"],
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>false,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"GHI 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input),
                            nil))).to be_equivalent_to output
   end
+
+  it "warns of missing Secretariat" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata type="standard">
+              <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+              <status><stage abbreviation="CD">30</stage></status>
+              <date type="published">2000</date>
+              <ext>
+                <editorialgroup>
+                </editorialgroup>
+              </ext>
+          </bibdata>
+          <sections>
+            <clause>
+              <title>Clause 1</title>
+            </clause>
+          </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <sections>
+        <clause displayorder="1">
+          <title depth="1">
+            <review date="#{Date.today}" reviewer="Metanorma" id="_">
+              <p>
+                <strong>
+                  Metadata warnings:
+                  <strong/>
+                  <p>Secretariat is missing.</p>
+                </strong>
+              </p>
+            </review>
+            Clause 1
+          </title>
+        </clause>
+      </sections>
+    OUTPUT
+    expect(xmlpp(strip_guid(Nokogiri::XML(
+      IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    )
+      .at("//xmlns:sections").to_xml)))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "warns of missing publication date" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata type="standard">
+              <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+              <status><stage abbreviation="CD">30</stage></status>
+              <ext>
+                <editorialgroup>
+                </editorialgroup>
+                <secretariat>BSI</secretariat>
+              </ext>
+          </bibdata>
+          <sections>
+            <clause>
+              <title>Clause 1</title>
+            </clause>
+          </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <sections>
+        <clause displayorder="1">
+          <title depth="1">
+            <review date="#{Date.today}" reviewer="Metanorma" id="_">
+              <p>
+                <strong>
+                  Metadata warnings:
+                  <strong/>
+                  <p>Document date is missing.</p>
+                </strong>
+              </p>
+            </review>
+            Clause 1
+          </title>
+        </clause>
+      </sections>
+    OUTPUT
+    expect(strip_guid(xmlpp(Nokogiri::XML(
+      IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    )
+  .at("//xmlns:sections")
+      .at("//xmlns:sections").to_xml)))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "warns of missing editorial groups" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata type="standard">
+              <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+              <status><stage abbreviation="CD">30</stage></status>
+              <date type="published">2000</date>
+              <ext>
+                <secretariat>BSI</secretariat>
+              </ext>
+          </bibdata>
+          <sections>
+            <clause>
+              <title>Clause 1</title>
+            </clause>
+          </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <sections>
+        <clause displayorder="1">
+          <title depth="1">
+            <review date="#{Date.today}" reviewer="Metanorma" id="_">
+              <p>
+                <strong>
+                  Metadata warnings:
+                  <strong/>
+                  <p>Editorial groups are missing.</p>
+                </strong>
+              </p>
+            </review>
+            Clause 1
+          </title>
+        </clause>
+      </sections>
+    OUTPUT
+    expect(strip_guid(xmlpp(Nokogiri::XML(
+      IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    )
+  .at("//xmlns:sections")
+      .at("//xmlns:sections").to_xml)))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "does not warn of missing metadata in compliant document" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata type="standard">
+              <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+              <status><stage abbreviation="CD">30</stage></status>
+              <date type="published">2000</date>
+              <ext>
+                <editorialgroup>
+                </editorialgroup>
+                <secretariat>BSI</secretariat>
+                </ext>
+          </bibdata>
+          <sections>
+            <clause>
+              <title>Clause 1</title>
+            </clause>
+          </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <sections>
+        <clause displayorder='1'>
+          <title depth='1'>Clause 1</title>
+        </clause>
+      </sections>
+    OUTPUT
+    expect(strip_guid(xmlpp(Nokogiri::XML(
+      IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    )
+      .at("//xmlns:sections").to_xml)))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "does not warn of missing metadata in published document" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata type="standard">
+              <title type="title-main" language="en" format="text/plain">Specifications and test methods</title>
+              <status><stage abbreviation="CD">90</stage></status>
+              <ext>
+                <editorialgroup>
+                </editorialgroup>
+                <secretariat>BSI</secretariat>
+              </ext>
+          </bibdata>
+          <sections>
+            <clause>
+              <title>Clause 1</title>
+            </clause>
+          </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <sections>
+        <clause displayorder='1'>
+          <title depth='1'>Clause 1</title>
+        </clause>
+      </sections>
+    OUTPUT
+    expect(strip_guid(xmlpp(Nokogiri::XML(
+      IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    )
+  .at("//xmlns:sections").to_xml)))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/isodoc/postproc_spec.rb

@@ -30,11 +30,9 @@ RSpec.describe IsoDoc do
       .convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
           <bibdata>
-            <title>
               <title format="text/plain" language="en" type="title-intro">Cereals and pulses</title>
               <title format="text/plain" language="en" type="title-main">Specifications and test methods</title>
               <title format="text/plain" language="en" type="title-part">Rice</title>
-            </title>
           </bibdata>
           <preface>
             <foreword>
@@ -59,11 +57,9 @@ RSpec.describe IsoDoc do
       .convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
           <bibdata>
-            <title>
               <title format="text/plain" language="en" type="title-intro">Cereals and pulses</title>
               <title format="text/plain" language="en" type="title-main">Specifications and test methods</title>
               <title format="text/plain" language="en" type="title-part">Rice</title>
-            </title>
           </bibdata>
           <preface>
             <foreword>
@@ -381,7 +377,7 @@ RSpec.describe IsoDoc do
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*An empty word intro page\./m, "")
       .sub(%r{</div>.*$}m, "</div>")
-    .gsub(/<o:p>&#xA0;<\/o:p>/, "")
+      .gsub(/<o:p>&#xA0;<\/o:p>/, "")
 
     expect(xmlpp("<div>#{word.gsub(/_Toc\d\d+/, '_Toc')}"))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
@@ -848,6 +844,46 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+  it "processes editorial notes (Word)" do
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <annex id="P" inline-header="false" obligation="normative">
+            <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="editorial">
+                           <p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>
+                   Only use paddy or parboiled rice for the
+                   determination of husked rice yield.
+                 </p>
+          <p id="_e94663cc-2473-4ccc-9a72-983a74d989f3">Para 2.</p>
+        </admonition>
+            </annex>
+          </iso-standard>
+      INPUT
+    word = File.read("test.doc", encoding: "UTF-8")
+      .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
+      .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
+    expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+           <div class='WordSection3'>
+         <p class='zzSTDTitle1'/>
+         <p class='MsoNormal'>
+           <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+         </p>
+         <div class='Section3'>
+           <a name='P' id='P'/>
+           <div class='zzHelp'>
+             <a name='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a'/>
+             <p class='zzHelp'> Only use paddy or parboiled rice for the determination of husked rice yield. </p>
+             <p class='zzHelp'>
+               <a name='_e94663cc-2473-4ccc-9a72-983a74d989f3' id='_e94663cc-2473-4ccc-9a72-983a74d989f3'/>
+               Para 2.
+             </p>
+           </div>
+         </div>
+       </div>
+    OUTPUT
+  end
+
   it "processes boilerplate" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/section_spec.rb

@@ -526,7 +526,7 @@ RSpec.describe IsoDoc do
 
   it "processes multiple terms & definitions sections" do
     input = <<~INPUT
-      #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, '<doctype>article</doctype><subdoctype>vocabulary</subdoctype>')}
+      #{BLANK_HDR.sub(%r{<doctype>standard</doctype>}, '<doctype>standard</doctype><subdoctype>vocabulary</subdoctype>')}
                <sections>
            <terms id='A' obligation='normative'>
              <title>Terms and definitions</title>
@@ -561,8 +561,7 @@ RSpec.describe IsoDoc do
            <language current='true'>en</language>
            <script current='true'>Latn</script>
            <status>
-             <stage abbreviation='IS' language=''>60</stage>
-             <stage abbreviation='IS' language='en'>International standard</stage>
+             <stage abbreviation='IS'>60</stage>
              <substage>60</substage>
            </status>
              <copyright>
@@ -575,13 +574,14 @@ RSpec.describe IsoDoc do
                </owner>
              </copyright>
              <ext>
-               <doctype>article</doctype>
+               <doctype>standard</doctype>
                <subdoctype>vocabulary</subdoctype>
-               <editorialgroup>
-                 <technical-committee/>
-                 <subcommittee/>
-                 <workgroup/>
+               <editorialgroup identifier='ISO'>
+               <agency>ISO</agency>
                </editorialgroup>
+               <approvalgroup identifier='ISO'>
+               <agency>ISO</agency>
+               </approvalgroup>
                <stagename>International standard</stagename>
              </ext>
            </bibdata>
@@ -708,7 +708,7 @@ RSpec.describe IsoDoc do
           </div>
           <p><br clear="all" class="section"/></p>
           <div class="WordSection3">
-            <p class="zzSTDTitle1"/>
+            <p class="zzSTDTitle"/>
           </div>
           <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
           <div class="colophon"/>