html2doc 0.8.14 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9f44fdf3b27550ae4e9216dd7c6a4a0a6a0949b522357c6165fcb31518d15d4
-  data.tar.gz: b011cfdd0c80b0de7e1154a122c92bada686604fa73a656c3bdcd0e354979e8a
+  metadata.gz: 736a1b4a315563665d82191a2a21a63f1db634b9e847a145607cd8f0aa93d794
+  data.tar.gz: 317869cf8d2ae0a7c4d7fee710bc29a472f2c09027d4845b3a1f70c2bee42df4
 SHA512:
-  metadata.gz: ac386659167fac76db54541b9e32b82bdd210ea60e2ecd3a035becf7b5a8b57d5ef25a4d314071af921ce8d1416e19c549625ff2d33dc7681f6e5806df4c00c3
-  data.tar.gz: 8d67c6e825681cf249f5b43f7a0641d27b8ec433e3deb058207931568b0aeb565ae446e1fc36523b2c325d80967e7b2dfec5406b18ba2d6f5ceeeab37f9071fa
+  metadata.gz: e299333ccf126d00439413fd2e9fc45dc87eeb5756798ace28ec863b3463052dfcade119a3730140067cd48f6e37d468934d80f8432d882a974753e900adec2f
+  data.tar.gz: 9a2337da976ae160b46284bc47f6f5131451bafff06cb1cc65d1cc9732d5e9122964b765bfabb25014c3179427f3170ba5f981b93f73d4ca4b50449b0e335383

data/html2doc.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", ">= 1.10.4"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "asciimath", "~> 1.0.7"
+  spec.add_dependency "asciimath", "~> 1.0.9"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/html2doc/base.rb

@@ -99,6 +99,10 @@ module Html2Doc
     r.gsub!(%r{></v:imagedata>}, "/>")
     r.gsub!(%r{></w:wrap>}, "/>")
     r.gsub!(%r{&tab;|&amp;tab;}, '<span style="mso-tab-count:1">&#xA0; </span>')
+    r = r.split(%r{(<m:oMath>|</m:oMath>)}).each_slice(4).map do |a|
+      a.size > 2 and a[2] = a[2].gsub(/>\s+</, "><")
+      a
+    end.join
     r
   end
 

data/lib/html2doc/math.rb

@@ -46,11 +46,20 @@ module Html2Doc
         gsub(/<\?[^>]+>\s*/, "").
         gsub(/ xmlns(:[^=]+)?="[^"]+"/, "").
         gsub(%r{<(/)?([a-z])}, "<\\1m:\\2")
-      ooxml = uncenter(x, ooxml)
+      ooxml = uncenter(esc_space(x), ooxml)
       x.swap(ooxml)
     end
   end
 
+  # escape space as &#x32;; we are removing any spaces generated by XML indentation
+  def self.esc_space(xml)
+    xml.traverse do |n|
+      next unless n.text?
+      n = n.text.gsub(/ /, "&#x32;")
+    end
+    xml
+  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)

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 module Html2Doc
-  VERSION = "0.8.14".freeze
+  VERSION = "0.9.0".freeze
 end

data/spec/html2doc_spec.rb

@@ -248,77 +248,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
 </html>
 FTR
 
-ASCII_MATH=<<~FTR
-<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>
-FTR
+ASCII_MATH='<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:d><m:dPr><m:sepChr m:val=","></m:sepChr></m:dPr><m:e><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:d><m:dPr><m:sepChr m:val=","></m:sepChr></m:dPr><m:e><m:r><m:t>n+1</m:t></m:r></m:e></m:d></m:num><m:den><m:r><m:t>2</m:t></m:r></m:den></m:f></m:e></m:d></m:e><m:sup><m:r><m:t>2</m:t></m:r></m:sup></m:sSup>'
 
 DEFAULT_STYLESHEET = File.read("lib/html2doc/wordstyle.css", encoding: "utf-8").freeze
 
@@ -431,13 +361,21 @@ RSpec.describe Html2Doc do
     #{WORD_HDR} #{DEFAULT_STYLESHEET} #{WORD_HDR_END}
     #{word_body("
        <div><m:oMath>
-       #{ASCII_MATH}
-       <m:r>
-       <m:rPr>
-       <m:nor></m:nor>
-       </m:rPr>
-       <m:t>\"integer\"</m:t>
-       </m:r>
+       #{ASCII_MATH}<m:r><m:rPr><m:nor></m:nor></m:rPr><m:t>\"integer\"</m:t></m:r>
+       </m:oMath>
+       </div>", '<div style="mso-element:footnote-list"/>')}
+    #{WORD_FTR1}
+    OUTPUT
+  end
+
+  it "processes spaces in AsciiMath" do
+    Html2Doc.process(html_input(%[<div>{{text " integer ")}}</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><m:oMath>
+       <m:r><m:rPr><m:nor></m:nor></m:rPr><m:t>integer</m:t></m:r>
        </m:oMath>
        </div>", '<div style="mso-element:footnote-list"/>')}
     #{WORD_FTR1}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement