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

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/prawn/extensions.rb

@@ -545,18 +545,24 @@ module Asciidoctor
       #    text 'An indented paragraph inside a box with equal padding on all sides.'
       #  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)
+          # 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
+            @bottom_gutters.pop
             bounds.subtract_left_padding p_left
             bounds.subtract_right_padding p_right
           end
@@ -594,6 +600,50 @@ module Asciidoctor
 
       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.
@@ -768,6 +818,11 @@ module Asciidoctor
         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
@@ -866,7 +921,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.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/theme_loader.rb

@@ -15,6 +15,9 @@ 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|
+        accum[%(#{prefix}_align)] = %(#{prefix}_text_align)
+      end
 
       VariableRx = /\$([a-z0-9_-]+)/
       LoneVariableRx = /^\$([a-z0-9_-]+)$/
@@ -22,6 +25,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 +81,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 +170,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]) ||
+            ((key.start_with? 'role_') && (key.end_with? '_align') && (rekey = key.sub RoleAlignKeyRx, '_text_align'))
+          data[rekey] = evaluate val, data
         # 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 +215,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 = AmbiguousAlignKeys[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.alpha.2'
   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.alpha.2
 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-04-29 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,7 @@ 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/optimizer.rb
 - lib/asciidoctor/pdf/pdfmark.rb
 - lib/asciidoctor/pdf/roman_numeral.rb