html2doc 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df61b49c5ba557bf2742f1d7240d5990322f2be01019dc6dd712eeecc0752e61
-  data.tar.gz: d85fdda65fcc3c7ed6bdcd5a38501549abc03d536ab00ac9bcb28f061790a3fd
+  metadata.gz: 834f2d69887ce656cd78e78822c78c98a19017e01ff1fbaffb5bcf9951fb1419
+  data.tar.gz: b7c12ae5d35ae84ac8de00d3cde42dc27549f5567623a5d88a50c3757a4c6dcd
 SHA512:
-  metadata.gz: 6173d729141614e61dfd5502c3ab0e6192b6c4fdf95b8689d882b14f97401086eab3188ac0c7a5154464a0c735226fa762041c926fe2827e8b936143e422ac29
-  data.tar.gz: dcc3a65d88d7ded0855930ac56f1848c72fa4ac45fa86187f2c2df4af9af593ec0f292a16e3df73a60a99d515dfff9dfaba7205c1bf633a425f54ead25b87760
+  metadata.gz: 02a2b5f53337616b673d43f20a3f90594bcf5355288235d4eafe2622cac8e6af01d24ea2b05a8d2fea0fb9256b4d43686f3c81cb075ea562f6fcb616791abfeb
+  data.tar.gz: 565a6554f2de5e99bbaa9cc5de81e3c7d9789e36d9251641518cf82f44c2183a36a9305d2054535396813b21e475a31af1ca9577c9cb7c4bd7a9dbc0b872cf6b

data/html2doc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "image_size"
   spec.add_dependency "mime-types"
-  spec.add_dependency "nokogiri", "~> 1.12"
+  spec.add_dependency "nokogiri", "~> 1.13"
   spec.add_dependency "plane1converter", "~> 0.0.1"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"

data/lib/html2doc/base.rb

@@ -14,6 +14,7 @@ class Html2Doc
     @imagedir = hash[:imagedir]
     @debug = hash[:debug]
     @liststyles = hash[:liststyles]
+    @stylesheet = hash[:stylesheet]
     @xsltemplate =
       Nokogiri::XSLT(File.read(File.join(File.dirname(__FILE__), "mml2omml.xsl"),
                                encoding: "utf-8"))

data/lib/html2doc/lists.rb

@@ -30,37 +30,48 @@ class Html2Doc
   end
 
   def list_add(xpath, liststyles, listtype, level)
-    xpath.each_with_index do |l, _i|
-      @listnumber += 1 if level == 1
-      l["seen"] = true if level == 1
+    xpath.each do |l|
+      level == 1 and l["seen"] = true and @listnumber += 1
       l["id"] ||= UUIDTools::UUID.random_create
       (l.xpath(".//li") - l.xpath(".//ol//li | .//ul//li")).each do |li|
         style_list(li, level, liststyles[listtype], @listnumber)
         list_add1(li, liststyles, listtype, level)
       end
-      l.xpath(".//ul[not(ancestor::li/ancestor::*/@id = '#{l['id']}')] | "\
-              ".//ol[not(ancestor::li/ancestor::*/@id = '#{l['id']}')]")
-        .each do |li|
-        list_add1(li.parent, liststyles, listtype, level - 1)
-      end
+      list_add_tail(l, liststyles, listtype, level)
+    end
+  end
+
+  def list_add_tail(list, liststyles, listtype, level)
+    list.xpath(".//ul[not(ancestor::li/ancestor::*/@id = '#{list['id']}')] | "\
+               ".//ol[not(ancestor::li/ancestor::*/@id = '#{list['id']}')]")
+      .each do |li|
+      list_add1(li.parent, liststyles, listtype, level - 1)
     end
   end
 
   def list2para(list)
     return if list.xpath("./li").empty?
 
-    list.xpath("./li").first["class"] ||= "MsoListParagraphCxSpFirst"
-    list.xpath("./li").last["class"] ||= "MsoListParagraphCxSpLast"
-    list.xpath("./li/p").each { |p| p["class"] ||= "MsoListParagraphCxSpMiddle" }
+    list2para_position(list)
     list.xpath("./li").each do |l|
       l.name = "p"
       l["class"] ||= "MsoListParagraphCxSpMiddle"
-      l&.first_element_child&.name == "p" and
-        l.first_element_child.replace(l.first_element_child.children)
+      next unless l.first_element_child&.name == "p"
+
+      l["style"] += (l.first_element_child["style"]&.sub(/mso-list[^;]+;/, "") || "")
+      l.first_element_child.replace(l.first_element_child.children)
     end
     list.replace(list.children)
   end
 
+  def list2para_position(list)
+    list.xpath("./li").first["class"] ||= "MsoListParagraphCxSpFirst"
+    list.xpath("./li").last["class"] ||= "MsoListParagraphCxSpLast"
+    list.xpath("./li/p").each do |p|
+      p["class"] ||= "MsoListParagraphCxSpMiddle"
+    end
+  end
+
   TOPLIST = "[not(ancestor::ul) and not(ancestor::ol)]".freeze
 
   def lists1(docxml, liststyles, style)
@@ -72,7 +83,7 @@ class Html2Doc
     else
       list_add(docxml.xpath("//ol[@class = '#{style}']#{TOPLIST} | "\
                             "//ul[@class = '#{style}']#{TOPLIST}"),
-      liststyles, style, 1)
+               liststyles, style, 1)
     end
   end
 

data/lib/html2doc/version.rb

@@ -1,3 +1,3 @@
 class Html2Doc
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: plane1converter
   requirement: !ruby/object:Gem::Requirement
@@ -334,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Convert HTML document to Microsoft Word document