html2doc 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecec67dface960721c0b292b79b8785270de805c
-  data.tar.gz: 590957f6fe53730432df6164a939060e4670431b
+  metadata.gz: 0f88d61ea0bbf6baa2a355ec6d5abfd35399c91e
+  data.tar.gz: 1f135f2907b6a7d51196dd6774fc0b81b2e51e34
 SHA512:
-  metadata.gz: 799b97564089aea3b91b4507a175148e33ad5b35112ab24c4c7f92cfc1c8d72e736696df9f8342824f2ef0a0dc06676fa15970fb2222d41e87168b0d4e46184d
-  data.tar.gz: bb8118524ab8026ac8750b508cf6eed3f2a5bb53a1858b31d84619103417a704b8f5aa79679117f4a281fdbca75ecb0e3cc954dffb67b6b3987dba1da20d10d8
+  metadata.gz: 69b5db648e40a37723b5591caa28c3f3131b40ce777245b80ff578cb80de7e183dbdfad677e13dccbdcb5aa2327520f386d52b975ea930d676f250113c2163a3
+  data.tar.gz: eca2bc4cb73d72345b362ec2f3eaa6389073aba39c77d20fbe2bd413c73347b10f2c6f4a9b2e216016a3c1f74cf4ed461b6f812ba525d3b44c9083ed3c49684a

data/README.adoc

@@ -26,18 +26,14 @@ The gem currently does the following:
 
 For a representative generator of HTML that uses this gem in postprocessing, see https://github.com/riboseinc/asciidoctor-iso
 
-Work to be done:
-
-* Render (editorial) comments
-
 == Constraints
 
-This generates .doc documents. Future versions will upgrade the output to docx.
+This generates .doc documents. Future versions may upgrade the output to docx.
 
 There there are two other Microsoft Word vendors in the Ruby ecosystem. 
 
 * https://github.com/jetruby/puredocx generate Word documents from a ruby struct as a DSL, rather than converting a preexisting html document. That constrains it's coverage to what is explicitly catered for in the DSL. 
-* https://github.com/MuhammetDilmac/Html2Docx is a much simpler wrapper around html: it does not do any of the added functionality described above (image resizing, converting footnotes, AsciiMath and MathML), though it does already generate docx.
+* https://github.com/MuhammetDilmac/Html2Docx is a much simpler wrapper around html: it does not do any of the added functionality described above (image resizing, converting footnotes, AsciiMath and MathML). However it does already generate docx, which involves many more auxiliary files than the .doc format. (Any attempt to generate docx through this gem will likely involve Html2Docx.)
 
 == Usage
 
@@ -58,6 +54,13 @@ liststyles:: a hash of list style labels in Word CSS, which are used to define t
 
 Note that the local CSS stylesheet file contains a variable `FILENAME` for the location of footnote/endnote separators and headers/footers, which are provided in the header HTML file. The gem replaces `FILENAME` with the file name that the document will be saved as. If you supply your own stylesheet and also wish to use separators or headers/footers, you will likewise need to replace the document name mentioned in your stylesheet with a `FILENAME` string.
 
+We include a script in this distribution that processes files from the command line, optionally including header and stylesheet:
+
+[source,console]
+--
+$ bin/html2doc --header header.html --stylesheet stylesheet.css filename.html
+--
+
 == Caveats
 
 === HTML
@@ -80,6 +83,12 @@ The good news is that the stylesheet is not identical to the stylesheet `mathml2
 
 The bad news is that the stylesheet is not identical to the stylesheet `mathml2omml.xsl` that is published with Microsoft Word, so it isn't guaranteed to have identical output. If you want to make sure that your MathML import is identical to what Word currently uses, replace `mml2omml.xsl` with `mathml2omml.xsl`, and edit the gem accordingly for your local installation. On Windows, you will find the stylesheet in the same directory as the `winword.exe` executable. On Mac, right-click on the Word application, and select "Show Package Contents"; you will find the stylesheet under `Contents/Resources`.
 
+=== Lists
+Natively, Word does not use `<ol>`, `<ul>`, or `<dl>` lists in its HTML exports at all: it uses paragraphs styled with list styles. If you save a Word document as HTML in order to use its CSS for Word documents generated by HTML, those styles will still work (with the caveat that you will need to extract the `@list` style specific to ordered and unordered lists, and pass it as a `liststyles` parameter to the conversion). *However*, Word applies a default indentation to all instances of `<ol>`, `<ul>` and `<dl>`, which the CSS stylesheet of a Word HTML will not have accounted for (because the Word HTML does not use lists at all.) If you are going to reuse that CSS for generating new documents using lists, you will need to add the rule `margin-left:0pt` to `ul`, `ol`, `dl` in the CSS stylesheet you supply, so that the margins in the Word-exported CSS remain correct.
+
+=== Math Positioning
+By default, mathematical formulas that are the only content of their paragraph are rendered as centered in Word. If you want your AsciiMath or MathML to be left-aligned or right-aligned, add `style="text-align:left"` or `style="text-align:right"` to its ancestor `div`, `p` or `td` node in HTML.
+
 == Example
 
 The `spec/examples` directory includes `rice.doc` and its source files: this Word document has been generated from `rice.html` through a call to html2doc from https://github.com/riboseinc/asciidoctor-iso. (The source document `rice.html` was itself generated from Asciidoc, rather than being hand-crafted.)

data/bin/html2doc

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require "html2doc"
+require "optparse"
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: bin/html2doc filename [options]"
+
+  opts.on("--stylesheet FILE.CSS", "Use the provided stylesheet") do |v|
+    options[:stylesheet] = v
+  end
+  opts.on("--header HEADER.HTML", "Use the provided stylesheet") do |v|
+    options[:header] = v
+  end
+end.parse!
+
+if ARGV.length < 1
+  puts "Usage: bin/html2doc filename [options]"
+  exit
+end
+
+Html2Doc.process(
+  File.read(ARGV[0], encoding: "utf-8"), 
+  filename: ARGV[0].gsub(/\.html?$/, ""),
+  stylesheet: options[:stylesheet],
+  header: options[:header],
+)
+                 

data/lib/html2doc/base.rb

@@ -32,6 +32,7 @@ module Html2Doc
 
   def self.rm_temp_files(filename, dir, dir1)
     system "rm #{filename}.htm"
+    system "rm -r #{dir1}/header.html"
     system "rm -r #{dir1}" unless dir
   end
 
@@ -82,6 +83,7 @@ module Html2Doc
     r.gsub!(%r{<link rel="File-List"}, "<link rel=File-List")
     r.gsub!(%r{<meta http-equiv="Content-Type"},
             "<meta http-equiv=Content-Type")
+    r.gsub!(%r{></m:jc>}, "/>")
     r.gsub!(%r{&tab;|&amp;tab;}, '<span style="mso-tab-count:1">&#xA0; </span>')
     r
   end
@@ -150,6 +152,7 @@ module Html2Doc
     {
       o: "urn:schemas-microsoft-com:office:office",
       w: "urn:schemas-microsoft-com:office:word",
+      v: "urn:schemas-microsoft-com:vml",
       m: "http://schemas.microsoft.com/office/2004/12/omml",
     }.each { |k, v| root.add_namespace_definition(k.to_s, v) }
     root.add_namespace(nil, "http://www.w3.org/TR/REC-html40")

data/lib/html2doc/math.rb

@@ -41,7 +41,25 @@ module Html2Doc
       ooxml = @xslt.serve.gsub(/<\?[^>]+>\s*/, "").
         gsub(/ xmlns(:[^=]+)?="[^"]+"/, "").
         gsub(%r{<(/)?([a-z])}, "<\\1m:\\2")
+      ooxml = uncenter(m, ooxml)
       m.swap(ooxml)
     end
   end
+
+  # if oomml has no siblings, by default it is centered; override this with
+  # left/right if parent is so tagged
+  def self.uncenter(m, ooxml)
+    if m.next == nil && m.previous == nil
+      alignnode = m.at(".//ancestor::*[@style][local-name() = 'p' or local-name() = "\
+                       "'div' or local-name() = 'td']/@style") or return ooxml
+      if alignnode.text.include? ("text-align:left")
+        ooxml = "<m:oMathPara><m:oMathParaPr><m:jc "\
+          "m:val='left'/></m:oMathParaPr>#{ooxml}</m:oMathPara>"
+      elsif alignnode.text.include? ("text-align:right")
+        ooxml = "<m:oMathPara><m:oMathParaPr><m:jc "\
+          "m:val='right'/></m:oMathParaPr>#{ooxml}</m:oMathPara>"
+      end
+    end
+    ooxml
+  end
 end

data/lib/html2doc/mime.rb

@@ -72,7 +72,7 @@ module Html2Doc
   end
 
   def self.image_cleanup(docxml, dir)
-    docxml.xpath("//*[local-name() = 'img']").each do |i|
+    docxml.xpath("//*[local-name() = 'img' or local-name() = 'imagedata']").each do |i|
       matched = /\.(?<suffix>\S+)$/.match i["src"]
       uuid = UUIDTools::UUID.random_create.to_s
       new_full_filename = File.join(dir, "#{uuid}.#{matched[:suffix]}")

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 module Html2Doc
-  VERSION = "0.6.9".freeze
+  VERSION = "0.7.0".freeze
 end

data/spec/html2doc_spec.rb

@@ -38,7 +38,7 @@ Content-Location: file:///C:/Doc/test.htm
 Content-Type: text/html; charset="utf-8"
 
 <?xml version="1.0"?>
-<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><!--[if gte mso 9]>
+<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><!--[if gte mso 9]>
 <xml>
 <w:WordDocument>
 <w:View>Print</w:View>
@@ -376,7 +376,6 @@ RSpec.describe Html2Doc do
     OUTPUT
   end
 
-    #{word_body('<div><m:oMath><m:nary><m:naryPr><m:chr m:val="&#x2211;"></m:chr><m:limLoc m:val="undOvr"></m:limLoc><m:grow m:val="1"></m:grow><m:subHide m:val="off"></m:subHide><m:supHide m:val="off"></m:supHide></m:naryPr><m:sub><m:r><m:t>i=1</m:t></m:r></m:sub><m:sup><m:r><m:t>n</m:t></m:r></m:sup><m:e><m:sSup><m:e><m:r><m:t>i</m:t></m:r></m:e><m:sup><m:r><m:t>3</m:t></m:r></m:sup></m:sSup></m:e></m:nary><m:r><m:t>=</m:t></m:r><m:sSup><m:e><m:r><m:t>(</m:t></m:r><m:f><m:fPr><m:type m:val="bar"></m:type></m:fPr><m:num><m:r><m:t>n</m:t></m:r><m:r><m:t>(n+1)</m:t></m:r></m:num><m:den><m:r><m:t>2</m:t></m:r></m:den></m:f><m:r><m:t>)</m:t></m:r></m:e><m:sup><m:r><m:t>2</m:t></m:r></m:sup></m:sSup></m:oMath>
   it "processes AsciiMath" do
     Html2Doc.process(html_input("<div>{{sum_(i=1)^n i^3=((n(n+1))/2)^2}}</div>"), filename: "test", asciimathdelims: ["{{", "}}"])
     expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
@@ -402,6 +401,56 @@ RSpec.describe Html2Doc do
     OUTPUT
   end
 
+  it "left-aligns AsciiMath" do
+    Html2Doc.process(html_input("<div style='text-align:left;'>{{sum_(i=1)^n i^3=((n(n+1))/2)^2}}</div>"), filename: "test", asciimathdelims: ["{{", "}}"])
+    expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
+      to match_fuzzy(<<~OUTPUT)
+    #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
+    #{word_body('
+       <div style="text-align:left;"><m:oMathPara><m:oMathParaPr><m:jc m:val="left"></m:jc></m:oMathParaPr><m:oMath>
+       <m:nary><m:naryPr><m:chr m:val="&#x2211;"></m:chr><m:limLoc m:val="undOvr"></m:limLoc><m:grow m:val="on"></m:grow><m:subHide m:val="off"></m:subHide><m:supHide m:val="off"></m:supHide></m:naryPr><m:sub>
+       <m:r><m:t>i=1</m:t></m:r>
+       </m:sub><m:sup><m:r><m:t>n</m:t></m:r></m:sup><m:e><m:sSup><m:e><m:r><m:t>i</m:t></m:r></m:e><m:sup><m:r><m:t>3</m:t></m:r></m:sup></m:sSup></m:e></m:nary>
+       <m:r><m:t>=</m:t></m:r>
+       <m:sSup><m:e>
+       <m:r><m:t>(</m:t></m:r>
+       <m:f><m:fPr><m:type m:val="bar"></m:type></m:fPr><m:num>
+       <m:r><m:t>n</m:t></m:r>
+       <m:r><m:t>(n+1)</m:t></m:r>
+       </m:num><m:den><m:r><m:t>2</m:t></m:r></m:den></m:f>
+       <m:r><m:t>)</m:t></m:r>
+       </m:e><m:sup><m:r><m:t>2</m:t></m:r></m:sup></m:sSup>
+       </m:oMath>
+       </m:oMathPara></div>', '<div style="mso-element:footnote-list"/>')}
+    #{WORD_FTR1}
+    OUTPUT
+  end
+
+  it "right-aligns AsciiMath" do
+    Html2Doc.process(html_input("<div style='text-align:right;'>{{sum_(i=1)^n i^3=((n(n+1))/2)^2}}</div>"), filename: "test", asciimathdelims: ["{{", "}}"])
+    expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
+      to match_fuzzy(<<~OUTPUT)
+    #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
+    #{word_body('
+       <div style="text-align:right;"><m:oMathPara><m:oMathParaPr><m:jc m:val="right"></m:jc></m:oMathParaPr><m:oMath>
+       <m:nary><m:naryPr><m:chr m:val="&#x2211;"></m:chr><m:limLoc m:val="undOvr"></m:limLoc><m:grow m:val="on"></m:grow><m:subHide m:val="off"></m:subHide><m:supHide m:val="off"></m:supHide></m:naryPr><m:sub>
+       <m:r><m:t>i=1</m:t></m:r>
+       </m:sub><m:sup><m:r><m:t>n</m:t></m:r></m:sup><m:e><m:sSup><m:e><m:r><m:t>i</m:t></m:r></m:e><m:sup><m:r><m:t>3</m:t></m:r></m:sup></m:sSup></m:e></m:nary>
+       <m:r><m:t>=</m:t></m:r>
+       <m:sSup><m:e>
+       <m:r><m:t>(</m:t></m:r>
+       <m:f><m:fPr><m:type m:val="bar"></m:type></m:fPr><m:num>
+       <m:r><m:t>n</m:t></m:r>
+       <m:r><m:t>(n+1)</m:t></m:r>
+       </m:num><m:den><m:r><m:t>2</m:t></m:r></m:den></m:f>
+       <m:r><m:t>)</m:t></m:r>
+       </m:e><m:sup><m:r><m:t>2</m:t></m:r></m:sup></m:sSup>
+       </m:oMath>
+       </m:oMathPara></div>', '<div style="mso-element:footnote-list"/>')}
+    #{WORD_FTR1}
+    OUTPUT
+  end
+
   it "wraps msup after munderover in MathML" do
     Html2Doc.process(html_input("<div><math xmlns='http://www.w3.org/1998/Math/MathML'>
 <munderover><mo>&#x2211;</mo><mrow><mi>i</mi><mo>=</mo><mn>0</mn></mrow><mrow><mi>n</mi></mrow></munderover><msup><mn>2</mn><mrow><mi>i</mi></mrow></msup></math></div>"), filename: "test", asciimathdelims: ["{{", "}}"])
@@ -502,7 +551,7 @@ RSpec.describe Html2Doc do
     #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
     #{word_body('<div>This is a very simple
     document<a epub:type="footnote" href="#_ftn1" style="mso-footnote-id:ftn1" name="_ftnref1" title="" id="_ftnref1"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a> allegedly<a epub:type="footnote" href="#_ftn2" style="mso-footnote-id:ftn2" name="_ftnref2" title="" id="_ftnref2"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a></div>',
-'<div style="mso-element:footnote-list"><div style="mso-element:footnote" id="ftn1">
+    '<div style="mso-element:footnote-list"><div style="mso-element:footnote" id="ftn1">
 <p id="" class="MsoFootnoteText"><a style="mso-footnote-id:ftn1" href="#_ftn1" name="_ftnref1" title="" id="_ftnref1"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a>Footnote</p></div>
 <div style="mso-element:footnote" id="ftn2">
 <p id="" class="MsoFootnoteText"><a style="mso-footnote-id:ftn2" href="#_ftn2" name="_ftnref2" title="" id="_ftnref2"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a>Other Footnote</p></div>
@@ -511,7 +560,7 @@ RSpec.describe Html2Doc do
     OUTPUT
   end
 
-    it "processes class footnotes" do
+  it "processes class footnotes" do
     simple_body = '<div>This is a very simple
      document<a class="footnote" href="#a1">1</a> allegedly<a class="footnote" href="#a2">2</a></div>
      <aside id="a1">Footnote</aside>
@@ -522,7 +571,7 @@ RSpec.describe Html2Doc do
     #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
     #{word_body('<div>This is a very simple
     document<a class="footnote" href="#_ftn1" style="mso-footnote-id:ftn1" name="_ftnref1" title="" id="_ftnref1"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a> allegedly<a class="footnote" href="#_ftn2" style="mso-footnote-id:ftn2" name="_ftnref2" title="" id="_ftnref2"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a></div>',
-'<div style="mso-element:footnote-list"><div style="mso-element:footnote" id="ftn1">
+    '<div style="mso-element:footnote-list"><div style="mso-element:footnote" id="ftn1">
 <p id="" class="MsoFootnoteText"><a style="mso-footnote-id:ftn1" href="#_ftn1" name="_ftnref1" title="" id="_ftnref1"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a>Footnote</p></div>
 <div style="mso-element:footnote" id="ftn2">
 <p id="" class="MsoFootnoteText"><a style="mso-footnote-id:ftn2" href="#_ftn2" name="_ftnref2" title="" id="_ftnref2"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a>Other Footnote</p></div>
@@ -531,79 +580,79 @@ RSpec.describe Html2Doc do
     OUTPUT
   end
 
-    it "extracts paragraphs from footnotes" do
-      simple_body = '<div>This is a very simple
+  it "extracts paragraphs from footnotes" do
+    simple_body = '<div>This is a very simple
      document<a class="footnote" href="#a1">1</a> allegedly<a class="footnote" href="#a2">2</a></div>
      <aside id="a1"><p>Footnote</p></aside>
      <div id="a2"><p>Other Footnote</p></div>'
-      Html2Doc.process(html_input(simple_body), filename: "test")
-      expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
-        to match_fuzzy(<<~OUTPUT)
-      #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
-      #{word_body('<div>This is a very simple
+    Html2Doc.process(html_input(simple_body), filename: "test")
+    expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
+      to match_fuzzy(<<~OUTPUT)
+    #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
+    #{word_body('<div>This is a very simple
     document<a class="footnote" href="#_ftn1" style="mso-footnote-id:ftn1" name="_ftnref1" title="" id="_ftnref1"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a> allegedly<a class="footnote" href="#_ftn2" style="mso-footnote-id:ftn2" name="_ftnref2" title="" id="_ftnref2"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a></div>',
-      '<div style="mso-element:footnote-list"><div style="mso-element:footnote" id="ftn1">
+    '<div style="mso-element:footnote-list"><div style="mso-element:footnote" id="ftn1">
 <p class="MsoFootnoteText"><a style="mso-footnote-id:ftn1" href="#_ftn1" name="_ftnref1" title="" id="_ftnref1"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a>Footnote</p></div>
 <div style="mso-element:footnote" id="ftn2">
 <p class="MsoFootnoteText"><a style="mso-footnote-id:ftn2" href="#_ftn2" name="_ftnref2" title="" id="_ftnref2"><span class="MsoFootnoteReference"><span style="mso-special-character:footnote"></span></span></a>Other Footnote</p></div>
 </div>')}
-      #{WORD_FTR1}
-      OUTPUT
-    end
+    #{WORD_FTR1}
+    OUTPUT
+  end
 
-   it "labels lists with list styles" do
-      simple_body = <<~BODY
+  it "labels lists with list styles" do
+    simple_body = <<~BODY
       <div><ul>
       <li><div><p><ol><li><ul><li><p><ol><li><ol><li>A</li></ol></li></ol></p></li></ul></li></ol></p></div></li></ul></div>
-      BODY
-      Html2Doc.process(html_input(simple_body), filename: "test", liststyles: {ul: "l1", ol: "l2"})
-      expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
-        to match_fuzzy(<<~OUTPUT)
-      #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
-      #{word_body('<div><ul>
+    BODY
+    Html2Doc.process(html_input(simple_body), filename: "test", liststyles: {ul: "l1", ol: "l2"})
+    expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
+      to match_fuzzy(<<~OUTPUT)
+    #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
+    #{word_body('<div><ul>
        <li style="mso-list:l1 level1 lfo1;" class="MsoNormal"><div><p class="MsoNormal"><ol><li style="mso-list:l2 level2 lfo1;" class="MsoNormal"><ul><li style="mso-list:l1 level3 lfo1;" class="MsoNormal"><p class="MsoNormal"><ol><li style="mso-list:l2 level4 lfo1;" class="MsoNormal"><ol><li style="mso-list:l2 level5 lfo1;" class="MsoNormal">A</li></ol></li></ol></p></li></ul></li></ol></p></div></li></ul></div>',
-       '<div style="mso-element:footnote-list"/>')}
-      #{WORD_FTR1}
-      OUTPUT
-    end
+    '<div style="mso-element:footnote-list"/>')}
+    #{WORD_FTR1}
+    OUTPUT
+  end
 
 
-   it "restarts numbering of lists with list styles" do
-      simple_body = <<~BODY
+  it "restarts numbering of lists with list styles" do
+    simple_body = <<~BODY
       <div>
       <ol><li><div><p><ol><li><ul><li><p><ol><li><ol><li>A</li></ol></li></ol></p></li></ul></li></ol></p></div></li></ol>
       <ol><li><div><p><ol><li><ul><li><p><ol><li><ol><li>A</li></ol></li></ol></p></li></ul></li></ol></p></div></li></ol></div>
-      BODY
-      Html2Doc.process(html_input(simple_body), filename: "test", liststyles: {ul: "l1", ol: "l2"})
-      expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
-        to match_fuzzy(<<~OUTPUT)
-      #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
-      #{word_body('<div>
+    BODY
+    Html2Doc.process(html_input(simple_body), filename: "test", liststyles: {ul: "l1", ol: "l2"})
+    expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
+      to match_fuzzy(<<~OUTPUT)
+    #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
+    #{word_body('<div>
       <ol><li style="mso-list:l2 level1 lfo1;" class="MsoNormal"><div><p class="MsoNormal"><ol><li style="mso-list:l2 level2 lfo1;" class="MsoNormal"><ul><li style="mso-list:l1 level3 lfo1;" class="MsoNormal"><p class="MsoNormal"><ol><li style="mso-list:l2 level4 lfo1;" class="MsoNormal"><ol><li style="mso-list:l2 level5 lfo1;" class="MsoNormal">A</li></ol></li></ol></p></li></ul></li></ol></p></div></li></ol>
       <ol><li style="mso-list:l2 level1 lfo2;" class="MsoNormal"><div><p class="MsoNormal"><ol><li style="mso-list:l2 level2 lfo2;" class="MsoNormal"><ul><li style="mso-list:l1 level3 lfo2;" class="MsoNormal"><p class="MsoNormal"><ol><li style="mso-list:l2 level4 lfo2;" class="MsoNormal"><ol><li style="mso-list:l2 level5 lfo2;" class="MsoNormal">A</li></ol></li></ol></p></li></ul></li></ol></p></div></li></ol></div>',
-       '<div style="mso-element:footnote-list"/>')}
-      #{WORD_FTR1}
-      OUTPUT
-    end
+    '<div style="mso-element:footnote-list"/>')}
+    #{WORD_FTR1}
+    OUTPUT
+  end
 
-   it "replaces id attributes with explicit a@name bookmarks" do
-      simple_body = <<~BODY
+  it "replaces id attributes with explicit a@name bookmarks" do
+    simple_body = <<~BODY
       <div>
         <p id="a">Hello</p>
         <p id="b"/>
       </div>
-      BODY
-      Html2Doc.process(html_input(simple_body), filename: "test", liststyles: {ul: "l1", ol: "l2"})
-      expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
-        to match_fuzzy(<<~OUTPUT)
-      #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
-      #{word_body('<div>
+    BODY
+    Html2Doc.process(html_input(simple_body), filename: "test", liststyles: {ul: "l1", ol: "l2"})
+    expect(guid_clean(File.read("test.doc", encoding: "utf-8"))).
+      to match_fuzzy(<<~OUTPUT)
+    #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
+    #{word_body('<div>
         <p class="MsoNormal"><a name="a" id="a"></a>Hello</p>
         <p class="MsoNormal"><a name="b" id="b"></a></p>
       </div>',
-       '<div style="mso-element:footnote-list"/>')}
-      #{WORD_FTR1}
-      OUTPUT
-    end
+    '<div style="mso-element:footnote-list"/>')}
+    #{WORD_FTR1}
+    OUTPUT
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -301,6 +301,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/html2doc
 - bin/rspec
 - bin/setup
 - html2doc.gemspec