asciidoctor-pdf 1.6.1 → 2.0.0.alpha.2

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

@@ -24,9 +24,5 @@ class Prawn::Font::AFM
     logger.warn %(The following text could not be fully converted to the Windows-1252 character set:
 #{text.gsub(/^/, '| ').rstrip}) if logger.info? && !@document.scratch?
     text.encode 'windows-1252', undef: :replace, replace: ?\u00ac
-  rescue ::Encoding::InvalidByteSequenceError
-    raise Prawn::Errors::IncompatibleStringEncoding,
-        'Your document includes text which is not compatible with the Windows-1252 character set.
-If you need full UTF-8 support, use TTF fonts instead of the built-in PDF (AFM) fonts.'
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# TODO: remove when upgrading to prawn-2.5.0
 class Prawn::FontMetricCache::CacheEntry
-  # workaround for https://github.com/prawnpdf/prawn/issues/1140
   def initialize font, options, size
     font = font.hash
     super

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

@@ -1,15 +1,45 @@
 # frozen_string_literal: true
 
+module Prawn::Text::NoopLstripBang
+  def lstrip!; end
+end
+
 Prawn::Text::Formatted::Arranger.prepend (Module.new do
   def initialize *_args
     super
     @dummy_text = ?\u0000
+    @normalize_line_height = false
+    @sub_and_sup_relative_size = 0.583
+  end
+
+  def format_array= array
+    @normalize_line_height = !array.empty? && (array[0].delete :normalize_line_height)
+    super
+  end
+
+  def finalize_line
+    @consumed.unshift text: Prawn::Text::ZWSP if @normalize_line_height
+    super
   end
 
   def next_string
-    if (string = super) == @dummy_text
-      def string.lstrip!; end
+    (string = super) == @dummy_text ? (string.extend Prawn::Text::NoopLstripBang) : string
+  end
+
+  def apply_font_size size, styles
+    if (subscript? styles) || (superscript? styles)
+      size ||= @document.font_size
+      if String === size
+        units = (size.end_with? 'em', '%') ? ((size.end_with? '%') ? '%' : 'em') : ''
+        size = %(#{size.to_f * @sub_and_sup_relative_size}#{units})
+      else
+        size *= @sub_and_sup_relative_size
+      end
+      @document.font_size(size) { yield }
+    elsif size
+      @document.font_size(size) { yield }
+    else
+      yield
     end
-    string
   end
 end)

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

@@ -1,7 +1,17 @@
 # frozen_string_literal: true
 
 Prawn::Text::Formatted::Box.prepend (Module.new do
-  include ::Asciidoctor::Logging
+  include Asciidoctor::Logging
+
+  def initialize formatted_text, options = {}
+    super
+    formatted_text[0][:normalize_line_height] = true if options[:normalize_line_height] && !formatted_text.empty?
+    options[:extensions]&.each {|extension| extend extension }
+    if (bottom_gutter = options[:bottom_gutter]) && bottom_gutter > 0
+      @bottom_gutter = bottom_gutter
+      extend Prawn::Text::Formatted::ProtectBottomGutter
+    end
+  end
 
   def draw_fragment_overlay_styles fragment
     if (underline = (styles = fragment.styles).include? :underline) || (styles.include? :strikethrough)
@@ -17,6 +27,7 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
     end
   end
 
+  # TODO: remove when upgrading to prawn-2.5.0
   def analyze_glyphs_for_fallback_font_support fragment_hash
     fragment_font = fragment_hash[:font] || (original_font = @document.font.family)
     if (fragment_font_styles = fragment_hash[:styles])
@@ -38,6 +49,7 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
     form_fragments_from_like_font_glyph_pairs font_glyph_pairs, fragment_hash
   end
 
+  # TODO: remove once Prawn 2.5 is released
   def find_font_for_this_glyph char, current_font, current_font_opts = {}, fallback_fonts_to_check = [], original_font = current_font
     (doc = @document).font current_font, current_font_opts
     if doc.font.glyph_present? char
@@ -49,7 +61,7 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
             (doc.instance_variable_get :@missing_chars) : (doc.instance_variable_set :@missing_chars, {})
         previous_fonts_checked = (missing_chars[char] ||= [])
         if previous_fonts_checked.empty? && !(previous_fonts_checked.include? fonts_checked)
-          logger.warn %(Could not locate the character `#{char}' in the following fonts: #{fonts_checked.join ', '})
+          logger.warn %(Could not locate the character `#{char}' (#{char.unpack('U*').map {|it| "\\u#{(it.to_s 16).rjust 4, '0'}" }.join}) in the following fonts: #{fonts_checked.join ', '})
           previous_fonts_checked << fonts_checked
         end
       end
@@ -59,29 +71,28 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
     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)
+    return super if Symbol === (valign = @vertical_align)
 
     return if defined? @vertical_alignment_processed
     @vertical_alignment_processed = true
 
     valign, offset = valign
 
-    if valign == :top
-      @at[1] -= offset
-      return
-    end
-
-    wrap text
-    h = height
-
     case valign
     when :center
-      @at[1] -= (@height - h + @descender) * 0.5 + offset
+      wrap text
+      @at[1] -= (@height - (rendered_height = height) + @descender) * 0.5 + offset
+      @height = rendered_height
     when :bottom
-      @at[1] -= (@height - h) + offset
+      wrap text
+      @at[1] -= (@height - (rendered_height = height)) + offset
+      @height = rendered_height
+    else # :top
+      @at[1] -= offset
     end
 
-    @height = h
+    nil
   end
 end)

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

@@ -3,9 +3,10 @@
 Prawn::Text::Formatted::Fragment.prepend (Module.new do
   attr_reader :document
 
-  # Prevent fragment from being written by discarding the text.
-  def conceal
+  # Prevent fragment from being written by discarding the text, optionally forcing the width to 0
+  def conceal force_width_to_zero = false
     @text = ''
+    @width = 0 if force_width_to_zero
   end
 
   # Don't strip soft hyphens when repacking unretrieved fragments
@@ -14,6 +15,11 @@ Prawn::Text::Formatted::Fragment.prepend (Module.new do
     super
   end
 
+  # Use .tr instead of .gsub to remove zero-width spaces
+  def strip_zero_width_spaces string
+    string.encoding == Encoding::UTF_8 ? (string.tr Prawn::Text::ZWSP, '') : string
+  end
+
   # Modify the built-in ascender write method to allow an override value to be
   # specified using the format_state hash.
   def ascender= val
@@ -28,7 +34,7 @@ Prawn::Text::Formatted::Fragment.prepend (Module.new do
 
   def width
     if (val = format_state[:width])
-      val = (val.end_with? 'em') ? val.to_f * @document.font_size : (@document.str_to_pt val) if ::String === val
+      val = (val.end_with? 'em') ? val.to_f * @document.font_size : (@document.str_to_pt val) if String === val
     else
       val = super
     end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Prawn::Text::Formatted::ProtectBottomGutter
+  def enough_height_for_this_line?
+    return super unless @arranger.finished?
+    begin
+      @height -= @bottom_gutter
+      super
+    ensure
+      @height += @bottom_gutter
+    end
+  end
+end

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

@@ -3,12 +3,6 @@
 module Asciidoctor
   module Prawn
     module Images
-      class << self
-        def extended base
-          base.class.__send__ :alias_method, :_initial_image, :image
-        end
-      end
-
       # Dispatch to suitable image method in Prawn based on file extension.
       def image file, opts = {}
         # FIXME: handle case when SVG is an IO object
@@ -18,38 +12,46 @@ module Asciidoctor
             #opts[:enable_web_requests] = allow_uri_read if !(opts.key? :enable_web_requests) && (respond_to? :allow_uri_read)
             #opts[:cache_images] = cache_uri if !(opts.key? :cache_images) && (respond_to? :cache_uri)
             #opts[:fallback_font_name] = fallback_svg_font_name if !(opts.key? :fallback_font_name) && (respond_to? :fallback_svg_font_name)
-            if (opts.key? :fit) && (fit = opts.delete :fit) && !opts[:width] && !opts[:height]
-              svg (::File.read file, mode: 'r:UTF-8'), opts do |svg_doc|
-                max_width, max_height = fit
-                svg_doc.calculate_sizing requested_width: max_width if max_width && svg_doc.sizing.output_width != max_width
-                svg_doc.calculate_sizing requested_height: max_height if max_height && svg_doc.sizing.output_height > max_height
+            if (fit = opts.delete :fit) && !(opts[:width] || opts[:height])
+              image_info = svg (::File.read file, mode: 'r:UTF-8'), opts do |svg_doc|
+                # NOTE: fit to specified width, then reduce size if height exceeds bounds
+                svg_doc.calculate_sizing requested_width: fit[0] if svg_doc.sizing.output_width != fit[0]
+                svg_doc.calculate_sizing requested_height: fit[1] if svg_doc.sizing.output_height > fit[1]
               end
             else
-              svg (::File.read file, mode: 'r:UTF-8'), opts
+              image_info = svg (::File.read file, mode: 'r:UTF-8'), opts
+            end
+            if ::Asciidoctor::Logging === self && !scratch? && !(warnings = image_info[:warnings]).empty?
+              warnings.each {|warning| log :warn, %(problem encountered in image: #{file}; #{warning}) }
             end
+            image_info
           else
-            ::File.open(file, 'rb') {|fd| _initial_image fd, opts }
+            ::File.open(file, 'rb') {|fd| super fd, opts }
           end
         else
-          _initial_image file, opts
+          super
         end
       end
 
-      # Retrieve the intrinsic image dimensions for the specified path.
+      # Retrieve the intrinsic image dimensions for the specified path in pt.
       #
       # Returns a Hash containing :width and :height keys that map to the image's
-      # intrinsic width and height values (in pixels)
+      # intrinsic width and height values (in pt).
       def intrinsic_image_dimensions path, format
         if format == 'svg'
+          # NOTE: prawn-svg computes intrinsic width and height in pt
           img_obj = ::Prawn::SVG::Interface.new (::File.read path, mode: 'r:UTF-8'), self, {}
           img_size = img_obj.document.sizing
           { width: img_size.output_width, height: img_size.output_height }
         else
-          # NOTE build_image_object caches image data previously loaded
+          # NOTE: build_image_object caches image data previously loaded
+          # NOTE: build_image_object computes intrinsic width and height in px
           _, img_size = ::File.open(path, 'rb') {|fd| build_image_object fd }
-          { width: img_size.width, height: img_size.height }
+          { width: (to_pt img_size.width, :px), height: (to_pt img_size.height, :px) }
         end
       rescue
+        # NOTE: image cannot be read, so it won't be used anyway
+        { width: 0, height: 0 }
       end
     end
 

data/lib/asciidoctor/pdf/ext/prawn-svg/loaders/data.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class Prawn::SVG::Loaders::Data
+  remove_const :REGEXP
+  REGEXP = %r(\Adata:image/(?:png|jpe?g);base64(?:;[a-z0-9]+)*,)i
+end

data/lib/asciidoctor/pdf/ext/prawn-svg/loaders/web.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+Prawn::SVG::Loaders::Web.prepend (Module.new do
+  def initialize open_uri_loader = nil
+    @open_uri_loader = Proc === open_uri_loader ? open_uri_loader : nil
+  end
+
+  def from_url url
+    (url.to_s.start_with? 'http://', 'https://') ? (load_open_uri.open_uri url, 'rb', &:read) : nil
+  rescue
+    raise Prawn::SVG::UrlLoader::Error, $!.message
+  end
+
+  def load_open_uri
+    if @open_uri_loader
+      @open_uri_loader.call
+    else
+      require 'open-uri' unless defined? OpenURI
+      OpenURI
+    end
+  end
+end)

data/lib/asciidoctor/pdf/ext/prawn-svg/url_loader.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+Prawn::SVG::UrlLoader.prepend (Module.new do
+  def initialize enable_cache: false, enable_web: true, enable_file_with_root: nil
+    @url_cache = {}
+    @enable_cache = enable_cache
+    loaders = []
+    loaders << Prawn::SVG::Loaders::Data.new
+    loaders << (Prawn::SVG::Loaders::Web.new enable_web) if enable_web
+    loaders << (Prawn::SVG::Loaders::File.new enable_file_with_root) if enable_file_with_root
+    @loaders = loaders
+  end
+end)

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
-require 'prawn-svg' unless defined? Prawn::SVG::Interface
-# NOTE disable system fonts since they're non-portable
+require 'prawn-svg'
+require_relative 'prawn-svg/loaders/data'
+require_relative 'prawn-svg/loaders/web'
+require_relative 'prawn-svg/url_loader'
+# NOTE: disable system fonts since they're non-portable
 Prawn::SVG::Interface.font_path.clear

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

@@ -4,6 +4,8 @@ module Prawn
   class Table
     class Cell
       class AsciiDoc < Cell
+        include ::Asciidoctor::Logging
+
         attr_accessor :align
         attr_accessor :valign
 
@@ -31,45 +33,99 @@ module Prawn
         # NOTE: automatic image sizing only works if cell has fixed width
         def dry_run
           cell = self
-          max_height = nil
-          height, = @pdf.dry_run do
-            max_height = bounds.height
-            # 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
-              # HACK: force margin_top to be applied
-              move_down 0.0001
-              # TODO: truncate margin bottom of last block
-              traverse cell.content
+          parent_doc = (doc = content.document).nested? ? doc.parent_document : doc
+          padding_y = cell.padding_top + cell.padding_bottom
+          max_height = @pdf.bounds.height
+          extent = nil
+          apply_font_properties do
+            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
+              end
+              pop_scratch parent_doc
+              doc.catalog[:footnotes] = parent_doc.catalog[:footnotes]
             end
           end
-          # FIXME: prawn-table doesn't support cell taller than a single page
-          [max_height, height - 0.0001].min
+          # NOTE: prawn-table doesn't support cells that exceed the height of a single page
+          # NOTE: height does not include top/bottom padding, but must account for it when checking for overrun
+          (extent.single_page_height || max_height) - padding_y
         end
 
         def natural_content_width
-          # QUESTION can we get a better estimate of the natural width?
+          # QUESTION: can we get a better estimate of the natural width?
           @natural_content_width ||= (@pdf.bounds.width - padding_left - padding_right)
         end
 
         def natural_content_height
-          # NOTE when natural_content_height is called, we already know max width
+          # NOTE: when natural_content_height is called, we already know max width
           @natural_content_height ||= dry_run
         end
 
+        # NOTE: prawn-table doesn't support cells that exceed the height of a single page
         def draw_content
-          pdf = @pdf
-          # NOTE draw_bounded_content automatically adds FPTolerance to width and height
+          if (pdf = @pdf).scratch?
+            pdf.move_down natural_content_height
+            return
+          end
+          # NOTE: draw_bounded_content automatically adds FPTolerance to width and height
           pdf.bounds.instance_variable_set :@width, spanned_content_width
-          # NOTE we've already reserved the space, so just let the box stretch to the bottom of the page to avoid overflow
-          pdf.bounds.instance_variable_set :@height, pdf.y
+          padding_adjustment = content.context == :document ? padding_bottom : 0
+          # NOTE: we've already reserved the space, so just let the box stretch to bottom of the content area
+          pdf.bounds.instance_variable_set :@height, (pdf.y - pdf.page.margins[:bottom] - padding_adjustment)
           if @valign != :top && (excess_y = spanned_content_height - natural_content_height) > 0
+            # QUESTION: could this cause a unexpected page overrun?
             pdf.move_down(@valign == :center ? (excess_y.fdiv 2) : excess_y)
           end
-          # TODO: apply horizontal alignment (right now must use alignment on content block)
-          # QUESTION inherit table cell font properties?
-          pdf.traverse content
+          # # use perform_on_single_page to prevent content from being written on extra pages
+          # # the problem with this approach is that we don't know whether any content is written to next page
+          # apply_font_properties do
+          #   if (pdf.perform_on_single_page { pdf.traverse content })
+          #     logger.error %(the table cell on page #{pdf.page_number} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page)
+          #   end
+          # end
+          start_page = pdf.page_number
+          # TODO: apply horizontal alignment; currently it is necessary to specify alignment on content blocks
+          apply_font_properties { pdf.traverse content }
+          if (extra_pages = pdf.page_number - start_page) > 0
+            logger.error %(the table cell on page #{start_page} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page) unless extra_pages == 1 && pdf.page.empty?
+            extra_pages.times { pdf.delete_page }
+          end
           nil
         end
+
+        private
+
+        def apply_font_properties
+          # NOTE: font_info holds font properties outside table; used as fallback values
+          # QUESTION: should we inherit table cell font properties?
+          font_info = (pdf = @pdf).font_info
+          font_color, font_family, font_size, font_style = @font_options.values_at :color, :family, :size, :style
+          prev_font_color, pdf.font_color = pdf.font_color, font_color if font_color
+          font_family ||= font_info[:family]
+          if font_size
+            prev_font_scale, pdf.font_scale = pdf.font_scale, (font_size.to_f / @pdf.root_font_size)
+          else
+            font_size = font_info[:size]
+          end
+          font_style ||= font_info[:style]
+          pdf.font font_family, size: font_size, style: font_style do
+            yield
+          ensure
+            pdf.font_color = prev_font_color if prev_font_color
+            pdf.font_scale = prev_font_scale if prev_font_scale
+          end
+        end
       end
     end
   end

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

@@ -1,16 +1,54 @@
 # frozen_string_literal: true
 
 class Prawn::Table::Cell::Text
+  include ::Asciidoctor::Logging
+
+  ImageTagRx = /<img(?: [^>]+ )?width="([^"]+)"[^>]*>/
+
   # Override draw_content method to drop cursor advancement
   remove_method :draw_content
   def draw_content
     with_font do
-      with_text_color do
+      self.valign = [:center, -font.descender * 0.5] if valign == :center
+      remaining_text = with_text_color do
         (text_box \
           width: spanned_content_width + FPTolerance,
           height: spanned_content_height + FPTolerance,
           at: [0, @pdf.cursor]).render
       end
+      logger.error %(the table cell on page #{@pdf.page_number} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page) unless remaining_text.empty? || @pdf.scratch?
+    end
+  end
+
+  # Override the styled_width_of to account for image widths and hard line breaks.
+  # This method computes the width of the text without wrapping (so InlineImageArranger is not called).
+  # This override also effectively backports the fix for prawn-table#42.
+  remove_method :styled_width_of
+  def styled_width_of text
+    # NOTE: remove :style since it's handled by with_font
+    options = @text_options.reject {|k| k == :style }
+    width_of_images = 0
+    if (inline_format = @text_options.key? :inline_format) && (text.include? '<img ')
+      placeholder_width = styled_width_of 'M'
+      text = text.gsub ImageTagRx do
+        if (pctidx = $1.index '%')
+          if pctidx == $1.length - 1
+            # TODO: look up the intrinsic image width in pixels
+            #width_of_images += (<image width> - placeholder_width)
+            next ''
+          else
+            width_of_images += (($1.slice pctidx + 1, $1.length).to_f - placeholder_width)
+          end
+        else
+          width_of_images += ($1.to_f - placeholder_width)
+        end
+        'M'
+      end
+    end
+    if inline_format && text.length > 3 && (text.include? '<br>')
+      (text.split '<br>').map {|line| (line = line.strip).empty? ? 0 : with_font { @pdf.width_of line, options } }.max + width_of_images
+    else
+      with_font { @pdf.width_of text, options } + width_of_images
     end
   end
 end

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

@@ -1,12 +1,18 @@
 # frozen_string_literal: true
 
-class Prawn::Table::Cell
-  remove_method :draw_borders
+Prawn::Table::Cell.prepend (Module.new do
+  def border_color= color
+    color = [color, color] if Asciidoctor::PDF::ThemeLoader::CMYKColorValue === color
+    super
+  end
+
   # Draws borders around the cell. Borders are centered on the bounds of
   # the cell outside of any padding, so the caller is responsible for
   # setting appropriate padding to ensure the border does not overlap with
   # cell content.
   #
+  # Adds support for transparent border color.
+  #
   def draw_borders pt
     x, y = pt
 
@@ -21,26 +27,26 @@ class Prawn::Table::Cell
 
         # Left and right borders are drawn one-half border beyond the center
         # of the corner, so that the corners end up square.
-        from, to = case border
-                   when :top
-                     [[x, y], [x + width, y]]
-                   when :bottom
-                     [[x, y - height], [x + width, y - height]]
-                   when :left
-                     [[x, y + (border_top_width / 2.0)], [x, y - height - (border_bottom_width / 2.0)]]
-                   when :right
-                     [[x + width, y + (border_top_width / 2.0)], [x + width, y - height - (border_bottom_width / 2.0)]]
-                   end
+        case border
+        when :top
+          from, to = [[x, y], [x + width, y]]
+        when :bottom
+          from, to = [[x, y - height], [x + width, y - height]]
+        when :left
+          from, to = [[x, y + (border_top_width / 2.0)], [x, y - height - (border_bottom_width / 2.0)]]
+        else # :right
+          from, to = [[x + width, y + (border_top_width / 2.0)], [x + width, y - height - (border_bottom_width / 2.0)]]
+        end
 
         case border_line
         when :dashed
           @pdf.dash border_width * 4
         when :dotted
-          @pdf.dash border_width, space: border_width * 2
+          @pdf.dash border_width
         when :solid
           # normal line style
         else
-          raise ::ArgumentError, 'border_line must be :solid, :dotted or :dashed'
+          raise ArgumentError, 'border_line must be :solid, :dotted or :dashed'
         end
 
         @pdf.line_width = border_width
@@ -57,4 +63,4 @@ class Prawn::Table::Cell
       end
     end
   end
-end
+end)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require ENV['PRAWN_TABLE_REQUIRE_PATH'] || 'prawn/table' unless defined? Prawn::Table::VERSION
+require 'prawn/table'
 require_relative 'prawn-table/cell'
 require_relative 'prawn-table/cell/asciidoc'
 require_relative 'prawn-table/cell/text'

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

@@ -7,4 +7,5 @@ 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/protect_bottom_gutter'
 require_relative 'prawn/extensions'

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

@@ -4,8 +4,8 @@ module Pygments
   module Ext
     module BlockStyles
       BlockSelectorRx = /^\.highlight *\{([^}]+?)\}/
-      HighlightBackgroundColorRx = /^\.highlight +\.hll +{ *background(?:-color)?: *#([a-fA-F0-9]{6})/
-      ColorPropertiesRx = /(?:^|;) *(background(?:-color)?|color): *#?([a-fA-F0-9]{6}) *(?=$|;)/
+      HighlightBackgroundColorRx = /^\.highlight +\.hll +{ *background(?:-color)?: *#(\h{6})/
+      ColorPropertiesRx = /(?:^|;) *(background(?:-color)?|color): *#?(\h{6}) *(?=$|;)/
 
       @cache = ::Hash.new do |cache, key|
         styles = {}