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

data/lib/asciidoctor/pdf/ext/pdf-core/page.rb

@@ -14,6 +14,14 @@ class PDF::Core::Page
     content.stream.filtered_stream == (@tare_content_stream ||= InitialPageContent) && document.page_number > 0
   end
 
+  # Flags this page as imported.
+  #
+  def imported
+    @imported_page = true
+  end
+
+  alias imported_page imported
+
   # Reset the content of the page.
   # Note that this method may leave behind an orphaned background image.
   def reset_content

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+Prawn::Document::ColumnBox.prepend (Module.new do
+  def absolute_bottom
+    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,
+        columns: @columns, reflow_margins: true, spacer: @spacer, width: margin_box.width
+    end
+  end
+end)

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

@@ -103,7 +103,7 @@ module Asciidoctor
       NewPageRequiredError = ::Class.new ::StopIteration
 
       InhibitNewPageProc = proc do |pdf|
-        pdf.delete_page
+        pdf.delete_current_page
         raise NewPageRequiredError
       end
 
@@ -111,7 +111,7 @@ module Asciidoctor
 
       DetectEmptyFirstPageProc = proc do |delegate, pdf|
         if pdf.state.pages[pdf.page_number - 2].empty?
-          pdf.delete_page
+          pdf.delete_current_page
           raise NewPageRequiredError
         end
         delegate.call pdf if (pdf.state.on_page_create_callback = delegate)
@@ -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?
@@ -269,6 +278,20 @@ module Asciidoctor
         dest_xyz 0, page_height, nil, (page_num ? state.pages[page_num - 1] : page)
       end
 
+      # Gets the destination registered for the specified name. The return value
+      # matches that which was passed to the add_dest method.
+      #
+      def get_dest name, node = dests.data
+        node.children.each do |child|
+          if ::PDF::Core::NameTree::Value === child
+            return child.value.data if child.name == name
+          elsif (found = get_dest name, child)
+            return found
+          end
+        end
+        nil
+      end
+
       # Fonts
 
       # Registers a new custom font described in the data parameter
@@ -396,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
 
@@ -421,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
@@ -439,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
@@ -472,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
@@ -495,6 +528,8 @@ module Asciidoctor
           lowercase_pcdata text
         when :capitalize, 'capitalize'
           capitalize_words_pcdata text
+        when :smallcaps, 'smallcaps'
+          smallcaps_pcdata text
         else
           text
         end
@@ -538,17 +573,20 @@ module Asciidoctor
       # Example:
       #
       #  pad_box 20 do
-      #    text 'A paragraph inside a blox with even padding on all sides.'
+      #    text 'A paragraph inside a blox with even padding from all edges.'
+      #  end
+      #
+      #  pad_box [10, 5] do
+      #    text 'A paragraph inside a box with different padding from ends and sides.'
       #  end
       #
-      #  pad_box [10, 10, 10, 20] do
-      #    text 'An indented paragraph inside a box with equal padding on all sides.'
+      #  pad_box [5, 10, 15, 20] do
+      #    text 'A paragraph inside a box with different padding from each edge.'
       #  end
       #
       def pad_box padding, node = nil
         if padding
-          # TODO: implement shorthand combinations like in CSS
-          p_top, p_right, p_bottom, p_left = ::Array === padding ? padding : (::Array.new 4, padding)
+          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)
@@ -560,8 +598,8 @@ module Asciidoctor
             bounds.add_left_padding p_left
             bounds.add_right_padding p_right
             yield
-            cursor > p_bottom ? (move_down p_bottom) : reference_bounds.move_past_bottom unless at_page_top?
           ensure
+            cursor > p_bottom ? (move_down p_bottom) : reference_bounds.move_past_bottom unless at_page_top?
             @bottom_gutters.pop
             bounds.subtract_left_padding p_left
             bounds.subtract_right_padding p_right
@@ -576,26 +614,25 @@ module Asciidoctor
       end
 
       def expand_padding_value shorthand
-        unless (padding = (@side_area_shorthand_cache ||= {})[shorthand])
-          if ::Array === shorthand
-            case shorthand.size
+        (@edge_shorthand_cache ||= ::Hash.new do |store, key|
+          if ::Array === key
+            case key.size
             when 1
-              padding = [shorthand[0], shorthand[0], shorthand[0], shorthand[0]]
+              value = [(value0 = key[0] || 0), value0, value0, value0]
             when 2
-              padding = [shorthand[0], shorthand[1], shorthand[0], shorthand[1]]
+              value = [(value0 = key[0] || 0), (value1 = key[1] || 0), value0, value1]
             when 3
-              padding = [shorthand[0], shorthand[1], shorthand[2], shorthand[1]]
+              value = [key[0] || 0, (value1 = key[1] || 0), key[2] || 0, value1]
             when 4
-              padding = shorthand
+              value = key.map {|it| it || 0 }
             else
-              padding = shorthand.slice 0, 4
+              value = (key.slice 0, 4).map {|it| it || 0 }
             end
           else
-            padding = ::Array.new 4, (shorthand || 0)
+            value = [(value0 = key || 0), value0, value0, value0]
           end
-          @side_area_shorthand_cache[shorthand] = padding
-        end
-        padding.dup
+          store[key] = value
+        end)[shorthand]
       end
 
       alias expand_margin_value expand_padding_value
@@ -700,7 +737,8 @@ module Asciidoctor
       def fill_and_stroke_bounds f_color = fill_color, s_color = stroke_color, options = {}
         no_fill = !f_color || f_color == 'transparent'
         if ::Array === (s_width = options[:line_width] || 0)
-          s_width_max = s_width.map(&:to_i).max
+          s_width = [s_width[0], s_width[1], s_width[0], s_width[1]] if s_width.size == 2
+          s_width_max = (s_width = s_width.map {|it| it || 0 }).max
           radius = 0
         else
           radius = options[:radius] || 0
@@ -718,13 +756,19 @@ module Asciidoctor
 
           # stroke
           if s_width_max
-            if (s_width_end = s_width[0] || 0) > 0
-              stroke_horizontal_rule s_color, line_width: s_width_end, line_style: options[:line_style]
-              stroke_horizontal_rule s_color, line_width: s_width_end, line_style: options[:line_style], at: bounds.height
+            s_width_top, s_width_right, s_width_bottom, s_width_left = s_width
+            projection_top, projection_right, projection_bottom, projection_left = s_width.map {|it| it * 0.5 }
+            if s_width_top > 0
+              stroke_horizontal_rule s_color, line_width: s_width_top, line_style: options[:line_style], left_projection: projection_left, right_projection: projection_right
+            end
+            if s_width_right > 0
+              stroke_vertical_rule s_color, line_width: s_width_right, line_style: options[:line_style], at: bounds.width, top_projection: projection_top, bottom_projection: projection_bottom
             end
-            if (s_width_side = s_width[1] || 0) > 0
-              stroke_vertical_rule s_color, line_width: s_width_side, line_style: options[:line_style]
-              stroke_vertical_rule s_color, line_width: s_width_side, line_style: options[:line_style], at: bounds.width
+            if s_width_bottom > 0
+              stroke_horizontal_rule s_color, line_width: s_width_bottom, line_style: options[:line_style], at: bounds.height, left_projection: projection_left, right_projection: projection_right
+            end
+            if s_width_left > 0
+              stroke_vertical_rule s_color, line_width: s_width_left, line_style: options[:line_style], top_projection: projection_top, bottom_projection: projection_bottom
             end
           else
             stroke_color s_color
@@ -759,8 +803,8 @@ module Asciidoctor
         rule_y = cursor - (options[:at] || 0)
         rule_style = options[:line_style]
         rule_width = options[:line_width] || 0.5
-        rule_x_start = bounds.left
-        rule_x_end = bounds.right
+        rule_x_start = bounds.left - (options[:left_projection] || 0)
+        rule_x_end = bounds.right - (options[:right_projection] || 0)
         save_graphics_state do
           stroke_color rule_color
           case rule_style
@@ -790,8 +834,8 @@ module Asciidoctor
       #
       def stroke_vertical_rule rule_color = stroke_color, options = {}
         rule_x = options[:at] || 0
-        rule_y_from = bounds.top
-        rule_y_to = bounds.bottom
+        rule_y_from = bounds.top + (options[:top_projection] || 0)
+        rule_y_to = bounds.bottom - (options[:bottom_projection] || 0)
         rule_style = options[:line_style]
         rule_width = options[:line_width] || 0.5
         save_graphics_state do
@@ -814,7 +858,7 @@ module Asciidoctor
 
       # Deletes the current page and move the cursor
       # to the previous page.
-      def delete_page
+      def delete_current_page
         pg = page_number
         pdf_store = state.store
         content_id = page.content.identifier
@@ -848,7 +892,7 @@ module Asciidoctor
         prev_page_size = page.size
         state.compress = false if state.compress # can't use compression if using template
         prev_text_rendering_mode = (defined? @text_rendering_mode) ? @text_rendering_mode : nil
-        delete_page if options[:replace]
+        delete_current_page if options[:replace]
         # NOTE: use functionality provided by prawn-templates
         start_new_page_discretely template: file, template_page: options[:page]
         # prawn-templates sets text_rendering_mode to :unknown, which breaks running content; revert
@@ -860,11 +904,11 @@ module Asciidoctor
           # way atm to prevent the size & layout of the imported page from affecting subsequent pages
           advance_page size: prev_page_size, layout: prev_page_layout if options.fetch :advance, true
         elsif options.fetch :advance_if_missing, true
-          delete_page
+          delete_current_page
           # NOTE: see previous comment
           advance_page size: prev_page_size, layout: prev_page_layout
         else
-          delete_page
+          delete_current_page
         end
         nil
       end
@@ -993,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]
@@ -99,7 +92,7 @@ module Prawn
           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 }
+            extra_pages.times { pdf.delete_current_page }
           end
           nil
         end

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/nopngmagick.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Prawn.image_handler.register! Prawn::Images::PNG if defined? GMagick::Image

data/lib/asciidoctor/pdf/optimizer.rb

@@ -40,9 +40,10 @@ module Asciidoctor
       attr_reader :quality
       attr_reader :compatibility_level
 
-      def initialize quality = 'default', compatibility_level = '1.4'
+      def initialize quality = 'default', compatibility_level = '1.4', compliance = 'PDF'
         @quality = QUALITY_NAMES[quality]
         @compatibility_level = compatibility_level
+        @compliance = compliance
         if (gs_path = ::ENV['GS'])
           ::RGhost::Config::GS[:path] = gs_path
         end
@@ -57,10 +58,16 @@ module Asciidoctor
           else
             inputs = target
           end
-          (::RGhost::Convert.new inputs).to :pdf,
-            filename: filename_tmp.to_s,
-            quality: @quality,
-            d: { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
+          d = { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
+          case @compliance
+          when 'PDF/A', 'PDF/A-1', 'PDF/A-2', 'PDF/A-3'
+            d[:PDFA] = ((@compliance.split '-', 2)[1] || 1).to_i
+            d[:ShowAnnots] = false
+          when 'PDF/X', 'PDF/X-1', 'PDF/X-3'
+            d[:PDFX] = true
+            d[:ShowAnnots] = false
+          end
+          (::RGhost::Convert.new inputs).to :pdf, filename: filename_tmp.to_s, quality: @quality, d: d
           filename_o.binwrite filename_tmp.binread
         end
         nil

data/lib/asciidoctor/pdf/text_transformer.rb

@@ -10,6 +10,12 @@ module Asciidoctor
       WordRx = /\p{Word}+/
       Hyphen = '-'
       SoftHyphen = ?\u00ad
+      LowerAlphaChars = 'a-z'
+      # NOTE: use more widely-supported ғ instead of ꜰ as replacement for F
+      # NOTE: use more widely-supported ǫ instead of ꞯ as replacement for Q
+      # NOTE: use more widely-supported s (lowercase latin "s") instead of ꜱ as replacement for S
+      # NOTE: in small caps, x (lowercase latin "x") remains unchanged
+      SmallCapsChars = 'ᴀʙᴄᴅᴇғɢʜɪᴊᴋʟᴍɴoᴘǫʀsᴛᴜᴠᴡxʏᴢ'
 
       def capitalize_words_pcdata string
         if XMLMarkupRx.match? string
@@ -50,6 +56,14 @@ module Asciidoctor
           string.upcase
         end
       end
+
+      def smallcaps_pcdata string
+        if XMLMarkupRx.match? string
+          string.gsub(PCDATAFilterRx) { $2 ? ($2.tr LowerAlphaChars, SmallCapsChars) : $1 }
+        else
+          string.tr LowerAlphaChars, SmallCapsChars
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -15,9 +15,10 @@ 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' }
-      AmbiguousAlignKeys = %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({}) do |prefix, accum|
+      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
+      PaddingBottomHackKeys = %w(example_padding quote_padding sidebar_padding verse_padding)
 
       VariableRx = /\$([a-z0-9_-]+)/
       LoneVariableRx = /^\$([a-z0-9_-]+)$/
@@ -170,9 +171,14 @@ module Asciidoctor
           val.each do |subkey, subval|
             process_entry %(#{key}_#{key == 'role' || !(subkey.include? '-') ? subkey : (subkey.tr '-', '_')}), subval, data
           end
-        elsif (rekey = AmbiguousAlignKeys[key]) ||
+        elsif (rekey = DeprecatedKeys[key]) ||
             ((key.start_with? 'role_') && (key.end_with? '_align') && (rekey = key.sub RoleAlignKeyRx, '_text_align'))
           data[rekey] = evaluate val, data
+        elsif PaddingBottomHackKeys.include? key
+          val = evaluate val, data
+          # normalize padding hacks for themes designed before the converter had smart margins
+          val[2] = val[0] if ::Array === val && val[0].to_f >= 0 && val[2].to_f <= 0
+          data[key] = val
         # QUESTION: do we really need to evaluate_math in this case?
         elsif key.end_with? '_color'
           if key == 'table_border_color'
@@ -216,7 +222,7 @@ module Asciidoctor
         var = var.tr '-', '_' if var.include? '-'
         if (vars.respond_to? var) ||
             DeprecatedCategoryKeys.any? {|old, new| (var.start_with? old + '_') && (vars.respond_to? (replace = new + (var.slice old.length, var.length))) && (var = replace) } ||
-            ((replace = AmbiguousAlignKeys[var]) && (vars.respond_to? replace) && (var = replace))
+            ((replace = DeprecatedKeys[var]) && (vars.respond_to? replace) && (var = replace))
           vars[var]
         else
           logger.warn %(unknown variable reference in PDF theme: #{ref})

data/lib/asciidoctor/pdf/version.rb

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