metanorma-iso 2.0.7 → 2.1.0

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

@@ -15,9 +15,12 @@ RSpec.describe IsoDoc::Iso do
       </iso-standard>
     INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
   end
 
   it "processes isodoc as ISO: alt HTML output" do
@@ -33,27 +36,34 @@ RSpec.describe IsoDoc::Iso do
       </iso-standard>
     INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Lato", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: Chinese HTML output" do
-    IsoDoc::Iso::HtmlConvert.new(script: "Hans").convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <note>
-              <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-            </note>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::HtmlConvert.new(script: "Hans")
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+            <foreword>
+              <note>
+                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+              </note>
+            </foreword>
+          </preface>
+        </iso-standard>
+      INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "processes isodoc as ISO: user nominated fonts" do
@@ -72,9 +82,12 @@ RSpec.describe IsoDoc::Iso do
         </iso-standard>
       INPUT
     html = File.read("test.html", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: Andale Mono;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: Andale Mono;]m)
+    expect(html)
+      .to match(%r[blockquote[^{]+\{[^{]+font-family: Zapf Chancery;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: Comic Sans;]m)
   end
 
   it "processes isodoc as ISO: Word output" do
@@ -90,9 +103,12 @@ RSpec.describe IsoDoc::Iso do
       </iso-standard>
     INPUT
     html = File.read("test.doc", encoding: "utf-8")
-    expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[Quote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
+    expect(html)
+      .to match(%r[Quote[^{]+\{[^{]+font-family: "Cambria", serif;]m)
+    expect(html)
+      .to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Cambria", serif;]m)
   end
 
   it "does not include IEV in references" do
@@ -141,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>

data/spec/isodoc/postproc_spec.rb

@@ -374,6 +374,7 @@ RSpec.describe IsoDoc do
               </clause>
             </clause>
           </sections>
+          <annex id="AA"><title>Annex A<tab/>Annex First</title></annex>
         </iso-standard>
       INPUT
 
@@ -456,6 +457,30 @@ 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"/>

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