html2doc 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88de00bdeb2cbb88460c403e03cd10d623fb1152371129a6b9cf90c2f664a02
-  data.tar.gz: 0c61af5fa5eb93dcc4730328055b0914dfe03de8794909779c6d99e1308a0a22
+  metadata.gz: 825c44453c97ff2f83cdd4099e293b8ce78642139a56bed33488e05dfaa22d5f
+  data.tar.gz: e3643c17f4c31ad1b202df404e45c1b00f52591eefb52779369496bc573819ac
 SHA512:
-  metadata.gz: 73ddb8e6c7e4505df3127737c4302a364c1ade83b18c55274c7e0bc34a3640cbc5e4d02cd94eca0cd72eb6f2c505ee6b701388eaadbb1b45969d543df15b778d
-  data.tar.gz: 15556cf840a5fe4de804e5de8d0eb0f23d470d1a7e620814e8e0a15239e8efba761be31601ea5d1a30cf806c9740eabe2ac9a8ae1382ebad158562a7c1081420
+  metadata.gz: 6dff48ab65903fac3b334738bc340a044c0a16237aa1980b8151f8468796ed25222dd2f88259ce64cd604788a461f87f2425f2f0ef5e7b4d11e7c7b34be9b333
+  data.tar.gz: d8fa57c7f1d34798bf2865a728a99df6634db4dd793bc4fae9feebcb13dab0a408b265bd73975043f02f6e0ba94e726aae259efe59eadc94d0a5ad699e0c12e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    html2doc (0.8.8)
+    html2doc (0.8.9)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    asciimath (1.0.7)
+    asciimath (1.0.8)
     ast (2.4.0)
     byebug (9.1.0)
     coderay (1.1.2)
@@ -52,13 +52,13 @@ GEM
     mime-types-data (3.2018.0812)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.10.0)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)

data/lib/html2doc/base.rb

@@ -2,7 +2,7 @@ require "uuidtools"
 require "asciimath"
 require "htmlentities"
 require "nokogiri"
-require "xml/xslt"
+#require "xml/xslt"
 require "pp"
 require "fileutils"
 

data/lib/html2doc/lists.rb

@@ -2,7 +2,6 @@ require "uuidtools"
 require "asciimath"
 require "htmlentities"
 require "nokogiri"
-require "xml/xslt"
 require "pp"
 
 module Html2Doc
@@ -29,8 +28,8 @@ module Html2Doc
 
   def self.list2para(u)
     return if u.xpath("./li").empty?
-    u.xpath("./li").last["class"] = "MsoListParagraphCxSpLast"
-    u.xpath("./li").first["class"] = "MsoListParagraphCxSpFirst"
+    u.xpath("./li").first["class"] ||= "MsoListParagraphCxSpFirst"
+    u.xpath("./li").last["class"] ||= "MsoListParagraphCxSpLast"
     u.xpath("./li/p").each { |p| p["class"] ||= "MsoListParagraphCxSpMiddle" }
     u.xpath("./li").each do |l|
       l.name = "p"

data/lib/html2doc/math.rb

@@ -3,12 +3,12 @@ require "asciimath"
 require "htmlentities"
 require "nokogiri"
 require "xml/xslt"
-require "pp"
 
 module Html2Doc
   @xslt = XML::XSLT.new
-  #@xslt.xsl = File.read(File.join(File.dirname(__FILE__), "mathml2omml.xsl"))
+  @xslt.xsl = File.read(File.join(File.dirname(__FILE__), "mathml2omml.xsl"))
   @xslt.xsl = File.read(File.join(File.dirname(__FILE__), "mml2omml.xsl"), encoding: "utf-8")
+  @xsltemplate = Nokogiri::XSLT(File.read(File.join(File.dirname(__FILE__), "mml2omml.xsl"), encoding: "utf-8"))
 
   def self.asciimath_to_mathml1(x)
     AsciiMath.parse(HTMLEntities.new.decode(x)).to_mathml.
@@ -17,17 +17,18 @@ module Html2Doc
 
   def self.asciimath_to_mathml(doc, delims)
     return doc if delims.nil? || delims.size < 2
-    doc.split(/(#{Regexp.escape(delims[0])}|#{Regexp.escape(delims[1])})/).
-      each_slice(4).map do |a|
+    m = doc.split(/(#{Regexp.escape(delims[0])}|#{Regexp.escape(delims[1])})/)
+    m.each_slice(4).map.with_index do |(*a), i|
+      warn "MathML #{i} of #{(m.size / 4).floor}" if i % 500 == 0 && m.size > 1000 && i > 0
       a[2].nil? || a[2] = asciimath_to_mathml1(a[2])
       a.size > 1 ? a[0] + a[2] : a[0]
     end.join
   end
 
   # random fixes to MathML input that OOXML needs to render properly
-  def self.ooxml_cleanup(m)
+  def self.ooxml_cleanup(m, docnamespaces)
     m.xpath(".//xmlns:msup[name(preceding-sibling::*[1])='munderover']",
-            m.document.collect_namespaces).each do |x|
+            docnamespaces).each do |x|
       x1 = x.replace("<mrow></mrow>").first
       x1.children = x
     end
@@ -36,13 +37,16 @@ module Html2Doc
   end
 
   def self.mathml_to_ooml(docxml)
-    docxml.xpath("//*[local-name() = 'math']").each do |m|
-      @xslt.xml = ooxml_cleanup(m)
+    docnamespaces = docxml.collect_namespaces
+    m = docxml.xpath("//*[local-name() = 'math']")
+    m.each_with_index do |x, i|
+      warn "Math OOXML #{i} of #{m.size}" if i % 100 == 0 && m.size > 500 && i > 0
+      @xslt.xml = ooxml_cleanup(x, docnamespaces)
       ooxml = @xslt.serve.gsub(/<\?[^>]+>\s*/, "").
         gsub(/ xmlns(:[^=]+)?="[^"]+"/, "").
         gsub(%r{<(/)?([a-z])}, "<\\1m:\\2")
-      ooxml = uncenter(m, ooxml)
-      m.swap(ooxml)
+      ooxml = uncenter(x, ooxml)
+      x.swap(ooxml)
     end
   end
 

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 module Html2Doc
-  VERSION = "0.8.8".freeze
+  VERSION = "0.8.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities