isodoc 0.7.1 → 0.8

data/lib/isodoc/word_function/postprocess.rb

@@ -0,0 +1,116 @@
+module IsoDoc::WordFunction
+  module Postprocess
+
+    def postprocess(result, filename, dir)
+      header = generate_header(filename, dir)
+      result = from_xhtml(cleanup(to_xhtml(result)))
+      toWord(result, filename, dir, header)
+      @files_to_delete.each { |f| system "rm #{f}" }
+    end
+
+    def toWord(result, filename, dir, header)
+      result = populate_template(result, :word)
+      result = from_xhtml(word_cleanup(to_xhtml(result)))
+      Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet,
+                       header_file: header, dir: dir,
+                       asciimathdelims: [@openmathdelim, @closemathdelim],
+                       liststyles: { ul: @ulstyle, ol: @olstyle })
+    end
+
+    def word_cleanup(docxml)
+      word_preface(docxml)
+      word_annex_cleanup(docxml)
+      docxml
+    end
+
+    # force Annex h2 to be p.h2Annex, so it is not picked up by ToC
+    def word_annex_cleanup(docxml)
+      docxml.xpath("//h2[ancestor::*[@class = 'Section3']]").each do |h2|
+        h2.name = "p"
+        h2["class"] = "h2Annex"
+      end
+    end
+
+    def word_preface(docxml)
+      word_cover(docxml) if @wordcoverpage
+      word_intro(docxml) if @wordintropage
+    end
+
+    def word_cover(docxml)
+      cover = File.read(@wordcoverpage, encoding: "UTF-8")
+      cover = populate_template(cover, :word)
+      coverxml = to_xhtml_fragment(cover)
+      docxml.at('//div[@class="WordSection1"]').children.first.previous =
+        coverxml.to_xml(encoding: "US-ASCII")
+    end
+
+    def word_intro(docxml)
+      intro = File.read(@wordintropage, encoding: "UTF-8").
+        sub(/WORDTOC/, make_WordToC(docxml))
+      intro = populate_template(intro, :word)
+      introxml = to_xhtml_fragment(intro)
+      docxml.at('//div[@class="WordSection2"]').children.first.previous =
+        introxml.to_xml(encoding: "US-ASCII")
+    end
+
+    def generate_header(filename, _dir)
+      return nil unless @header
+      template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
+      meta = @meta.get
+      meta[:filename] = filename
+      params = meta.map { |k, v| [k.to_s, v] }.to_h
+      File.open("header.html", "w") do |f|
+        f.write(template.render(params))
+      end
+      @files_to_delete << "header.html"
+      "header.html"
+    end
+
+    def word_toc_entry(toclevel, heading)
+      bookmark = Random.rand(1000000000)
+      <<~TOC
+        <p class="MsoToc#{toclevel}"><span class="MsoHyperlink"><span
+        lang="EN-GB" style='mso-no-proof:yes'>
+        <a href="#_Toc#{bookmark}">#{heading}<span lang="EN-GB"
+        class="MsoTocTextSpan">
+        <span style='mso-tab-count:1 dotted'>. </span>
+        </span><span lang="EN-GB" class="MsoTocTextSpan">
+        <span style='mso-element:field-begin'></span></span>
+        <span lang="EN-GB"
+        class="MsoTocTextSpan"> PAGEREF _Toc#{bookmark} \\h </span>
+          <span lang="EN-GB" class="MsoTocTextSpan"><span
+          style='mso-element:field-separator'></span></span><span
+          lang="EN-GB" class="MsoTocTextSpan">1</span>
+          <span lang="EN-GB"
+          class="MsoTocTextSpan"></span><span
+          lang="EN-GB" class="MsoTocTextSpan"><span
+          style='mso-element:field-end'></span></span></a></span></span></p>
+
+      TOC
+    end
+
+    WORD_TOC_PREFACE1 = <<~TOC.freeze
+      <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\o &quot;1-2&quot; \\h \\z \\u <span
+        style='mso-element:field-separator'></span></span>
+    TOC
+
+    WORD_TOC_SUFFIX1 = <<~TOC.freeze
+      <p class="MsoToc1"><span lang="EN-GB"><span
+        style='mso-element:field-end'></span></span><span
+        lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
+    TOC
+
+    def make_WordToC(docxml)
+      toc = ""
+      docxml.xpath("//h1 | //h2[not(ancestor::*[@class = 'Section3'])]").
+        each do |h|
+        toc += word_toc_entry(h.name == "h1" ? 1 : 2, header_strip(h))
+      end
+      toc.sub(/(<p class="MsoToc1">)/,
+              %{\\1#{WORD_TOC_PREFACE1}}) +  WORD_TOC_SUFFIX1
+    end
+  end
+end

data/spec/isodoc/blocks_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "processes unlabelled notes" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -27,7 +27,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes labelled notes" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note id="note1">
@@ -52,7 +52,7 @@ INPUT
   end
 
     it "processes sequences of notes" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note id="note1">
@@ -83,7 +83,7 @@ INPUT
   end
 
   it "processes multi-para notes" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -110,7 +110,7 @@ INPUT
   end
 
   it "processes non-para notes" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -143,7 +143,7 @@ INPUT
   end
 
   it "processes figures" do
-    expect(strip_guid(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to <<~"OUTPUT"
+    expect(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <figure id="figureA-1">
@@ -180,7 +180,7 @@ INPUT
     OUTPUT
   end
 
-    it "processes figures (Word)" do
+  it "processes figures (Word)" do
     expect(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -232,7 +232,7 @@ INPUT
   end
 
   it "processes examples" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
@@ -263,7 +263,7 @@ INPUT
 
 
   it "processes sequences of examples" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
@@ -304,7 +304,7 @@ INPUT
   end
 
   it "processes sourcecode" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <sourcecode id="samplecode">
@@ -328,7 +328,7 @@ INPUT
   end
 
   it "processes sourcecode with escapes preserved" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <sourcecode id="samplecode">
@@ -352,7 +352,7 @@ INPUT
   end
 
   it "processes sourcecode with annotations" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <sourcecode id="_">puts "Hello, world." <callout target="A">1</callout>
@@ -384,7 +384,7 @@ INPUT
   end
 
   it "processes admonitions" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
@@ -409,7 +409,7 @@ INPUT
   end
 
   it "processes formulae" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934">
@@ -448,7 +448,7 @@ INPUT
   end
 
   it "processes paragraph alignments" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
@@ -519,7 +519,7 @@ World</p>
 
 
   it "processes blockquotes" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
@@ -549,7 +549,7 @@ World</p>
   end
 
   it "processes term domains" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
     <terms>

data/spec/isodoc/cleanup_spec.rb

@@ -3,7 +3,7 @@ require "nokogiri"
 
 RSpec.describe IsoDoc do
   it "cleans up admonitions" do
-    expect(IsoDoc::Convert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::WordConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
     <html>
     <body>
       <div class="Admonition">
@@ -26,7 +26,7 @@ RSpec.describe IsoDoc do
   end
 
   it "cleans up figures" do
-    expect(IsoDoc::Convert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
     <html xmlns:epub="http://www.idpf.org/2007/ops">
     <body>
       <div class="figure">
@@ -80,7 +80,7 @@ RSpec.describe IsoDoc do
   end
 
   it "cleans up inline headers" do
-    expect(IsoDoc::Convert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::WordConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
              <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
            <title>test</title>
@@ -149,7 +149,7 @@ RSpec.describe IsoDoc do
   end
 
   it "cleans up footnotes" do
-    expect(IsoDoc::Convert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
               <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
            <title>test</title>
@@ -218,7 +218,7 @@ RSpec.describe IsoDoc do
   end
 
   it "cleans up tables with tfoot" do
-    expect(IsoDoc::Convert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
            <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
            <title>test</title>
@@ -505,7 +505,7 @@ INPUT
                         <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:0pt;">2,26</td>
                         <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:0pt;">6,06</td>
                       </tr>
-                    <tr><td colspan="5" style="border-top:0pt;mso-border-top-alt:0pt;       border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;"><div id="" class="Note">
+                    <tr><td colspan="5" style="border-top:0pt;mso-border-top-alt:0pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;"><div id="" class="Note">
                       <p class="Note">NOTE<span style="mso-tab-count:1">&#xA0; </span>This is a table about rice</p>
                     </div><div class="TableFootnote"><div id="ftntableD-1a">
           <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55" class="TableFootnote"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#xA0; </span></a>Parboiled rice.</p>
@@ -533,7 +533,7 @@ INPUT
 
 
   it "cleans up tables without tfoot" do
-    expect(IsoDoc::Convert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
            <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
            <title>test</title>
@@ -672,7 +672,7 @@ INPUT
   end
 
   it "cleans up symbols lists" do
-    expect(IsoDoc::Convert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::WordConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
   <div id="L" class="Symbols">
                  <h1>4.<span style="mso-tab-count:1">&#160; </span>Symbols and Abbreviated Terms</h1>
                  <dl>

data/spec/isodoc/footnotes_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "processes IsoXML footnotes" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>
     <foreword>
@@ -94,7 +94,7 @@ RSpec.describe IsoDoc do
 
   it "processes IsoXML reviewer notes" do
     system "rm -f test.html"
-    IsoDoc::Convert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+    IsoDoc::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>

data/spec/isodoc/i18n_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "processes English" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>en</language>
@@ -159,7 +159,7 @@ RSpec.describe IsoDoc do
   end
 
   it "defaults to English" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -316,7 +316,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes French" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>fr</language>
@@ -472,7 +472,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes Simplified Chinese" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>zh</language>

data/spec/isodoc/inline_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "processes inline formatting" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -32,7 +32,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes links" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -60,7 +60,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes unrecognised markup" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -86,7 +86,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes AsciiMath and MathML" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -118,7 +118,7 @@ RSpec.describe IsoDoc do
   end
 
   it "overrides AsciiMath delimiters" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -146,7 +146,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes eref types" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>
@@ -191,7 +191,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes eref content" do
-    expect(IsoDoc::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p>

data/spec/isodoc/iso_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 RSpec.describe IsoDoc do
   system "rm -f test.html"
   it "processes isodoc as ISO: HTML output" do
-    IsoDoc::Iso::Convert.new({}).convert("test", <<~"INPUT", false)
+    IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -20,7 +20,7 @@ RSpec.describe IsoDoc do
 
   it "processes isodoc as ISO: alt HTML output" do
   system "rm -f test.html"
-    IsoDoc::Iso::Convert.new({alt: true}).convert("test", <<~"INPUT", false)
+    IsoDoc::Iso::HtmlConvert.new({alt: true}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -37,7 +37,7 @@ RSpec.describe IsoDoc do
 
   it "processes isodoc as ISO: Chinese HTML output" do
   system "rm -f test.html"
-    IsoDoc::Iso::Convert.new({script: "Hans"}).convert("test", <<~"INPUT", false)
+    IsoDoc::Iso::HtmlConvert.new({script: "Hans"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -54,7 +54,7 @@ RSpec.describe IsoDoc do
 
   it "processes isodoc as ISO: user nominated fonts" do
   system "rm -f test.html"
-    IsoDoc::Iso::Convert.new({bodyfont: "Zapf Chancery", headerfont: "Comic Sans", monospacefont: "Andale Mono"}).convert("test", <<~"INPUT", false)
+    IsoDoc::Iso::HtmlConvert.new({bodyfont: "Zapf Chancery", headerfont: "Comic Sans", monospacefont: "Andale Mono"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -87,7 +87,7 @@ RSpec.describe IsoDoc do
   end
 
   it "does not include IEV in references" do
-    expect(IsoDoc::Iso::Convert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">