metanorma-iec 1.2.6 → 1.2.11

data/spec/asciidoctor-iec/validate_spec.rb

@@ -37,4 +37,19 @@ it "Warns of illegal doctype" do
   INPUT
     expect(File.read("test.err")).to include "pizza is not a recognised document type"
 end
+
+it "Warns of illegal function" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :function: pizza
+
+  text
+  INPUT
+    expect(File.read("test.err")).to include "pizza is not a recognised document function"
+end
 end

data/spec/isodoc/i18n_spec.rb

@@ -7,6 +7,11 @@ RSpec.describe IsoDoc do
       <bibdata>
       <docnumber>1</docnumber>
       <language>en</language>
+      <ext>
+      <doctype>international-standard</doctype>
+      <horizontal>true</horizontal>
+      <function>emc</function>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -76,12 +81,19 @@ RSpec.describe IsoDoc do
         <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
        <bibdata>
        <docnumber>1</docnumber>
-       <language>en</language>
+       <language current="true">en</language>
+       <ext>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+<horizontal language=''>true</horizontal>
+<horizontal language='fr'>Norme horizontale</horizontal>
+<horizontal language='en'>Horizontal Standard</horizontal>
+<function language=''>emc</function>
+<function language='fr'>Publication fondamentale en CEM</function>
+<function language='en'>Basic EMC Publication</function>
+</ext>
        </bibdata>
-       <local_bibdata>
-       <docnumber>1</docnumber>
-       <language>en</language>
-       </local_bibdata>
        <preface>
        <foreword obligation="informative">
           <title>Foreword</title>
@@ -220,12 +232,12 @@ RSpec.describe IsoDoc do
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+        expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iec::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>
@@ -295,11 +307,8 @@ RSpec.describe IsoDoc do
         INPUT
         <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <bibdata>
-           <language>tlh</language>
+           <language current="true">tlh</language>
          </bibdata>
-         <local_bibdata>
-           <language>tlh</language>
-         </local_bibdata>
          <preface>
            <foreword obligation='informative'>
              <title>Foreword</title>
@@ -439,6 +448,11 @@ RSpec.describe IsoDoc do
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>fr</language>
+      <ext>
+      <doctype>international-standard</doctype>
+      <horizontal>false</horizontal>
+      <function>emc</function>
+      </ext>
       </bibdata>
       <preface>
       <foreword obligation="informative">
@@ -507,11 +521,17 @@ RSpec.describe IsoDoc do
         presxml = <<~OUTPUT
 <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
        <bibdata>
-       <language>fr</language>
+       <language current="true">fr</language>
+       <ext>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+  <horizontal language=''>false</horizontal>
+  <function language=''>emc</function>
+  <function language='fr'>Publication fondamentale en CEM</function>
+  <function language='en'>Basic EMC Publication</function>
+</ext>
        </bibdata>
-       <local_bibdata>
-       <language>fr</language>
-       </local_bibdata>
        <preface>
        <foreword obligation="informative">
           <title>Foreword</title>
@@ -651,7 +671,7 @@ RSpec.describe IsoDoc do
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 

data/spec/isodoc/iev_spec.rb

@@ -27,10 +27,6 @@ RSpec.describe IsoDoc do
     <docidentifier type='iso'>IEC/PWI 60050-871 ED 2</docidentifier>
     <docnumber>60050</docnumber>
   </bibdata>
-  <local_bibdata>
-    <docidentifier type='iso'>IEC/PWI 60050-871 ED 2</docidentifier>
-    <docnumber>60050</docnumber>
-  </local_bibdata>
   <preface>
     <foreword obligation='informative'>
       <title>Foreword</title>
@@ -68,7 +64,7 @@ OUTPUT
   </body>
 </html>
        OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
@@ -164,11 +160,11 @@ OUTPUT
                <abbreviation>IEC</abbreviation>
              </organization>
            </contributor>
-           <language>en</language>
-           <script>Latn</script>
+           <language current="true">en</language>
+           <script current="true">Latn</script>
            <status>
-             <stage>60</stage>
-             <substage>60</substage>
+             <stage language="">60</stage>
+             <substage language="">60</substage>
            </status>
            <copyright>
              <from>2020</from>
@@ -180,7 +176,7 @@ OUTPUT
              </owner>
            </copyright>
            <ext>
-             <doctype>article</doctype>
+             <doctype language="">article</doctype>
              <editorialgroup>
                <technical-committee/>
                <subcommittee/>
@@ -191,50 +187,6 @@ OUTPUT
              </structuredidentifier>
            </ext>
          </bibdata>
-         <local_bibdata type='standard'>
-           <docidentifier type='iso'>IEC 60050 ED 1</docidentifier>
-           <docnumber>60050</docnumber>
-           <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>60</stage>
-             <substage>60</substage>
-           </status>
-           <copyright>
-             <from>2020</from>
-             <owner>
-               <organization>
-                 <name>International Electrotechnical Commission</name>
-                 <abbreviation>IEC</abbreviation>
-               </organization>
-             </owner>
-           </copyright>
-           <ext>
-             <doctype>article</doctype>
-             <editorialgroup>
-               <technical-committee/>
-               <subcommittee/>
-               <workgroup/>
-             </editorialgroup>
-             <structuredidentifier>
-               <project-number>IEC 60050</project-number>
-             </structuredidentifier>
-           </ext>
-         </local_bibdata>
          <sections> </sections>
          <bibliography>
            <references obligation='informative' normative='true' id="X">
@@ -275,7 +227,7 @@ OUTPUT
   </body>
 </html>
 OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
@@ -343,10 +295,6 @@ presxml = <<~INPUT
            <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
            <docnumber>60050</docnumber>
     </bibdata>
-     <local_bibdata type='standard'>
-           <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
-           <docnumber>60050</docnumber>
-    </local_bibdata>
     <sections>
     <clause id="_terms_and_definitions" obligation="normative"><title depth="1">1<tab/>Terms and definitions</title>
     <terms id="_general" obligation="normative"><title>192-01 General</title>
@@ -493,7 +441,7 @@ html = <<~OUTPUT
   </body>
 </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
 end
 
@@ -530,10 +478,6 @@ end
     <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
     <docnumber>60050</docnumber>
   </bibdata>
-  <local_bibdata type='standard'>
-    <docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
-    <docnumber>60050</docnumber>
-  </local_bibdata>
   <sections>
     <clause id='_terms_and_definitions' obligation='normative'>
       <title depth='1'>1<tab/>Terms and definitions</title>
@@ -565,7 +509,7 @@ end
   </sections>
 </iso-standard>
 OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     IsoDoc::Iec::WordConvert.new({}).convert("test", presxml, false)
     word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
       sub(%r{<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>.*$}m, "")

data/spec/isodoc/iso_spec.rb

@@ -65,9 +65,9 @@ RSpec.describe IsoDoc::Iec do
     </iso-standard>
     INPUT
     html = File.read("test.doc", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New",monospace;]m)
+    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
     expect(html).to match(%r[Quote[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial",sans-serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Arial", sans-serif;]m)
   end
 
   it "processes examples" do

data/spec/isodoc/metadata_spec.rb

@@ -59,7 +59,15 @@ RSpec.describe IsoDoc::Iec::Metadata do
     </owner>
   </copyright>
   <ext>
-  <doctype>international-standard</doctype>
+  <doctype language=''>international-standard</doctype>
+  <doctype language='fr'>Norme international</doctype>
+  <doctype language='en'>International Standard</doctype>
+<horizontal language=''>true</horizontal>
+<horizontal language='fr'>Norme horizontale</horizontal>
+<horizontal language='en'>Horizontal Standard</horizontal>
+<function language=''>emc</function>
+<function language='fr'>Publication fondamentale en CEM</function>
+<function language='en'>Basic EMC Publication</function>
   <editorialgroup>
     <technical-committee number="34">Food products</technical-committee>
     <subcommittee number="4">Cereals and pulses</subcommittee>
@@ -76,6 +84,9 @@ INPUT
 {:accesseddate=>"2012",
 :activateddate=>"2013",
 :agency=>"ISO",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
 :createddate=>"2010&ndash;2011",
 :docnumber=>"ISO/PreCD3 17301-1",
 :docnumeric=>"1730",
@@ -90,17 +101,33 @@ INPUT
 :doctitlepart=>"Rice",
 :doctitlepartlabel=>"Part&nbsp;1",
 :doctype=>"International Standard",
+:doctype_display=>"International Standard",
+:doctype_en=>"International Standard",
+:doctype_fr=>"Norme International",
 :docyear=>"2016",
 :draft=>"0.4",
 :draftinfo=>" (draft 0.4, 2016-05-01)",
 :edition=>"2",
 :editorialgroup=>["TC 34", "SC 4", "WG 3"],
+:function=>"Emc",
+:function_display=>"Basic Emc Publication",
+:function_en=>"Basic Emc Publication",
+:function_fr=>"Publication Fondamentale En Cem",
+:horizontal=>"True",
+:horizontal_display=>"Horizontal Standard",
+:horizontal_en=>"Horizontal Standard",
+:horizontal_fr=>"Norme Horizontale",
+:implementeddate=>"XXX",
+:issueddate=>"XXX",
+:lang=>"en",
 :obsoleteddate=>"2014",
 :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=>"35",
 :stage_int=>35,
@@ -108,7 +135,12 @@ INPUT
 :statusabbr=>"3CD",
 :tc=>"TC 34",
 :tc_docnumber=>["17301"],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
 :unpublished=>true,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
 :wg=>"WG 3"}
 OUTPUT
   end
@@ -174,6 +206,7 @@ OUTPUT
   </relation>
   <ext>
   <doctype>technical-report</doctype>
+  <horizontal>false</horizontal>
   <editorialgroup>
     <technical-committee number="34" type="ABC">Food products</technical-committee>
     <subcommittee number="4" type="DEF">Cereals and pulses</subcommittee>
@@ -188,7 +221,12 @@ OUTPUT
 </bibdata>
 </iso-standard>
 INPUT
-{:agency=>"ISO/IEC",
+{:accesseddate=>"XXX",
+:agency=>"ISO/IEC",
+:circulateddate=>"XXX",
+:confirmeddate=>"XXX",
+:copieddate=>"XXX",
+:createddate=>"XXX",
 :docnumber=>"ISO/IEC/CD 17301-1-3",
 :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",
@@ -201,21 +239,37 @@ INPUT
 :doctitlepart=>"Rice",
 :doctitlepartlabel=>"Part&nbsp;1&ndash;3",
 :doctype=>"Technical Report",
+:doctype_display=>"Technical Report",
+:doctype_en=>"Technical Report",
+:doctype_fr=>"Technical Report",
 :docyear=>"2016",
 :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
+:horizontal=>"False",
 :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",
-:secretariat=>"XXXX",
+:script=>"Latn",
+:secretariat=>"XXX",
 :stage=>"50",
 :stage_int=>50,
 :stageabbr=>"FDIS",
 :statusabbr=>"CFDIS",
 :tc=>"ABC 34",
 :tc_docnumber=>["17301"],
+:transmitteddate=>"XXX",
+:unchangeddate=>"XXX",
 :unpublished=>true,
+:updateddate=>"XXX",
+:vote_endeddate=>"XXX",
+:vote_starteddate=>"XXX",
 :wg=>"GHI 3"}
 OUTPUT
   end

data/spec/isodoc/ref_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe IsoDoc::Iec 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>
@@ -128,11 +128,8 @@ RSpec.describe IsoDoc::Iec do
     presxml = <<~OUTPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
             <bibdata>
-            <language>en</language>
+            <language current="true">en</language>
             </bibdata>
-            <local_bibdata>
-            <language>en</language>
-            </local_bibdata>
             <preface><foreword>
           <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
           <eref bibitemid="ISO712">[110]</eref>
@@ -170,7 +167,7 @@ RSpec.describe IsoDoc::Iec 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>
@@ -372,7 +369,7 @@ RSpec.describe IsoDoc::Iec do
 </html>
 
     OUTPUT
-    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end