metanorma-iso 1.5.7 → 1.5.12

data/spec/isodoc/blocks_spec.rb

@@ -272,7 +272,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <formula id='_be9158af-7e93-4ee2-90c5-26d31c181934' unnumbered='true'>
@@ -436,6 +436,7 @@ OUTPUT
                <div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
+                       <span style='mso-tab-count:1'>&#160; </span>
                  </p>
                </div>
                <p>where</p>

data/spec/isodoc/i18n_spec.rb

@@ -72,9 +72,9 @@ RSpec.describe IsoDoc do
         INPUT
 
         presxml = <<~OUTPUT
-         <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -238,12 +238,12 @@ RSpec.describe IsoDoc do
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(<<~"OUTPUT")
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -311,9 +311,9 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml'>
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>tlh</language>
+           <language current="true">tlh</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -520,9 +520,9 @@ RSpec.describe IsoDoc do
        INPUT
 
        presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>fr</language>
+           <language current="true">fr</language>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -685,7 +685,7 @@ OUTPUT
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
@@ -770,10 +770,10 @@ OUTPUT
        </iso-standard>
         INPUT
         presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>zh</language>
-           <script>Hans</script>
+           <language current="true">zh</language>
+           <script current="true">Hans</script>
          </bibdata>
          <preface>
            <foreword obligation='informative'>
@@ -947,7 +947,7 @@ OUTPUT
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 

data/spec/isodoc/inline_spec.rb

@@ -194,7 +194,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes eref content" do
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true)).sub(%r{<i18nyaml>.*</i18nyaml>}m, "")).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -229,7 +229,7 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
        <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
            <foreword>
              <p>

data/spec/isodoc/iso_spec.rb

@@ -175,7 +175,7 @@ end
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode'>
@@ -231,7 +231,7 @@ OUTPUT
     </iso-standard>
     INPUT
     <?xml version='1.0'?>
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <preface>
     <foreword>
       <example id='samplecode'>

data/spec/isodoc/metadata_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
     <title type="title-intro" language="en" format="text/plain">Cereals and pulses</title>
@@ -81,8 +81,9 @@ INPUT
 {:accesseddate=>"2012",
 :activateddate=>"2013",
 :agency=>"ISO",
-:authors=>[],
-:authors_affiliations=>{},
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
 :createddate=>"2010&ndash;2011",
 :docnumber=>"ISO/PreCD3 17301-1",
 :docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
@@ -99,21 +100,24 @@ INPUT
 :doctitlepart=>"Rice",
 :doctitlepartlabel=>"Part&nbsp;1",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
 :draft=>"0.4",
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
-:ics=>nil,
+:implementeddate=>"XXX",
+:issueddate=>"XXX",
 :keywords=>["kw2", "kw1"],
+:lang=>"en",
 :obsoleteddate=>"2014",
-:obsoletes=>nil,
-:obsoletes_part=>nil,
 :publisheddate=>"2011",
 :publisher=>"International Organization for Standardization",
+:receiveddate=>"XXX",
 :revdate=>"2016-05-01",
 :revdate_monthyear=>"May 2016",
 :sc=>"SC 4",
+:script=>"Latn",
 :secretariat=>"GB",
 :stage=>"30",
 :stage_int=>30,
@@ -121,17 +125,22 @@ INPUT
 :statusabbr=>"PreCD3",
 :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
   end
 
-  it "processes IsoXML metadata" do
+  it "processes IsoXML metadata #2" do
     c = IsoDoc::Iso::HtmlConvert.new({})
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title>
@@ -203,13 +212,15 @@ OUTPUT
 </bibdata>
 </iso-standard>
 INPUT
-{:agency=>"ISO/IEC",
-:authors=>[],
-:authors_affiliations=>{},
+{:accesseddate=>"XXX",
+:agency=>"ISO/IEC",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
+:createddate=>"XXX",
 :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)",
-:docnumeric=>nil,
 :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz",
 :docsubtitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
 :docsubtitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
@@ -221,26 +232,166 @@ INPUT
 :doctitlepart=>"Rice",
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
 :docyear=>"2016",
-:draft=>nil,
-:draftinfo=>"",
-:edition=>nil,
 :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
 :ics=>"1.2.3, 1.2.3",
-:keywords=>[],
+: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",
-:revdate=>nil,
-:revdate_monthyear=>nil,
+:receiveddate=>"XXX",
+:sc=>"DEF 4",
+:script=>"Latn",
+:secretariat=>"XXX",
+:stage=>"60",
+:stage_int=>60,
+:statusabbr=>"IS",
+:tc=>"ABC 34",
+:tc_docnumber=>["17301"],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
+:unpublished=>false,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
+:wg=>"GHI 3"}
+OUTPUT
+  end
+
+  it "processes IsoXML metadata in French" do
+    c = IsoDoc::Iso::HtmlConvert.new({})
+    arr = c.convert_init(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>fr</language>
+    </bibdata>
+    </iso-standard>
+    INPUT
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
+    <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>
+  <docidentifier type="iso-tc">17301</docidentifier>
+  <contributor>
+    <role type="author"/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+     </organization>
+  </contributor>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Electrotechnical Commission</name>
+      <abbreviation>IEC</abbreviation>
+    </organization>
+  </contributor>
+  <language>fr</language>
+  <script>Latn</script>
+  <status>
+    <stage abbreviation="IS">60</stage>
+    <substage>92</substage>
+  </status>
+  <copyright>
+    <from>2016</from>
+    <owner>
+      <organization>
+        <name>International Organization for Standardization</name>
+      </organization>
+    </owner>
+  </copyright>
+  <relation type="obsoletes">
+    <locality type="clause"><referenceFrom>3.1</referenceFrom></locality>
+    <docidentifier>IEC 8121</docidentifier>
+  </relation>
+  <ext>
+  <doctype language="">international-standard</doctype>
+  <doctype language="fr">Standard International</doctype>
+  <editorialgroup>
+    <technical-committee number="34" type="ABC">Food products</technical-committee>
+    <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
+    <workgroup number="3" type="GHI">Rice Group</workgroup>
+  </editorialgroup>
+  <ics><code>1.2.3</code></ics>
+  <ics><code>1.2.3</code></ics>
+    <structuredidentifier>
+    <project-number part="1" subpart="3">ISO/IEC/CD 17301</project-number>
+  </strucuredidentifier>
+  <stagename>International standard</stagename>
+  </ext>
+</bibdata>
+</iso-standard>
+INPUT
+{:accesseddate=>"XXX",
+:agency=>"ISO/IEC",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
+:createddate=>"XXX",
+: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=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice",
+:docsubtitleintro=>"Cereals and pulses",
+:docsubtitlemain=>"Specifications and test methods",
+:docsubtitlepart=>"Rice",
+:docsubtitlepartlabel=>"Part&nbsp;1&ndash;3",
+:doctitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz",
+:doctitleintro=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses",
+:doctitlemain=>"Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai",
+:doctitlepart=>"Riz",
+:doctitlepartlabel=>"Partie&nbsp;1&ndash;3",
+:doctype=>"International Standard",
+:doctype_display=>"Standard International",
+: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",
-:secretariat=>"XXXX",
+:script=>"Latn",
+:secretariat=>"XXX",
 :stage=>"60",
 :stage_int=>60,
 :statusabbr=>"IS",
 :tc=>"ABC 34",
 :tc_docnumber=>["17301"],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
 :unpublished=>false,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
 :wg=>"GHI 3"}
 OUTPUT
   end

data/spec/isodoc/postproc_spec.rb

@@ -611,9 +611,9 @@ documentation.</p>
     INPUT
 
     presxml = <<~OUTPUT
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
                <bibdata type="standard">
-               <status><stage>30</stage></status>
+               <status><stage language="">30</stage></status>
                </bibdata>
            <boilerplate>
          <copyright-statement>
@@ -661,7 +661,7 @@ documentation.</p>
 
      FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-expect((IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", presxml, false)
     word = File.read("test.html", encoding: "UTF-8")
     expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'

data/spec/isodoc/ref_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe IsoDoc do
       <abbreviation>ISO</abbreviation>
     </organization>
   </contributor>
-  <note format="text/plain" reference="1" type="ISO DATE">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+  <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>
@@ -121,9 +121,9 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>en</language>
+           <language current="true">en</language>
          </bibdata>
          <preface>
            <foreword>
@@ -175,7 +175,7 @@ RSpec.describe IsoDoc do
                    <abbreviation>ISO</abbreviation>
                  </organization>
                </contributor>
-               <note format='text/plain' reference='1' type='ISO DATE'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+               <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>
@@ -339,7 +339,7 @@ html = <<~OUTPUT
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true)).sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end