isodoc 1.2.8 → 1.4.2

data/spec/isodoc/presentation_xml_spec.rb

@@ -494,7 +494,7 @@ it "customises localisation of numbers" do
         </bibdata>
         <preface>
         <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0.0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
         </preface>
    </iso-standard>
   INPUT
@@ -573,7 +573,7 @@ it "customises localisation of numbers" do
                    <mrow>
                      <mfenced open='(' close=')'>
                        <mrow>
-                         <mn>1</mn>
+                         <mn>0,0000032</mn>
                          <mo>&#x2212;</mo>
                          <mi>p</mi>
                        </mrow>

data/spec/isodoc/ref_spec.rb

@@ -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>
@@ -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>
@@ -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>
@@ -424,4 +424,322 @@ RSpec.describe IsoDoc do
     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/table_spec.rb

@@ -8,6 +8,13 @@ RSpec.describe IsoDoc do
     <foreword>
       <table id="tableD-1" alt="tool tip" summary="long desc" width="70%" keep-with-next="true" keep-lines-together="true">
   <name>Repeatability and reproducibility of <em>husked</em> rice yield<fn reference="1"><p>X</p></fn></name>
+  <colgroup>
+  <col width="30%"/>
+  <col width="20%"/>
+  <col width="20%"/>
+  <col width="20%"/>
+  <col width="10%"/>
+  </colgroup>
   <thead>
     <tr>
       <td rowspan="2" align="left">Description</td>
@@ -77,6 +84,13 @@ RSpec.describe IsoDoc do
                    <p>X</p>
                  </fn>
                </name>
+                <colgroup>
+   <col width='30%'/>
+   <col width='20%'/>
+   <col width='20%'/>
+   <col width='20%'/>
+   <col width='10%'/>
+ </colgroup>
                <thead>
                  <tr>
                    <td rowspan='2' align='left'>Description</td>
@@ -165,6 +179,13 @@ html = <<~OUTPUT
                <caption>
                <span style="display:none">long desc</span>
                </caption>
+                <colgroup>
+   <col style='width: 30%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 10%;'/>
+ </colgroup>
                  <thead>
                    <tr>
                      <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;" scope="col">Description</td>
@@ -259,6 +280,13 @@ html = <<~OUTPUT
                </p>
                <div align='center' class='table_container'>
                  <table id='tableD-1' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;page-break-after: avoid;page-break-inside: avoid;' title='tool tip' summary='long desc' width='70%'>
+                 <colgroup>
+  <col width='30%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='10%'/>
+</colgroup>
                    <thead>
                      <tr>
                        <td rowspan='2' align='left' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>Description</td>

data/spec/isodoc/xref_spec.rb

@@ -2313,7 +2313,7 @@ OUTPUT
   <li id="N1"><p>A</p></li>
 </ol>
   <clause id="xyz"><title>Preparatory</title>
-     <ol id="N02">
+     <ol id="N02" type="arabic">
   <li id="N2"><p>A</p></li>
 </ol>
 </clause>
@@ -2321,17 +2321,17 @@ OUTPUT
     </preface>
     <sections>
     <clause id="scope" type="scope"><title>Scope</title>
-    <ol id="N0">
+    <ol id="N0" type="roman">
   <li id="N"><p>A</p></li>
 </ol>
     </clause>
     <terms id="terms"/>
     <clause id="widgets"><title>Widgets</title>
     <clause id="widgets1">
-    <ol id="note1l">
+    <ol id="note1l" type="alphabet">
   <li id="note1"><p>A</p></li>
 </ol>
-    <ol id="note2l">
+    <ol id="note2l" type="roman_upper">
   <li id="note2"><p>A</p></li>
 </ol>
     </clause>
@@ -2339,12 +2339,12 @@ OUTPUT
     </sections>
     <annex id="annex1">
     <clause id="annex1a">
-    <ol id="ANl">
+    <ol id="ANl" type="alphabet_upper">
   <li id="AN"><p>A</p></li>
 </ol>
     </clause>
     <clause id="annex1b">
-    <ol id="Anote1l">
+    <ol id="Anote1l" type="roman" start="4">
   <li id="Anote1"><p>A</p></li>
 </ol>
     <ol id="Anote2l">
@@ -2360,12 +2360,12 @@ OUTPUT
             <foreword>
               <p>
                 <xref target='N1'>Introduction, a)</xref>
-                <xref target='N2'>Preparatory, a)</xref>
-                <xref target='N'>Clause 1, a)</xref>
+                <xref target='N2'>Preparatory, 1)</xref>
+                <xref target='N'>Clause 1, i)</xref>
                 <xref target='note1'>Clause 3.1, List 1 a)</xref>
-                <xref target='note2'>Clause 3.1, List 2 a)</xref>
-                <xref target='AN'>Annex A.1, a)</xref>
-                <xref target='Anote1'>Annex A.2, List 1 a)</xref>
+                <xref target='note2'>Clause 3.1, List 2 I)</xref>
+                <xref target='AN'>Annex A.1, A)</xref>
+                <xref target='Anote1'>Annex A.2, List 1 iv)</xref>
                 <xref target='Anote2'>Annex A.2, List 2 a)</xref>
               </p>
             </foreword>
@@ -2377,7 +2377,7 @@ OUTPUT
               </ol>
               <clause id='xyz'>
                 <title depth='2'>Preparatory</title>
-                <ol id='N02'>
+                <ol id='N02' type="arabic">
                   <li id='N2'>
                     <p>A</p>
                   </li>
@@ -2392,7 +2392,7 @@ OUTPUT
   <tab/>
   Scope
 </title>
-              <ol id='N0'>
+              <ol id='N0' type="roman">
                 <li id='N'>
                   <p>A</p>
                 </li>
@@ -2408,12 +2408,12 @@ OUTPUT
   Widgets
 </title>
               <clause id='widgets1'><title>3.1.</title>
-                <ol id='note1l'>
+                <ol id='note1l' type="alphabet">
                   <li id='note1'>
                     <p>A</p>
                   </li>
                 </ol>
-                <ol id='note2l'>
+                <ol id='note2l' type="roman_upper">
                   <li id='note2'>
                     <p>A</p>
                   </li>
@@ -2428,14 +2428,14 @@ OUTPUT
   (informative)
 </title>
             <clause id='annex1a'><title>A.1.</title>
-              <ol id='ANl'>
+              <ol id='ANl' type="alphabet_upper">
                 <li id='AN'>
                   <p>A</p>
                 </li>
               </ol>
             </clause>
             <clause id='annex1b'><title>A.2.</title>
-              <ol id='Anote1l'>
+              <ol id='Anote1l' type="roman" start="4">
                 <li id='Anote1'>
                   <p>A</p>
                 </li>
@@ -2547,6 +2547,151 @@ OUTPUT
     OUTPUT
   end
 
+  it "cross-references bookmarks" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N"/>
+    <xref target="note1"/>
+    <xref target="note2"/>
+    <xref target="AN"/>
+    <xref target="Anote1"/>
+    <xref target="Anote2"/>
+    </p>
+    </foreword>
+    <introduction id="intro">
+    <p id="N01">
+  <bookmark id="N1"/>
+</p>
+  <clause id="xyz"><title>Preparatory</title>
+     <p id="N02" type="arabic">
+  <bookmark id="N2"/>
+</p>
+</clause>
+    </introduction>
+    </preface>
+    <sections>
+    <clause id="scope" type="scope"><title>Scope</title>
+    <p id="N0" type="roman">
+  <bookmark id="N"/>
+</p>
+    </clause>
+    <terms id="terms"/>
+    <clause id="widgets"><title>Widgets</title>
+    <clause id="widgets1">
+    <p id="note1l" type="alphabet">
+  <bookmark id="note1"/>
+</p>
+    <p id="note2l" type="roman_upper">
+  <bookmark id="note2"/>
+</p>
+    </clause>
+    </clause>
+    </sections>
+    <annex id="annex1">
+    <clause id="annex1a">
+    <p id="ANl" type="alphabet_upper">
+  <bookmark id="AN"/>
+</p>
+    </clause>
+    <clause id="annex1b">
+    <p id="Anote1l" type="roman" start="4">
+  <bookmark id="Anote1"/>
+</p>
+    <p id="Anote2l">
+  <bookmark id="Anote2"/>
+</p>
+    </clause>
+    </annex>
+    </iso-standard>
+    INPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword>
+             <p>
+               <xref target='N1'>Introduction</xref>
+               <xref target='N2'>Preparatory</xref>
+               <xref target='N'>Clause 1</xref>
+               <xref target='note1'>Clause 3.1</xref>
+               <xref target='note2'>Clause 3.1</xref>
+               <xref target='AN'>Annex A.1</xref>
+               <xref target='Anote1'>Annex A.2</xref>
+               <xref target='Anote2'>Annex A.2</xref>
+             </p>
+           </foreword>
+           <introduction id='intro'>
+             <p id='N01'>
+               <bookmark id='N1'/>
+             </p>
+             <clause id='xyz'>
+               <title depth='2'>Preparatory</title>
+               <p id='N02' type='arabic'>
+                 <bookmark id='N2'/>
+               </p>
+             </clause>
+           </introduction>
+         </preface>
+         <sections>
+           <clause id='scope' type='scope'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Scope
+             </title>
+             <p id='N0' type='roman'>
+               <bookmark id='N'/>
+             </p>
+           </clause>
+           <terms id='terms'>
+             <title>2.</title>
+           </terms>
+           <clause id='widgets'>
+             <title depth='1'>
+               3.
+               <tab/>
+               Widgets
+             </title>
+             <clause id='widgets1'>
+               <title>3.1.</title>
+               <p id='note1l' type='alphabet'>
+                 <bookmark id='note1'/>
+               </p>
+               <p id='note2l' type='roman_upper'>
+                 <bookmark id='note2'/>
+               </p>
+             </clause>
+           </clause>
+         </sections>
+         <annex id='annex1'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (informative)
+           </title>
+           <clause id='annex1a'>
+             <title>A.1.</title>
+             <p id='ANl' type='alphabet_upper'>
+               <bookmark id='AN'/>
+             </p>
+           </clause>
+           <clause id='annex1b'>
+             <title>A.2.</title>
+             <p id='Anote1l' type='roman' start='4'>
+               <bookmark id='Anote1'/>
+             </p>
+             <p id='Anote2l'>
+               <bookmark id='Anote2'/>
+             </p>
+           </clause>
+         </annex>
+       </iso-standard>
+OUTPUT
+end
+
    it "realises subsequences" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -2665,6 +2810,31 @@ INPUT
     <xref target="N12"/>
     <xref target="N13"/>
     </p>
+    <p>
+    <xref target="S1"/>
+    <xref target="S2"/>
+    <xref target="S3"/>
+    <xref target="S4"/>
+    <xref target="S12"/>
+    <xref target="S13"/>
+    <xref target="S14"/>
+    <xref target="S15"/>
+    <xref target="S16"/>
+    <xref target="S17"/>
+    <xref target="S18"/>
+    <xref target="S19"/>
+    <xref target="S20"/>
+    <xref target="S21"/>
+    <xref target="S22"/>
+    <xref target="S23"/>
+    <xref target="S24"/>
+    <xref target="S25"/>
+    <xref target="S26"/>
+    <xref target="S27"/>
+    <xref target="S28"/>
+    <xref target="S29"/>
+    <xref target="S30"/>
+    </p>
     </foreword>
         <introduction id="intro">
         <figure id="N1"> <name>Split-it-right sample divider</name>
@@ -2707,6 +2877,83 @@ INPUT
            <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
         </figure>
   </introduction>
+  </preface>
+  <sections>
+  <clause id='S1' number='1bis' type='scope' inline-header='false' obligation='normative'>
+             <title>Scope</title>
+             <p id='_'>Text</p>
+           </clause>
+           <terms id='S3' number='3bis' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <term id='S4' number='4bis'>
+               <preferred>Term1</preferred>
+             </term>
+           </terms>
+           <definitions id='S12' number='12bis' type='abbreviated_terms' obligation='normative'>
+             <title>Abbreviated terms</title>
+           </definitions>
+           <clause id='S13' number='13bis' inline-header='false' obligation='normative'>
+             <title>Clause 4</title>
+             <clause id='S14' number='14bis' inline-header='false' obligation='normative'>
+               <title>Introduction</title>
+             </clause>
+             <clause id='S15' inline-header='false' obligation='normative'>
+               <title>Clause A</title>
+             </clause>
+             <clause id='S16' inline-header='false' obligation='normative'>
+               <title>Clause B</title>
+             </clause>
+             <clause id='S17' number='0' inline-header='false' obligation='normative'>
+               <title>Clause C</title>
+             </clause>
+             <clause id='S18' inline-header='false' obligation='normative'>
+               <title>Clause D</title>
+             </clause>
+             <clause id='S19' inline-header='false' obligation='normative'>
+               <title>Clause E</title>
+             </clause>
+             <clause id='S20' number='a' inline-header='false' obligation='normative'>
+               <title>Clause F</title>
+             </clause>
+             <clause id='S21' inline-header='false' obligation='normative'>
+               <title>Clause G</title>
+             </clause>
+             <clause id='S22' number='B' inline-header='false' obligation='normative'>
+               <title>Clause H</title>
+             </clause>
+             <clause id='S23' inline-header='false' obligation='normative'>
+               <title>Clause I</title>
+             </clause>
+           </clause>
+           <clause id='S24' number='16bis' inline-header='false' obligation='normative'>
+             <title>Terms and Definitions</title>
+           </clause>
+         </sections>
+         <annex id='S25' obligation='normative'>
+         <title>First Annex</title>
+         </annex>
+         <annex id='S26' number='17bis' inline-header='false' obligation='normative'>
+           <title>Annex</title>
+           <clause id='S27' number='18bis' inline-header='false' obligation='normative'>
+             <title>Annex A.1</title>
+           </clause>
+         </annex>
+         <annex id='S28' inline-header='false' obligation='normative'>
+         <title>Another Annex</title>
+         </annex>
+         <bibliography>
+           <references id='S2' number='2bis' normative='true' obligation='informative'>
+             <title>Normative references</title>
+             <p id='_'>There are no normative references in this document.</p>
+           </references>
+           <clause id='S29' number='19bis' obligation='informative'>
+             <title>Bibliography</title>
+             <references id='S30' number='20bis' normative='false' obligation='informative'>
+               <title>Bibliography Subsection</title>
+             </references>
+           </clause>
+         </bibliography>
   </iso-standard>
 INPUT
 <?xml version='1.0'?>
@@ -2716,7 +2963,7 @@ INPUT
       <p>
         <xref target='N1'>Figure 1</xref>
 <xref target='N2'>Figure A</xref>
-<xref target='N3'>Figure 2</xref>
+<xref target='N3'>Figure B</xref>
 <xref target='N4'>Figure 7</xref>
 <xref target='N5'>Figure 8</xref>
 <xref target='N6'>Figure 9a</xref>
@@ -2728,6 +2975,31 @@ INPUT
 <xref target='N12'>Figure A.2</xref>
 <xref target='N13'>Figure 100</xref>
       </p>
+       <p>
+   <xref target='S1'>Clause 1bis</xref>
+   <xref target='S2'>Clause 2bis</xref>
+   <xref target='S3'>Clause 3bis</xref>
+   <xref target='S4'>Clause 3bis.4bis</xref>
+   <xref target='S12'>Clause 12bis</xref>
+   <xref target='S13'>Clause 13bis</xref>
+   <xref target='S14'>Clause 13bis.14bis</xref>
+   <xref target='S15'>Clause 13bis.14bit</xref>
+   <xref target='S16'>Clause 13bis.14biu</xref>
+   <xref target='S17'>Clause 13bis.0</xref>
+   <xref target='S18'>Clause 13bis.1</xref>
+   <xref target='S19'>Clause 13bis.2</xref>
+   <xref target='S20'>Clause 13bis.a</xref>
+   <xref target='S21'>Clause 13bis.b</xref>
+   <xref target='S22'>Clause 13bis.B</xref>
+   <xref target='S23'>Clause 13bis.C</xref>
+   <xref target='S24'>Clause 16bis</xref>
+   <xref target='S25'>Annex A</xref>
+   <xref target='S26'>Annex 17bis</xref>
+   <xref target='S27'>Annex 17bis.18bis</xref>
+   <xref target='S28'>Annex 17bit</xref>
+   <xref target='S29'>Bibliography</xref>
+   <xref target='S30'>Bibliography Subsection</xref>
+ </p>
     </foreword>
     <introduction id='intro'>
       <figure id='N1'>
@@ -2739,7 +3011,7 @@ INPUT
         <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
       </figure>
       <figure id='N3'>
-        <name>Figure 2&#xA0;&#x2014; Split-it-right sample divider</name>
+        <name>Figure B&#xA0;&#x2014; Split-it-right sample divider</name>
         <image src='rice_images/rice_image1.png' id='_8357ede4-6d44-4672-bac4-9a85e82ab7f0' mimetype='image/png'/>
       </figure>
       <figure id='N4' number='7'>
@@ -2785,8 +3057,189 @@ INPUT
 
     </introduction>
   </preface>
+  <sections>
+           <clause id='S1' number='1bis' type='scope' inline-header='false' obligation='normative'>
+             <title depth='1'>
+               1bis.
+               <tab/>
+               Scope
+             </title>
+             <p id='_'>Text</p>
+           </clause>
+           <terms id='S3' number='3bis' obligation='normative'>
+             <title depth='1'>
+               3bis.
+               <tab/>
+               Terms and definitions
+             </title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <term id='S4' number='4bis'>
+               <name>3bis.4bis.</name>
+               <preferred>Term1</preferred>
+             </term>
+           </terms>
+           <definitions id='S12' number='12bis' type='abbreviated_terms' obligation='normative'>
+             <title depth='1'>
+               12bis.
+               <tab/>
+               Abbreviated terms
+             </title>
+           </definitions>
+           <clause id='S13' number='13bis' inline-header='false' obligation='normative'>
+             <title depth='1'>
+               13bis.
+               <tab/>
+               Clause 4
+             </title>
+             <clause id='S14' number='14bis' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.14bis.
+                 <tab/>
+                 Introduction
+               </title>
+             </clause>
+             <clause id='S15' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.14bit.
+                 <tab/>
+                 Clause A
+               </title>
+             </clause>
+             <clause id='S16' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.14biu.
+                 <tab/>
+                 Clause B
+               </title>
+             </clause>
+             <clause id='S17' number='0' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.0.
+                 <tab/>
+                 Clause C
+               </title>
+             </clause>
+             <clause id='S18' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.1.
+                 <tab/>
+                 Clause D
+               </title>
+             </clause>
+             <clause id='S19' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.2.
+                 <tab/>
+                 Clause E
+               </title>
+             </clause>
+             <clause id='S20' number='a' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.a.
+                 <tab/>
+                 Clause F
+               </title>
+             </clause>
+             <clause id='S21' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.b.
+                 <tab/>
+                 Clause G
+               </title>
+             </clause>
+             <clause id='S22' number='B' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.B.
+                 <tab/>
+                 Clause H
+               </title>
+             </clause>
+             <clause id='S23' inline-header='false' obligation='normative'>
+               <title depth='2'>
+                 13bis.C.
+                 <tab/>
+                 Clause I
+               </title>
+             </clause>
+           </clause>
+           <clause id='S24' number='16bis' inline-header='false' obligation='normative'>
+             <title depth='1'>
+               16bis.
+               <tab/>
+               Terms and Definitions
+             </title>
+           </clause>
+         </sections>
+         <annex id='S25' obligation='normative'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>First Annex</strong>
+           </title>
+         </annex>
+         <annex id='S26' number='17bis' inline-header='false' obligation='normative'>
+           <title>
+             <strong>Annex 17bis</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Annex</strong>
+           </title>
+           <clause id='S27' number='18bis' inline-header='false' obligation='normative'>
+             <title depth='2'>
+               17bis.18bis.
+               <tab/>
+               Annex A.1
+             </title>
+           </clause>
+         </annex>
+         <annex id='S28' inline-header='false' obligation='normative'>
+           <title>
+             <strong>Annex 17bit</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Another Annex</strong>
+           </title>
+         </annex>
+         <bibliography>
+           <references id='S2' number='2bis' normative='true' obligation='informative'>
+             <title depth='1'>
+               2bis.
+               <tab/>
+               Normative references
+             </title>
+             <p id='_'>There are no normative references in this document.</p>
+           </references>
+           <clause id='S29' number='19bis' obligation='informative'>
+             <title depth='1'>Bibliography</title>
+             <references id='S30' number='20bis' normative='false' obligation='informative'>
+               <title depth='2'>Bibliography Subsection</title>
+             </references>
+           </clause>
+         </bibliography>
 </iso-standard>
 OUTPUT
       end
 
+ it "realises roman counter for xrefs" do
+   a = IsoDoc::XrefGen::Counter.new(0, numerals: :roman)
+   a.increment({})
+   expect(a.print).to eq "I"
+   a.increment({})
+   expect(a.print).to eq "II"
+   a.increment({})
+   expect(a.print).to eq "III"
+   a.increment({})
+   expect(a.print).to eq "IV"
+   a.increment({})
+   expect(a.print).to eq "V"
+   
+    end
+
 end