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

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

@@ -252,6 +252,15 @@ module Asciidoctor
         @y == @margin_box.absolute_top
       end
 
+      # Prevents at_page_top? from returning true while yielding to the specified block.
+      #
+      def conceal_page_top
+        margin_box.instance_variable_set :@y, (old_top = margin_box.absolute_top) + 0.0001
+        yield
+      ensure
+        margin_box.instance_variable_set :@y, old_top
+      end
+
       # Returns whether the current page is the last page in the document.
       #
       def last_page?
@@ -410,20 +419,11 @@ module Asciidoctor
       def parse_text string, options = {}
         return [] if string.nil?
 
-        options = options.dup
-        if (format_option = options.delete :inline_format)
+        if (format_option = options[:inline_format])
           format_option = [] unless ::Array === format_option
-          fragments = text_formatter.format string, *format_option
-        else
-          fragments = [text: string]
-        end
-
-        if (color = options.delete :color)
-          fragments.map do |fragment|
-            fragment[:color] ? fragment : (fragment.merge color: color)
-          end
+          text_formatter.format string, *format_option
         else
-          fragments
+          [text: string]
         end
       end
 
@@ -435,7 +435,8 @@ module Asciidoctor
         @no_text_printed = box.nothing_printed?
         @all_text_printed = box.everything_printed?
 
-        if ((defined? @final_gap) && @final_gap) || (options[:first_line] && !(@no_text_printed || @all_text_printed))
+        if ((defined? @final_gap) && @final_gap) ||
+            (options[:first_line] && (options[:final_gap] || !(@no_text_printed || @all_text_printed)))
           self.y -= box.height + box.line_gap + box.leading
         else
           self.y -= box.height
@@ -453,31 +454,50 @@ module Asciidoctor
       # renderered. It's necessary to use low-level APIs in this method so we only style the first line and not the
       # remaining lines (which is the default behavior in Prawn).
       def text_with_formatted_first_line string, first_line_options, options
-        color = options.delete :color
+        if (first_line_font_color = first_line_options.delete :color)
+          other_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
-        # NOTE: disabled until we have a need for it
+        # NOTE: disabled until we have a need for it; currently handled in convert_abstract
         #if (styles = options.delete :styles)
         #  options[:style] = resolve_font_style styles
         #end
         if (first_line_styles = first_line_options.delete :styles)
           first_line_options[:style] = resolve_font_style first_line_styles
         end
-        first_line_color = (first_line_options.delete :color) || color
+        first_line_text_transform = first_line_options.delete :text_transform
         options = options.merge document: self
+        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
-        # NOTE: get remaining_fragments before we add color to fragments on first line
-        if (text_indent = options.delete :indent_paragraphs)
+        if text_indent
           remaining_fragments = indent text_indent do
             box.render dry_run: true
           end
         else
           remaining_fragments = box.render dry_run: true
         end
-        # NOTE: color must be applied per-fragment
-        fragments.each {|fragment| fragment[:color] ||= first_line_color }
+        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
+          first_line_text = (box.instance_variable_get :@printed_lines)[0]
+          unless first_line_text == fragments[0][:text]
+            original_fragments, fragments = fragments, []
+            original_fragments.reduce '' do |traced, fragment|
+              fragments << fragment
+              # NOTE: we could just do a length comparison here
+              if (traced += fragment[:text]).start_with? first_line_text
+                fragment[:text] = fragment[:text][0...-(traced.length - first_line_text.length)]
+                break
+              end
+              traced
+            end
+          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?
+        end
         if text_indent
           indent text_indent do
             fill_formatted_text_box fragments, first_line_options
@@ -486,8 +506,7 @@ module Asciidoctor
           fill_formatted_text_box fragments, first_line_options
         end
         unless remaining_fragments.empty?
-          # NOTE: color must be applied per-fragment
-          remaining_fragments.each {|fragment| fragment[:color] ||= color }
+          options[:color] = other_lines_font_color if first_line_font_color
           remaining_fragments = fill_formatted_text_box remaining_fragments, options
           draw_remaining_formatted_text_on_new_pages remaining_fragments, options
         end
@@ -1018,7 +1037,15 @@ module Asciidoctor
         state.on_page_create_callback = delegate
       end
 
-      # NOTE: only used in dry_run since that's when DetectEmptyFirstPage is active
+      # This method delegates to the provided block, then tares (i.e., resets) the content stream of
+      # the initial page.
+      #
+      # The purpose of this method is to ink content while making it appear as though the page is
+      # empty. This technique allows the caller to detect whether any subsequent content was written
+      # to the page following the content inked by the block. It's often used to keep the title of a
+      # content block with the block's first child.
+      #
+      # NOTE: this method should only used inside dry_run since that's when DetectEmptyFirstPage is active
       def tare_first_page_content_stream
         return yield unless DetectEmptyFirstPage === (delegate = state.on_page_create_callback)
         on_page_create_called = nil

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

@@ -4,13 +4,18 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
   include Asciidoctor::Logging
 
   def initialize formatted_text, options = {}
+    if (color = options[:color]) && !formatted_text.empty?
+      formatted_text = formatted_text.map {|fragment| fragment[:color] ? fragment : (fragment.merge color: color) }
+    end
     super
     formatted_text[0][:normalize_line_height] = true if options[:normalize_line_height] && !formatted_text.empty?
     options[:extensions]&.each {|extension| extend extension }
+    extend Prawn::Text::Formatted::IndentedParagraphWrap if (@indent_paragraphs = options[:indent_paragraphs])
     if (bottom_gutter = options[:bottom_gutter]) && bottom_gutter > 0
       @bottom_gutter = bottom_gutter
       extend Prawn::Text::Formatted::ProtectBottomGutter
     end
+    @force_justify = options[:force_justify]
   end
 
   def draw_fragment_overlay_styles fragment
@@ -71,6 +76,15 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
     end
   end
 
+  # Override method to force text justification when :force_justify option is set (typically for rendering a single line)
+  def word_spacing_for_this_line
+    if @align == :justify && (@force_justify || (@line_wrap.space_count > 0 && !@line_wrap.paragraph_finished?))
+      (available_width - @line_wrap.width) / @line_wrap.space_count
+    else
+      0
+    end
+  end
+
   # Override method in super class to provide support for a tuple consisting of alignment and offset
   def process_vertical_alignment text
     return super if Symbol === (valign = @vertical_align)

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Prawn::Text::Formatted
+  module IndentedParagraphWrap
+    # Override Prawn::Text::Formatted::Box#wrap method to add support for :indent_paragraphs to (formatted_)text_box.
+    def wrap array
+      initialize_wrap array
+      stop = nil
+      until stop
+        if (first_line_indent = @indent_paragraphs) && @printed_lines.empty?
+          @width -= first_line_indent
+          stop = @document.indent(first_line_indent) { wrap_and_print_line }
+          @width += first_line_indent
+        else
+          stop = wrap_and_print_line
+        end
+      end
+      @text = @printed_lines.join ?\n
+      @everything_printed = @arranger.finished?
+      @arranger.unconsumed
+    end
+
+    def wrap_and_print_line
+      @line_wrap.wrap_line \
+        document: @document,
+        kerning: @kerning,
+        width: @width,
+        arranger: @arranger,
+        disable_wrap_by_char: @disable_wrap_by_char
+      if enough_height_for_this_line?
+        move_baseline_down
+        print_line
+        @single_line || @arranger.finished?
+      else
+        true
+      end
+    end
+  end
+end

data/lib/asciidoctor/pdf/ext/prawn-table/cell/asciidoc.rb

@@ -41,17 +41,10 @@ module Prawn
             extent = @pdf.dry_run keep_together: true, single_page: true do
               push_scratch parent_doc
               doc.catalog[:footnotes] = parent_doc.catalog[:footnotes]
-              if padding_y > 0
-                move_down padding_y
-              #elsif at_page_top?
-              else
-                # TODO: encapsulate this logic to force top margin to be applied
-                margin_box.instance_variable_set :@y, margin_box.absolute_top + 0.0001
-              end
               # NOTE: we should be able to use cell.max_width, but returns 0 in some conditions (like when colspan > 1)
               indent cell.padding_left, bounds.width - cell.width + cell.padding_right do
-                # TODO: truncate margin bottom of last block
-                traverse cell.content
+                move_down padding_y if padding_y > 0
+                conceal_page_top { traverse cell.content }
               end
               pop_scratch parent_doc
               doc.catalog[:footnotes] = parent_doc.catalog[:footnotes]

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

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 # the following are organized under the Asciidoctor::Prawn namespace
+require_relative 'prawn/document/column_box'
 require_relative 'prawn/font_metric_cache'
 require_relative 'prawn/font/afm'
 require_relative 'prawn/images'
 require_relative 'prawn/formatted_text/arranger'
 require_relative 'prawn/formatted_text/box'
 require_relative 'prawn/formatted_text/fragment'
+require_relative 'prawn/formatted_text/indented_paragraph_wrap'
 require_relative 'prawn/formatted_text/protect_bottom_gutter'
 require_relative 'prawn/extensions'

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

@@ -24,14 +24,19 @@ module Asciidoctor
               @arranger.unconsumed.unshift highlight_line if highlight_line
               @arranger.unconsumed.unshift linenum_spacer.dup
             end
-            @line_wrap.wrap_line document: @document, kerning: @kerning, width: available_width, arranger: @arranger, disable_wrap_by_char: @disable_wrap_by_char
+            @line_wrap.wrap_line \
+              document: @document,
+              kerning: @kerning,
+              width: @width,
+              arranger: @arranger,
+              disable_wrap_by_char: @disable_wrap_by_char
             if enough_height_for_this_line?
               move_baseline_down
               print_line
+              stop = @arranger.finished?
             else
               stop = true
             end
-            stop ||= @arranger.finished?
           end
           @text = @printed_lines.join ?\n
           @everything_printed = @arranger.finished?

data/lib/asciidoctor/pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -234,9 +234,12 @@ files:
 - data/themes/base-theme.yml
 - data/themes/default-for-print-theme.yml
 - data/themes/default-for-print-with-fallback-font-theme.yml
+- data/themes/default-for-print-with-font-fallbacks-theme.yml
+- data/themes/default-sans-theme.yml
+- data/themes/default-sans-with-font-fallbacks-theme.yml
 - data/themes/default-theme.yml
 - data/themes/default-with-fallback-font-theme.yml
-- data/themes/sans-with-fallback-font-theme.yml
+- data/themes/default-with-font-fallbacks-theme.yml
 - docs/theming-guide.adoc
 - lib/asciidoctor-pdf.rb
 - lib/asciidoctor/pdf.rb
@@ -264,12 +267,14 @@ files:
 - lib/asciidoctor/pdf/ext/prawn-table/cell/text.rb
 - lib/asciidoctor/pdf/ext/prawn.rb
 - lib/asciidoctor/pdf/ext/prawn/coderay_encoder.rb
+- lib/asciidoctor/pdf/ext/prawn/document/column_box.rb
 - lib/asciidoctor/pdf/ext/prawn/extensions.rb
 - lib/asciidoctor/pdf/ext/prawn/font/afm.rb
 - lib/asciidoctor/pdf/ext/prawn/font_metric_cache.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/arranger.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/box.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/fragment.rb
+- lib/asciidoctor/pdf/ext/prawn/formatted_text/indented_paragraph_wrap.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/protect_bottom_gutter.rb
 - lib/asciidoctor/pdf/ext/prawn/images.rb
 - lib/asciidoctor/pdf/ext/pygments.rb