metanorma-iso 2.1.1 → 2.1.2

data/spec/isodoc/i18n_spec.rb

@@ -93,7 +93,7 @@ RSpec.describe IsoDoc do
         <bibdata>
            <status>
              <stage abbreviation='IS' language=''>60</stage>
-             <stage abbreviation='IS' language='en'>International standard</stage>
+             <stage abbreviation='IS' language='en'>International Standard</stage>
            </status>
            <language current='true'>en</language>
            <ext>
@@ -308,7 +308,7 @@ RSpec.describe IsoDoc do
              <br clear='all' class='section'/>
            </p>
            <div class='WordSection3'>
-             <p class='zzSTDTitle1'/>
+             <p class='zzSTDTitle'/>
              <div id='D'>
                <h1>
                  1
@@ -453,90 +453,90 @@ RSpec.describe IsoDoc do
   it "defaults to English" do
     output = IsoDoc::Iso::PresentationXMLConvert.new({})
       .convert("test", <<~"INPUT", true)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <bibdata>
-            <status>
-            <stage abbreviation='IS' language=''>60</stage>
-          </status>
-          <language>tlh</language>
-          <ext>
-            <doctype language=''>international-standard</doctype>
-          </ext>
-        </bibdata>
-        <preface>
-          <foreword obligation="informative">
-            <title>Foreword</title>
-            <p id="A">This is a preamble</p>
-          </foreword>
-          <introduction id="B" obligation="informative">
-            <title>Introduction</title>
-            <clause id="C" inline-header="false" obligation="informative">
-              <title>Introduction Subsection</title>
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata>
+              <status>
+              <stage abbreviation='IS' language=''>60</stage>
+            </status>
+            <language>tlh</language>
+            <ext>
+              <doctype language=''>international-standard</doctype>
+            </ext>
+          </bibdata>
+          <preface>
+            <foreword obligation="informative">
+              <title>Foreword</title>
+              <p id="A">This is a preamble</p>
+            </foreword>
+            <introduction id="B" obligation="informative">
+              <title>Introduction</title>
+              <clause id="C" inline-header="false" obligation="informative">
+                <title>Introduction Subsection</title>
+              </clause>
+              <p>This is patent boilerplate</p>
+            </introduction>
+          </preface>
+          <sections>
+            <clause id="D" obligation="normative" type="scope">
+              <title>Scope</title>
+              <p id="E">Text</p>
             </clause>
-            <p>This is patent boilerplate</p>
-          </introduction>
-        </preface>
-        <sections>
-          <clause id="D" obligation="normative" type="scope">
-            <title>Scope</title>
-            <p id="E">Text</p>
-          </clause>
-          <clause id="H" obligation="normative">
-            <title>Terms, definitions, symbols and abbreviated terms</title>
-            <terms id="I" obligation="normative">
-              <title>Normal Terms</title>
-              <term id="J">
-                <preferred><expression><name>Term2</name></expression></preferred>
-              </term>
-            </terms>
-            <definitions id="K">
+            <clause id="H" obligation="normative">
+              <title>Terms, definitions, symbols and abbreviated terms</title>
+              <terms id="I" obligation="normative">
+                <title>Normal Terms</title>
+                <term id="J">
+                  <preferred><expression><name>Term2</name></expression></preferred>
+                </term>
+              </terms>
+              <definitions id="K">
+                <dl>
+                  <dt>Symbol</dt>
+                  <dd>Definition</dd>
+                </dl>
+              </definitions>
+            </clause>
+            <definitions id="L">
               <dl>
                 <dt>Symbol</dt>
                 <dd>Definition</dd>
               </dl>
             </definitions>
-          </clause>
-          <definitions id="L">
-            <dl>
-              <dt>Symbol</dt>
-              <dd>Definition</dd>
-            </dl>
-          </definitions>
-          <clause id="M" inline-header="false" obligation="normative">
-            <title>Clause 4</title>
-            <clause id="N" inline-header="false" obligation="normative">
-              <title>Introduction</title>
-            </clause>
-            <clause id="O" inline-header="false" obligation="normative">
-              <title>Clause 4.2</title>
+            <clause id="M" inline-header="false" obligation="normative">
+              <title>Clause 4</title>
+              <clause id="N" inline-header="false" obligation="normative">
+                <title>Introduction</title>
+              </clause>
+              <clause id="O" inline-header="false" obligation="normative">
+                <title>Clause 4.2</title>
+              </clause>
             </clause>
-          </clause>
-        </sections>
-        <annex id="P" inline-header="false" obligation="normative">
-          <title>Annex</title>
-          <clause id="Q" inline-header="false" obligation="normative">
-            <title>Annex A.1</title>
-            <clause id="Q1" inline-header="false" obligation="normative">
-              <title>Annex A.1a</title>
+          </sections>
+          <annex id="P" inline-header="false" obligation="normative">
+            <title>Annex</title>
+            <clause id="Q" inline-header="false" obligation="normative">
+              <title>Annex A.1</title>
+              <clause id="Q1" inline-header="false" obligation="normative">
+                <title>Annex A.1a</title>
+              </clause>
             </clause>
-          </clause>
-          <appendix id="Q2" inline-header="false" obligation="normative">
-            <title>An Appendix</title>
-          </appendix>
-        </annex>
-        <bibliography>
-          <references id="R" normative="true" obligation="informative">
-            <title>Normative References</title>
-          </references>
-          <clause id="S" obligation="informative">
-            <title>Bibliography</title>
-            <references id="T" normative="false" obligation="informative">
-              <title>Bibliography Subsection</title>
+            <appendix id="Q2" inline-header="false" obligation="normative">
+              <title>An Appendix</title>
+            </appendix>
+          </annex>
+          <bibliography>
+            <references id="R" normative="true" obligation="informative">
+              <title>Normative References</title>
             </references>
-          </clause>
-        </bibliography>
-      </iso-standard>
-    INPUT
+            <clause id="S" obligation="informative">
+              <title>Bibliography</title>
+              <references id="T" normative="false" obligation="informative">
+                <title>Bibliography Subsection</title>
+              </references>
+            </clause>
+          </bibliography>
+        </iso-standard>
+      INPUT
     expect(xmlpp(output)
       .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -544,7 +544,7 @@ RSpec.describe IsoDoc do
           <bibdata>
            <status>
              <stage abbreviation='IS' language=''>60</stage>
-             <stage abbreviation='IS' language='tlh'>International standard</stage>
+             <stage abbreviation='IS' language='tlh'>International Standard</stage>
            </status>
            <language current='true'>tlh</language>
            <ext>
@@ -1010,14 +1010,14 @@ RSpec.describe IsoDoc do
            <status>
              <stage abbreviation='IS' language=''>60</stage>
              <stage abbreviation='IS' language='ru'>
-               &#x41C;&#x435;&#x436;&#x434;&#x443;&#x43D;&#x430;&#x440;&#x43E;&#x434;&#x43D;&#x44B;&#x439; &#x441;&#x442;&#x430;&#x43D;&#x434;&#x430;&#x440;&#x442;
+               Международный Стандарт
              </stage>
            </status>
            <language current='true'>ru</language>
            <ext>
              <doctype language=''>international-standard</doctype>
              <doctype language='ru'>
-               &#x41C;&#x435;&#x436;&#x434;&#x443;&#x43D;&#x430;&#x440;&#x43E;&#x434;&#x43D;&#x44B;&#x439; &#x421;&#x442;&#x430;&#x43D;&#x434;&#x430;&#x440;&#x442;
+               Международный Стандарт
              </doctype>
            </ext>
          </bibdata>
@@ -1511,4 +1511,69 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true)))
       .to be_equivalent_to xmlpp(html)
   end
+
+  it "internationalises locality" do
+    input = <<~"INPUT"
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <bibdata>
+      <language>fr</language>
+      <script>Latn</script>
+      <status>
+      <stage>published</stage>
+      <substage>withdrawn</substage>
+      </status>
+      <edition>2</edition>
+      <ext>
+      <doctype>brochure</doctype>
+      </ext>
+      </bibdata>
+      <preface>
+      <foreword obligation="informative">
+         <title>Foreword</title>
+         <p id="A"><eref type="inline" bibitemid="ISO712"><locality type="locality:appendix"><referenceFrom>7</referenceFrom></locality></eref></p>
+         <p id="B"><eref type="inline" bibitemid="ISO712"><locality type="annex"><referenceFrom>7</referenceFrom></locality></eref></p>
+       </foreword>
+       </preface>
+       <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+      <bibitem id="ISO712" type="standard">
+        <title format="text/plain">Cereals and cereal products</title>
+        <docidentifier>ISO 712</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <abbreviation>ISO</abbreviation>
+          </organization>
+        </contributor>
+      </bibitem>
+          </references>
+          </bibliography>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <foreword obligation='informative' displayorder='1'>
+              <title>Foreword</title>
+              <p id='A'>
+                <eref type='inline' bibitemid='ISO712'>
+                  <locality type='locality:appendix'>
+                    <referenceFrom>7</referenceFrom>
+                  </locality>
+                  ISO 712, Appendice 7
+                </eref>
+              </p>
+              <p id='B'>
+          <eref type='inline' bibitemid='ISO712'>
+            <locality type='annex'>
+              <referenceFrom>7</referenceFrom>
+            </locality>
+            ISO 712,
+            <span class='citeapp'>Annexe 7</span>
+          </eref>
+        </p>
+      </foreword>
+    OUTPUT
+    expect(xmlpp(Nokogiri::XML(IsoDoc::Iso::PresentationXMLConvert
+      .new({}).convert("test", input, true))
+      .at("//xmlns:foreword").to_xml))
+      .to be_equivalent_to xmlpp(presxml)
+  end
 end

data/spec/isodoc/iso_spec.rb

@@ -195,180 +195,61 @@ RSpec.describe IsoDoc::Iso do
     OUTPUT
   end
 
-  it "processes examples" do
+  it "inserts identifiers for editorial group and approval group" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <name>Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
+        <bibdata>
+          <ext>
+            <doctype>international-standard</doctype>
+            <horizontal>true</horizontal>
+            <editorialgroup>
+              <agency>ISO</agency>
+              <agency>IEC</agency>
+              <technical-committee type="A" number="34">Food products</technical-committee>
+              <subcommittee type="B" number="4">Cereals and pulses</subcommittee>
+              <workgroup type="C" number="3">Rice Group</workgroup>
+              <secretariat>GB</secretariat>
+            </editorialgroup>
+            <approvalgroup>
+              <agency>ISO</agency>
+              <technical-committee type="D" number="34a">Food products A</technical-committee>
+              <subcommittee type="E" number="4a">Cereals and pulses A</subcommittee>
+              <workgroup type="F" number="3a">Rice Group A</workgroup>
+            </approvalgroup>
+            <stagename>Committee draft</stagename>
+          </ext>
+        </bibdata>
       </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-      <?xml version='1.0'?>
-      <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword displayorder="1">
-            <example id="samplecode">
-              <name>EXAMPLE — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    OUTPUT
-
-    html = <<~OUTPUT
-      #{HTML_HDR}
-            <br/>
-            <div>
-              <h1 class="ForewordTitle">Foreword</h1>
-              <div id="samplecode" class="example">
-                <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span>&#160; Hello</p>
-              </div>
-            </div>
-            <p class="zzSTDTitle1"/>
-          </div>
-        </body>
-      </html>
-    OUTPUT
-
-    word = <<~OUTPUT
-          <body lang="EN-US" link="blue" vlink="#954F72">
-        <div class="WordSection1">
-          <p>&#160;</p>
-        </div>
-        <p>
-          <br clear="all" class="section"/>
-        </p>
-        <div class="WordSection2">
-          <p>
-            <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-          </p>
-          <div>
-            <h1 class="ForewordTitle">Foreword</h1>
-            <div id="samplecode" class="example">
-              <p><span class="example_label">EXAMPLE&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
-            </div>
-          </div>
-          <p>&#160;</p>
-        </div>
-        <p>
-          <br clear="all" class="section"/>
-        </p>
-        <div class="WordSection3">
-          <p class="zzSTDTitle1"/>
-        </div>
-        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
-        <div class="colophon"/>
-      </body>
-    OUTPUT
-    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
-      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
-    expect(IsoDoc::Iso::HtmlConvert.new({})
-      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
-    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
-    expect(xmlpp(output
-      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
-      .to be_equivalent_to xmlpp(word)
-  end
-
-  it "processes sequences of examples" do
-    input = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <example id="samplecode">
-              <quote>Hello</quote>
-            </example>
-            <example id="samplecode2">
-              <name>Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
-    presxml = <<~OUTPUT
-      <?xml version='1.0'?>
-      <iso-standard type="presentation" xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword displayorder="1">
-            <example id="samplecode">
-              <name>EXAMPLE 1</name>
-              <quote>Hello</quote>
-            </example>
-            <example id="samplecode2">
-              <name>EXAMPLE 2 — Title</name>
-              <p>Hello</p>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    OUTPUT
-    html = <<~OUTPUT
-      #{HTML_HDR}
-            <br/>
-            <div>
-              <h1 class="ForewordTitle">Foreword</h1>
-              <div id="samplecode" class="example">
-                <p><span class="example_label">EXAMPLE  1</span>&#160; </p>
-                 <div class="Quote">Hello</div>
-              </div>
-              <div id="samplecode2" class="example">
-                <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span>&#160; Hello</p>
-              </div>
-            </div>
-            <p class="zzSTDTitle1"/>
-          </div>
-        </body>
-      </html>
-    OUTPUT
-    word = <<~OUTPUT
-          <body lang="EN-US" link="blue" vlink="#954F72">
-        <div class="WordSection1">
-          <p>&#160;</p>
-        </div>
-        <p>
-          <br clear="all" class="section"/>
-        </p>
-        <div class="WordSection2">
-          <p>
-            <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
-          </p>
-          <div>
-            <h1 class="ForewordTitle">Foreword</h1>
-            <div id="samplecode" class="example">
-              <p><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#160; </span></p>
-              <div class="Quote">Hello</div>
-            </div>
-            <div id="samplecode2" class="example">
-              <p><span class="example_label">EXAMPLE  2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
-            </div>
-          </div>
-          <p>&#160;</p>
-        </div>
-        <p>
-          <br clear="all" class="section"/>
-        </p>
-        <div class="WordSection3">
-          <p class="zzSTDTitle1"/>
-        </div>
-        <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
-        <div class="colophon"/>
-      </body>
+      <bibdata>
+        <ext>
+          <doctype language=''>international-standard</doctype>
+          <doctype language='en'>International Standard</doctype>
+          <horizontal>true</horizontal>
+          <editorialgroup identifier='ISO/IEC/A 34/B 4/C 3'>
+              <agency>ISO</agency>
+              <agency>IEC</agency>
+            <technical-committee type='A' number='34'>Food products</technical-committee>
+            <subcommittee type='B' number='4'>Cereals and pulses</subcommittee>
+            <workgroup type='C' number='3'>Rice Group</workgroup>
+            <secretariat>GB</secretariat>
+          </editorialgroup>
+          <approvalgroup identifier='ISO/D 34a/E 4a/F 3a'>
+              <agency>ISO</agency>
+            <technical-committee type='D' number='34a'>Food products A</technical-committee>
+            <subcommittee type='E' number='4a'>Cereals and pulses A</subcommittee>
+            <workgroup type='F' number='3a'>Rice Group A</workgroup>
+          </approvalgroup>
+          <stagename>Committee draft</stagename>
+        </ext>
+      </bibdata>
     OUTPUT
-    expect(IsoDoc::Iso::PresentationXMLConvert.new({})
-      .convert("test", input, true)).to be_equivalent_to xmlpp(presxml)
-    expect(IsoDoc::Iso::HtmlConvert.new({})
-      .convert("test", presxml, true)).to be_equivalent_to xmlpp(html)
-    output = IsoDoc::Iso::WordConvert.new({}).convert("test", presxml, true)
-    expect(xmlpp(output
-      .sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")))
-      .to be_equivalent_to xmlpp(word)
+    expect(xmlpp(Nokogiri::XML(
+      IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true),
+    )
+      .at("//xmlns:bibdata").to_xml))
+      .to be_equivalent_to xmlpp(presxml)
   end
 end