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

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

@@ -11,6 +11,10 @@ class Asciidoctor::Document
       preface.sectname = 'preface'
       preface.title = blk0.instance_variable_get :@title
       preface.id = preface.generate_id
+      if (first_child = blk0.blocks[0])&.option? 'notitle'
+        preface.set_option 'notitle'
+        first_child.role = 'lead' if first_child.context == :paragraph && !first_child.role?
+      end
       preface.blocks.replace (blk0.blocks.map do |b|
         b.parent = preface
         b

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/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)
@@ -269,6 +269,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
@@ -495,6 +509,8 @@ module Asciidoctor
           lowercase_pcdata text
         when :capitalize, 'capitalize'
           capitalize_words_pcdata text
+        when :smallcaps, 'smallcaps'
+          smallcaps_pcdata text
         else
           text
         end
@@ -538,25 +554,34 @@ 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
+      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
-            # logic is intentionally inlined
+            if node && ((last_block = node).content_model != :compound || (last_block = node.blocks[-1])&.context == :paragraph)
+              @bottom_gutters << { last_block => p_bottom }
+            else
+              @bottom_gutters << {}
+            end
             move_down p_top
             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
           end
@@ -570,30 +595,73 @@ 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
 
+      def expand_grid_values shorthand, default = nil
+        if ::Array === shorthand
+          case shorthand.size
+          when 1
+            [(value0 = shorthand[0] || default), value0]
+          when 2
+            shorthand.map {|it| it || default }
+          when 4
+            if Asciidoctor::PDF::ThemeLoader::CMYKColorValue === shorthand
+              [shorthand, shorthand]
+            else
+              (shorthand.slice 0, 2).map {|it| it || default }
+            end
+          else
+            (shorthand.slice 0, 2).map {|it| it || default }
+          end
+        else
+          [(value0 = shorthand || default), value0]
+        end
+      end
+
+      def expand_rect_values shorthand, default = nil
+        if ::Array === shorthand
+          case shorthand.size
+          when 1
+            [(value0 = shorthand[0] || default), value0, value0, value0]
+          when 2
+            [(value0 = shorthand[0] || default), (value1 = shorthand[1] || default), value0, value1]
+          when 3
+            [shorthand[0] || default, (value1 = shorthand[1] || default), shorthand[2] || default, value1]
+          when 4
+            if Asciidoctor::PDF::ThemeLoader::CMYKColorValue === shorthand
+              [shorthand, shorthand, shorthand, shorthand]
+            else
+              shorthand.map {|it| it || default }
+            end
+          else
+            (shorthand.slice 0, 4).map {|it| it || default }
+          end
+        else
+          [(value0 = shorthand || default), value0, value0, value0]
+        end
+      end
+
       # Stretch the current bounds to the left and right edges of the current page
       # while yielding the specified block if the verdict argument is true.
       # Otherwise, simply yield the specified block.
@@ -650,7 +718,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
@@ -668,13 +737,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_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_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_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
@@ -709,8 +784,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
@@ -740,8 +815,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
@@ -764,10 +839,15 @@ 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
+        page_ref = page.dictionary
+        (prune_dests = proc do |node|
+          node.children.delete_if {|it| ::PDF::Core::NameTree::Node === it ? prune_dests[it] : it.value.data[0] == page_ref }
+          false
+        end)[dests.data]
         # NOTE: cannot delete objects and IDs, otherwise references get corrupted; so just reset the value
         (pdf_store.instance_variable_get :@objects)[content_id] = ::PDF::Core::Reference.new content_id, {}
         pdf_store.pages.data[:Kids].pop
@@ -793,7 +873,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
@@ -805,11 +885,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
@@ -866,7 +946,6 @@ module Asciidoctor
       def scratch?
         @label == :scratch
       end
-      alias is_scratch? scratch?
 
       def with_dry_run &block
         yield dry_run(&block).position_onto self, cursor

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

@@ -6,6 +6,11 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
   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

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

@@ -13,14 +13,18 @@ module Asciidoctor
             #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 (fit = opts.delete :fit) && !(opts[:width] || opts[:height])
-              svg (::File.read file, mode: 'r:UTF-8'), opts do |svg_doc|
+              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| super fd, opts }
           end

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

@@ -99,7 +99,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

@@ -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/formatted_text/transform.rb

@@ -156,14 +156,19 @@ module Asciidoctor
                 if (pcdata = node[:pcdata]).empty?
                   # QUESTION: should this be handled by the formatter after the transform is complete?
                   if previous_fragment_is_text && ((previous_fragment_text = fragments[-1][:text]).end_with? ' ')
-                    fragments[-1][:text] = previous_fragment_text.chomp ' '
+                    fragments[-1][:text] = previous_fragment_text.chop
                   end
                 else
                   tag_name = node[:name]
                   attributes = node[:attributes]
                   parent = clone_fragment inherited
+                  fragment = build_fragment parent, tag_name, attributes
+                  if tag_name == :a && fragment[:type] == :indexterm && !attributes[:visible] &&
+                      previous_fragment_is_text && ((previous_fragment_text = fragments[-1][:text]).end_with? ' ')
+                    fragments[-1][:text] = previous_fragment_text.chop
+                  end
                   # NOTE: decorate child fragments with inherited properties from this element
-                  apply pcdata, fragments, (build_fragment parent, tag_name, attributes)
+                  apply pcdata, fragments, fragment
                   previous_fragment_is_text = false
                 end
               # case 2: void element

data/lib/asciidoctor/pdf/nogmagick.rb

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

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,6 +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' }
+      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_-]+)$/
@@ -22,6 +26,7 @@ module Asciidoctor
       MultiplyDivideOpRx = %r((-?\d+(?:\.\d+)?) +([*/^]) +(-?\d+(?:\.\d+)?))
       AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
       PrecisionFuncRx = /^(round|floor|ceil)\(/
+      RoleAlignKeyRx = /(?:_text)?_align$/
 
       module ColorValue; end
 
@@ -77,7 +82,7 @@ module Asciidoctor
         else
           theme_data = load_file theme_path, nil, theme_dir
           unless (::File.dirname theme_path) == ThemesDir
-            theme_data.base_align ||= 'left'
+            theme_data.base_text_align ||= 'left'
             theme_data.base_line_height ||= 1
             theme_data.base_font_color ||= '000000'
             theme_data.code_font_family ||= (theme_data.codespan_font_family || 'Courier')
@@ -166,9 +171,19 @@ module Asciidoctor
           val.each do |subkey, subval|
             process_entry %(#{key}_#{key == 'role' || !(subkey.include? '-') ? subkey : (subkey.tr '-', '_')}), subval, data
           end
+        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_grid_color' && (Array val).size == 2
+          if key == 'table_border_color'
+            data[key] = ::Array === val ? val.map {|it| to_color evaluate it, data } : (to_color evaluate val, data)
+          elsif key == 'table_grid_color' && ::Array === val && val.size == 2
             data[key] = val.map {|it| to_color evaluate it, data }
           else
             data[key] = to_color evaluate val, data
@@ -206,7 +221,8 @@ module Asciidoctor
       def resolve_var vars, ref, var
         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) }
+            DeprecatedCategoryKeys.any? {|old, new| (var.start_with? old + '_') && (vars.respond_to? (replace = new + (var.slice old.length, var.length))) && (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.1'
+    VERSION = '2.0.0.beta.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.1
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -270,6 +270,7 @@ files:
 - 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/protect_bottom_gutter.rb
 - lib/asciidoctor/pdf/ext/prawn/images.rb
 - lib/asciidoctor/pdf/ext/pygments.rb
 - lib/asciidoctor/pdf/ext/rouge.rb
@@ -289,6 +290,8 @@ files:
 - lib/asciidoctor/pdf/formatted_text/transform.rb
 - lib/asciidoctor/pdf/index_catalog.rb
 - lib/asciidoctor/pdf/measurements.rb
+- lib/asciidoctor/pdf/nogmagick.rb
+- lib/asciidoctor/pdf/nopngmagick.rb
 - lib/asciidoctor/pdf/optimizer.rb
 - lib/asciidoctor/pdf/pdfmark.rb
 - lib/asciidoctor/pdf/roman_numeral.rb