isodoc 1.2.4 → 1.3.0

data/spec/isodoc/ref_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe IsoDoc do
       <abbreviation>ISO</abbreviation>
     </organization>
   </contributor>
-  <note format="text/plain" type="ISO DATE" reference="1">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+  <note format="text/plain" type="Unpublished-Status" reference="1">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
   <extent type="part">
   <referenceFrom>all</referenceFrom>
   </extent>
@@ -63,7 +63,7 @@ RSpec.describe IsoDoc do
 </bibitem>
 <bibitem id="ref1">
   <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
-  <docidentifier type="ICC">167</docidentifier>
+  <docidentifier type="ICC">ICC/167</docidentifier>
 </bibitem>
 <note><p>This is an annotation of ISO 20483:2013-2014</p></note>
     <bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
@@ -125,9 +125,9 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     presxml = <<~PRESXML
-        <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>
@@ -136,7 +136,7 @@ RSpec.describe IsoDoc do
                 <eref bibitemid='ISBN'>[1]</eref>
                 <eref bibitemid='ISSN'>[2]</eref>
                 <eref bibitemid='ISO16634'>ISO 16634:-- (all parts)</eref>
-                <eref bibitemid='ref1'>ICC 167</eref>
+                <eref bibitemid='ref1'>ICC/167</eref>
                 <eref bibitemid='ref10'>[10]</eref>
                 <eref bibitemid='ref12'>Citn</eref>
                 <eref bibitemid='zip_ffs'>[5]</eref>
@@ -181,7 +181,7 @@ RSpec.describe IsoDoc do
                     <abbreviation>ISO</abbreviation>
                   </organization>
                 </contributor>
-                <note format='text/plain' type='ISO DATE' reference='1'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+                <note format='text/plain' type='Unpublished-Status' reference='1'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
                 <extent type='part'>
                   <referenceFrom>all</referenceFrom>
                 </extent>
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
                   <link target='http://www.icc.or.at'/>
                   )
                 </formattedref>
-                <docidentifier type='ICC'>167</docidentifier>
+                <docidentifier type='ICC'>ICC/167</docidentifier>
               </bibitem>
               <note>
                 <name>NOTE</name>
@@ -309,7 +309,7 @@ RSpec.describe IsoDoc do
           <a href='#ISBN'>[1]</a>
           <a href='#ISSN'>[2]</a>
           <a href='#ISO16634'>ISO 16634:-- (all parts)</a>
-          <a href='#ref1'>ICC 167</a>
+          <a href='#ref1'>ICC/167</a>
           <a href='#ref10'>[10]</a>
           <a href='#ref12'>Citn</a>
           <a href='#zip_ffs'>[5]</a>
@@ -342,7 +342,7 @@ RSpec.describe IsoDoc do
           <i>Cereals and pulses</i>
         </p>
         <p id='ref1' class='NormRef'>
-          ICC 167,
+          ICC/167,
           <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
           .
           <i>
@@ -420,8 +420,326 @@ RSpec.describe IsoDoc do
 </html>
 
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
+
+    it "processes hidden references sections in Relaton bibliographies" do
+    presxml = <<~PRESXML
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+          <bibdata>
+            <language current="true">en</language>
+          </bibdata>
+          <preface>
+            <foreword>
+              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                <eref bibitemid='ISO712'>[110]</eref>
+                <eref bibitemid='ISBN'>[1]</eref>
+                <eref bibitemid='ISSN'>[2]</eref>
+                <eref bibitemid='ISO16634'>ISO 16634:-- (all parts)</eref>
+                <eref bibitemid='ref1'>ICC/167</eref>
+                <eref bibitemid='ref10'>[10]</eref>
+                <eref bibitemid='ref12'>Citn</eref>
+                <eref bibitemid='zip_ffs'>[5]</eref>
+              </p>
+            </foreword>
+          </preface>
+          <bibliography>
+            <references id='_normative_references' obligation='informative' normative='true' hidden="true">
+            <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>
+                <docidentifier type='ISO'>ISO 712</docidentifier>
+                <docidentifier type='metanorma'>[110]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ISO16634' type='standard'>
+                <title language='x' format='text/plain'>
+                  Cereals, pulses, milled cereal products, xxxx, oilseeds and animal
+                  feeding stuffs
+                </title>
+                <title language='en' format='text/plain'>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+                <docidentifier type='ISO'>ISO 16634:-- (all parts)</docidentifier>
+                <date type='published'>
+                  <on>--</on>
+                </date>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+                <note format='text/plain' type='Unpublished-Status' reference='1'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+                <extent type='part'>
+                  <referenceFrom>all</referenceFrom>
+                </extent>
+              </bibitem>
+              <bibitem id='ISO20483' type='standard'>
+                <title format='text/plain'>Cereals and pulses</title>
+                <docidentifier type='ISO'>ISO 20483:2013-2014</docidentifier>
+                <date type='published'>
+                  <from>2013</from>
+                  <to>2014</to>
+                </date>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ref1'>
+                <formattedref format='application/x-isodoc+xml'>
+                  <smallcap>Standard No I.C.C 167</smallcap>
+                  .
+                  <em>
+                    Determination of the protein content in cereal and cereal products
+                    for food and animal feeding stuffs according to the Dumas combustion
+                    method
+                  </em>
+                   (see
+                  <link target='http://www.icc.or.at'/>
+                  )
+                </formattedref>
+                <docidentifier type='ICC'>ICC/167</docidentifier>
+              </bibitem>
+              <note>
+                <name>NOTE</name>
+                <p>This is an annotation of ISO 20483:2013-2014</p>
+              </note>
+              <bibitem id='zip_ffs'>
+                <formattedref format='application/x-isodoc+xml'>Title 5</formattedref>
+                <docidentifier type='metanorma'>[5]</docidentifier>
+              </bibitem>
+            </references>
+            <references id='_bibliography' obligation='informative' normative='false' hidden="true">
+              <title depth="1">Bibliography</title>
+              <bibitem id='ISBN' type='ISBN'>
+                <title format='text/plain'>Chemicals for analytical laboratory use</title>
+                <docidentifier type='ISBN'>ISBN</docidentifier>
+                <docidentifier type='metanorma'>[1]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISBN</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ISSN' type='ISSN'>
+                <title format='text/plain'>Instruments for analytical laboratory use</title>
+                <docidentifier type='ISSN'>ISSN</docidentifier>
+                <docidentifier type='metanorma'>[2]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISSN</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <note>
+                <name>NOTE</name>
+                <p>This is an annotation of document ISSN.</p>
+              </note>
+              <note>
+                <name>NOTE</name>
+                <p>This is another annotation of document ISSN.</p>
+              </note>
+              <bibitem id='ISO3696' type='standard'>
+                <title format='text/plain'>Water for analytical laboratory use</title>
+                <docidentifier type='ISO'>ISO 3696</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ref10'>
+                <formattedref format='application/x-isodoc+xml'>
+                  <smallcap>Standard No I.C.C 167</smallcap>
+                  .
+                  <em>
+                    Determination of the protein content in cereal and cereal products
+                    for food and animal feeding stuffs according to the Dumas combustion
+                    method
+                  </em>
+                   (see
+                  <link target='http://www.icc.or.at'/>
+                  )
+                </formattedref>
+                <docidentifier type='metanorma'>[10]</docidentifier>
+              </bibitem>
+              <bibitem id='ref11'>
+                <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+                <docidentifier type='IETF'>RFC 10</docidentifier>
+              </bibitem>
+              <bibitem id='ref12'>
+                <formattedref format='application/x-isodoc+xml'>
+                  CitationWorks. 2019.
+                  <em>How to cite a reference</em>
+                  .
+                </formattedref>
+                <docidentifier type='metanorma'>[Citn]</docidentifier>
+                <docidentifier type='IETF'>RFC 20</docidentifier>
+              </bibitem>
+            </references>
+          </bibliography>
+        </iso-standard>
+        PRESXML
+
+        html = <<~OUTPUT
+    #{HTML_HDR}
+<br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                 <a href='#ISO712'>[110]</a>
+                 <a href='#ISBN'>[1]</a>
+                 <a href='#ISSN'>[2]</a>
+                 <a href='#ISO16634'>ISO 16634:-- (all parts)</a>
+                 <a href='#ref1'>ICC/167</a>
+                 <a href='#ref10'>[10]</a>
+                 <a href='#ref12'>Citn</a>
+                 <a href='#zip_ffs'>[5]</a>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+  end
+
+     it "processes hidden references sections in Relaton bibliographies" do
+    presxml = <<~PRESXML
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+          <bibdata>
+            <language current="true">en</language>
+          </bibdata>
+          <preface>
+            <foreword>
+              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                <eref bibitemid='ISO712'>[110]</eref>
+                <eref bibitemid='ISBN'>[1]</eref>
+                <eref bibitemid='ISSN'>[2]</eref>
+                <eref bibitemid='ISO16634'>ISO 16634:-- (all parts)</eref>
+                <eref bibitemid='ref1'>ICC/167</eref>
+                <eref bibitemid='ref10'>[10]</eref>
+                <eref bibitemid='ref12'>Citn</eref>
+                <eref bibitemid='zip_ffs'>[5]</eref>
+              </p>
+            </foreword>
+          </preface>
+          <bibliography>
+            <references id='_normative_references' obligation='informative' normative='true'>
+            <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' hidden="true">
+                <title format='text/plain'>Cereals or cereal products</title>
+                <title type='main' format='text/plain'>Cereals and cereal products</title>
+                <docidentifier type='ISO'>ISO 712</docidentifier>
+                <docidentifier type='metanorma'>[110]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ISO16634' type='standard'>
+                <title language='x' format='text/plain'>
+                  Cereals, pulses, milled cereal products, xxxx, oilseeds and animal
+                  feeding stuffs
+                </title>
+                <title language='en' format='text/plain'>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+                <docidentifier type='ISO'>ISO 16634:-- (all parts)</docidentifier>
+                <date type='published'>
+                  <on>--</on>
+                </date>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+                <note format='text/plain' type='Unpublished-Status' reference='1'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+                <extent type='part'>
+                  <referenceFrom>all</referenceFrom>
+                </extent>
+              </bibitem>
+</references></bibliography></iso-standard>
+PRESXML
+
+html = <<~OUTPUT
+    #{HTML_HDR}
+<br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                 <a href='#ISO712'>[110]</a>
+                 <a href='#ISBN'>[1]</a>
+                 <a href='#ISSN'>[2]</a>
+                 <a href='#ISO16634'>ISO 16634:-- (all parts)</a>
+                 <a href='#ref1'>ICC/167</a>
+                 <a href='#ref10'>[10]</a>
+                 <a href='#ref12'>Citn</a>
+                 <a href='#zip_ffs'>[5]</a>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div>
+  <h1>1.&#160; Normative References</h1>
+  <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>
+  <p id='ISO16634' class='NormRef'>
+    ISO 16634:-- (all parts)
+    <a class='FootnoteRef' href='#fn:1'>
+      <sup>1</sup>
+    </a>
+    ,
+    <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
+  </p>
+</div>
+<aside id='fn:1' class='footnote'>
+  <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
+</aside>
+
+           </div>
+         </body>
+       </html>
+
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+  end
+
+
 end
+
+

data/spec/isodoc/section_spec.rb

@@ -260,7 +260,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"PRESXML"
-       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <boilerplate>
     <copyright-statement>
       <clause>
@@ -755,7 +755,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 obligation='informative'>
               <title>Foreword</title>
@@ -849,7 +849,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>
     <introduction id='B' obligation='informative'>
       <title>Introduction</title>
@@ -876,7 +876,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"OUTPUT"
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <terms id='H' obligation='normative'>
     <title depth='1'>1.<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
@@ -921,7 +921,7 @@ OUTPUT
     INPUT
 
     presxml = <<~"PRESXML"
-<iso-standard xmlns='http://riboseinc.com/isoxml'>
+<iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
   <sections>
     <clause id='M' inline-header='false' obligation='normative'>
     <title depth='1'>1.<tab/>Clause 4</title>
@@ -973,7 +973,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">
   <sections>
     <clause id='M' inline-header='false' obligation='normative'>
       <title depth="1">Clause 4</title>
@@ -991,7 +991,7 @@ OUTPUT
 
         it "processes sections without titles" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
       <preface>
        <introduction id="M" inline-header="false" obligation="normative"><clause id="N" inline-header="false" obligation="normative">
          <title>Intro</title>
@@ -1009,7 +1009,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>
     <introduction id='M' inline-header='false' obligation='normative'>
       <clause id='N' inline-header='false' obligation='normative'>
@@ -1059,7 +1059,7 @@ OUTPUT
        </iso-standard>
 INPUT
 presxml = <<~OUTPUT
-<iso-standard xmlns="http://riboseinc.com/isoxml">
+<iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
             <bibliography>
         <clause id="D" obligation="informative">
          <title depth="1">Bibliography</title>