metanorma-iso 2.0.8.1 → 2.1.2

data/spec/isodoc/inline_spec.rb

@@ -199,7 +199,7 @@ RSpec.describe IsoDoc do
             <title>1<tab/>
               Normative references</title>
             <bibitem id="ISO712" type="standard">
-              <title format="text/plain">Cereals and cereal products</title>
+              <formattedref format="text/plain"><em>Cereals and cereal products</em></formattedref>
               <docidentifier>ISO 712</docidentifier>
               <contributor>
                 <role type="publisher"/>
@@ -297,6 +297,7 @@ RSpec.describe IsoDoc do
                   </locality>
                 </eref>
                 <eref bibitemid="ISO712" citeas="ISO 712" type="inline">A</eref>
+                <eref bibitemid="ISO712" citeas="ISO/IEC DIR 1" type="inline"/>
               </p>
             </foreword>
           </preface>
@@ -328,40 +329,40 @@ RSpec.describe IsoDoc do
                 <eref bibitemid="IEV" citeas="IEV" type="inline">
                   <locality type="clause">
                     <referenceFrom>1-2-3</referenceFrom>
-                  </locality>IEV, 1-2-3</eref>
-                <eref bibitemid="ISO712" citeas="ISO 712" type="inline">ISO 712</eref>
+                  </locality><span class='stdpublisher'>IEV</span>, <span class="citesec">1-2-3</span></eref>
+                <eref bibitemid="ISO712" citeas="ISO 712" type="inline"><span class='stdpublisher'>ISO</span> <span class='stddocNumber'>712</span></eref>
                 <eref bibitemid="ISO712" type="inline">ISO 712</eref>
                 <eref bibitemid="ISO712" type="inline">
                   <locality type="table">
                     <referenceFrom>1</referenceFrom>
-                  </locality>ISO 712, Table 1</eref>
+                  </locality>ISO 712, <span class="citetbl">Table 1</span></eref>
                 <eref bibitemid="ISO712" type="inline">
                   <locality type="table">
                     <referenceFrom>1</referenceFrom>
                     <referenceTo>1</referenceTo>
-                  </locality>ISO 712, Table 1–1</eref>
+                  </locality>ISO 712, <span class="citetbl">Table 1–1</span></eref>
                 <eref bibitemid="ISO712" type="inline">
                   <locality type="clause">
                     <referenceFrom>1</referenceFrom>
                   </locality>
                   <locality type="table">
                     <referenceFrom>1</referenceFrom>
-                  </locality>ISO 712, Clause 1, Table 1</eref>
+                  </locality>ISO 712, <span class="citesec">Clause 1</span>, <span class="citetbl">Table 1</span></eref>
                 <eref bibitemid="ISO712" type="inline">
                   <locality type="clause">
                     <referenceFrom>1</referenceFrom>
                   </locality>
                   <locality type="list">
                     <referenceFrom>a</referenceFrom>
-                  </locality>ISO 712, Clause 1 a)</eref>
+                  </locality>ISO 712, <span class="citesec">Clause 1</span> a)</eref>
                 <eref bibitemid="ISO712" type="inline">
                   <locality type="clause">
                     <referenceFrom>1</referenceFrom>
-                  </locality>ISO 712, Clause 1</eref>
+                  </locality>ISO 712, <span class="citesec">Clause 1</span></eref>
                 <eref bibitemid="ISO712" type="inline">
                   <locality type="clause">
                     <referenceFrom>1.5</referenceFrom>
-                  </locality>ISO 712, 1.5</eref>
+                  </locality>ISO 712, <span class="citesec">1.5</span></eref>
                 <eref bibitemid="ISO712" type="inline">
                   <locality type="table">
                     <referenceFrom>1</referenceFrom>
@@ -373,6 +374,11 @@ RSpec.describe IsoDoc do
                     <referenceFrom>7</referenceFrom>
                   </locality>ISO 712, Prelude 7</eref>
                 <eref bibitemid="ISO712" citeas="ISO 712" type="inline">A</eref>
+                <eref bibitemid='ISO712' citeas='ISO/IEC DIR 1' type='inline'>
+          <span class='stdpublisher'>ISO/IEC</span>
+          <span class='stddocNumber'>DIR</span>
+          <span class='stddocNumber'>1</span>
+        </eref>
               </p>
             </foreword>
           </preface>
@@ -381,14 +387,8 @@ RSpec.describe IsoDoc do
               <title depth="1">1<tab/>
                 Normative References</title>
               <bibitem id="ISO712" type="standard">
-                <title format="text/plain">Cereals and cereal products</title>
+                 <formattedref><em><span class='stddocTitle'>Cereals and cereal products</span></em></formattedref>
                 <docidentifier>ISO 712</docidentifier>
-                <contributor>
-                  <role type="publisher"/>
-                  <organization>
-                    <abbreviation>ISO</abbreviation>
-                  </organization>
-                </contributor>
               </bibitem>
             </references>
           </bibliography>
@@ -509,11 +509,11 @@ RSpec.describe IsoDoc do
           <p>
           <ul>
                     <li>
-              (<xref target="clause1">Clause 3</xref>)
+              (<xref target="clause1"><span class='citesec'>Clause 3</span></xref>)
             </li>
             <li>
               <em>term</em>
-              (<xref target="clause1">Clause 3</xref>)
+              (<xref target="clause1"><span class='citesec'>Clause 3</span></xref>)
             </li>
           <li>
               <em>w[o]rd</em>
@@ -521,7 +521,7 @@ RSpec.describe IsoDoc do
             </li>
             <li>
               <em>term</em>
-              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">ISO 712</eref>)
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712"><span class='stdpublisher'>ISO</span> <span class='stddocNumber'>712</span></eref>)
             </li>
             <li>
               <em>word</em>
@@ -533,7 +533,7 @@ RSpec.describe IsoDoc do
                   <referenceFrom>3.1</referenceFrom>
                 </locality><locality type="figure">
                   <referenceFrom>a</referenceFrom>
-                </locality>ISO 712, 3.1, Figure a</eref>)
+                </locality><span class='stdpublisher'>ISO</span> <span class='stddocNumber'>712</span>, <span class="citesec">3.1</span>, <span class="citefig">Figure a</span></eref>)
             </li>
             <li>
               <em>word</em>
@@ -545,7 +545,7 @@ RSpec.describe IsoDoc do
                 <locality type="figure">
                   <referenceFrom>b</referenceFrom>
                 </locality>
-              </localityStack>ISO 712, 3.1 and Figure b</eref>)
+              </localityStack><span class='stdpublisher'>ISO</span> <span class='stddocNumber'>712</span>, <span class="citesec">3.1</span> and <span class="citefig">Figure b</span></eref>)
             </li>
             <li>
               <em>word</em>
@@ -584,15 +584,8 @@ RSpec.describe IsoDoc do
           <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder="1"><title depth="1">1<tab/>Normative References</title>
           <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
       <bibitem id="ISO712" type="standard">
-        <title format="text/plain">Cereals or cereal products</title>
-        <title type="main" format="text/plain">Cereals and cereal products</title>
+         <formattedref><em><span class='stddocTitle'>Cereals and cereal products</span></em></formattedref>
         <docidentifier type="ISO">ISO 712</docidentifier>
-        <contributor>
-          <role type="publisher"/>
-          <organization>
-            <name>International Organization for Standardization</name>
-          </organization>
-        </contributor>
       </bibitem>
       </references></bibliography>
           </iso-standard>
@@ -768,7 +761,7 @@ RSpec.describe IsoDoc do
                 <li>
                   <em>term</em>
                    (
-                  <xref target='clause1'>1.2</xref>
+                  <xref target='clause1'><span class='citesec'>1.2</span></xref>
                   )
                 </li>
                 <li> term </li>
@@ -780,7 +773,7 @@ RSpec.describe IsoDoc do
                 <li>
                   <em>term</em>
                    (
-                  <xref target='clause1'>1.2</xref>
+                  <xref target='clause1'><span class='citesec'>1.2</span></xref>
                   )
                 </li>
                 <li> term </li>
@@ -850,15 +843,15 @@ RSpec.describe IsoDoc do
         <ul>
         <li>
             <em>term</em>
-            (<xref target="clause1">Clause 1</xref>)
+            (<xref target="clause1"><span class='citesec'>Clause 1</span></xref>)
           </li>
           <li>
             term
-            (<xref target="clause1">Clause 1</xref>)
+            (<xref target="clause1"><span class='citesec'>Clause 1</span></xref>)
           </li>
         <li>
             <em>term</em>
-            (<xref target="clause1">Clause 1</xref>)
+            (<xref target="clause1"><span class='citesec'>Clause 1</span></xref>)
           </li>
          <li>
             term
@@ -869,10 +862,10 @@ RSpec.describe IsoDoc do
         <li>
             term
           </li>
-        <li><xref target="clause1"><em>term</em></xref> (<xref target="clause1">Clause 1</xref>)</li>
-        <li><xref target="clause1"><em>term</em></xref> (Clause 1)</li>
-        <li><em>term</em> (<xref target="clause1">Clause 1</xref>)</li>
-        <li><em>term</em> (Clause 1)</li>
+        <li><xref target="clause1"><em>term</em></xref> (<xref target="clause1"><span class='citesec'>Clause 1</span></xref>)</li>
+        <li><xref target="clause1"><em>term</em></xref> (<span class='citesec'>Clause 1</span>)</li>
+        <li><em>term</em> (<xref target="clause1"><span class='citesec'>Clause 1</span></xref>)</li>
+        <li><em>term</em> (<span class='citesec'>Clause 1</span>)</li>
          </ul></p>
          </term>
         </terms>
@@ -1017,7 +1010,7 @@ RSpec.describe IsoDoc do
                 <referenceFrom>5</referenceFrom>
               </locality>
             </localityStack>
-            XYZ, Clause 3 to 5
+            <span class='stdpublisher'>XYZ</span>, <span class="citesec">Clause <span class="citesec">3</span> to <span class="citesec">5</span></span>
           </eref>
           <eref type='inline' bibitemid='ref1' citeas='XYZ' droploc=''>
             <localityStack connective='from'>
@@ -1030,7 +1023,7 @@ RSpec.describe IsoDoc do
                 <referenceFrom>5.1</referenceFrom>
               </locality>
             </localityStack>
-            XYZ, 3.1 to 5.1
+            <span class='stdpublisher'>XYZ</span>, <span class="citesec">3.1</span> to <span class="citesec">5.1</span>
           </eref>
           <eref type='inline' bibitemid='ref1' citeas='XYZ'>
             <localityStack connective='from'>
@@ -1043,7 +1036,7 @@ RSpec.describe IsoDoc do
                 <referenceFrom>5</referenceFrom>
               </locality>
             </localityStack>
-            XYZ, 3.1 to Clause 5
+            <span class='stdpublisher'>XYZ</span>, <span class="citesec">3.1</span> to <span class="citesec">Clause 5</span>
           </eref>
           <eref type='inline' bibitemid='ref1' citeas='XYZ'>
             <localityStack connective='from'>
@@ -1056,7 +1049,7 @@ RSpec.describe IsoDoc do
                 <referenceFrom>5</referenceFrom>
               </locality>
             </localityStack>
-            XYZ, 3.1 to Table 5
+            <span class='stdpublisher'>XYZ</span>, <span class="citesec">3.1</span> to <span class="citetbl">Table 5</span>
           </eref>
         </p>
       </itu-standard>

data/spec/isodoc/iso_spec.rb

@@ -157,7 +157,7 @@ RSpec.describe IsoDoc::Iso do
               </relation>
             </bibitem>
             <bibitem id="ISO20483" type="standard">
-              <title format="text/plain">Cereals and pulses</title>
+              <formattedref format="text/plain"><em>Cereals and pulses</em></formattedref>
               <docidentifier>ISO 20483</docidentifier>
               <date type="published">
                 <from>2013</from>
@@ -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