coradoc 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e528645f0bdb38f707239ed1862dc74944dc7eba4149cf9f1243458e98591edb
-  data.tar.gz: 268acd80823a507d3a86e83bfeaef55a8145819822aac9903f0bc96cee29d55c
+  metadata.gz: 9931a29512bb9c4e3b590dfc1b3e60ae1dc949da9b4c401e1395a14011c55843
+  data.tar.gz: 5990bc988013a86964fd4554f5f094e30a83086b5ae47bada16e83a7a31d596b
 SHA512:
-  metadata.gz: 624f718300d0877f0d610a3fbf953b324d5bfd6a73c68de30db69ddc75b45e1b396eeb5bdfdcfc7d0ecac2d50c8301d7011f118a2d23d4ac02d11c2e54e92e6a
-  data.tar.gz: 849b5851b2ca0b37313d8f7c743defbc168f698284c694c0a467536dbffd9cc10f5ec263fd2c28e1f287a926c6acbe3756c8753f6f3ae303dc61fc9678981ff1
+  metadata.gz: a20be2069a6dd16193c6d53c1f08731a3f6732378bd26acac9af98c223c7e801d257c9c0d2055155ed82534d78979fb29fc926d1d896ed07f71d7dffdf002eb7
+  data.tar.gz: c4d5552c3b9862849a995bf77c46b413bf2864569a0d75ef00ee3b071182ec25e3c672105841b9944b85d8f690e19f83efca49a069449954dc727f946fdb4681

data/lib/coradoc/element/list_item.rb

@@ -15,26 +15,83 @@ module Coradoc
         @line_break = options.fetch(:line_break, "\n")
       end
 
+      def inline?(elem)
+        case elem
+        when Inline::HardLineBreak
+          :hardbreak
+        when ->(i){ i.class.name.to_s.include? "::Inline::" }
+          true
+        when String, TextElement, Image::InlineImage
+          true
+        else
+          false
+        end
+      end
+
       def to_adoc
         anchor = @anchor.nil? ? "" : " #{@anchor.to_adoc.to_s} "
         # text = Coradoc::Generator.gen_adoc(@content)
-        content = Array(@content).map do |subitem|
-          next if subitem.is_a? Inline::HardLineBreak
+        content = Array(@content).flatten.compact
+        out = ""
+        prev_inline = :init
+
+        # Collapse meaningless <DIV>s
+        while content.map(&:class) == [Section] && content.first.safe_to_collapse?
+          content = Array(content.first.contents)
+        end
 
+        content.each_with_index do |subitem, idx|
           subcontent = Coradoc::Generator.gen_adoc(subitem)
+
+          inline = inline?(subitem)
+          next_inline = idx+1 == content.length ? :end : inline?(content[idx+1])
+
           # Only try to postprocess elements that are text,
           # otherwise we could strip markup.
-          if Coradoc.a_single?(subitem, Coradoc::Element::TextElement)
-            subcontent = Coradoc.strip_unicode(subcontent)
+          if subitem.is_a? Coradoc::Element::TextElement
+            if [:hardbreak, :init, false].include?(prev_inline)
+              subcontent = Coradoc.strip_unicode(subcontent, only: :begin)
+            end
+            if [:hardbreak, :end, false].include?(next_inline)
+              subcontent = Coradoc.strip_unicode(subcontent, only: :end)
+            end
           end
-          subcontent
-        end.compact.join("\n+\n")
+
+          case inline
+          when true
+            if prev_inline == false
+              out += "\n+\n" + subcontent
+            else
+              out += subcontent
+            end
+          when false
+            case prev_inline
+            when :hardbreak
+              out += subcontent.strip
+            when :init
+              out += "{empty}\n+\n" + subcontent.strip
+            else
+              out += "\n+\n" + subcontent.strip
+            end
+          when :hardbreak
+            if %i[hardbreak init].include? prev_inline
+              # can't have two hard breaks in a row; can't start with a hard break
+            else
+              out += "\n+\n"
+            end
+          end
+
+          prev_inline = inline
+        end
+        out += "{empty}" if prev_inline == :hardbreak
+        out = "{empty}" if out.empty?
+
         # attach = Coradoc::Generator.gen_adoc(@attached)
         attach = @attached.map do |elem|
           "+\n" + Coradoc::Generator.gen_adoc(elem)
         end.join
         nest = Coradoc::Generator.gen_adoc(@nested)
-        out = " #{anchor}#{content}#{@line_break}"
+        out = " #{anchor}#{out}#{@line_break}"
         out + attach + nest
       end
     end

data/lib/coradoc/util.rb

@@ -1,6 +1,8 @@
 module Coradoc
-  def self.strip_unicode(str)
-    str.gsub(/\A[[:space:]]+|[[:space:]]+\z/, "")
+  def self.strip_unicode(str, only: nil)
+    str = str.gsub(/\A[[:space:]]+/, "") unless only == :end
+    str = str.gsub(/[[:space:]]+\z/, "") unless only == :begin
+    str
   end
 
   def self.a_single?(obj, klass)

data/lib/coradoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coradoc
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coradoc
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ribose Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2024-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marcel