metanorma-iso 1.4.0 → 1.5.0

data/spec/isodoc/inline_spec.rb

@@ -158,7 +158,7 @@ RSpec.describe IsoDoc do
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</stem>
     </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>1<tab/>Normative references</title>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals and cereal products</title>
   <docidentifier>ISO 712</docidentifier>
@@ -185,7 +185,7 @@ RSpec.describe IsoDoc do
                <p class="zzSTDTitle1"/>
                <div>
                  <h1>1&#160; Normative references</h1>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
+                 <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
                </div>
              </div>
            </body>
@@ -194,7 +194,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes eref content" do
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -228,34 +228,102 @@ RSpec.describe IsoDoc do
     </bibliography>
     </iso-standard>
     INPUT
-    #{HTML_HDR}
-               <br/>
-               <div>
-                 <h1 class="ForewordTitle">Foreword</h1>
-                 <p>
-           <a href="#IEV">IEV, 1-2-3</a>
-           <a href="#ISO712">ISO 712</a>
-           <a href="#ISO712">ISO 712</a>
-           <a href="#ISO712">ISO 712, Table 1</a>
-           <a href="#ISO712">ISO 712, Table 1&#8211;1</a>
-           <a href="#ISO712">ISO 712, Clause 1, Table 1</a>
-           <a href="#ISO712">ISO 712, Clause 1 a)</a>
-           <a href="#ISO712">ISO 712, Clause 1</a>
-           <a href="#ISO712">ISO 712, 1.5</a>
-           <a href="#ISO712">A</a>
-           <a href="#ISO712">ISO 712, Whole of text</a>
-           <a href="#ISO712">ISO 712, Prelude 7</a>
-           <a href="#ISO712">A</a>
-           </p>
-               </div>
-               <p class="zzSTDTitle1"/>
-               <div>
-                 <h1>1&#160; Normative references</h1>
-                 <p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
-               </div>
-             </div>
-           </body>
-       </html>
+       <?xml version='1.0'?>
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <preface>
+           <foreword>
+             <p>
+               <eref type='inline' bibitemid='IEV' citeas='IEV'>
+                 <locality type='clause'>
+                   <referenceFrom>1-2-3</referenceFrom>
+                 </locality>
+                 IEV, 1-2-3
+               </eref>
+               <eref type='inline' bibitemid='ISO712' citeas='ISO 712'>ISO 712</eref>
+               <eref type='inline' bibitemid='ISO712'>ISO 712</eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 ISO 712, Table 1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                   <referenceTo>1</referenceTo>
+                 </locality>
+                 ISO 712, Table 1&#x2013;1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 ISO 712, Clause 1, Table 1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 <locality type='list'>
+                   <referenceFrom>a</referenceFrom>
+                 </locality>
+                 ISO 712, Clause 1 a)
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 ISO 712, Clause 1
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='clause'>
+                   <referenceFrom>1.5</referenceFrom>
+                 </locality>
+                 ISO 712, 1.5
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='table'>
+                   <referenceFrom>1</referenceFrom>
+                 </locality>
+                 A
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='whole'/>
+                 ISO 712, Whole of text
+               </eref>
+               <eref type='inline' bibitemid='ISO712'>
+                 <locality type='locality:prelude'>
+                   <referenceFrom>7</referenceFrom>
+                 </locality>
+                 ISO 712, Prelude 7
+               </eref>
+               <eref type='inline' bibitemid='ISO712' citeas='ISO 712'>A</eref>
+             </p>
+           </foreword>
+         </preface>
+         <bibliography>
+           <references id='_normative_references' obligation='informative' normative='true'>
+             <title depth='1'>
+  1
+  <tab/>
+  Normative References
+</title>
+             <bibitem id='ISO712' type='standard'>
+               <title format='text/plain'>Cereals and cereal products</title>
+               <docidentifier>ISO 712</docidentifier>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <abbreviation>ISO</abbreviation>
+                 </organization>
+               </contributor>
+             </bibitem>
+           </references>
+         </bibliography>
+       </iso-standard>
     OUTPUT
   end
 

data/spec/isodoc/iso_spec.rb

@@ -92,11 +92,11 @@ RSpec.describe IsoDoc::Iso do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
-  <eref bibitemid="IEV"/>
-  <eref bibitemid="ISO20483"/>
+  <eref bibitemid="IEV">IEV</eref>
+  <eref bibitemid="ISO20483">ISO 20483</eref>
   </p>
     </foreword></preface>
-    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+    <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>1<tab/>Normative References</title>
           <bibitem type="international-standard" id="IEV">
   <title format="text/plain" language="en" script="Latn">Electropedia: 
   The World's Online Electrotechnical Vocabulary</title>
@@ -153,8 +153,8 @@ RSpec.describe IsoDoc::Iso do
              </div>
              <p class="zzSTDTitle1"/>
              <div>
-               <h1>1&#160; Normative references</h1>
-               <p id="ISO20483" class="NormRef">ISO 20483, <i> Cereals and pulses</i></p>
+               <h1>1&#160; Normative References</h1>
+               <p id="ISO20483" class="NormRef">ISO 20483, <i>Cereals and pulses</i></p>
              </div>
            </div>
          </body>
@@ -163,8 +163,8 @@ RSpec.describe IsoDoc::Iso do
     OUTPUT
 end
 
-  it "processes examples" do
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+   it "processes examples (Presentation XML)" do
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
@@ -173,6 +173,33 @@ end
 </example>
     </foreword></preface>
     </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode'>
+        <name>EXAMPLE&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
+OUTPUT
+   end
+
+  it "processes examples (HTML)" do
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode'>
+        <name>EXAMPLE&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
         #{HTML_HDR}
                      <br/>
@@ -189,9 +216,8 @@ end
     OUTPUT
   end
 
-
-  it "processes sequences of examples" do
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+   it "processes sequences of examples (Presentation XML)" do
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
@@ -203,6 +229,41 @@ end
 </example>
     </foreword></preface>
     </iso-standard>
+    INPUT
+    <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode'>
+        <name>EXAMPLE 1</name>
+        <quote>Hello</quote>
+      </example>
+      <example id='samplecode2'>
+        <name>EXAMPLE 2&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
+OUTPUT
+end
+
+  it "processes sequences of examples (HTML)" do
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode'>
+        <name>EXAMPLE 1</name>
+        <quote>Hello</quote>
+      </example>
+      <example id='samplecode2'>
+        <name>EXAMPLE 2&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
         #{HTML_HDR}
              <br/>
@@ -225,14 +286,16 @@ end
 
     it "processes examples (Word)" do
     expect(xmlpp(IsoDoc::Iso::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>
-    <example id="samplecode">
-    <name>Title</name>
-  <p>Hello</p>
-</example>
-    </foreword></preface>
-    </iso-standard>
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode'>
+        <name>EXAMPLE&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
            <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">
@@ -268,17 +331,20 @@ end
 
   it "processes sequences of examples (Word)" do
     expect(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")).to be_equivalent_to <<~"OUTPUT"
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <preface><foreword>
-    <example id="samplecode">
-  <quote>Hello</quote>
-</example>
-    <example id="samplecode2">
-    <name>Title</name>
-  <p>Hello</p>
-</example>
-    </foreword></preface>
-    </iso-standard>
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <preface>
+    <foreword>
+      <example id='samplecode'>
+        <name>EXAMPLE 1</name>
+        <quote>Hello</quote>
+      </example>
+      <example id='samplecode2'>
+        <name>EXAMPLE 2&#xA0;&#x2014; Title</name>
+        <p>Hello</p>
+      </example>
+    </foreword>
+  </preface>
+</iso-standard>
     INPUT
            <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">

data/spec/isodoc/postproc_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe IsoDoc do
+
   it "generates file based on string input" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
@@ -105,10 +106,10 @@ RSpec.describe IsoDoc do
     <annex id="P" inline-header="false" obligation="normative">
          <title>Annex</title>
          <clause id="Q" inline-header="false" obligation="normative">
-         <title>Annex A.1</title>
+         <title>A.1<tab/>Annex A.1</title>
          </clause>
                 <appendix id="Q2" inline-header="false" obligation="normative">
-         <title>An Appendix</title>
+         <title>Appendix 1<tab/>An Appendix</title>
        </appendix>
     </annex>
     </iso-standard>
@@ -120,7 +121,7 @@ RSpec.describe IsoDoc do
                <p class="zzSTDTitle1"></p>
                <p class="MsoNormal"><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/>(normative)<br/><br/><b>Annex</b></h1>
+                 <h1 class="Annex">Annex</h1>
                  <div><a name="Q" id="Q"></a>
             <p class="h2Annex">A.1<span style="mso-tab-count:1">&#xA0; </span>Annex A.1</p>
        </div>
@@ -138,12 +139,14 @@ RSpec.describe IsoDoc do
     IsoDoc::Iso::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>
@@ -190,14 +193,14 @@ RSpec.describe IsoDoc do
     IsoDoc::Iso::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
-               <clause id="A" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+               <clause id="A" inline-header="false" obligation="normative"><title>1<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
 
-         <title>Introduction<bookmark id="Q"/> to this<fn reference="1">
+         <title>1.1<tab/>Introduction<bookmark id="Q"/> to this<fn reference="1">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
 </fn></title>
        </clause>
        <clause id="O" inline-header="false" obligation="normative">
-         <title>Clause 4.2</title>
+         <title>1.2<tab/>Clause 4.2</title>
          <p>A<fn reference="1">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
 </fn></p>
@@ -263,21 +266,21 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "reorders footnote numbers in HTML" do
+  it "reorders footnote numbers" do
     FileUtils.rm_f "test.html"
-    IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
+    input = <<~INPUT
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
-               <clause id="A" inline-header="false" obligation="normative"><title>Clause 4</title><fn reference="3">
+               <clause id="A" inline-header="false" obligation="normative"><title>1<tab/>Clause 4</title><fn reference="3">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">This is a footnote.</p>
 </fn><clause id="N" inline-header="false" obligation="normative">
 
-         <title>Introduction to this<fn reference="2">
+         <title>1.1<tab/>Introduction to this<fn reference="2">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
 </fn></title>
        </clause>
        <clause id="O" inline-header="false" obligation="normative">
-         <title>Clause 4.2</title>
+         <title>1.2<tab/>Clause 4.2</title>
          <p>A<fn reference="1">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
 </fn></p>
@@ -285,6 +288,7 @@ RSpec.describe IsoDoc do
         </sections>
         </iso-standard>
     INPUT
+    IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", input, false)
     html = File.read("test.html", encoding: "UTF-8").sub(/^.*<main class="main-section">/m, '<main xmlns:epub="epub" class="main-section">').
       sub(%r{</main>.*$}m, "</main>")
     expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -315,30 +319,9 @@ RSpec.describe IsoDoc do
 
            </main>
     OUTPUT
-  end
 
-    it "renders footnote numbers in Word" do
     FileUtils.rm_f "test.doc"
-    IsoDoc::Iso::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <sections>
-               <clause id="A" inline-header="false" obligation="normative"><title>Clause 4</title><fn reference="3">
-  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">This is a footnote.</p>
-</fn><clause id="N" inline-header="false" obligation="normative">
-
-         <title>Introduction to this<fn reference="2">
-  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
-</fn></title>
-       </clause>
-       <clause id="O" inline-header="false" obligation="normative">
-         <title>Clause 4.2</title>
-         <p>A<fn reference="1">
-  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
-</fn></p>
-       </clause></clause>
-        </sections>
-        </iso-standard>
-    INPUT
+    IsoDoc::Iso::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", input, false)
     html = File.read("test.doc", encoding: "UTF-8").sub(/^.*<div class="WordSection3"/m, '<body xmlns:epub="epub"><div class="WordSection3"').
       sub(%r{</body>.*$}m, "</body>").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")
     expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -442,42 +425,6 @@ RSpec.describe IsoDoc do
   end
 
 
-  it "moves images in HTML" do
-    FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "_images"
-    FileUtils.rm_rf "test_htmlimages"
-    IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface><foreword>
-         <figure id="_">
-         <name>Split-it-right sample divider</name>
-                  <image src="spec/assets/rice_image1.png" id="_" mimetype="image/png"/>
-                  <image src="spec/assets/rice_image1.png" id="_" width="20000" height="300000" mimetype="image/png"/>
-                  <image src="spec/assets/rice_image1.png" id="_" width="99" height="auto" mimetype="image/png"/>
-       </figure>
-       </foreword></preface>
-        </iso-standard>
-    INPUT
-    html = File.read("test.html", encoding: "UTF-8").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
-      sub(%r{</main>.*$}m, "</main>")
-    expect(`ls test_htmlimages`).to match(/\.png$/)
-    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-           <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
-             <br />
-             <div>
-               <h1 class="ForewordTitle" id="toc0">Foreword</h1>
-               <div id="_" class="figure">
-               <img src="test_htmlimages/_.png" height="776" width="922" />
-<img src="test_htmlimages/_.png" height="800" width="53" />
-<img src="test_htmlimages/_.png" height="83" width="99" />
-       <p class="FigureTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
-             </div>
-             <p class="zzSTDTitle1"></p>
-           </main>
-    OUTPUT
-
-  end
-
   it "processes IsoXML terms for HTML" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_f "test.doc"
@@ -486,7 +433,9 @@ RSpec.describe IsoDoc do
     <sections>
     <terms id="_terms_and_definitions" obligation="normative"><title>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">
@@ -508,7 +457,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>
@@ -561,19 +512,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/>
-  (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>
@@ -606,19 +549,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/>
-  (normative)
-  <br/>
-  <br/>
-  <b/>
-</h1>
                <div class="figure"><a name="samplecode" id="samplecode"></a>
          <p class="MsoNormal">Hello</p>
          <p class="MsoNormal">Key</p>
          <p style='page-break-after:avoid;' class='MsoNormal'><b>Key</b></p><div class="figdl" style="page-break-after:avoid;"><table class="figdl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;" class="MsoNormal"><p class="MsoNormal">A</p></p></td><td valign="top"><p class="MsoNormal">B</p></td></tr></table></div>
-         <p class="FigureTitle" style="text-align:center;">Figure A.1</p></div>
+         <p class="FigureTitle" style="text-align:center;"/></div>
              </div>
            </div>
 
@@ -626,9 +561,7 @@ RSpec.describe IsoDoc do
   end
 
       it "processes boilerplate" do
-     FileUtils.rm_f "test.doc"
-    FileUtils.rm_f "test.html"
-    IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+        input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata type="standard">
         <status><stage>30</stage></status>
@@ -662,8 +595,7 @@ I am the Walrus.
     <clause>
 <title>Warning for Stuff</title>
 
-<p>This
-document is not an ISO International Standard. It is distributed for review and
+<p>This document is not an ISO International Standard. It is distributed for review and
 comment. It is subject to change without notice and may not be referred to as
 an International Standard.</p>
 
@@ -677,67 +609,100 @@ documentation.</p>
 </boilerplate>
 </iso-standard>
     INPUT
-    word = File.read("test.html", encoding: "UTF-8")
-    expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'
-    expect((word)).to include "I am the Walrus."
-end
 
-  it "processes boilerplate (Word)" do
-     FileUtils.rm_f "test.doc"
-    FileUtils.rm_f "test.html"
-    IsoDoc::Iso::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
-        <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <bibdata type="standard">
-        <status><stage>30</stage></status>
-        </bibdata>
-    <boilerplate>
-  <copyright-statement>
-    <clause>
-    <p id="boilerplate-year">Published in Elbonia</p>
+    presxml = <<~OUTPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+               <bibdata type="standard">
+               <status><stage>30</stage></status>
+               </bibdata>
+           <boilerplate>
+         <copyright-statement>
+           <clause inline-header="true">
+           <p id="boilerplate-year">
+           &#xA9; ISO 2019, Published in Switzerland
+         </p>
+
+         <p id="boilerplate-message">
+       I am the Walrus.
+         </p>
+
+           <p id="boilerplate-name">ISO copyright office</p>
+         <p id="boilerplate-address" align="left">
+           ISO copyright office<br/>
+           Ch. de Blandonnet 8 ?~@? CP 401<br/>
+           CH-1214 Vernier, Geneva, Switzerland<br/>
+           Tel. + 41 22 749 01 11<br/>
+           Fax + 41 22 749 09 47<br/>
+           copyright@iso.org<br/>
+           www.iso.org
+         </p>
+       </clause>
+         </copyright-statement>
 
-  <p id="boilerplate-message">No soup for you</p>
 
-  <p id="boilerplate-place">Dilbert Associates</p>
-  <p id="boilerplate-address" align="left">Elbonia 5000</p>
-</clause>
-  </copyright-statement>
+         <license-statement>
+           <clause>
+       <title depth="1">Warning for Stuff</title>
 
+       <p>This document is not an ISO International Standard. It is distributed for review and
+       comment. It is subject to change without notice and may not be referred to as
+       an International Standard.</p>
 
-  <license-statement>
-    <clause>
-<title>Warning for Stuff</title>
+       <p>Recipients
+       of this draft are invited to submit, with their comments, notification of any
+       relevant patent rights of which they are aware and to provide supporting
+       documentation.</p>
+       </clause>
+         </license-statement>
 
-<p>I am the Walrus</p>
-</clause>
-  </license-statement>
+       </boilerplate>
+       </iso-standard>
+    OUTPUT
 
-</boilerplate>
-</iso-standard>
-    INPUT
+     FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+expect((IsoDoc::Iso::PresentationXMLConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", presxml, false)
+    word = File.read("test.html", encoding: "UTF-8")
+    expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'
+    expect((word)).to include "I am the Walrus."
+    IsoDoc::Iso::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", presxml, false)
     word = File.read("test.doc", encoding: "UTF-8")
     expect(xmlpp(word.sub(%r{^.*<div class="boilerplate-copyright">}m, '<div class="boilerplate-copyright">').sub(%r{</div>.*$}m, '</div></div>'))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <div class='boilerplate-copyright'>
-  <div>
-    <p class='zzCopyright'>
-      <a name='boilerplate-year' id='boilerplate-year'/>
-      <span><b/></span>Published in Elbonia
-    </p>
-    <p class='zzCopyright1'>
-      <a name='boilerplate-message' id='boilerplate-message'/>
-      No soup for you
-    </p>
-    <p class='zzCopyright1'>
-      <a name='boilerplate-place' id='boilerplate-place'/>
-      Dilbert Associates
-    </p>
-    <p align='left' style='text-align:left;' class='zzAddress'>
-      <a name='boilerplate-address' id='boilerplate-address'/>
-      Elbonia 5000
-    </p>
-  </div>
-</div>
+<div class='boilerplate-copyright'>
+         <div>
+           <p class='zzCopyright'>
+             <a name='boilerplate-year' id='boilerplate-year'/>
+              &#xA9; ISO 2019, Published in Switzerland 
+           </p>
+           <p class='zzCopyright1'>
+             <a name='boilerplate-message' id='boilerplate-message'/>
+              I am the Walrus. 
+           </p>
+           <p class='zzCopyright'>
+             <a name='boilerplate-name' id='boilerplate-name'/>
+             ISO copyright office
+           </p>
+           <p style='text-align:left;' align='left' class='zzAddress'>
+             <a name='boilerplate-address' id='boilerplate-address'/>
+              ISO copyright office
+             <br/>
+              Ch. de Blandonnet 8 ?~@? CP 401
+             <br/>
+              CH-1214 Vernier, Geneva, Switzerland
+             <br/>
+              Tel. + 41 22 749 01 11
+             <br/>
+              Fax + 41 22 749 09 47
+             <br/>
+              copyright@iso.org
+             <br/>
+              www.iso.org 
+           </p>
+         </div>
+       </div>
            OUTPUT
-    expect(word).to include '<p class="zzWarning">I am the Walrus</p>'
+           expect(word).to include '<p class="zzWarning">This document is not an ISO International Standard'
 end
 
 end