metanorma-iec 1.1.3 → 1.2.0

data/spec/isodoc/iso_spec.rb

@@ -75,6 +75,7 @@ RSpec.describe IsoDoc::Iec do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
+    <name>EXAMPLE</name>
   <p>Hello</p>
 </example>
     </foreword></preface>
@@ -101,9 +102,11 @@ RSpec.describe IsoDoc::Iec do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
+    <name>EXAMPLE 1</name>
   <p>Hello</p>
 </example>
     <example id="samplecode2">
+    <name>EXAMPLE 2</name>
   <p>Hello</p>
 </example>
     </foreword></preface>
@@ -132,6 +135,7 @@ RSpec.describe IsoDoc::Iec do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
+    <name>EXAMPLE</name>
   <p>Hello</p>
 </example>
     </foreword></preface>
@@ -170,9 +174,11 @@ RSpec.describe IsoDoc::Iec do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
+    <name>EXAMPLE 1</name>
   <p>Hello</p>
 </example>
     <example id="samplecode2">
+    <name>EXAMPLE 2</name>
   <p>Hello</p>
 </example>
     </foreword></preface>

data/spec/isodoc/postproc_spec.rb

@@ -103,12 +103,14 @@ RSpec.describe IsoDoc do
     IsoDoc::Iec::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
-    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+    <terms id="_terms_and_definitions" obligation="normative"><title>1<tab/>Terms and Definitions</title>
 
-<term id="paddy1"><preferred>paddy</preferred>
+<term id="paddy1">
+<name>1.1</name>
+<preferred>paddy</preferred>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
 <termsource status="modified">
-  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
     <modification>
     <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
   </modification>
@@ -156,9 +158,11 @@ RSpec.describe IsoDoc do
     IsoDoc::Iec::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
-    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+    <terms id="_terms_and_definitions" obligation="normative"><title>1<tab/>Terms and Definitions</title>
 
-<term id="paddy1"><preferred>paddy</preferred>
+<term id="paddy1">
+<name>1.1</name>
+<preferred>paddy</preferred>
 <domain>rice</domain>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
 <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
@@ -180,7 +184,9 @@ RSpec.describe IsoDoc do
   </modification>
 </termsource></term>
 
-<term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
+<term id="paddy">
+<name>1.2</name>
+<preferred>paddy</preferred><admitted>paddy rice</admitted>
 <admitted>rough rice</admitted>
 <deprecates>cargo rice</deprecates>
 <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
@@ -233,20 +239,11 @@ RSpec.describe IsoDoc do
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
              </p>
              <div class="Section3"><a name="P" id="P"></a>
-             <h1 class='Annex'>
-  <b>Annex A</b>
-  <br/>
-  <br/>
-  (normative)
-  <br/>
-  <br/>
-  <b/>
-</h1>
                <div class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
-                 <p class="example"><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#xA0; </span>'1M', '01M', and '0001M' all describe the calendar month January.</p>
+                 <p class="example"><span style="mso-tab-count:1">&#xA0; </span>'1M', '01M', and '0001M' all describe the calendar month January.</p>
                </div>
                <div class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
-                 <p class="example"><span class="example_label">EXAMPLE  2</span><span style="mso-tab-count:1">&#xA0; </span>'2M', '02M', and '0002M' all describe the calendar month February.</p>
+                 <p class="example"><span style="mso-tab-count:1">&#xA0; </span>'2M', '02M', and '0002M' all describe the calendar month February.</p>
                </div>
              </div>
            </div>
@@ -279,18 +276,7 @@ RSpec.describe IsoDoc do
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
              </p>
              <div class="Section3"><a name="P" id="P"></a>
-             <h1 class='Annex'>
-  <b>Annex A</b>
-  <br/>
-  <br/>
-  (normative)
-  <br/>
-  <br/>
-  <b/>
-</h1>
-               <p class="Sourcecode" style='page-break-after:avoid;'><a name="A" id="A"></a>puts "Hello, world."</p>
-               <p class='SourceTitle' style='text-align:center;'>Figure A.1</p>
-               <p class="TableTitle" style="text-align:center;">Table A.1</p>
+               <p class="Sourcecode"><a name="A" id="A"></a>puts "Hello, world."</p>
                           <div align='center' class='table_container'>
              <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
               <a name='samplecode' id='samplecode'/>

data/spec/isodoc/ref_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc::Iec do
   it "processes IsoXML bibliographies" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
     <language>en</language>
@@ -124,6 +124,131 @@ RSpec.describe IsoDoc::Iec do
 </bibliography>
     </iso-standard>
     INPUT
+
+    presxml = <<~OUTPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+            <bibdata>
+            <language>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:--</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">
+          <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" reference="1" type="ISO DATE">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">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">
+          <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>
+  OUTPUT
+
+  html = <<~OUTPUT
     #{HTML_HDR}
       <div>
         <h1 class='ForewordTitle'>FOREWORD</h1>
@@ -141,7 +266,7 @@ RSpec.describe IsoDoc::Iec do
       </div>
       #{IEC_TITLE1}
       <div>
-        <h1>1&#160; Normative references</h1>
+        <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
@@ -244,6 +369,8 @@ RSpec.describe IsoDoc::Iec do
 </html>
 
     OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
 end

data/spec/isodoc/section_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "processes section names" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <preface>
       <foreword obligation="informative">
@@ -14,7 +14,7 @@ RSpec.describe IsoDoc do
        </clause>
        <p>This is patent boilerplate</p>
        </introduction></preface><sections>
-       <clause id="D" obligation="normative">
+       <clause id="D" obligation="normative" type="scope">
          <title>Scope</title>
          <p id="E">Text</p>
        </clause>
@@ -67,6 +67,74 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     INPUT
+
+    presxml = <<~OUTPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface>
+        <foreword obligation="informative">
+           <title>Foreword</title>
+           <p id="A">This is a preamble</p>
+         </foreword>
+          <introduction id="B" obligation="informative"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
+           <title depth="2">0.1<tab/>Introduction Subsection</title>
+         </clause>
+         <p>This is patent boilerplate</p>
+         </introduction></preface><sections>
+         <clause id="D" obligation="normative" type="scope">
+           <title depth="1">1<tab/>Scope</title>
+           <p id="E">Text</p>
+         </clause>
+
+         <clause id="H" obligation="normative"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
+           <title depth="2">3.1<tab/>Normal Terms</title>
+           <term id="J"><name>3.1.1</name>
+           <preferred>Term2</preferred>
+         </term>
+         </terms>
+         <definitions id="K"><title>3.2</title>
+           <dl>
+           <dt>Symbol</dt>
+           <dd>Definition</dd>
+           </dl>
+         </definitions>
+         </clause>
+         <definitions id="L"><title>4</title>
+           <dl>
+           <dt>Symbol</dt>
+           <dd>Definition</dd>
+           </dl>
+         </definitions>
+         <clause id="M" inline-header="false" obligation="normative"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+           <title depth="2">5.1<tab/>Introduction</title>
+         </clause>
+         <clause id="O" inline-header="false" obligation="normative">
+           <title depth="2">5.2<tab/>Clause 4.2</title>
+         </clause></clause>
+
+         </sections><annex id="P" inline-header="false" obligation="normative">
+           <title><strong>Annex A</strong><br/>(normative)<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">
+           <title depth="3">A.1.1<tab/>Annex A.1a</title>
+           </clause>
+         </clause>
+                <appendix id="Q2" inline-header="false" obligation="normative">
+           <title depth="2">Appendix 1<tab/>An Appendix</title>
+         </appendix>
+         </annex><bibliography><references id="R" obligation="informative" normative="true">
+           <title depth="1">2<tab/>Normative References</title>
+         </references><clause id="S" obligation="informative">
+           <title depth="1">Bibliography</title>
+           <references id="T" obligation="informative" normative="false">
+           <title depth="2">Bibliography Subsection</title>
+         </references>
+         </clause>
+         </bibliography>
+         </iso-standard>
+    OUTPUT
+
+    html = <<~OUTPUT
     <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
          <body lang="en">
@@ -88,7 +156,7 @@ RSpec.describe IsoDoc do
                 </div>
                 <br/>
                 <div class="Section3" id="B">
-                  <h1 class="IntroTitle">0&#160; INTRODUCTION</h1>
+                  <h1 class="IntroTitle">0&#160; Introduction</h1>
                   <div id="C">
            <h2>0.1&#160; Introduction Subsection</h2>
          </div>
@@ -100,7 +168,7 @@ RSpec.describe IsoDoc do
                   <p id="E">Text</p>
                 </div>
                 <div>
-                  <h1>2&#160; Normative references</h1>
+                  <h1>2&#160; Normative References</h1>
                 </div>
                 <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
         <div id="I">
@@ -108,11 +176,11 @@ RSpec.describe IsoDoc do
            <p class="TermNum" id="J">3.1.1</p>
            <p class="Terms" style="text-align:left;">Term2</p>
       
-         </div><div id="K"><h2>3.2&#160; Symbols and abbreviated terms</h2>
+         </div><div id="K"><h2>3.2</h2>
            <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
          </div></div>
                 <div id="L" class="Symbols">
-                  <h1>4&#160; Symbols and abbreviated terms</h1>
+                  <h1>4</h1>
                   <dl>
                     <dt>
                       <p>Symbol</p>
@@ -131,7 +199,7 @@ RSpec.describe IsoDoc do
                 </div>
                 <br/>
                 <div id="P" class="Section3">
-                  <h1 class="Annex"><b>Annex A</b><br/><br/>(normative)<br/><br/><b>Annex</b></h1>
+                  <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
                   <div id="Q">
            <h2>A.1&#160; Annex A.1</h2>
            <div id="Q1">
@@ -154,74 +222,8 @@ RSpec.describe IsoDoc do
             </body>
         </html>
 OUTPUT
-  end
-
-  it "processes section names (Word)" do
-    expect(xmlpp(IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-      <preface>
-      <foreword obligation="informative">
-         <title>Foreword</title>
-         <p id="A">This is a preamble</p>
-       </foreword>
-        <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
-         <title>Introduction Subsection</title>
-       </clause>
-       <p>This is patent boilerplate</p>
-       </introduction></preface><sections>
-       <clause id="D" obligation="normative">
-         <title>Scope</title>
-         <p id="E">Text</p>
-       </clause>
-
-       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
-         <title>Normal Terms</title>
-         <term id="J">
-         <preferred>Term2</preferred>
-       </term>
-       </terms>
-       <definitions id="K">
-         <dl>
-         <dt>Symbol</dt>
-         <dd>Definition</dd>
-         </dl>
-       </definitions>
-       </clause>
-       <definitions id="L">
-         <dl>
-         <dt>Symbol</dt>
-         <dd>Definition</dd>
-         </dl>
-       </definitions>
-       <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
-         <title>Introduction</title>
-       </clause>
-       <clause id="O" inline-header="false" obligation="normative">
-         <title>Clause 4.2</title>
-       </clause></clause>
 
-       </sections><annex id="P" inline-header="false" obligation="normative">
-         <title>Annex</title>
-         <clause id="Q" inline-header="false" obligation="normative">
-         <title>Annex A.1</title>
-         <clause id="Q1" inline-header="false" obligation="normative">
-         <title>Annex A.1a</title>
-         </clause>
-       </clause>
-              <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
-       </appendix>
-       </annex><bibliography><references id="R" obligation="informative" normative="true">
-         <title>Normative References</title>
-       </references><clause id="S" obligation="informative">
-         <title>Bibliography</title>
-         <references id="T" obligation="informative" normative="false">
-         <title>Bibliography Subsection</title>
-       </references>
-       </clause>
-       </bibliography>
-       </iso-standard>
-    INPUT
+    word = <<~OUTPUT
            <body lang="EN-US" link="blue" vlink="#954F72">
              <div class="WordSection2">
                <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
@@ -233,7 +235,7 @@ OUTPUT
                </div>
                <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div class="Section3" id="B">
-                 <h1 class="IntroTitle">0<span style="mso-tab-count:1">&#160; </span>INTRODUCTION</h1>
+                 <h1 class="IntroTitle">0<span style="mso-tab-count:1">&#160; </span>Introduction</h1>
                  <div id="C">
           <h2>0.1<span style="mso-tab-count:1">&#160; </span>Introduction Subsection</h2>
         </div>
@@ -249,7 +251,7 @@ OUTPUT
                  <p id="E">Text</p>
                </div>
                <div>
-                 <h1>2<span style="mso-tab-count:1">&#160; </span>Normative references</h1>
+                 <h1>2<span style="mso-tab-count:1">&#160; </span>Normative References</h1>
                </div>
                <div id="H"><h1>3<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I">
@@ -257,11 +259,11 @@ OUTPUT
           <p class="TermNum" id="J">3.1.1</p>
           <p class="Terms" style="text-align:left;">Term2</p>
 
-        </div><div id="K"><h2>3.2<span style="mso-tab-count:1">&#160; </span>Symbols and abbreviated terms</h2>
+        </div><div id="K"><h2>3.2</h2>
           <table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">Symbol</p></td><td valign="top">Definition</td></tr></table>
         </div></div>
                <div id="L" class="Symbols">
-                 <h1>4<span style="mso-tab-count:1">&#160; </span>Symbols and abbreviated terms</h1>
+                 <h1>4</h1>
                  <table class="dl">
                    <tr>
                      <td valign="top" align="left">
@@ -282,7 +284,7 @@ OUTPUT
                </div>
                <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div id="P" class="Section3">
-                 <h1 class="Annex"><b>Annex A</b><br/><br/>(normative)<br/><br/><b>Annex</b></h1>
+                 <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
                  <div id="Q">
           <h2>A.1<span style="mso-tab-count:1">&#160; </span>Annex A.1</h2>
           <div id="Q1">
@@ -305,10 +307,13 @@ OUTPUT
              <div class="colophon"/>
            </body>
 OUTPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iec::WordConvert.new({}).convert("test", presxml, true).sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(word)
   end
 
   it "processes subclauses with and without titles" do
-    expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       <iso-standard xmlns="http://riboseinc.com/isoxml">
        <sections>
        <clause id="D" obligation="normative">
@@ -322,24 +327,27 @@ OUTPUT
        </sections>
        </iso-standard>
 INPUT
-    #{HTML_HDR}
-    <div id=''>
-  <h1 class='ForewordTitle'>FOREWORD</h1>
-  <div class='boilerplate_legal'/>
-</div>
-#{IEC_TITLE1}
-      <div id='D'>
-        <h1>1&#160; Scope</h1>
-        <div id='D1'>
-          <h2>1.1&#160; Scope 1</h2>
-        </div>
-        <div id='D2'>
-          <h2>1.2&#160; </h2>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <sections>
+    <clause id='D' obligation='normative'>
+      <title depth='1'>
+        1
+        <tab/>
+        Scope
+      </title>
+      <clause id='D1' obligation='normative'>
+        <title depth='2'>
+          1.1
+          <tab/>
+          Scope 1
+        </title>
+      </clause>
+      <clause id='D2' obligation='normative'>
+        <title>1.2</title>
+      </clause>
+    </clause>
+  </sections>
+</iso-standard>
 OUTPUT
     end
 
@@ -348,8 +356,9 @@ OUTPUT
         expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
                <iso-standard xmlns="http://riboseinc.com/isoxml">
        <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+       <terms id="H" obligation="normative"><title>1<tab/>Terms, Definitions, Symbols and Abbreviated Terms</title>
          <term id="J">
+         <name>1.1</name>
          <preferred>Term2</preferred>
        </term>
         </terms>
@@ -376,11 +385,12 @@ OUTPUT
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <sections>
-       <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
-         <title>Introduction</title>
+       <clause id="M" inline-header="false" obligation="normative"><title>1<tab/>Clause 4</title>
+<clause id="N" inline-header="false" obligation="normative">
+         <title>1.1<tab/>Introduction</title>
        </clause>
        <clause id="O" inline-header="true" obligation="normative">
-         <title>Clause 4.2</title>
+         <title>1.2<tab/>Clause 4.2</title>
        </clause></clause>
 
        </sections>