isodoc 1.8.3.3 → 2.0.1

data/lib/isodoc/presentation_function/terms.rb

@@ -6,35 +6,40 @@ module IsoDoc
 
     def concept1(node)
       xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, ital: node["ital"] || "true",
-                                    ref: node["ref"] || "true",
-                                    linkref: node["linkref"] || "true",
-                                    linkmention: node["linkmention"] || "false")
+        return concept_render(node, ital: "true", ref: "true",
+                                    linkref: "true", linkmention: "false")
       if node.at(ns("//definitions//dt[@id = '#{xref}']"))
-        concept_render(node, ital: node["ital"] || "false",
-                             ref: node["ref"] || "false",
-                             linkref: node["linkref"] || "true",
-                             linkmention: node["linkmention"] || "false")
-      else concept_render(node, ital: node["ital"] || "true",
-                                ref: node["ref"] || "true",
-                                linkref: node["linkref"] || "true",
-                                linkmention: node["linkmention"] || "false")
+        concept_render(node, ital: "false", ref: "false",
+                             linkref: "true", linkmention: "false")
+      else concept_render(node, ital: "true", ref: "true",
+                                linkref: "true", linkmention: "false")
       end
     end
 
-    def concept_render(node, opts)
+    def concept_render(node, defaults)
+      opts, render, ref = concept_render_init(node, defaults)
       node&.at(ns("./refterm"))&.remove
-      r = node.at(ns("./renderterm"))
-      ref = node.at(ns("./xref | ./eref | ./termref"))
-      ref && opts[:ref] != "false" and r&.next = " "
-      opts[:ital] == "true" and r&.name = "em"
-      concept1_linkmention(ref, r, opts)
+      ref && opts[:ref] != "false" and render&.next = " "
+      opts[:ital] == "true" and render&.name = "em"
+      concept1_linkmention(ref, render, opts)
       concept1_ref(node, ref, opts)
+      concept1_nonital(node, opts)
+      node.replace(node.children)
+    end
+
+    def concept1_nonital(node, opts)
       if opts[:ital] == "false"
         r = node.at(ns(".//renderterm"))
         r&.replace(r&.children)
       end
-      node.replace(node.children)
+    end
+
+    def concept_render_init(node, defaults)
+      opts = %i(ital ref linkref linkmention).each_with_object({}) do |x, m|
+        m[x] = node[x.to_s] || defaults[x]
+      end
+      [opts, node.at(ns("./renderterm")),
+       node.at(ns("./xref | ./eref | ./termref"))]
     end
 
     def concept1_linkmention(ref, renderterm, opts)
@@ -237,7 +242,7 @@ module IsoDoc
     end
 
     def termsource_modification(mod)
-      mod.previous_element.next = ", #{@i18n.modified}"
+      mod.previous_element.next = l10n(", #{@i18n.modified}")
       mod.text.strip.empty? or mod.previous = " – "
       mod.elements.size == 1 and
         mod.elements[0].replace(mod.elements[0].children)

data/lib/isodoc/presentation_xml_convert.rb

@@ -37,6 +37,7 @@ module IsoDoc
       references docxml
       index docxml
       clausetitle docxml
+      floattitle docxml
       toc docxml
       display_order docxml
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.8.3.3".freeze
+  VERSION = "2.0.1".freeze
 end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -9,6 +9,10 @@ module IsoDoc
         docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
           preface_names(b)
         end
+        references(docxml)
+      end
+
+      def references(docxml)
         docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
           reference_names(ref)
         end
@@ -148,11 +152,11 @@ module IsoDoc
         "xmlns:name = 'International Electrotechnical Commission']".freeze
 
       def reference_names(ref)
-        # isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
         ids = @klass.bibitem_ref_code(ref)
         identifiers = @klass.render_identifier(ids)
-        # date = ref.at(ns("./date[@type = 'published']"))
-        reference = @klass.docid_l10n(identifiers[0] || identifiers[1])
+        reference = @klass
+          .docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
+                                     identifiers[:ordinal] || identifiers[:doi])
         @anchors[ref["id"]] = { xref: reference }
       end
     end

data/lib/isodoc/xslfo_convert.rb

@@ -33,7 +33,7 @@ module IsoDoc
     end
 
     def tmpimagedir_suffix
-      "_pdfimages"
+      "_#{SecureRandom.hex(8)}_pdfimages"
     end
 
     def pdf_stylesheet(_docxml)

data/spec/isodoc/blocks_spec.rb

@@ -1691,7 +1691,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           <bibliography><references id="_bibliography" obligation="informative" normative="false" displayorder="2">
       <title>Bibliography</title>
-      <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
+      <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">RFC 2616</docidentifier>  <docidentifier type="IETF" scope="anchor">RFC2616</docidentifier>  <docidentifier type="DOI">10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
       </references></bibliography>
           </iso-standard>
     INPUT
@@ -1752,7 +1752,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           <bibliography><references id="_bibliography" obligation="informative" normative="false"  displayorder='2'>
       <title depth='1'>Bibliography</title>
-      <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>  <docidentifier type="IETF">IETF RFC 2616</docidentifier>  <docidentifier type="rfc-anchor">RFC2616</docidentifier>  <docidentifier type="DOI">DOI 10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
+      <bibitem id="rfc2616" type="standard">  <fetched>2020-03-27</fetched>  <title format="text/plain" language="en" script="Latn">Hypertext Transfer Protocol — HTTP/1.1</title>  <uri type="xml">https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.2616.xml</uri>  <uri type="src">https://www.rfc-editor.org/info/rfc2616</uri>   <docidentifier type='metanorma-ordinal'>[1]</docidentifier> <docidentifier type="IETF">IETF RFC 2616</docidentifier>  <docidentifier type="IETF" scope="anchor">IETF RFC2616</docidentifier>  <docidentifier type="DOI">DOI 10.17487/RFC2616</docidentifier>  <date type="published">    <on>1999-06</on>  </date>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">R. Fielding</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Gettys</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">J. Mogul</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">H. Frystyk</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">L. Masinter</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">P. Leach</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <contributor>    <role type="author"/>    <person>      <name>        <completename language="en">T. Berners-Lee</completename>      </name>      <affiliation>        <organization>          <name>IETF</name>          <abbreviation>IETF</abbreviation>        </organization>      </affiliation>    </person>  </contributor>  <language>en</language>  <script>Latn</script>  <abstract format="text/plain" language="en" script="Latn">HTTP has been in use by the World-Wide Web global information initiative since 1990. This specification defines the protocol referred to as “HTTP/1.1”, and is an update to RFC 2068.  [STANDARDS-TRACK]</abstract>  <series type="main">    <title format="text/plain" language="en" script="Latn">RFC</title>    <number>2616</number>  </series>  <place>Fremont, CA</place></bibitem>
       </references></bibliography>
           </iso-standard>
     OUTPUT
@@ -2518,6 +2518,7 @@ RSpec.describe IsoDoc do
                <bibliography>
                  <references hidden='true' normative='false' displayorder="1">
                    <bibitem id='express_action_schema' type='internal'>
+                     <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
                      <docidentifier type='repository'>express/action_schema</docidentifier>
                    </bibitem>
                  </references>

data/spec/isodoc/postproc_spec.rb

@@ -474,6 +474,33 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+=begin
+  it "populates HTML ToC" do
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    IsoDoc::HtmlConvert.new({ htmltoclevels: 3 })
+      .convert("test", <<~"INPUT", false)
+            <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface><foreword><title>Foreword</title>
+        <variant-title type="toc">FORVORT</variant-title>
+        </foreword></preface>
+        <sections>
+        <clause><title>First Clause</title>
+        <clause><title>First Subclause</title>
+        <variant-title type="toc">SUBCLOZ</variant-title>
+        </clause>
+        </clause>
+        </sections>
+        </iso-standard>
+      INPUT
+    html = Nokogiri::XML(File.read("test.html")).
+      at("//div[@id = 'toc']")
+    expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~OUTPUT)
+    HAJSHJAS
+    OUTPUT
+  end
+=end
+
   it "populates Word ToC" do
     FileUtils.rm_f "test.doc"
     IsoDoc::WordConvert.new(
@@ -495,6 +522,7 @@ RSpec.describe IsoDoc do
       </fn></p>
       <clause id="P" inline-header="false" obligation="normative">
       <title>Clause 4.2.1</title>
+      <variant-title type="toc">SUBCLOZ</variant-title>
       </clause>
              </clause></clause>
               </sections>
@@ -726,9 +754,9 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "moves images in HTML" do
+  it "moves images in HTML #1" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert.new(
       { wordstylesheet: "spec/assets/word.css",
         htmlstylesheet: "spec/assets/html.scss" },
@@ -750,8 +778,9 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
       .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")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+    .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
                    <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
                      <br />
@@ -771,7 +800,7 @@ RSpec.describe IsoDoc do
       OUTPUT
   end
 
-  it "moves images in HTML" do
+  it "moves images in HTML #2" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_rf "test_htmlimages"
     IsoDoc::HtmlConvert.new(
@@ -791,8 +820,9 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
       .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")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+           .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
             <main class='main-section'>
           <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
@@ -813,7 +843,6 @@ RSpec.describe IsoDoc do
     context "when `mathvariant` attr equal to `script`" do
       it "converts mathvariant text chars into associated plain chars" do
         FileUtils.rm_f "test.html"
-        FileUtils.rm_rf "test_htmlimages"
         input = <<~INPUT
           <?xml version="1.0" encoding="UTF-8"?>
           <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="1.5.14">
@@ -865,7 +894,6 @@ RSpec.describe IsoDoc do
     context "when complex `mathvariant` combinations" do
       it "converts mathvariant text chars into associated plain chars" do
         FileUtils.rm_f "test.html"
-        FileUtils.rm_rf "test_htmlimages"
         input = <<~INPUT
           <?xml version="1.0" encoding="UTF-8"?>
           <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="1.5.14">
@@ -975,7 +1003,7 @@ RSpec.describe IsoDoc do
 
   it "moves images in HTML with no file suffix" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert.new(
       { wordstylesheet: "spec/assets/word.css",
         htmlstylesheet: "spec/assets/html.scss" },
@@ -994,8 +1022,9 @@ RSpec.describe IsoDoc do
     html = File.read("test.html")
       .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")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+    .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <main class='main-section'>
              <button onclick='topFunction()' id='myBtn' title='Go to top'>Top</button>
@@ -1036,8 +1065,9 @@ RSpec.describe IsoDoc do
     html = File.read("spec/test.html")
       .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")))
+    expect(`ls test_*_htmlimages`).to match(/\.png$/)
+    expect(xmlpp(html.gsub(/\/[0-9a-f-]+\.png/, "/_.png"))
+           .gsub(/test_[^_]+_htmlimages/, "test_htmlimages"))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
                    <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
                      <br />
@@ -1057,7 +1087,7 @@ RSpec.describe IsoDoc do
 
   it "encodes images in HTML as data URIs" do
     FileUtils.rm_f "test.html"
-    FileUtils.rm_rf "test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert
       .new(htmlstylesheet: "spec/assets/html.scss", datauriimage: true)
       .convert("test", <<~"INPUT", false)
@@ -1093,7 +1123,7 @@ RSpec.describe IsoDoc do
 
   it "encodes images in HTML as data URIs, using relative file location" do
     FileUtils.rm_f "spec/test.html"
-    FileUtils.rm_rf "spec/test_htmlimages"
+    FileUtils.rm_rf Dir.glob "test_*_htmlimages"
     IsoDoc::HtmlConvert
       .new({ htmlstylesheet: "assets/html.scss", datauriimage: true })
       .convert("spec/test", <<~"INPUT", false)

data/spec/isodoc/presentation_xml_spec.rb

@@ -717,49 +717,220 @@ RSpec.describe IsoDoc do
          </annex>
       </iso-standard>
     INPUT
-    output = <<~OUTPUT
-      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
-      <bibdata/>
-      <sections>
-        <clause id='_' inline-header='false' obligation='normative' displayorder='1'>
-          <title depth='1'>
-            <strong>Annex A</strong>
-            <br/>
-            (normative).
-            <tab/>
-            Clause
-          </title>
-          <p id='_'>Text</p>
-          <clause id='_' inline-header='false' obligation='normative'>
-            <title depth='1'>
-              <strong>Annex A</strong>
-              <br/>
-              (normative).
-              <tab/>
-              Subclause
-            </title>
-        <variant-title variant_title='true' type='sub' id='_'>&#x201C;A&#x201D; &#x2018;B&#x2019;</variant-title>
-            <p id='_'>Text</p>
-          </clause>
-        </clause>
-      </sections>
-      <annex id='_' inline-header='false' obligation='normative' displayorder='2'>
-        <title>
-          <strong>Annex A</strong>
-          <br/>
-          (normative)
+    presxml = <<~OUTPUT
+            <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+            <bibdata/>
+            <sections>
+              <clause id='_' inline-header='false' obligation='normative' displayorder='1'>
+                <title depth='1'>
+                  <strong>Annex A</strong>
+                  <br/>
+                  (normative).
+                  <tab/>
+                  Clause
+                </title>
+                <p id='_'>Text</p>
+                <clause id='_' inline-header='false' obligation='normative'>
+                  <title depth='1'>
+                    <strong>Annex A</strong>
+                    <br/>
+                    (normative).
+                    <tab/>
+                    Subclause
+                  </title>
+              <variant-title variant_title='true' type='sub' id='_'>&#x201C;A&#x201D; &#x2018;B&#x2019;</variant-title>
+              <variant-title variant_title='true' type='toc' id='_'>
+         Clause
+        <em>A</em>
+        <stem type='MathML'>
+          <math xmlns='http://www.w3.org/1998/Math/MathML'>
+            <mi>x</mi>
+          </math>
+          <!-- x -->
+        </stem>
+      </variant-title>
+                  <p id='_'>Text</p>
+                </clause>
+              </clause>
+            </sections>
+            <annex id='_' inline-header='false' obligation='normative' displayorder='2'>
+              <title>
+                <strong>Annex A</strong>
+                <br/>
+                (normative)
+                <br/>
+                <br/>
+                <strong>Clause</strong>
+              </title>
+                  <variant-title variant_title='true' type='toc' id='_'>
+             Clause
+            <em>A</em>
+            <stem type='MathML'>
+              <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                <mi>x</mi>
+              </math>
+              <!-- x -->
+            </stem>
+          </variant-title>
+              <p id='_'>Text</p>
+            </annex>
+            </iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+          <html lang='en'>
+        <head/>
+        <body lang='en'>
+          <div class='title-section'>
+            <p>&#160;</p>
+          </div>
           <br/>
+          <div class='prefatory-section'>
+            <p>&#160;</p>
+          </div>
           <br/>
-          <strong>Clause</strong>
-        </title>
-        <p id='_'>Text</p>
-      </annex>
-      </iso-standard>
+          <div class='main-section'>
+            <p class='zzSTDTitle1'/>
+            <div id='_'>
+              <h1>
+                <b>Annex A</b>
+                <br/>
+                 (normative). &#160; Clause
+              </h1>
+              <p id='_'>Text</p>
+              <div id='_'>
+                <h1>
+                  <b>Annex A</b>
+                  <br/>
+                   (normative). &#160; Subclause
+                  <br/>
+                  <br/>
+                  &#8220;A&#8221; &#8216;B&#8217;
+                </h1>
+                <p style='display:none;' class='variant-title-toc'>
+                   Clause
+                  <i>A</i>
+                  <span class='stem'>
+                    <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                      <mi>x</mi>
+                    </math>
+                  </span>
+                </p>
+                <p id='_'>Text</p>
+              </div>
+            </div>
+            <br/>
+            <div id='_' class='Section3'>
+              <h1 class='Annex'>
+                <b>Annex A</b>
+                <br/>
+                 (normative)
+                <br/>
+                <br/>
+                <b>Clause</b>
+              </h1>
+              <p style='display:none;' class='variant-title-toc'>
+                 Clause
+                <i>A</i>
+                <span class='stem'>
+                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                    <mi>x</mi>
+                  </math>
+                </span>
+              </p>
+              <p id='_'>Text</p>
+            </div>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    doc = <<~OUTPUT
+           <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+         <head>
+           <style>
+           </style>
+         </head>
+         <body lang='EN-US' link='blue' vlink='#954F72'>
+           <div class='WordSection1'>
+             <p>&#160;</p>
+           </div>
+           <p>
+             <br clear='all' class='section'/>
+           </p>
+           <div class='WordSection2'>
+             <p>&#160;</p>
+           </div>
+           <p>
+             <br clear='all' class='section'/>
+           </p>
+           <div class='WordSection3'>
+             <p class='zzSTDTitle1'/>
+             <div id='_'>
+               <h1>
+                 <b>Annex A</b>
+                 <br/>
+                  (normative).
+                 <span style='mso-tab-count:1'>&#160; </span>
+                  Clause
+               </h1>
+               <p id='_'>Text</p>
+               <div id='_'>
+                 <h1>
+                   <b>Annex A</b>
+                   <br/>
+                    (normative).
+                   <span style='mso-tab-count:1'>&#160; </span>
+                    Subclause
+                   <br/>
+                   <br/>
+                   &#8220;A&#8221; &#8216;B&#8217;
+                 </h1>
+                 <p style='display:none;' class='variant-title-toc'>
+                    Clause
+                   <i>A</i>
+                   <span class='stem'>
+                     <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                       <mi>x</mi>
+                     </math>
+                   </span>
+                 </p>
+                 <p id='_'>Text</p>
+               </div>
+             </div>
+             <p>
+               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+             </p>
+             <div id='_' class='Section3'>
+               <h1 class='Annex'>
+                 <b>Annex A</b>
+                 <br/>
+                  (normative)
+                 <br/>
+                 <br/>
+                 <b>Clause</b>
+               </h1>
+               <p style='display:none;' class='variant-title-toc'>
+                  Clause
+                 <i>A</i>
+                 <span class='stem'>
+                   <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                     <mi>x</mi>
+                   </math>
+                 </span>
+               </p>
+               <p id='_'>Text</p>
+             </div>
+           </div>
+         </body>
+       </html>
     OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))
       .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
-      .to be_equivalent_to xmlpp(output)
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
   end
 
   it "duplicates EMF and SVG files" do