asciidoctor-pdf 2.0.0.beta.2 → 2.0.0.rc.1

data/lib/asciidoctor/pdf/ext/asciidoctor/abstract_block.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+Asciidoctor::AbstractBlock.prepend (Module.new do
+  def empty?
+    blocks.empty?
+  end
+
+  def first_child
+    blocks[0]
+  end
+
+  def last_child
+    blocks[-1]
+  end
+
+  def last_child?
+    self == parent.blocks[-1]
+  end
+
+  def next_sibling
+    (siblings = parent.blocks)[(siblings.index self) + 1]
+  end
+
+  def previous_sibling
+    (self_idx = (siblings = parent.blocks).index self) > 0 ? siblings[self_idx - 1] : nil
+  end
+
+  def remove
+    parent.blocks.delete self
+  end
+end)

data/lib/asciidoctor/pdf/ext/asciidoctor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # NOTE: these are either candidates for inclusion in Asciidoctor core or backports
+require_relative 'asciidoctor/abstract_block'
 require_relative 'asciidoctor/document'
 require_relative 'asciidoctor/section'
 require_relative 'asciidoctor/list'

data/lib/asciidoctor/pdf/ext/prawn/document/column_box.rb

@@ -5,12 +5,16 @@ Prawn::Document::ColumnBox.prepend (Module.new do
     stretchy? ? @parent.absolute_bottom : super
   end
 
-  def move_past_bottom *_args
-    initial_page = @document.page
-    super
-    if (page = @document.page) != initial_page && page.margins != initial_page.margins
-      @document.bounds = self.class.new @document, @parent, (margin_box = @document.margin_box).absolute_top_left,
+  def move_past_bottom
+    (doc = @document).y = @y
+    return if (@current_column = (@current_column + 1) % @columns) > 0
+    @y = (par = @parent).absolute_top if @reflow_margins
+    initial_margins = doc.page.margins
+    par.move_past_bottom
+    if doc.page.margins != initial_margins
+      doc.bounds = self.class.new doc, par, (margin_box = doc.margin_box).absolute_top_left,
         columns: @columns, reflow_margins: true, spacer: @spacer, width: margin_box.width
     end
+    nil
   end
 end)

data/lib/asciidoctor/pdf/ext/prawn/extensions.rb

@@ -429,14 +429,17 @@ module Asciidoctor
 
       # NOTE: override built-in fill_formatted_text_box to insert leading before second line when :first_line is true
       def fill_formatted_text_box text, options
+        if (initial_gap = options[:initial_gap]) && (first_text = text[0]) && first_text[:from_page] != page_number
+          self.y -= initial_gap
+        end
         merge_text_box_positioning_options options
         box = ::Prawn::Text::Formatted::Box.new text, options
         remaining_text = box.render
         @no_text_printed = box.nothing_printed?
         @all_text_printed = box.everything_printed?
+        remaining_text[0][:from_page] = page_number unless remaining_text.empty?
 
-        if ((defined? @final_gap) && @final_gap) ||
-            (options[:first_line] && (options[:final_gap] || !(@no_text_printed || @all_text_printed)))
+        if @final_gap || (options[:first_line] && !(@no_text_printed || @all_text_printed))
           self.y -= box.height + box.line_gap + box.leading
         else
           self.y -= box.height
@@ -455,7 +458,7 @@ module Asciidoctor
       # remaining lines (which is the default behavior in Prawn).
       def text_with_formatted_first_line string, first_line_options, options
         if (first_line_font_color = first_line_options.delete :color)
-          other_lines_font_color, options[:color] = options[:color], first_line_font_color
+          remaining_lines_font_color, options[:color] = options[:color], first_line_font_color
         end
         fragments = parse_text string, options
         # NOTE: the low-level APIs we're using don't recognize the :styles option, so we must resolve
@@ -468,19 +471,19 @@ module Asciidoctor
         end
         first_line_text_transform = first_line_options.delete :text_transform
         options = options.merge document: self
+        @final_gap = final_gap = options.delete :final_gap
         text_indent = options.delete :indent_paragraphs
         # QUESTION: should we merge more carefully here? (hand-select keys?)
         first_line_options = (options.merge first_line_options).merge single_line: true, first_line: true
         box = ::Prawn::Text::Formatted::Box.new fragments, first_line_options
         if text_indent
-          remaining_fragments = indent text_indent do
-            box.render dry_run: true
-          end
+          remaining_fragments = indent(text_indent) { box.render dry_run: true }
         else
           remaining_fragments = box.render dry_run: true
         end
+        remaining_fragments.empty? ? (remaining_fragments = nil) : (remaining_fragments[0][:from_page] = page_number)
         if first_line_text_transform
-          # NOTE: applying text transform here could alter the wrapping, so we need to isolate first line and shrink to fit
+          # NOTE: applying text transform here could alter the wrapping, so isolate first line and shrink it to fit
           first_line_text = (box.instance_variable_get :@printed_lines)[0]
           unless first_line_text == fragments[0][:text]
             original_fragments, fragments = fragments, []
@@ -496,17 +499,16 @@ module Asciidoctor
           end
           fragments.each {|fragment| fragment[:text] = transform_text fragment[:text], first_line_text_transform }
           first_line_options[:overflow] = :shrink_to_fit
-          first_line_options[:final_gap] = first_line_options[:force_justify] = true unless remaining_fragments.empty?
+          @final_gap = first_line_options[:force_justify] = true if remaining_fragments
         end
         if text_indent
-          indent text_indent do
-            fill_formatted_text_box fragments, first_line_options
-          end
+          indent(text_indent) { fill_formatted_text_box fragments, first_line_options }
         else
           fill_formatted_text_box fragments, first_line_options
         end
-        unless remaining_fragments.empty?
-          options[:color] = other_lines_font_color if first_line_font_color
+        if remaining_fragments
+          options[:color] = remaining_lines_font_color if first_line_font_color
+          @final_gap = final_gap if first_line_text_transform
           remaining_fragments = fill_formatted_text_box remaining_fragments, options
           draw_remaining_formatted_text_on_new_pages remaining_fragments, options
         end
@@ -589,7 +591,7 @@ module Asciidoctor
           p_top, p_right, p_bottom, p_left = expand_padding_value padding
           # logic is intentionally inlined
           begin
-            if node && ((last_block = node).content_model != :compound || (last_block = node.blocks[-1])&.context == :paragraph)
+            if node && ((last_block = node).content_model != :compound || (last_block = node.last_child)&.context == :paragraph)
               @bottom_gutters << { last_block => p_bottom }
             else
               @bottom_gutters << {}
@@ -599,7 +601,7 @@ module Asciidoctor
             bounds.add_right_padding p_right
             yield
           ensure
-            cursor > p_bottom ? (move_down p_bottom) : reference_bounds.move_past_bottom unless at_page_top?
+            cursor > p_bottom ? (move_down p_bottom) : bounds.move_past_bottom unless at_page_top?
             @bottom_gutters.pop
             bounds.subtract_left_padding p_left
             bounds.subtract_right_padding p_right
@@ -943,7 +945,7 @@ module Asciidoctor
       # if the current page is the last page of the document. Otherwise, it simply
       # advances to the next existing page.
       def advance_page options = {}
-        last_page? ? (start_new_page options) : (go_to_page page_number + 1)
+        !options.empty? && last_page? ? (start_new_page options) : bounds.move_past_bottom
       end
 
       # Start a new page without triggering the on_page_create callback
@@ -952,14 +954,14 @@ module Asciidoctor
         perform_discretely { start_new_page options }
       end
 
-      # Grouping
+      # Scratch
 
-      def allocate_prototype
-        @prototype = create_prototype { ::Marshal.load ::Marshal.dump self }
+      def allocate_scratch_prototype
+        @scratch_prototype = create_scratch_prototype { ::Marshal.load ::Marshal.dump self }
       end
 
       def scratch
-        @scratch ||= ((Marshal.load Marshal.dump @prototype).send :init_scratch, self)
+        @scratch ||= ((Marshal.load Marshal.dump @scratch_prototype).send :init_scratch, self)
       end
 
       def scratch?

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.0.beta.2'
+    VERSION = '2.0.0.rc.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.rc.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -246,6 +246,7 @@ files:
 - lib/asciidoctor/pdf/converter.rb
 - lib/asciidoctor/pdf/ext.rb
 - lib/asciidoctor/pdf/ext/asciidoctor.rb
+- lib/asciidoctor/pdf/ext/asciidoctor/abstract_block.rb
 - lib/asciidoctor/pdf/ext/asciidoctor/document.rb
 - lib/asciidoctor/pdf/ext/asciidoctor/image.rb
 - lib/asciidoctor/pdf/ext/asciidoctor/list.rb