metanorma-iso 2.0.8 → 2.1.1

data/spec/isodoc/postproc_spec.rb

@@ -374,12 +374,14 @@ RSpec.describe IsoDoc do
               </clause>
             </clause>
           </sections>
+          <annex id="AA"><title>Annex A<tab/>Annex First</title></annex>
         </iso-standard>
       INPUT
 
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*An empty word intro page\./m, "")
       .sub(%r{</div>.*$}m, "</div>")
+    .gsub(/<o:p>&#xA0;<\/o:p>/, "")
 
     expect(xmlpp("<div>#{word.gsub(/_Toc\d\d+/, '_Toc')}"))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
@@ -456,12 +458,35 @@ RSpec.describe IsoDoc do
               </span>
             </span>
           </p>
+          <p class='MsoToc1'>
+           <span class='MsoHyperlink'>
+             <span lang='EN-GB' xml:lang='EN-GB' style='mso-no-proof:yes'>
+               <a href='#_Toc'>
+                 Annex A Annex First
+                 <span lang='EN-GB' xml:lang='EN-GB' class='MsoTocTextSpan'>
+                   <span style='mso-tab-count:1 dotted'>. </span>
+                 </span>
+                 <span lang='EN-GB' xml:lang='EN-GB' class='MsoTocTextSpan'>
+                   <span style='mso-element:field-begin'/>
+                 </span>
+                 <span lang='EN-GB' xml:lang='EN-GB' class='MsoTocTextSpan'> PAGEREF _Toc \h </span>
+                 <span lang='EN-GB' xml:lang='EN-GB' class='MsoTocTextSpan'>
+                   <span style='mso-element:field-separator'/>
+                 </span>
+                 <span lang='EN-GB' xml:lang='EN-GB' class='MsoTocTextSpan'>1</span>
+                 <span lang='EN-GB' xml:lang='EN-GB' class='MsoTocTextSpan'/>
+                 <span lang='EN-GB' xml:lang='EN-GB' class='MsoTocTextSpan'>
+                   <span style='mso-element:field-end'/>
+                 </span>
+               </a>
+             </span>
+           </span>
+         </p>
           <p class="MsoToc1">
             <span lang="EN-GB" xml:lang="EN-GB">
               <span style="mso-element:field-end"/>
             </span>
             <span lang="EN-GB" xml:lang="EN-GB">
-              <p class="MsoNormal"> </p>
             </span>
           </p>
           <p class="MsoNormal"> </p>
@@ -1005,7 +1030,8 @@ RSpec.describe IsoDoc do
            '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
 
-    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")))
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")
+      .gsub(/<o:p>&#xA0;<\/o:p>/, "")))
       .to be_equivalent_to xmlpp(<<~'OUTPUT')
         <div class="WordSection2">An empty word intro page.
           <p class="MsoToc1">
@@ -1085,7 +1111,6 @@ RSpec.describe IsoDoc do
               <span style="mso-element:field-end"/>
             </span>
             <span lang="EN-GB" xml:lang="EN-GB">
-              <p class="MsoNormal"> </p>
             </span>
           </p>
           <p class="MsoNormal"> </p>

data/spec/isodoc/ref_spec.rb

@@ -84,7 +84,7 @@ RSpec.describe IsoDoc do
           </references>
           <references id="_bibliography" normative="false" obligation="informative">
             <title>Bibliography</title>
-            <bibitem id="ISBN" type="ISBN">
+            <bibitem id="ISBN" type="book">
               <title format="text/plain">Chemicals for analytical laboratory use</title>
               <docidentifier type="ISBN">ISBN</docidentifier>
               <docidentifier type="metanorma">[1]</docidentifier>
@@ -95,7 +95,7 @@ RSpec.describe IsoDoc do
                 </organization>
               </contributor>
             </bibitem>
-            <bibitem id="ISSN" type="ISSN">
+            <bibitem id="ISSN" type="journal">
               <title format="text/plain">Instruments for analytical laboratory use</title>
               <docidentifier type="ISSN">ISSN</docidentifier>
               <docidentifier type="metanorma">[2]</docidentifier>
@@ -177,49 +177,17 @@ RSpec.describe IsoDoc do
                        amendments) applies.
                      </p>
             <bibitem id="ISO712" type="standard">
-              <title format="text/plain">Cereals or cereal products</title>
-              <title format="text/plain" type="main">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>
             <bibitem id="ISO16634" type="standard">
-              <title format="text/plain" language="x">Cereals, pulses, milled cereal products, xxxx, oilseeds and animal
-                         feeding stuffs
-                       </title>
-              <title format="text/plain" language="en">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+               <formattedref><em><span class="stddocTitle">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</span></em></formattedref>
               <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" reference="1" type="Unpublished-Status">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>
+              <formattedref><em><span class="stddocTitle">Cereals and pulses</span></em></formattedref>
               <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">
@@ -229,8 +197,8 @@ RSpec.describe IsoDoc do
                            for food and animal feeding stuffs according to the Dumas combustion
                            method</em> (see
 
-                <link target="http://www.icc.or.at"/>
-                )</formattedref>
+                <link target="http://www.icc.or.at"/> )
+                </formattedref>
               <docidentifier type="ICC">ICC 167</docidentifier>
             </bibitem>
             <note>
@@ -240,27 +208,15 @@ RSpec.describe IsoDoc do
           </references>
           <references id="_bibliography" normative="false" obligation="informative" displayorder="3">
             <title depth="1">Bibliography</title>
-            <bibitem id="ISBN" type="ISBN">
-              <title format="text/plain">Chemicals for analytical laboratory use</title>
+            <bibitem id="ISBN" type="book">
+              <formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
               <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>
+            <bibitem id="ISSN" type="journal">
+              <formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
               <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>
@@ -271,15 +227,9 @@ RSpec.describe IsoDoc do
               <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>
+              <formattedref><em><span class='stddocTitle'>Water for analytical laboratory use</span></em></formattedref>
               <docidentifier type='metanorma-ordinal'>[3]</docidentifier>
               <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">
@@ -294,15 +244,13 @@ RSpec.describe IsoDoc do
               <docidentifier type="metanorma">[10]</docidentifier>
             </bibitem>
             <bibitem id="ref11">
-              <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+               <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
               <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
               <docidentifier type="IETF">IETF RFC 10</docidentifier>
             </bibitem>
             <bibitem id="ref12">
               <formattedref format="application/x-isodoc+xml">CitationWorks. 2019.
-
-                <em>How to cite a reference</em>
-                .</formattedref>
+                <em>How to cite a reference</em>.</formattedref>
               <docidentifier type="metanorma">[Citn]</docidentifier>
               <docidentifier type="IETF">IETF RFC 20</docidentifier>
             </bibitem>
@@ -353,8 +301,8 @@ RSpec.describe IsoDoc do
             <br/>
             <div>
               <h1 class="Section3">Bibliography</h1>
-              <p class="Biblio" id="ISBN">[1]&#160; <i>Chemicals for analytical laboratory use</i></p>
-              <p class="Biblio" id="ISSN">[2]&#160; <i>Instruments for analytical laboratory use</i></p>
+              <p class="Biblio" id="ISBN">[1]&#160; <i>Chemicals for analytical laboratory use</i>. ISBN.</p>
+              <p class="Biblio" id="ISSN">[2]&#160; <i>Instruments for analytical laboratory use</i>. ISSN.</p>
               <div class="Note">
                 <p>
                   <span class="note_label">NOTE</span>&#160; This is an annotation of document ISSN.</p>
@@ -372,7 +320,7 @@ RSpec.describe IsoDoc do
                 <a href="http://www.icc.or.at">http://www.icc.or.at</a>
                 )</p>
               <p class="Biblio" id="ref11">[4]&#160; IETF RFC 10,
-                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
+                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>.</p>
               <p class="Biblio" id="ref12">Citn&#160; IETF RFC 20, CitationWorks. 2019.
                 <i>How to cite a reference</i>
                 .</p>
@@ -392,4 +340,53 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true)))
       .to be_equivalent_to xmlpp(html)
   end
+
+  it "processes websites" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+              <bibdata>
+                <language>en</language>
+              </bibdata>
+              <references normative="false">
+              <title>Bibliography</title>
+              <bibitem id="ignf" type="website">
+        <fetched>2022-05-06</fetched>
+        <title type="title-main" format="text/plain">IGNF. (IGN France) Registry</title>
+        <title type="main" format="text/plain">IGNF. (IGN France) Registry</title>
+        <uri>https://registre.ign.fr/ign/IGNF/</uri>
+        <docidentifier type="metanorma">2</docidentifier>
+      </bibitem>
+      </references>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <bibdata>
+           <language current='true'>en</language>
+         </bibdata>
+
+         <references normative='false'>
+           <title depth='1'>Bibliography</title>
+           <bibitem id='ignf' type='website'>
+             <formattedref>
+               <em>
+                 <span class='stddocTitle'>IGNF. (IGN France) Registry</span>
+               </em>
+                [website]. Available from:
+               <span class='biburl'>
+                 <link target='https://registre.ign.fr/ign/IGNF/'>https://registre.ign.fr/ign/IGNF/</link>
+               </span>
+               .
+             </formattedref>
+             <uri>https://registre.ign.fr/ign/IGNF/</uri>
+             <docidentifier type='metanorma'>2</docidentifier>
+           </bibitem>
+         </references>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/isodoc/section_spec.rb

@@ -137,7 +137,7 @@ RSpec.describe IsoDoc do
           </clause>
         </sections>
         <annex id="P" inline-header="false" obligation="normative" displayorder="8">
-          <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+          <title><strong>Annex A</strong><br/><span class='obligation'>(normative)</span><br/><br/><strong>Annex</strong></title>
           <clause id="Q" inline-header="false" obligation="normative">
             <title depth="2">A.1<tab/>Annex A.1</title>
             <clause id="Q1" inline-header="false" obligation="normative">
@@ -369,7 +369,7 @@ RSpec.describe IsoDoc do
           </p>
           <div class="Section3" id="P">
             <h1 class="Annex">
-              <br/>(normative)
+              <br/><span style='font-weight:normal;'>(normative)</span>
               <br/>
               <br/>
               <b>Annex</b></h1>
@@ -563,81 +563,81 @@ RSpec.describe IsoDoc do
            <status>
              <stage abbreviation='IS' language=''>60</stage>
              <stage abbreviation='IS' language='en'>International standard</stage>
-             <substage language=''>60</substage>
+             <substage>60</substage>
            </status>
-           <copyright>
-             <from>#{Time.new.year}</from>
-             <owner>
-               <organization>
-                 <name>International Organization for Standardization</name>
-                 <abbreviation>ISO</abbreviation>
-               </organization>
-             </owner>
-           </copyright>
-           <ext>
-             <doctype language=''>article</doctype>
-             <subdoctype>vocabulary</subdoctype>
-             <editorialgroup>
-               <technical-committee/>
-               <subcommittee/>
-               <workgroup/>
-             </editorialgroup>
-             <stagename>International standard</stagename>
-           </ext>
-         </bibdata>
-         <sections>
-           <terms id='A' obligation='normative' displayorder='1'>
-             <title depth='1'>
-               1
-               <tab/>
-               Terms and definitions
-             </title>
-             <p id='A1'>No terms and definitions are listed in this document.</p>
-           </terms>
-           <clause id='B' inline-header='false' obligation='normative' displayorder='2'>
-             <title depth='1'>
-               2
-               <tab/>
-               Clause
-             </title>
-           </clause>
-           <terms id='C' obligation='normative' displayorder='3'>
-             <title depth='1'>
-               3
-               <tab/>
-               More terms
-             </title>
-           </terms>
-         </sections>
-       </iso-standard>
+             <copyright>
+               <from>#{Time.new.year}</from>
+               <owner>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                 </organization>
+               </owner>
+             </copyright>
+             <ext>
+               <doctype>article</doctype>
+               <subdoctype>vocabulary</subdoctype>
+               <editorialgroup>
+                 <technical-committee/>
+                 <subcommittee/>
+                 <workgroup/>
+               </editorialgroup>
+               <stagename>International standard</stagename>
+             </ext>
+           </bibdata>
+           <sections>
+             <terms id='A' obligation='normative' displayorder='1'>
+               <title depth='1'>
+                 1
+                 <tab/>
+                 Terms and definitions
+               </title>
+               <p id='A1'>No terms and definitions are listed in this document.</p>
+             </terms>
+             <clause id='B' inline-header='false' obligation='normative' displayorder='2'>
+               <title depth='1'>
+                 2
+                 <tab/>
+                 Clause
+               </title>
+             </clause>
+             <terms id='C' obligation='normative' displayorder='3'>
+               <title depth='1'>
+                 3
+                 <tab/>
+                 More terms
+               </title>
+             </terms>
+           </sections>
+         </iso-standard>
     OUTPUT
     output = <<~OUTPUT
-    <html lang='en'>
-  <head/>
-  <body lang='en'>
-    <div class='title-section'>
-      <p>&#160;</p>
-    </div>
-    <br/>
-    <div class='prefatory-section'>
-      <p>&#160;</p>
-    </div>
-    <br/>
-    <div class='main-section'>
-      <p class='zzSTDTitle1'/>
-      <div id='A'>
-        <h1> 1 &#160; Terms and definitions </h1>
-        <p id='A1'>No terms and definitions are listed in this document.</p>
-      </div>
-      <div id='B'>
-        <h1> 2 &#160; Clause </h1>
-      </div>
-      <div id='C'>
-        <h1> 3 &#160; More terms </h1>
-      </div>
-    </div>
-  </body>
-</html>
+          <html lang='en'>
+        <head/>
+        <body lang='en'>
+          <div class='title-section'>
+            <p>&#160;</p>
+          </div>
+          <br/>
+          <div class='prefatory-section'>
+            <p>&#160;</p>
+          </div>
+          <br/>
+          <div class='main-section'>
+            <p class='zzSTDTitle1'/>
+            <div id='A'>
+              <h1> 1 &#160; Terms and definitions </h1>
+              <p id='A1'>No terms and definitions are listed in this document.</p>
+            </div>
+            <div id='B'>
+              <h1> 2 &#160; Clause </h1>
+            </div>
+            <div id='C'>
+              <h1> 3 &#160; More terms </h1>
+            </div>
+          </div>
+        </body>
+      </html>
     OUTPUT
     expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
       .convert("test", input, true)
@@ -695,7 +695,8 @@ RSpec.describe IsoDoc do
         <sections/>
       </iso-standard>
     INPUT
-    expect(xmlpp(output.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>")))
+    expect(xmlpp(output.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m,
+                                                        "</body>")))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <body lang="EN-US" link="blue" vlink="#954F72">
           <div class="WordSection1">
@@ -726,7 +727,8 @@ RSpec.describe IsoDoc do
         <sections/>
       </iso-standard>
     INPUT
-    expect(xmlpp(output.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>")))
+    expect(xmlpp(output.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m,
+                                                        "</body>")))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <body lang="EN-US" link="blue" vlink="#954F72">
           <div class="WordSection1">

data/spec/isodoc/table_spec.rb

@@ -154,7 +154,7 @@ RSpec.describe IsoDoc do
           <title>
             <strong>Annex A</strong>
             <br/>
-            (informative)
+            <span class="obligation">(informative)</span>
             <br/>
             <br/>
             <strong>Annex</strong>
@@ -382,7 +382,7 @@ RSpec.describe IsoDoc do
         <a name='Annex' id='Annex'/>
         <p class='ANNEX'>
           <br/>
-           (informative)
+           <span style='font-weight:normal;'>(informative)</span>
           <br/>
           <br/>
           <b>Annex</b>

data/spec/isodoc/terms_spec.rb

@@ -90,7 +90,7 @@ RSpec.describe IsoDoc do
                 </ul>
               </termexample>
               <termsource status='modified'>[SOURCE:
-                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>, modified &#x2013; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]
+                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality><span class='stdpublisher'>ISO</span> <span class='stddocNumber'>7301</span>:<span class='stdyear'>2011</span>, <span class='citesec'>3.1</span></origin>, modified &#x2013; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]
               </termsource>
             </term>
             <term id='paddy'><name>1.2</name>
@@ -121,7 +121,7 @@ RSpec.describe IsoDoc do
                 </ul>
               </termexample>
               <termsource status='identical'>[SOURCE:
-                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>]
+                <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality><span class='stdpublisher'>ISO</span> <span class='stddocNumber'>7301</span>:<span class='stdyear'>2011</span>, <span class='citesec'>3.1</span></origin>]
               </termsource>
             </term>
             <term id='A'>