isodoc 1.5.1 → 1.6.0

data/lib/isodoc/presentation_function/section.rb

@@ -47,7 +47,7 @@ module IsoDoc
     end
 
     def index(docxml)
-      docxml.xpath(ns("//index | //index-xref")).each do |f|
+      docxml.xpath(ns("//index | //index-xref | //indexsect")).each do |f|
         f.remove
       end
     end

data/lib/isodoc/presentation_xml_convert.rb

@@ -59,7 +59,7 @@ module IsoDoc
       variant docxml
     end
 
-    def postprocess(result, filename, dir)
+    def postprocess(result, filename, _dir)
       toXML(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.5.1".freeze
+  VERSION = "1.6.0".freeze
 end

data/lib/isodoc/word_function/inline.rb

@@ -22,6 +22,12 @@ module IsoDoc::WordFunction
       end
     end
 
+    def svg_parse(node, out)
+      svg = Base64.strict_encode64(node.to_xml)
+      r = node.replace("<img src='data:image/svg+xml;base64,#{svg}' mimetype='image/svg+xml'/>").first
+      image_parse(r, out, nil)
+    end
+
     def imgsrc(node)
       ret = svg_to_emf(node) and return ret
       return node["src"] unless %r{^data:}.match node["src"]

data/lib/isodoc/word_function/postprocess.rb

@@ -37,17 +37,27 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
 
     def toWord(result, filename, dir, header)
       result = from_xhtml(word_cleanup(to_xhtml(result)))
-      unless @landscapestyle.empty?
-        @wordstylesheet&.open
-        @wordstylesheet&.write(@landscapestyle)
-        @wordstylesheet&.close
-      end
+      @wordstylesheet = wordstylesheet_update
       Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet&.path,
                        header_file: header&.path, dir: dir,
                        asciimathdelims: [@openmathdelim, @closemathdelim],
                        liststyles: { ul: @ulstyle, ol: @olstyle })
       header&.unlink
-      @wordstylesheet&.unlink
+      @wordstylesheet&.unlink if @wordstylesheet&.is_a?(Tempfile)
+    end
+
+    def wordstylesheet_update()
+      return if @wordstylesheet.nil?
+      f = File.open(@wordstylesheet.path, "a")
+      @landscapestyle.empty? or f.write(@landscapestyle)
+      if @wordstylesheet_override && @wordstylesheet
+        f.write(@wordstylesheet_override.read)
+        @wordstylesheet_override.close
+      elsif @wordstylesheet_override && !@wordstylesheet
+        @wordstylesheet = @wordstylesheet_override
+      end
+      f.close
+      @wordstylesheet
     end
 
     def word_admonition_images(docxml)

data/lib/isodoc/xref.rb

@@ -49,7 +49,7 @@ module IsoDoc
       note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      bookmark_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      bookmark_anchor_names(docxml)
     end
 
     def ns(xpath)

data/lib/isodoc/xref/xref_gen.rb

@@ -94,16 +94,17 @@ module IsoDoc::XrefGen
       "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
       "xmlns:example | ./xmlns:example".freeze
 
-    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | ./references"
+    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | "\
+      "./references"
 
     def example_anchor_names(sections)
       sections.each do |s|
         notes = s.xpath(CHILD_EXAMPLES_XPATH)
         c = Counter.new
         notes.each do |n|
-          next if @anchors[n["id"]]
-          next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 && !n["number"]  ? "" : " #{c.increment(n).print}"
+          next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
+          idx = notes.size == 1 && !n["number"]  ? "" :
+            " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
                                             "example", n["unnumbered"])
         end
@@ -119,7 +120,8 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list", false)
+          @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list",
+                                            false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -141,17 +143,16 @@ module IsoDoc::XrefGen
       end
     end
 
-    def bookmark_anchor_names(sections)
-      sections.each do |s|
-        notes = s.xpath(ns(".//bookmark")) - s.xpath(ns(".//clause//bookmark")) -
-          s.xpath(ns(".//appendix//bookmark"))
-        notes.each do |n|
-          next if n["id"].nil? || n["id"].empty?
-          @anchors[n["id"]] = {
-            type: "bookmark", label: nil, value: nil,
-            xref: @anchors[s["id"]][:xref] }
+    def bookmark_anchor_names(docxml)
+      docxml.xpath(ns(".//bookmark")).each do |n|
+        next if n["id"].nil? || n["id"].empty?
+        parent = nil
+        n.ancestors.each do |a|
+          next unless a["id"] && parent = @anchors.dig(a["id"], :xref)
+          break
         end
-        bookmark_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+        @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
+                              xref: parent || "???" }
       end
     end
   end

data/lib/isodoc/xslfo_convert.rb

@@ -2,50 +2,61 @@ require "metanorma"
 
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
+    MN2PDF_OPTIONS = :mn2pdf
+    MN2PDF_FONT_MANIFEST = :font_manifest_file
 
     def initialize(options)
+      @format = :pdf
+      @suffix = "pdf"
       super
-      @maxwidth = 500
-      @maxheight = 800
     end
 
     def tmpimagedir_suffix
       "_pdfimages"
     end
 
-    def initialize(options)
-      @format = :pdf
-      @suffix = "pdf"
-      super
-    end
-
-    def pdf_stylesheet(docxml)
+    def pdf_stylesheet(_docxml)
       nil
     end
 
-    def pdf_options(docxml)
-      ""
+    def pdf_options(_docxml)
+      if font_manifest_file = @options.dig(MN2PDF_OPTIONS,
+                                           MN2PDF_FONT_MANIFEST)
+        "--font-manifest #{font_manifest_file}"
+      else
+        ""
+      end
     end
 
-    def convert(input_filename, file = nil, debug = false, output_filename = nil)
+    def convert(input_filename, file = nil, debug = false,
+                output_filename = nil)
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
-      docxml, filename, dir = convert_init(file, input_filename, debug)
-      /\.xml$/.match(input_filename) or
-          input_filename = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
-          f.write file
+      input_filename, docxml, filename = input_xml_path(input_filename,
+                                                        file, debug)
+      ::Metanorma::Output::XslfoPdf.new.convert(
+        input_filename,
+        output_filename || "#{filename}.#{@suffix}",
+        File.join(@libdir, pdf_stylesheet(docxml)),
+        pdf_options(docxml)
+      )
+    end
+
+    def xref_parse(node, out)
+      out.a(**{ "href": target_pdf(node) }) { |l| l << get_linkend(node) }
+    end
+
+    def input_xml_path(input_filename, xml_file, debug)
+      docxml, filename, dir = convert_init(xml_file, input_filename, debug)
+      unless /\.xml$/.match?(input_filename)
+        input_filename = Tempfile.open([filename, ".xml"],
+                                       encoding: "utf-8") do |f|
+          f.write xml_file
           f.path
         end
+      end
       FileUtils.rm_rf dir
-      ::Metanorma::Output::XslfoPdf.new.convert(input_filename,
-                                                output_filename || "#{filename}.#{@suffix}", 
-                                               File.join(@libdir, pdf_stylesheet(docxml)),
-                                               pdf_options(docxml))
-    end
 
-    def xref_parse(node, out)
-      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".pdf#") :
-        "##{node["target"]}"
-      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+      [input_filename, docxml, filename]
     end
   end
 end

data/spec/assets/html_override.css

@@ -0,0 +1 @@
+/* html-override */

data/spec/assets/word_override.css

@@ -0,0 +1 @@
+/* word-override */

data/spec/isodoc/blocks_spec.rb

@@ -768,6 +768,93 @@ B</pre>
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", presxml, true).gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(word)
   end
 
+  it "processes SVG" do
+    input = <<~INPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <figure id="figureA-1">
+    <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
+</figure>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+
+    presxml = <<~OUTPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+  <preface>
+    <foreword>
+      <figure id='figureA-1'>
+        <name>Figure 1</name>
+        <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
+          <circle fill='#009' r='45' cx='50' cy='50'/>
+          <path d='M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z' fill='#FFF'/>
+        </svg>
+      </figure>
+    </foreword>
+  </preface>
+</iso-standard>
+    OUTPUT
+
+    html = <<~HTML
+    #{HTML_HDR}
+    <br/>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='figureA-1' class='figure'>
+          <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
+            <circle fill='#009' r='45' cx='50' cy='50'/>
+            <path d='M33,26H78A37,37,0,0,1,33,83V57H59V43H33Z' fill='#FFF'/>
+          </svg>
+          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
+        </div>
+      </div>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+    HTML
+
+    doc = <<~DOC
+    <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>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div>
+        <h1 class='ForewordTitle'>Foreword</h1>
+        <div id='figureA-1' class='figure'>
+        <img src='_.emf'/>
+          <p class='FigureTitle' style='text-align:center;'>Figure 1</p>
+        </div>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+    </div>
+  </body>
+</html>
+    DOC
+
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true).gsub(/\&lt;/, "&#x3c;"))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true)))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", presxml, true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'")))).to be_equivalent_to xmlpp(doc)
+  end
+
    it "converts SVG (Word)" do
     FileUtils.rm_rf "spec/assets/odf1.emf"
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")

data/spec/isodoc/footnotes_spec.rb

@@ -155,17 +155,8 @@ RSpec.describe IsoDoc do
     </preface>
     </iso-standard>
     INPUT
-    html = File.read("test.html").sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")
+    html = File.read("test.html").sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")
     expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-     <body lang="en" xml:lang="en">
-           <div class="title-section">
-             <p>&#xA0;</p>
-           </div>
-           <br />
-           <div class="prefatory-section">
-             <p>&#xA0;</p>
-           </div>
-           <br />
            <main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
              <br />
              <div>
@@ -180,12 +171,6 @@ RSpec.describe IsoDoc do
              </div>
              <p class="zzSTDTitle1"></p>
            </main>
-           <script type='text/x-mathjax-config'>
-   MathJax.Hub.Config({ "HTML-CSS": { preferredFont: "STIX" }, asciimath2jax:
-  { delimiters: [['(#(', ')#)']] } });
-</script>
-       <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=MML_HTMLorMML-full" async="async"></script>
-       <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script></body>
     OUTPUT
   end
 

data/spec/isodoc/inline_spec.rb

@@ -124,7 +124,10 @@ OUTPUT
     <preface><foreword>
     <p><index primary="A" secondary="B" tertiary="C"/></p>
     </foreword></preface>
-    <sections>
+    <sections/>
+    <indexsect>
+      <title>Index</title>
+    </indexsect>
     </iso-standard>
     INPUT
     <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
@@ -587,6 +590,8 @@ OUTPUT
     <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
     <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality></eref>
     <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality></eref>
+    <eref type="inline" droploc="true" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality></eref>
+    <eref type="inline" case="lowercase" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality></eref>
     </p>
     </foreword></preface>
     <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
@@ -623,6 +628,8 @@ OUTPUT
            <eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
            <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality>ISO 712</eref>
            <eref type="inline" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, Clause 1</eref>
+           <eref type="inline" droploc="true" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, 1</eref>
+           <eref type="inline" case="lowercase" bibitemid="ISO712"><locality type="anchor"><referenceFrom>1</referenceFrom></locality><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 712, clause 1</eref>
            </p>
            </foreword></preface>
            <bibliography><references id="_normative_references" obligation="informative" normative="true"><title depth='1'>1.<tab/>Normative References</title>
@@ -662,6 +669,8 @@ html = <<~OUTPUT
            <a href="#ISO712">A</a>
            <a href='#ISO712'>ISO 712</a>
            <a href='#ISO712'>ISO 712, Clause 1</a>
+           <a href='#ISO712'>ISO 712, 1</a>
+           <a href='#ISO712'>ISO 712, clause 1</a>
            </p>
                </div>
                <p class="zzSTDTitle1"/>
@@ -1014,4 +1023,32 @@ INPUT
 OUTPUT
 end
 
+  it "processes add, del" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <itu-standard xmlns="https://www.calconnect.org/standards/itu">
+      <preface><foreword id="A">
+      <add>ABC <xref target="A"></add> <del><strong>B</strong></del>
+      </foreword></preface>
+      </itu-standard>
+    INPUT
+      #{HTML_HDR}
+             <br/>
+             <div id='A'>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <span class='addition'>
+                 ABC
+                 <a href='#A'/>
+                 <span class='deletion'>
+                   <b>B</b>
+                 </span>
+               </span>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+  end
+
+
 end

data/spec/isodoc/postproc_spec.rb

@@ -27,6 +27,27 @@ RSpec.describe IsoDoc do
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
 
+  it "generates file in a remote directory" do
+    FileUtils.rm_f "spec/assets/test.doc"
+    FileUtils.rm_f "spec/assets/test.html"
+    IsoDoc::HtmlConvert.new({wordstylesheet: "word.css", htmlstylesheet: "html.scss", filename: "test"}).convert("spec/assets/test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
+        <title language="en">test</title>
+        </bibdata>
+    <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></preface>
+    </iso-standard>
+    INPUT
+    expect(File.exist?("spec/assets/test.html")).to be true
+    html = File.read("spec/assets/test.html")
+    expect(html).to match(%r{<title>test</title>})
+    expect(html).to match(/another empty stylesheet/)
+  end
+
   it "ignores Liquid markup in the document body" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
@@ -83,6 +104,7 @@ expect(File.exist?("test.doc")).to be true
     expect(html).not_to match(/another empty stylesheet/)
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
+    expect(html).not_to match(/html-override/)
   end
 
   it "generates Word output docs with null configuration" do
@@ -101,22 +123,25 @@ expect(File.exist?("test.doc")).to be true
     word = File.read("test.doc")
     expect(word).to match(/one empty stylesheet/)
     expect(word).to match(/div\.table_container/)
+    expect(word).not_to match(/word-override/)
   end
 
   it "generates HTML output docs with null configuration from file" do
     FileUtils.rm_f "spec/assets/iso.doc"
     FileUtils.rm_f "spec/assets/iso.html"
-    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss"}).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::HtmlConvert.new({wordstylesheet: "word.css", htmlstylesheet: "html.scss"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.html")).to be true
     html = File.read("spec/assets/iso.html")
     expect(html).to match(/another empty stylesheet/)
     expect(html).to match(%r{https://use.fontawesome.com})
     expect(html).to match(%r{libs/jquery})
+    expect(html).to include "$('#toggle')"
+    expect(html).not_to match(/CDATA/)
   end
 
   it "generates Headless HTML output docs with null configuration from file" do
     FileUtils.rm_f "spec/assets/iso.html"
-    IsoDoc::HeadlessHtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss"}).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::HeadlessHtmlConvert.new({wordstylesheet: "word.css", htmlstylesheet: "html.scss"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.headless.html")).to be true
     html = File.read("spec/assets/iso.headless.html")
     expect(html).not_to match(/another empty stylesheet/)
@@ -130,7 +155,7 @@ expect(File.exist?("test.doc")).to be true
 
   it "generates Word output docs with null configuration from file" do
     FileUtils.rm_f "spec/assets/iso.doc"
-    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss"}).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::WordConvert.new({wordstylesheet: "word.css", htmlstylesheet: "html.scss"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.doc")).to be true
     word = File.read("spec/assets/iso.doc")
     expect(word).to match(/one empty stylesheet/)
@@ -139,7 +164,7 @@ expect(File.exist?("test.doc")).to be true
   it "generates HTML output docs with complete configuration" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::HtmlConvert.new({bodyfont: "Zapf", monospacefont: "Consolas", headerfont: "Comic Sans", normalfontsize: "30pt", monospacefontsize: "29pt", smallerfontsize: "28pt", footnotefontsize: "27pt", htmlstylesheet: "spec/assets/html.scss", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+    IsoDoc::HtmlConvert.new({bodyfont: "Zapf", monospacefont: "Consolas", headerfont: "Comic Sans", normalfontsize: "30pt", monospacefontsize: "29pt", smallerfontsize: "28pt", footnotefontsize: "27pt", htmlstylesheet: "spec/assets/html.scss", htmlstylesheet_override: "spec/assets/html_override.css", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -162,6 +187,7 @@ expect(File.exist?("test.doc")).to be true
     expect(html).to match(/This is > a script/)
     expect(html).not_to match(/CDATA/)
     expect(html).to match(%r{Anta&#x16D;parolo</h1>})
+    expect(html).to match(%r{html-override})
   end
 
   it "generates HTML output docs with default fonts" do
@@ -195,7 +221,7 @@ expect(File.exist?("test.doc")).to be true
   it "generates Word output docs with complete configuration" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new({bodyfont: "Zapf", monospacefont: "Consolas", headerfont: "Comic Sans", normalfontsize: "30pt", monospacefontsize: "29pt", smallerfontsize: "28pt", footnotefontsize: "27pt", wordstylesheet: "spec/assets/html.scss", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+    IsoDoc::WordConvert.new({bodyfont: "Zapf", monospacefont: "Consolas", headerfont: "Comic Sans", normalfontsize: "30pt", monospacefontsize: "29pt", smallerfontsize: "28pt", footnotefontsize: "27pt", wordstylesheet: "spec/assets/html.scss", wordstylesheet_override: "spec/assets/word_override.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -214,11 +240,11 @@ expect(File.exist?("test.doc")).to be true
     expect(word).to match(/p\.note \{[^}]*?font-size: 28pt/m)
     expect(word).to match(/aside \{[^}]*?font-size: 27pt/m)
     expect(word).to match(/a third empty stylesheet/)
-    #expect(word).to match(/<title>test<\/title>/)
-    expect(word).to match(/test_files\/header.html/)
+    expect(word).to match(/Content-Disposition: inline; filename="filelist.xml"/)
     expect(word).to match(/an empty word cover page/)
     expect(word).to match(/an empty word intro page/)
     expect(word).to match(%r{Anta&#x16D;parolo</h1>})
+    expect(word).to match(%r{word-override})
   end
 
   it "generates Word output docs with default fonts" do
@@ -244,7 +270,7 @@ expect(File.exist?("test.doc")).to be true
     expect(word).to match(/aside \{[^}]*?font-size: 9pt/m)
     expect(word).to match(/a third empty stylesheet/)
     #expect(word).to match(/<title>test<\/title>/)
-    expect(word).to match(/test_files\/header.html/)
+    expect(word).to match(/Content-Disposition: inline; filename="filelist.xml"/)
     expect(word).to match(/an empty word cover page/)
     expect(word).to match(/an empty word intro page/)
     expect(word).to match(%r{Anta&#x16D;parolo</h1>})
@@ -335,10 +361,12 @@ expect(File.exist?("test.doc")).to be true
         </bibdata>
 </iso-standard>
     INPUT
-    word = File.read("test.doc").sub(%r{^.*Content-Location: file:///C:/Doc/test_files/header.html}m, "Content-Location: file:///C:/Doc/test_files/header.html").
-      sub(/------=_NextPart.*$/m, "")
+    word = File.read("test.doc")
+      .sub(%r{^.*Content-ID: <header.html>}m, "Content-ID: <header.html>")
+      .sub(/------=_NextPart.*$/m, "")
     expect(word).to be_equivalent_to <<~"OUTPUT"
-Content-Location: file:///C:/Doc/test_files/header.html
+Content-ID: <header.html>
+Content-Disposition: inline; filename="header.html"
 Content-Transfer-Encoding: base64
 Content-Type: text/html charset="utf-8"
 Ci8qIGFuIGVtcHR5IGhlYWRlciAqLwoKU1RBUlQgRE9DIElEOiAKICAgICAgICAgICAxMDAwCiAg
@@ -352,7 +380,7 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
         <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">
-         <title>Introduction<bookmark id="Q"/> to this<fn reference="1">
+         <title>Introduction<bookmark id="Q"/> to this <image src="spec/assets/rice_image1.png" id="_" mimetype="image/png"/> <fn reference="1">
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
 </fn></title>
        </clause>
@@ -822,7 +850,7 @@ TOCLEVEL
   it "moves images in HTML, using relative file location" do
     FileUtils.rm_f "spec/test.html"
     FileUtils.rm_rf "spec/test_htmlimages"
-    IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss"}).convert("spec/test", <<~"INPUT", false)
+    IsoDoc::HtmlConvert.new({wordstylesheet: "assets/word.css", htmlstylesheet: "assets/html.scss"}).convert("spec/test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface><foreword>
          <figure id="_">
@@ -891,7 +919,7 @@ TOCLEVEL
     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"
-    IsoDoc::HtmlConvert.new({htmlstylesheet: "spec/assets/html.scss", datauriimage: true}).convert("spec/test", <<~"INPUT", false)
+    IsoDoc::HtmlConvert.new({htmlstylesheet: "assets/html.scss", datauriimage: true}).convert("spec/test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface><foreword>
          <figure id="_">