metanorma-iso 2.0.2 → 2.0.5

data/spec/isodoc/metadata_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
     _ = c.convert_init(<<~"INPUT", "test", false)
       <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-    expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type="standard">
           <title format="text/plain" language="en" type="title-intro">Cereals and pulses</title>
@@ -90,6 +90,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
         </bibdata>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
       {:accesseddate=>"2012",
       :activateddate=>"2013",
       :agency=>"ISO",
@@ -146,6 +147,8 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :vote_starteddate=>"XXX",
       :wg=>"WG 3"}
     OUTPUT
+    expect(metadata(c.info(Nokogiri::XML(input),
+                           nil))).to be_equivalent_to output
   end
 
   it "processes IsoXML metadata #2" do
@@ -153,7 +156,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
     _ = c.convert_init(<<~"INPUT", "test", false)
       <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-    expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type="standard">
           <title>
@@ -225,6 +228,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
         </bibdata>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
       {:accesseddate=>"XXX",
       :agency=>"ISO/IEC",
       :circulateddate=>"XXX",
@@ -274,6 +278,8 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :vote_starteddate=>"XXX",
       :wg=>"GHI 3"}
     OUTPUT
+    expect(metadata(c.info(Nokogiri::XML(input),
+                           nil))).to be_equivalent_to output
   end
 
   it "processes IsoXML metadata in French" do
@@ -285,7 +291,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
         </bibdata>
       </iso-standard>
     INPUT
-    expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type="standard">
           <title>
@@ -358,6 +364,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
         </bibdata>
       </iso-standard>
     INPUT
+    output = <<~OUTPUT
       {:accesseddate=>"XXX",
       :agency=>"ISO/IEC",
       :circulateddate=>"XXX",
@@ -407,5 +414,148 @@ RSpec.describe IsoDoc::Iso::Metadata do
       :vote_starteddate=>"XXX",
       :wg=>"GHI 3"}
     OUTPUT
+    expect(metadata(c.info(Nokogiri::XML(input),
+                           nil))).to be_equivalent_to output
+  end
+
+  it "processes IsoXML metadata in Russian" do
+    c = IsoDoc::Iso::HtmlConvert.new({})
+    _ = c.convert_init(<<~"INPUT", "test", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
+          <language>ru</language>
+        </bibdata>
+      </iso-standard>
+    INPUT
+    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>
+          <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>ru</language>
+          <script>Cyrl</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
+    output = <<~OUTPUT
+      {: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=>"&#x417;&#x435;&#x440;&#x43d;&#x43e;&#x432;&#x44b;&#x435; &#x438; &#x431;&#x43e;&#x431;&#x43e;&#x432;&#x44b;&#x435;&nbsp;&mdash; &#x422;&#x435;&#x445;&#x43d;&#x438;&#x447;&#x435;&#x441;&#x43a;&#x438;&#x435; &#x445;&#x430;&#x440;&#x430;&#x43a;&#x442;&#x435;&#x440;&#x438;&#x441;&#x442;&#x438;&#x43a;&#x438; &#x438; &#x43c;&#x435;&#x442;&#x43e;&#x434;&#x44b; &#x438;&#x441;&#x43f;&#x44b;&#x442;&#x430;&#x43d;&#x438;&#x439;&nbsp;&mdash; Часть&nbsp;1&ndash;3: &#x420;&#x438;&#x441;",
+      :doctitleintro=>"&#x417;&#x435;&#x440;&#x43d;&#x43e;&#x432;&#x44b;&#x435; &#x438; &#x431;&#x43e;&#x431;&#x43e;&#x432;&#x44b;&#x435;",
+      :doctitlemain=>"&#x422;&#x435;&#x445;&#x43d;&#x438;&#x447;&#x435;&#x441;&#x43a;&#x438;&#x435; &#x445;&#x430;&#x440;&#x430;&#x43a;&#x442;&#x435;&#x440;&#x438;&#x441;&#x442;&#x438;&#x43a;&#x438; &#x438; &#x43c;&#x435;&#x442;&#x43e;&#x434;&#x44b; &#x438;&#x441;&#x43f;&#x44b;&#x442;&#x430;&#x43d;&#x438;&#x439;",
+      :doctitlepart=>"&#x420;&#x438;&#x441;",
+      :doctitlepartlabel=>"Часть&nbsp;1&ndash;3",
+      :doctype=>"International Standard",
+      :doctype_display=>"International Standard",
+      :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",
+      :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
 end

data/spec/isodoc/postproc_spec.rb

@@ -222,7 +222,7 @@ RSpec.describe IsoDoc do
       .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
 
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-           <div class='WordSection3'>
+      <div class='WordSection3'>
          <p class='zzSTDTitle1'/>
          <div>
            <a name='_terms_and_definitions' id='_terms_and_definitions'/>
@@ -241,9 +241,7 @@ RSpec.describe IsoDoc do
              rice retaining its husk after threshing
            </p>
            <p class='Source'>
-             [SOURCE:
-             <a href='#ISO7301'>ISO 7301:2011, 3.1</a>
-             , modified &#x2013; The term "cargo rice" is shown as deprecated, and Note
+             [SOURCE: ISO 7301:2011, 3.1, modified &#x2013; The term "cargo rice" is shown as deprecated, and Note
              1 to entry is not included here]
            </p>
          </div>
@@ -875,6 +873,7 @@ RSpec.describe IsoDoc do
         <bibdata type="standard">
           <status>
             <stage language="">30</stage>
+            <stage language='en'>Committee draft</stage>
           </status>
         </bibdata>
         <boilerplate>

data/spec/isodoc/section_spec.rb

@@ -562,6 +562,7 @@ RSpec.describe IsoDoc do
            <script current='true'>Latn</script>
            <status>
              <stage abbreviation='IS' language=''>60</stage>
+             <stage abbreviation='IS' language='en'>International standard</stage>
              <substage language=''>60</substage>
            </status>
            <copyright>

data/spec/isodoc/terms_spec.rb

@@ -161,7 +161,7 @@ RSpec.describe IsoDoc do
                 </ul>
               </div>
               <p>[SOURCE:
-                <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &#8211;
+                ISO 7301:2011, 3.1, modified &#8211;
                   The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p>
               <p class="TermNum" id="paddy">1.2</p>
               <p class="Terms" style="text-align:left;"><b>paddy</b></p>
@@ -187,7 +187,7 @@ RSpec.describe IsoDoc do
                   <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
                 </p>
               </div>
-              <p>[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p>
+              <p>[SOURCE: ISO 7301:2011, 3.1]</p>
               <p class='TermNum' id='A'>1.3</p>
               <p class='Terms' style='text-align:left;'><b>term1</b></p>
                term1 definition
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
           </ul></div>
 
         <p class="Source">[SOURCE:
-          <a href="#ISO7301">ISO 7301:2011, 3.1</a>, modified &#8211;
+          ISO 7301:2011, 3.1, modified &#8211;
             The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p>
         <p class="TermNum" id="paddy">1.2</p>
         <p class="Terms" style="text-align:left;"><b>paddy</b></p>
@@ -228,7 +228,7 @@ RSpec.describe IsoDoc do
         </div>
         <div id='_671a1994-4783-40d0-bc81-987d06ffb74e' class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
         <div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
-        <p class="Source">[SOURCE: <a href="#ISO7301">ISO 7301:2011, 3.1</a>]</p>
+        <p class="Source">[SOURCE: ISO 7301:2011, 3.1]</p>
         <p class='TermNum' id='A'>1.3</p>
         <p class='Terms' style='text-align:left;'><b>term1</b></p>
          term1 definition

data/spec/isodoc/xref_spec.rb

@@ -1373,7 +1373,7 @@ RSpec.describe IsoDoc do
             <title depth="1">1
               <tab/>
               Scope</title>
-            <ol id="N">
+            <ol id="N" type="alphabet">
               <li>
                 <p>A</p>
               </li>
@@ -1388,12 +1388,12 @@ RSpec.describe IsoDoc do
               Widgets</title>
             <clause id="widgets1" inline-header="true">
               <title>3.1</title>
-              <ol id="note1">
+              <ol id="note1" type="alphabet">
                 <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different
                           types of kernel.
                         </p>
               </ol>
-              <ol id="note2">
+              <ol id="note2" type="alphabet">
                 <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different
                           types of kernel.
                         </p>
@@ -1407,7 +1407,7 @@ RSpec.describe IsoDoc do
             <br/>(informative)</title>
           <clause id="annex1a" inline-header="true">
             <title>A.1</title>
-            <ol id="AN">
+            <ol id="AN" type="alphabet">
               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different
                         types of kernel.
                       </p>
@@ -1415,12 +1415,12 @@ RSpec.describe IsoDoc do
           </clause>
           <clause id="annex1b" inline-header="true">
             <title>A.2</title>
-            <ol id="Anote1">
+            <ol id="Anote1" type="alphabet">
               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different
                         types of kernel.
                       </p>
             </ol>
-            <ol id="Anote2">
+            <ol id="Anote2" type="alphabet">
               <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different
                         types of kernel.
                       </p>
@@ -1513,7 +1513,7 @@ RSpec.describe IsoDoc do
         <sections>
           <clause id='scope' type='scope' displayorder='2'>
             <title depth='1'>1<tab/>Scope</title>
-            <ol id='N1'>
+            <ol id='N1' type="alphabet">
               <li id='N'>
                 <p>A</p>
               </li>
@@ -1523,12 +1523,12 @@ RSpec.describe IsoDoc do
           <clause id='widgets' displayorder='4'>
           <title depth='1'>3<tab/>Widgets</title>
             <clause inline-header="true" id='widgets1'><title>3.1</title>
-              <ol id='note1l'>
+              <ol id='note1l' type="alphabet">
                 <li id='note1'>
                   <p>A</p>
                 </li>
               </ol>
-              <ol id='note2l'>
+              <ol id='note2l' type="alphabet">
                 <li id='note2'>
                   <p>A</p>
                 </li>
@@ -1538,19 +1538,19 @@ RSpec.describe IsoDoc do
         </sections>
         <annex id='annex1'  displayorder='5'><title><strong>Annex A</strong><br/>(informative)</title>
           <clause inline-header="true" id='annex1a'><title>A.1</title>
-            <ol id='ANl'>
+            <ol id='ANl' type="alphabet">
               <li id='AN'>
                 <p>A</p>
               </li>
             </ol>
           </clause>
           <clause inline-header="true" id='annex1b'><title>A.2</title>
-            <ol id='Anote1l'>
+            <ol id='Anote1l' type="alphabet">
               <li id='Anote1'>
                 <p>A</p>
               </li>
             </ol>
-            <ol id='Anote2l'>
+            <ol id='Anote2l' type="alphabet">
               <li id='Anote2'>
                 <p>A</p>
               </li>
@@ -1633,22 +1633,22 @@ RSpec.describe IsoDoc do
         <sections>
           <clause id='scope' type='scope' displayorder='2'>
             <title depth='1'>1<tab/>Scope</title>
-            <ol id='N1'>
+            <ol id='N1' type="alphabet">
               <li id='N'>
                 <p>A</p>
-                <ol>
+                <ol type="arabic">
                   <li id='note1'>
                     <p>A</p>
-                    <ol>
+                    <ol type="roman">
                       <li id='note2'>
                         <p>A</p>
-                        <ol>
+                        <ol type="alphabet_upper">
                           <li id='AN'>
                             <p>A</p>
-                            <ol>
+                            <ol type="roman_upper">
                               <li id='Anote1'>
                                 <p>A</p>
-                                <ol>
+                                <ol type="alphabet">
                                   <li id='Anote2'>
                                     <p>A</p>
                                   </li>