html2doc 1.4.0.1 → 1.4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39f218409dbbaa66345a38c3ac768bde9def9ffffa4fb40b388366994c28cba3
-  data.tar.gz: c3eb9ec0b62796ca8cd165c787f03a752e3ba92ff01f4fcedac7c47099e3b6f9
+  metadata.gz: 8c9737d99ed7f4eaa814bd07e97e5b11b54f1f27a07c628b97e21216b9a3a816
+  data.tar.gz: 7778c03a49a8223a873f139fda9722a451700d6c39df1003dde40bf8cb8e6bfb
 SHA512:
-  metadata.gz: 5de663e28833714b38e902ecb78f567f1e6734ab7998c12f37aec432a44694b8f5e8f868b861a443716b1a88d05c60e92fc298b2f9d608e6370c74d0ad0170f6
-  data.tar.gz: 5e508c5589940b6b50cb16de23d8de07717d82807308e4980ae8206a219778a0ef3ae835afd87d021f835ffd218675e557cea0fb396fc85707e6df9502cab118
+  metadata.gz: b9b0479132c6115e69449fec5797c3e30007790940c9530f59cb74c5bf8598f1d01b6c180c42a9bc87880c86636cf9719f4e704036f2afe8adb264312867d1eb
+  data.tar.gz: 616429b25b5cd9d59db066f5085fb19a5d79d308d38cb0f4360ec66e85a3dc1163d5707de433155226e72cb86b065dbe03e9e07c9f1eb6dae66300a0169846e5

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/lists.rb

@@ -30,37 +30,49 @@ 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["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 +84,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.1".freeze
+  VERSION = "1.4.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2doc
 version: !ruby/object:Gem::Version
-  version: 1.4.0.1
+  version: 1.4.2.1
 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