asciidoctor-pdf 2.0.0.beta.2 → 2.0.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

@@ -4,7 +4,7 @@ Prawn::Font::AFM.instance_variable_set :@hide_m17n_warning, true
 
 require 'prawn/icon'
 
-Prawn::Icon::Compatibility.send :prepend, (::Module.new { def warning *_args; end })
+Prawn::Icon::Compatibility.prepend (::Module.new { def warning *_args; end })
 
 module Asciidoctor
   module Prawn
@@ -13,6 +13,8 @@ module Asciidoctor
       include ::Asciidoctor::PDF::Sanitizer
       include ::Asciidoctor::PDF::TextTransformer
 
+      ColumnBox = ::Prawn::Document::ColumnBox
+
       FontAwesomeIconSets = %w(fab far fas)
       IconSets = %w(fab far fas fi pf).to_set
       IconSetPrefixes = IconSets.map {|it| it + '-' }
@@ -429,20 +431,27 @@ 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]) && !text.empty? && text[0][: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
+        remaining_fragments = box.render
         @no_text_printed = box.nothing_printed?
         @all_text_printed = box.everything_printed?
+        unless remaining_fragments.empty? || (remaining_fragments[0][:from_page] ||= page_number) == page_number
+          log :error, %(cannot fit formatted text on page: #{remaining_fragments.map {|it| it[:image_path] || it[:text] }.join})
+          page.tare_content_stream
+          remaining_fragments = {}
+        end
 
-        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
         end
 
-        remaining_text
+        remaining_fragments
       end
 
       # NOTE: override built-in draw_indented_formatted_line to set first_line flag
@@ -455,7 +464,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 +477,25 @@ 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
+        if remaining_fragments.empty?
+          remaining_fragments = nil
+        elsif (remaining_fragments[0][:from_page] ||= page_number) != page_number
+          log :error, %(cannot fit formatted text on page: #{remaining_fragments.map {|it| it[:image_path] || it[:text] }.join})
+          page.tare_content_stream
+          remaining_fragments = nil
+        end
         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 +511,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
@@ -541,6 +555,18 @@ module Asciidoctor
 
       # Cursor
 
+      # Override the built-in float method to add support for restoring the current column of a ColumnBox
+      #
+      def float
+        original_page_number = page_number
+        original_y = y
+        original_column = bounds.instance_variable_get :@current_column if ColumnBox === bounds
+        yield
+        go_to_page original_page_number unless page_number == original_page_number
+        self.y = original_y
+        bounds.instance_variable_set :@current_column, original_column if original_column
+      end
+
       # Short-circuits the call to the built-in move_up operation
       # when n is 0.
       #
@@ -589,7 +615,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 +625,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 +969,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 +978,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?
@@ -1116,10 +1142,14 @@ module Asciidoctor
       # Returns an Extent or ScratchExtent object that describes the bounds of the content block.
       def dry_run keep_together: nil, pages_advanced: 0, single_page: nil, onto: nil, &block
         (scratch_pdf = scratch).start_new_page
-        scratch_bounds = scratch_pdf.bounds
-        restore_bounds = [:@total_left_padding, :@total_right_padding, :@width, :@x].each_with_object({}) do |name, accum|
-          accum[name] = scratch_bounds.instance_variable_get name
-          scratch_bounds.instance_variable_set name, (bounds.instance_variable_get name)
+        saved_bounds = scratch_pdf.bounds
+        scratch_pdf.bounds = bounds.dup.tap do |bounds_copy|
+          bounds_copy.instance_variable_set :@document, scratch_pdf
+          bounds_copy.instance_variable_set :@parent, saved_bounds
+          if ColumnBox === bounds_copy
+            bounds_copy.instance_variable_set :@width, bounds_copy.bare_column_width
+            bounds_copy.instance_variable_set :@current_column, (bounds_copy.instance_variable_set :@columns, 1) - 1
+          end
         end
         scratch_pdf.move_cursor_to cursor unless (scratch_start_at_top = keep_together || pages_advanced > 0 || at_page_top?)
         scratch_start_cursor = scratch_pdf.cursor
@@ -1161,7 +1191,7 @@ module Asciidoctor
         extent = ScratchExtent.new scratch_start_page, scratch_start_cursor, scratch_end_page, scratch_end_cursor
         onto ? extent.position_onto(*onto) : extent
       ensure
-        restore_bounds.each {|name, val| scratch_bounds.instance_variable_set name, val }
+        scratch_pdf.bounds = saved_bounds
       end
     end
   end

data/lib/asciidoctor/pdf/ext/prawn/formatted_text/protect_bottom_gutter.rb

@@ -2,12 +2,15 @@
 
 module Prawn::Text::Formatted::ProtectBottomGutter
   def enough_height_for_this_line?
-    return super unless @arranger.finished?
-    begin
-      @height -= @bottom_gutter
+    if @arranger.finished? && @arranger.fragments.none? {|it| it.format_state[:full_height] }
+      begin
+        @height -= @bottom_gutter
+        super
+      ensure
+        @height += @bottom_gutter
+      end
+    else
       super
-    ensure
-      @height += @bottom_gutter
     end
   end
 end

data/lib/asciidoctor/pdf/formatted_text/inline_image_arranger.rb

@@ -38,7 +38,7 @@ module Asciidoctor::PDF::FormattedText
       return if (raw_image_fragments = fragments.select {|f| (f.key? :image_path) && !(f.key? :image_obj) }).empty?
       scratch = doc.scratch?
       available_w = available_width
-      available_h = doc.page.empty? ? doc.cursor : doc.bounds.height
+      available_h = doc.bounds.height
       last_fragment = {}
       raw_image_fragments.each do |fragment|
         if fragment[:object_id] == last_fragment[:object_id]
@@ -96,6 +96,10 @@ module Asciidoctor::PDF::FormattedText
           if (f_height = image_h) > (line_font = doc.font).height * 1.5
             # align with descender (equivalent to vertical-align: bottom in CSS)
             fragment[:ascender] = f_height - (fragment[:descender] = line_font.descender)
+            if f_height == available_h
+              fragment[:ascender] -= (doc.calc_line_metrics (doc.instance_variable_get :@base_line_height), line_font, doc.font_size).padding_top
+              fragment[:full_height] = true
+            end
             doc.font_size (fragment[:size] = f_height * (doc.font_size / line_font.height))
             # align with baseline (roughly equivalent to vertical-align: baseline in CSS)
             #fragment[:ascender] = f_height

data/lib/asciidoctor/pdf/formatted_text/source_wrap.rb

@@ -11,15 +11,15 @@ module Asciidoctor
         def wrap array
           return super unless array[0][:linenum] # sanity check
           initialize_wrap array
+          @line_wrap.extend SourceLineWrap
           highlight_line = stop = nil
           unconsumed = @arranger.unconsumed
           until stop
             if (first_fragment = unconsumed[0])[:linenum]
               linenum_text = first_fragment[:text]
-              linenum_spacer ||= { text: (NoBreakSpace.encode linenum_text.encoding) + (' ' * (linenum_text.length - 1)) }
+              linenum_spacer ||= { text: (NoBreakSpace.encode linenum_text.encoding) + (' ' * (linenum_text.length - 1)), linenum: :spacer }
               highlight_line = (second_fragment = unconsumed[1])[:highlight] ? second_fragment.dup : nil
-            else
-              # NOTE: a wrapped line
+            else # wrapped line
               first_fragment[:text] = first_fragment[:text].lstrip
               @arranger.unconsumed.unshift highlight_line if highlight_line
               @arranger.unconsumed.unshift linenum_spacer.dup
@@ -43,6 +43,12 @@ module Asciidoctor
           @arranger.unconsumed
         end
       end
+
+      module SourceLineWrap
+        def update_line_status_based_on_last_output
+          @arranger.current_format_state[:linenum] ? nil : super
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/pdf/formatted_text/transform.rb

@@ -95,22 +95,24 @@ module Asciidoctor
                 styles: (to_styles theme.menu_font_style),
               }.compact,
             }
-            revise_roles = [].to_set
-            theme.each_pair.each_with_object @theme_settings do |(key, val), accum|
-              next unless (key = key.to_s).start_with? 'role_'
-              role, key = (key.slice 5, key.length).split '_', 2
-              if (prop = ThemeKeyToFragmentProperty[key])
-                (accum[role] ||= {})[prop] = val
-              #elsif key == 'font_kerning'
-              #  unless (resolved_val = val == 'none' ? false : (val == 'normal' ? true : nil)).nil?
-              #    (accum[role] ||= {})[:kerning] = resolved_val
-              #  end
-              elsif key == 'font_style' || key == 'text_decoration'
-                revise_roles << role
+            @theme_settings.tap do |accum|
+              revise_roles = [].to_set
+              theme.each_pair do |key, val|
+                next unless (key = key.to_s).start_with? 'role_'
+                role, key = (key.slice 5, key.length).split '_', 2
+                if (prop = ThemeKeyToFragmentProperty[key])
+                  (accum[role] ||= {})[prop] = val
+                #elsif key == 'font_kerning'
+                #  unless (resolved_val = val == 'none' ? false : (val == 'normal' ? true : nil)).nil?
+                #    (accum[role] ||= {})[:kerning] = resolved_val
+                #  end
+                elsif key == 'font_style' || key == 'text_decoration'
+                  revise_roles << role
+                end
+              end
+              revise_roles.each do |role|
+                (accum[role] ||= {})[:styles] = to_styles theme[%(role_#{role}_font_style)], theme[%(role_#{role}_text_decoration)]
               end
-            end
-            revise_roles.each_with_object @theme_settings do |role, accum|
-              (accum[role] ||= {})[:styles] = to_styles theme[%(role_#{role}_font_style)], theme[%(role_#{role}_text_decoration)]
             end
             @theme_settings['line-through'] = { styles: [:strikethrough].to_set } unless @theme_settings.key? 'line-through'
             @theme_settings['underline'] = { styles: [:underline].to_set } unless @theme_settings.key? 'underline'
@@ -276,8 +278,10 @@ module Asciidoctor
               when '#' # hex string (e.g., #FF0000)
                 fragment[:color] = value.length == 7 ? (value.slice 1, 6) : (value.slice 1, 3).each_char.map {|c| c * 2 }.join if HexColorRx.match? value
               when '[' # CMYK array (e.g., [50, 100, 0, 0])
-                fragment[:color] = ((((value.slice 1, value.length).chomp ']').split ', ', 4).each_with_object ::Array.new 4, 0).with_index do |(it, accum), idx|
-                  accum[idx] = (ival = it.to_i) == (fval = it.to_f) ? ival : fval
+                fragment[:color] = [0, 0, 0, 0].tap do |accum|
+                  (((value.slice 1, value.length).chomp ']').split ', ', 4).each_with_index do |it, idx|
+                    accum[idx] = (ival = it.to_i) == (fval = it.to_f) ? ival : fval
+                  end
                 end
               else # assume a 6-character hex color (internal only)
                 fragment[:color] = value

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -15,9 +15,7 @@ module Asciidoctor
       BaseThemePath = ::File.join ThemesDir, 'base-theme.yml'
       BundledThemeNames = (::Dir.children ThemesDir).map {|it| it.slice 0, it.length - 10 }
       DeprecatedCategoryKeys = { 'blockquote' => 'quote', 'key' => 'kbd', 'literal' => 'codespan', 'outline_list' => 'list' }
-      DeprecatedKeys = %w(base heading heading_h1 heading_h2 heading_h3 heading_h4 heading_h5 heading_h6 title_page abstract abstract_title admonition_label sidebar_title toc_title).each_with_object({ 'table_caption_side' => 'table_caption_end' }) do |prefix, accum|
-        accum[%(#{prefix}_align)] = %(#{prefix}_text_align)
-      end
+      DeprecatedKeys = { 'table_caption_side' => 'table_caption_end' }.tap {|accum| %w(base heading heading_h1 heading_h2 heading_h3 heading_h4 heading_h5 heading_h6 title_page abstract abstract_title admonition_label sidebar_title toc_title).each {|prefix| accum[%(#{prefix}_align)] = %(#{prefix}_text_align) } }
       PaddingBottomHackKeys = %w(example_padding quote_padding sidebar_padding verse_padding)
 
       VariableRx = /\$([a-z0-9_-]+)/
@@ -159,10 +157,12 @@ module Asciidoctor
         elsif key == 'font_fallbacks'
           data[key] = ::Array === val ? val.map {|name| expand_vars name.to_s, data } : []
         elsif key.start_with? 'admonition_icon_'
-          data[key] = val.map do |(key2, val2)|
-            key2 = key2.tr '-', '_' if key2.include? '-'
-            [key2.to_sym, (key2.end_with? '_color') ? (to_color evaluate val2, data) : (evaluate val2, data)]
-          end.to_h if val
+          data[key] = {}.tap do |accum|
+            val.each do |key2, val2|
+              key2 = key2.tr '-', '_' if key2.include? '-'
+              accum[key2.to_sym] = (key2.end_with? '_color') ? (to_color evaluate val2, data) : (evaluate val2, data)
+            end
+          end if val
         elsif ::Hash === val
           if (rekey = DeprecatedCategoryKeys[key])
             logger.warn %(the #{key.tr '_', '-'} theme category is deprecated; use the #{rekey.tr '_', '-'} category instead)

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.0.beta.2'
+    VERSION = '2.0.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.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-21 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
@@ -324,9 +325,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: