RubyGems - isodoc - Versions diffs - 0.5.8 → 0.5.9 - Mend

isodoc 0.5.8 → 0.5.9

Files changed (41) hide show

checksums.yaml +4 -4
data/.rubocop.tb.yml +20 -10
data/lib/isodoc/blocks.rb +13 -13
data/lib/isodoc/cleanup.rb +19 -3
data/lib/isodoc/comments.rb +1 -1
data/lib/isodoc/convert.rb +2 -0
data/lib/isodoc/footnotes.rb +4 -2
data/lib/isodoc/html.rb +28 -10
data/lib/isodoc/i18n-en.yaml +9 -0
data/lib/isodoc/i18n-fr.yaml +12 -3
data/lib/isodoc/i18n-zh-Hans.yaml +10 -1
data/lib/isodoc/i18n.rb +9 -2
data/lib/isodoc/inline.rb +5 -6
data/lib/isodoc/iso2wordhtml.rb +9 -6
data/lib/isodoc/lists.rb +7 -5
data/lib/isodoc/metadata.rb +27 -10
data/lib/isodoc/references.rb +12 -6
data/lib/isodoc/section.rb +17 -11
data/lib/isodoc/table.rb +2 -4
data/lib/isodoc/terms.rb +3 -3
data/lib/isodoc/utils.rb +15 -14
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/wordconvert/comments.rb +1 -1
data/lib/isodoc/wordconvert/wordconvertmodule.rb +51 -12
data/lib/isodoc/xref_gen.rb +30 -26
data/lib/isodoc/xref_sect_gen.rb +31 -13
data/spec/assets/scripts.html +1 -0
data/spec/isodoc/blocks_spec.rb +50 -49
data/spec/isodoc/cleanup_spec.rb +6 -6
data/spec/isodoc/footnotes_spec.rb +10 -2
data/spec/isodoc/i18n_spec.rb +86 -54
data/spec/isodoc/inline_spec.rb +22 -18
data/spec/isodoc/lists_spec.rb +25 -11
data/spec/isodoc/metadata_spec.rb +4 -3
data/spec/isodoc/postproc_spec.rb +108 -42
data/spec/isodoc/ref_spec.rb +9 -7
data/spec/isodoc/section_spec.rb +162 -141
data/spec/isodoc/table_spec.rb +18 -16
data/spec/isodoc/terms_spec.rb +9 -9
data/spec/isodoc/xref_spec.rb +153 -122
metadata +3 -2

@@ -4,7 +4,7 @@ RSpec.describe IsoDoc do
   it "processes unordered lists" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <ul id="_61961034-0fb1-436b-b281-828857a59ddb">
   <li>
     <p id="_cb370dd3-8463-4ec7-aa1a-96f644e2e9a2">updated normative references;</p>
@@ -13,7 +13,7 @@ RSpec.describe IsoDoc do
     <p id="_60eb765c-1f6c-418a-8016-29efa06bf4f9">deletion of 4.3.</p>
   </li>
 </ul>
-</foreword>
+</foreword></preface>
 </iso-standard>
     INPUT
               <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -52,7 +52,7 @@ RSpec.describe IsoDoc do
   it "processes ordered lists" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <ol id="_ae34a226-aab4-496d-987b-1aa7b6314026" type="alphabet">
   <li>
     <p id="_0091a277-fb0e-424a-aea8-f0001303fe78">all information necessary for the complete identification of the sample;</p>
@@ -68,7 +68,7 @@ RSpec.describe IsoDoc do
   </ol>
   </ol>
 </ol>
-</foreword>
+</foreword></preface>
 </iso-standard>
     INPUT
               <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -114,7 +114,7 @@ RSpec.describe IsoDoc do
   it "processes Roman Upper ordered lists" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <ol id="_ae34a226-aab4-496d-987b-1aa7b6314026" type="roman_upper">
   <li>
     <p id="_0091a277-fb0e-424a-aea8-f0001303fe78">all information necessary for the complete identification of the sample;</p>
@@ -126,7 +126,7 @@ RSpec.describe IsoDoc do
     <p id="_ea248b7f-839f-460f-a173-a58a830b2abe">the sampling method used;</p>
   </li>
 </ol>
-</foreword>
+</foreword></preface>
 </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -168,7 +168,7 @@ RSpec.describe IsoDoc do
   it "processes definition lists" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <dl id="_732d3f57-4f88-40bf-9ae9-633891edc395">
   <dt>
     W
@@ -178,8 +178,9 @@ RSpec.describe IsoDoc do
   </dd>
   <dt><stem type="AsciiMath">w</stem></dt>
   <dd><p>??</p></dd>
+  <note><p>This is a note</p></note>
   </dl>
-</foreword>
+</foreword></preface>
 </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -210,6 +211,9 @@ RSpec.describe IsoDoc do
                      <p>??</p>
                    </dd>
                  </dl>
+                 <div id="" class="Note">
+  <p class="Note"><span class="note_label">NOTE</span>&#160; This is a note</p>
+</div>
                </div>
                <p>&#160;</p>
              </div>
@@ -226,7 +230,7 @@ RSpec.describe IsoDoc do
   it "processes definition lists (Word)" do
     expect(IsoDoc::WordConvert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <dl id="_732d3f57-4f88-40bf-9ae9-633891edc395">
   <dt>
     W
@@ -236,8 +240,9 @@ RSpec.describe IsoDoc do
   </dd>
   <dt><stem type="AsciiMath">w</stem></dt>
   <dd><p>??</p></dd>
+  <note><p>This is a note</p></note>
   </dl>
-</foreword>
+</foreword></preface>
 </iso-standard>
     INPUT
            <html xmlns:epub="http://www.idpf.org/2007/ops">
@@ -255,7 +260,7 @@ RSpec.describe IsoDoc do
                   <table class="dl">
                     <tr>
                       <td valign="top" align="left">
-                        <p style="text-align: left;">
+                        <p align="left" style="margin-left:0pt;text-align:left;">
             W
           </p>
                       </td>
@@ -265,12 +270,21 @@ RSpec.describe IsoDoc do
                     </tr>
                     <tr>
                       <td valign="top" align="left">
+                      <p align="left" style="margin-left:0pt;text-align:left;">
                         <span class="stem">(#(w)#)</span>
+                      </p>
                       </td>
                       <td valign="top">
                         <p>??</p>
                       </td>
                     </tr>
+                    <tr>
+                     <td rowspan="2">
+                       <div id="" class="Note">
+                         <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>This is a note</p>
+                       </div>
+                      </td>
+                    </tr>
                   </table>
                 </div>
                 <p>&#160;</p>

data/spec/isodoc/metadata_spec.rb CHANGED

@@ -42,6 +42,7 @@ RSpec.describe IsoDoc do
   <status>
     <stage>30</stage>
     <substage>92</substage>
+    <iteration>3</iteration>
   </status>
   <copyright>
     <from>2016</from>
@@ -60,11 +61,11 @@ RSpec.describe IsoDoc do
 </bibdata><version>
   <edition>2</edition>
   <revision-date>2016-05-01</revision-date>
+  <draft>0.4</draft>
 </version>
 </iso-standard>
 INPUT
-       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :createddate=>"2010&ndash;2011", :docnumber=>"CD 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stageabbr=>"CD", :tc=>"TC 34", :wg=>"WG 3"}
+       {:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :docnumber=>"PreCD3 17301-1", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" ( 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stageabbr=>"PreCD3", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
 OUTPUT
   end
@@ -134,7 +135,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-       {:accesseddate=>"XXX", :activateddate=>"XXX", :agency=>"ISO/IEC", :createddate=>"XXX", :docnumber=>"CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :docyear=>"2016", :draft=>"12", :draftinfo=>" ( 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"30", :stageabbr=>"CD", :tc=>"ABC 34", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"CD 17301-1-3", :docsubtitle=>"C&#xe9;r&#xe9;ales et l&#xe9;gumineuses&nbsp;&mdash; Sp&#xe9;cification et m&#xe9;thodes d&#x27;essai&nbsp;&mdash; Partie&nbsp;1&ndash;3: Riz", :doctitle=>"Cereals and pulses&nbsp;&mdash; Specifications and test methods&nbsp;&mdash; Part&nbsp;1&ndash;3: Rice", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" ( 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"30", :stageabbr=>"CD", :tc=>"ABC 34", :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end

data/spec/isodoc/postproc_spec.rb CHANGED

@@ -6,11 +6,11 @@ RSpec.describe IsoDoc do
     system "rm -f test.html"
     IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert_file(<<~"INPUT", "test", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
     expect(File.exist?("test.html")).to be true
@@ -26,11 +26,11 @@ RSpec.describe IsoDoc do
     system "rm -f test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert_file(<<~"INPUT", "test", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
     expect(File.exist?("test.doc")).to be true
@@ -58,19 +58,20 @@ RSpec.describe IsoDoc do
   it "generates HTML output docs with complete configuration" do
     system "rm -f test.doc"
     system "rm -f test.html"
-    IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert_file(<<~"INPUT", "test", false)
+    IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert_file(<<~"INPUT", "test", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
     html = File.read("test.html")
     expect(html).to match(/a third empty stylesheet/)
     expect(html).to match(/an empty html cover page/)
     expect(html).to match(/an empty html intro page/)
+    expect(html).to match(/This is a script/)
     expect(html).to match(%r{Enkonduko</h1>})
   end
@@ -79,11 +80,11 @@ RSpec.describe IsoDoc do
     system "rm -f test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert_file(<<~"INPUT", "test", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
     word = File.read("test.doc")
@@ -100,14 +101,14 @@ RSpec.describe IsoDoc do
     system "rm -f test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert_file(<<~"INPUT", "test", false)
      <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <foreword>
+    <preface><foreword>
     <dl>
     <dt>Term</dt>
     <dd>Definition</dd>
     <dt>Term 2</dt>
     <dd>Definition 2</dd>
     </dl>
-    </foreword>
+    </foreword></preface>
     </iso-standard>
     INPUT
     word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
@@ -120,13 +121,13 @@ RSpec.describe IsoDoc do
                   <table class="dl">
                     <tr>
                       <td valign="top" align="left">
-                        <p style="text-align: left;" class="MsoNormal">Term</p>
+                        <p align="left" style="margin-left:0pt;text-align:left;" class="MsoNormal">Term</p>
                       </td>
                       <td valign="top">Definition</td>
                     </tr>
                     <tr>
                       <td valign="top" align="left">
-                        <p style="text-align: left;" class="MsoNormal">Term 2</p>
+                        <p align="left" style="margin-left:0pt;text-align:left;" class="MsoNormal">Term 2</p>
                       </td>
                       <td valign="top">Definition 2</td>
                     </tr>
@@ -144,8 +145,12 @@ RSpec.describe IsoDoc do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <annex id="P" inline-header="false" obligation="normative">
          <title>Annex</title>
-         <subsection id="Q" inline-header="false" obligation="normative">
+         <clause id="Q" inline-header="false" obligation="normative">
          <title>Annex A.1</title>
+         </clause>
+                <appendix id="Q2" inline-header="false" obligation="normative">
+         <title>An Appendix</title>
+       </appendix>
     </annex>
     </iso-standard>
     INPUT
@@ -160,6 +165,9 @@ RSpec.describe IsoDoc do
                  <div><a name="Q" id="Q"></a>
             <p class="h2Annex">A.1. Annex A.1</p>
        </div>
+              <div><a name="Q2" id="Q2"></a>
+                <p class="h2Annex">Appendix 1. An Appendix</p>
+                </div>
                </div>
              </div>
     OUTPUT
@@ -192,7 +200,7 @@ RSpec.describe IsoDoc do
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
-               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>3.<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1><p class="MsoNormal">For the purposes of this document,
+               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1><p class="MsoNormal">For the purposes of this document,
            the following terms and definitions apply.</p>
        <p class="MsoNormal">ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -203,7 +211,7 @@ RSpec.describe IsoDoc do
        <li class="MsoNormal"> <p class="MsoNormal">IEC Electropedia: available at
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
-       <p class="TermNum"><a name="paddy1" id="paddy1"></a>3.1</p><p class="Terms">paddy</p>
+       <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
        <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301: 2011, 3.1</a>, modified &mdash; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
              </div>
@@ -241,18 +249,18 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert_file(<<~"INPUT", "test", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
-               <clause inline-header="false" obligation="normative"><title>Clause 4</title><subsection id="N" inline-header="false" obligation="normative">
+               <clause inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>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>
-       </subsection>
-       <subsection id="O" inline-header="false" obligation="normative">
+       </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>
-       </subsection></clause>
+       </clause></clause>
         </sections>
         </iso-standard>
@@ -266,7 +274,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
        <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
          \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
        <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-       <a href="#_Toc">4.<span style="mso-tab-count:1">&#xA0; </span>Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <a href="#_Toc">1.<span style="mso-tab-count:1">&#xA0; </span>Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-tab-count:1 dotted">. </span>
        </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-element:field-begin"></span></span>
@@ -277,7 +285,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
        <p class="MsoToc2">
          <span class="MsoHyperlink">
            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-       <a href="#_Toc">4.1. Introduction to this<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <a href="#_Toc">1.1. Introduction to this<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-tab-count:1 dotted">. </span>
        </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-element:field-begin"></span></span>
@@ -290,7 +298,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
        <p class="MsoToc2">
          <span class="MsoHyperlink">
            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-       <a href="#_Toc">4.2. Clause 4.2<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
+       <a href="#_Toc">1.2. Clause 4.2<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-tab-count:1 dotted">. </span>
        </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
        <span style="mso-element:field-begin"></span></span>
@@ -322,18 +330,18 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
         <sections>
                <clause 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><subsection id="N" inline-header="false" obligation="normative">
+</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>
-       </subsection>
-       <subsection id="O" inline-header="false" obligation="normative">
+       </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>
-       </subsection></clause>
+       </clause></clause>
         </sections>
         </iso-standard>
     INPUT
@@ -343,23 +351,23 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
            <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
                <div>
-                 <h1>4.&#xA0; Clause 4</h1>
+                 <h1>1.&#xA0; Clause 4</h1>
                  <a href="#ftn3" epub:type="footnote" id="_footnote1">
                    <sup>1</sup>
                  </a>
                  <div id="N">
-                <h2>4.1. Introduction to this<a href="#ftn2" epub:type="footnote" id="_footnote2"><sup>2</sup></a></h2>
+                <h2>1.1. Introduction to this<a href="#ftn2" epub:type="footnote" id="_footnote2"><sup>2</sup></a></h2>
               </div>
                  <div id="O">
-                <h2>4.2. Clause 4.2</h2>
+                <h2>1.2. Clause 4.2</h2>
                 <p>A<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
               </div>
                </div>
-               <aside id="ftn3">
+               <aside id="ftn3" class="footnote">
          <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a href="#_footnote1">1) </a>This is a footnote.</p>
        </aside>
-               <aside id="ftn2">
+               <aside id="ftn2" class="footnote">
          <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a href="#_footnote2">2) </a>Formerly denoted as 15 % (m/m).</p>
        </aside>
@@ -372,12 +380,12 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
     system "rm -rf _images"
     IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert_file(<<~"INPUT", "test", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <foreword>
+        <preface><foreword>
          <figure id="_">
          <name>Split-it-right sample divider</name>
                   <image src="spec/assets/rice_image1.png" id="_" imagetype="PNG"/>
        </figure>
-       </foreword>
+       </foreword></preface>
         </iso-standard>
     INPUT
     html = File.read("test.html").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
@@ -391,7 +399,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
           <div id="_" class="figure">
            <img src="_images/_.png" width="800" height="673" />
-<p class="FigureTitle" align="center"><b>Figure 1&#xA0;&#x2014; Split-it-right sample divider</b></p></div>
+<p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
         </div>
         <p>&#xA0;</p>
       </div>
@@ -405,18 +413,18 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
     IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", htmlintropage: "spec/assets/htmlintro.html"}).convert_file(<<~"INPUT", "test", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
-               <clause inline-header="false" obligation="normative"><title>Clause 4</title><subsection id="N" inline-header="false" obligation="normative">
+               <clause inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>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>
-       </subsection>
-       <subsection id="O" inline-header="false" obligation="normative">
+       </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>
-       </subsection></clause>
+       </clause></clause>
                <clause inline-header="false" obligation="normative"><title>Clause 5</title></clause>
         </sections>
         </iso-standard>
@@ -427,10 +435,9 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
     expect(html.gsub(/"#[a-f0-9-]+"/, "#_")).to be_equivalent_to <<~"OUTPUT"
        <div class="WordSection2">
-       <p>/* an empty html intro page */
+       /* an empty html intro page */
-       </p>
-       <ul><li><a href=#_>5.&#xA0; Clause 4</a></li><ul><li><a href=#_>4.1. Introduction to this</a></li><li><a href=#_>4.2. Clause 4.2</a></li></ul><li><a href=#_>5.&#xA0; Clause 5</a></li></ul>
+       <ul><li><a href=#_>2.&#xA0; Clause 4</a></li><ul><li><a href=#_>1.1. Introduction to this</a></li><li><a href=#_>1.2. Clause 4.2</a></li></ul><li><a href=#_>2.&#xA0; Clause 5</a></li></ul>
@@ -441,4 +448,63 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
     OUTPUT
   end
+  it "processes IsoXML terms for HTML" do
+        system "rm -f test.doc"
+    system "rm -f test.html"
+    IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert_file(<<~"INPUT", "test", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+<term id="paddy1"><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">
+  <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termsource status="modified">
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></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>
+</termsource></term>
+<term id="paddy"><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>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
+  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+</termnote>
+<termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
+<ul><li>A</li></ul>
+  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+</termnote>
+<termsource status="identical">
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+</termsource></term>
+</terms>
+</sections>
+</iso-standard>
+    INPUT
+        expect(File.exist?("test.html")).to be true
+    html = File.read("test.html")
+    expect(html).to match(%r{<h2 class="TermNum" id="paddy1">1\.1</h2>})
+    expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2</h2>})
+end
 end