asciidoctor-pdf 2.3.8 → 2.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1b77004c38f0efc5a577f0ab5222f42b66398f70d5347e333d906616734aeb
-  data.tar.gz: 42ebc021e2b392e1b159ed0c473250b67d7e6c1f308dd7af282c61d6464538b5
+  metadata.gz: 53465d3756b672a087912f7052c98da2174506d348ae415702b6ad0923c35887
+  data.tar.gz: 81156616786953961b86a747720fdb1c92117a7645df0faba24b02e96bec4635
 SHA512:
-  metadata.gz: '03019b94151e1fdfc90e3d4cfc2cd25b115f936300e4982a0b62903108ed54429dbaee451b0b6d86a6b10d51a7db6da87acd0f34065773c2438f32fd0fd1e899'
-  data.tar.gz: f91b9506aa4242e9c253e0cbb5bce32666253a4af775891ab1378b5c3d48d390af45683f159fa9ce6cb26865da8f5f46320558e5929b57a41194958c83736eda
+  metadata.gz: 73d88491443fdafb5086bf4a122c3910631e547ef118b4ff4b23dffcbb315d7fb21a7335fc41db778b0d11bf5f851d3cae9df1b838fa342d3e5cf73cbe0f259d
+  data.tar.gz: cbd1fe371ed58d54c76770ef7abda45a080bb84dcbece1e5f60bda8a260668538ee5f71b92088b67ea71b9b29ed01cf6746fa9568a123366080a1e2fcdbb1c2e

data/CHANGELOG.adoc

@@ -5,6 +5,31 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {url-repo}/commits/main[commit history] on GitHub.
 
+== 2.3.10 (2023-12-04) - @mojavelinux
+
+Bug Fixes::
+
+* show dot leaders in TOC entry if toclevels is increased for a given section (#2441)
+* decouple tests from path of PWD (#2444)
+* consider inherited styles when analyzing glyphs for fallback font support (#2463)
+* add fallback character for placeholder character when using AFM font (#2453)
+* don't advance image that's first child of block at top of page if image is taller than page (#2012)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.10[git tag] | {url-repo}/compare/v2.3.9\...v2.3.10[full diff]
+
+== 2.3.9 (2023-06-28) - @mojavelinux
+
+Bug Fixes::
+
+* correctly align block image in raster format in column when align is right or center and page columns are enabled (#2433)
+* honor table caption end placement (`table-caption-end` theme key) when `unbreakable` (or `breakable`) option is set on table (#2434)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.9[git tag] | {url-repo}/compare/v2.3.8\...v2.3.9[full diff]
+
 == 2.3.8 (2023-06-25) - @mojavelinux
 
 Improvements::
@@ -14,7 +39,7 @@ Improvements::
 
 Bug Fixes::
 
-* remove null character enclosed in XML tag when santizing text; fixes invisible text in outline when heading contains index term (#2430)
+* remove null character enclosed in XML tag when sanitizing text; fixes invisible text in outline when heading contains index term (#2430)
 * alias `File.exists?` to `File.exist?` when loading RGhost optimizer to patch incompatibility when using Ruby 3.2
 
 Build / Infrastructure::

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor PDF: A native PDF converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.3.8, 2023-06-25
+v2.3.10, 2023-12-04
 // Settings:
 :experimental:
 :idprefix:

data/lib/asciidoctor/pdf/converter.rb

@@ -377,7 +377,7 @@ module Asciidoctor
         if (rotated_page_margin = resolve_page_margin (doc.attr 'pdf-page-margin-rotated') || theme.page_margin_rotated)
           rotated_page_margin = expand_margin_value rotated_page_margin
           @edge_shorthand_cache = nil
-          @page_margin[PageLayouts[(PageLayouts.index page.layout) - 1]] = { recto: rotated_page_margin, verso: rotated_page_margin.dup }
+          @page_margin[PageLayouts[(PageLayouts.index page.layout) - 1]] = { recto: rotated_page_margin, verso: (rotated_page_margin.drop 0) }
         end
         if @media == 'prepress'
           @ppbook = doc.doctype == 'book'
@@ -1048,7 +1048,7 @@ module Asciidoctor
             else
               highlighter = nil
             end
-            saved_subs = (subs = node.subs).dup
+            saved_subs = (subs = node.subs).drop 0
             callouts_enabled = subs.include? :callouts
             highlight_idx = subs.index :highlight
             # NOTE: scratch? here only applies if listing block is nested inside another block
@@ -1069,9 +1069,9 @@ module Asciidoctor
                 source_string = expand_tabs node.content
               else
                 if callouts_enabled
-                  saved_lines = node.lines.dup
+                  saved_lines = node.lines.drop 0
                   subs.delete :callouts
-                  prev_subs = subs.dup
+                  prev_subs = subs.drop 0
                   subs.clear
                   source_string, conum_mapping = extract_conums node.content
                   node.lines.replace (source_string.split LF)
@@ -1421,7 +1421,7 @@ module Asciidoctor
             term_inline_format = (term_font_styles = font_styles).empty? ? true : [inherited: { styles: term_font_styles }]
             term_line_metrics = calc_line_metrics @base_line_height
             term_padding_no_blocks = [term_line_metrics.padding_top, 10, term_line_metrics.padding_bottom, 10]
-            (term_padding = term_padding_no_blocks.dup)[2] += @theme.prose_margin_bottom * 0.5
+            (term_padding = (term_padding_no_blocks.drop 0))[2] += @theme.prose_margin_bottom * 0.5
             desc_padding = [0, 10, 0, 10]
             term_kerning = default_kerning?
           end
@@ -1802,7 +1802,7 @@ module Asciidoctor
               end
               # NOTE: shrink image so it fits within available space; group image & caption
               if (rendered_h = svg_size.output_height) > (available_h = cursor - caption_h)
-                unless pinned || at_page_top?
+                unless pinned || at_page_top? || (node.first_child? && (node.parent.attr? 'pdf-at-top'))
                   advance_page
                   available_h = cursor - caption_h
                 end
@@ -1844,7 +1844,7 @@ module Asciidoctor
               rendered_w, rendered_h = image_info.calc_image_dimensions width: (width || [available_w, actual_w].min)
               # NOTE: shrink image so it fits within available space; group image & caption
               if rendered_h > (available_h = cursor - caption_h)
-                unless pinned || at_page_top?
+                unless pinned || at_page_top? || (node.first_child? && (node.parent.attr? 'pdf-at-top'))
                   advance_page
                   available_h = cursor - caption_h
                 end
@@ -1856,9 +1856,16 @@ module Asciidoctor
               update_colors if graphic_state.color_space.empty?
               ink_caption node, category: :image, end: :top, block_align: alignment, block_width: rendered_w, max_width: caption_max_width if caption_end == :top && node.title?
               image_y = y
-              image_cursor = cursor
+              left = bounds.left
+              # NOTE: prawn does not compute :at for alignment correctly in column box, so resort to our own logic
+              case alignment
+              when :center
+                left += (available_w - rendered_w) * 0.5
+              when :right
+                left += available_w - rendered_w
+              end
               # NOTE: specify both width and height to avoid recalculation
-              embed_image image_obj, image_info, width: rendered_w, height: rendered_h, position: alignment
+              embed_image image_obj, image_info, at: [left, (image_cursor = cursor)], height: rendered_h, width: rendered_w
               draw_image_border image_cursor, rendered_w, rendered_h, alignment unless pinned || (node.role? && (node.has_role? 'noborder'))
               if (link = node.attr 'link')
                 add_link_to_image link, { width: rendered_w, height: rendered_h }, position: alignment, y: image_y
@@ -1974,6 +1981,7 @@ module Asciidoctor
       end
 
       def convert_table node
+        caption_end = (theme = @theme).table_caption_end&.to_sym || :top
         if !at_page_top? && ((unbreakable = node.option? 'unbreakable') || ((node.option? 'breakable') && (node.id || node.title?)))
           # NOTE: we use the current node as the parent so we can navigate back into the document model
           (table_container = Block.new node, :open) << (table_dup = node.dup)
@@ -1985,7 +1993,7 @@ module Asciidoctor
           end
           table_container.style = 'table-container'
           table_container.id, table_dup.id = table_dup.id, nil
-          if table_dup.title?
+          if caption_end == :top && table_dup.title?
             table_container.title = ''
             table_container.instance_variable_set :@converted_title, table_dup.captioned_title
             table_dup.title = nil
@@ -1997,7 +2005,6 @@ module Asciidoctor
         num_rows = node.attr 'rowcount'
         num_cols = node.columns.size
         table_header_size = false
-        theme = @theme
         prev_font_scale, @font_scale = @font_scale, 1 if node.document.nested?
 
         tbl_bg_color = resolve_theme_color :table_background_color
@@ -2023,15 +2030,15 @@ module Asciidoctor
           head_rows = node.rows[:head]
           body_rows = node.rows[:body]
           #if (hrows = node.attr 'hrows') && (shift_rows = hrows.to_i - head_rows.size) > 0
-          #  head_rows = head_rows.dup
-          #  body_rows = body_rows.dup
+          #  head_rows = head_rows.drop 0
+          #  body_rows = body_rows.drop 0
           #  shift_rows.times { head_rows << body_rows.shift unless body_rows.empty? }
           #end
           theme_font :table_head do
             table_header_size = head_rows.size
             head_font_info = font_info
             head_line_metrics = calc_line_metrics theme.table_head_line_height || theme.table_cell_line_height || @base_line_height
-            head_cell_padding = ((head_cell_padding = theme.table_head_cell_padding) ? (expand_padding_value head_cell_padding) : body_cell_padding).dup
+            head_cell_padding = (theme.table_head_cell_padding ? (expand_padding_value theme.table_head_cell_padding) : body_cell_padding).drop 0
             head_cell_padding[0] += head_line_metrics.padding_top
             head_cell_padding[2] += head_line_metrics.padding_bottom
             # QUESTION: why doesn't text transform inherit from table?
@@ -2142,7 +2149,7 @@ module Asciidoctor
                 cell_data = { content: asciidoc_cell, source_location: cell.source_location }
               end
               if cell_line_metrics
-                cell_padding = body_cell_padding.dup
+                cell_padding = body_cell_padding.drop 0
                 cell_padding[0] += cell_line_metrics.padding_top
                 cell_padding[2] += cell_line_metrics.padding_bottom
                 cell_data[:leading] = cell_line_metrics.leading
@@ -2235,7 +2242,6 @@ module Asciidoctor
           alignment = theme.table_align&.to_sym || :left
         end
 
-        caption_end = theme.table_caption_end&.to_sym || :top
         caption_max_width = theme.table_caption_max_width || 'fit-content'
 
         table_settings = {
@@ -2267,7 +2273,7 @@ module Asciidoctor
           @column_widths = column_widths unless column_widths.empty?
           # NOTE: call width to capture resolved table width
           table_width = width
-          @pdf.ink_table_caption node, alignment, table_width, caption_max_width if node.title? && caption_end == :top
+          @pdf.ink_table_caption node, alignment, table_width, caption_max_width if caption_end == :top && node.title?
           # NOTE: align using padding instead of bounding_box as prawn-table does
           # using a bounding_box across pages mangles the margin box of subsequent pages
           if alignment != :left && table_width != (this_bounds = @pdf.bounds).width
@@ -2340,7 +2346,7 @@ module Asciidoctor
           bounds.subtract_left_padding left_padding
           bounds.subtract_right_padding right_padding if right_padding
         end
-        ink_table_caption node, alignment, table_width, caption_max_width, caption_end if node.title? && caption_end == :bottom
+        ink_table_caption node, alignment, table_width, caption_max_width, caption_end if caption_end == :bottom && node.title?
         theme_margin :block, :bottom, (next_enclosed_block node)
       rescue ::Prawn::Errors::CannotFit
         log :error, (message_with_context 'cannot fit contents of table cell into specified column width', source_location: node.source_location)
@@ -3855,7 +3861,7 @@ module Asciidoctor
               font_style: dot_leader_font_style,
               font_size: font_size,
               levels: ((dot_leader_l = @theme.toc_dot_leader_levels) == 'none' ? ::Set.new :
-                  (dot_leader_l && dot_leader_l != 'all' ? dot_leader_l.to_s.split.map(&:to_i).to_set : (0..num_levels).to_set)),
+                  (dot_leader_l && dot_leader_l != 'all' ? dot_leader_l.to_s.split.map(&:to_i).to_set : nil)),
               text: (dot_leader_text = @theme.toc_dot_leader_content || DotLeaderTextDefault),
               width: dot_leader_text.empty? ? 0 : (rendered_width_of_string dot_leader_text),
               # TODO: spacer gives a little bit of room between dots and page number
@@ -3929,7 +3935,7 @@ module Asciidoctor
               end_cursor = cursor
               move_cursor_to start_cursor
               # NOTE: we're guaranteed to be on the same page as the final line of the entry
-              if dot_leader[:width] > 0 && (dot_leader[:levels].include? entry_level.pred)
+              if dot_leader[:width] > 0 && (dot_leader[:levels] ? (dot_leader[:levels].include? entry_level.pred) : true)
                 pgnum_label_width = rendered_width_of_string pgnum_label
                 pgnum_label_font_settings = { color: @font_color, font: font_family, size: @font_size, styles: font_styles }
                 save_font do
@@ -4903,7 +4909,7 @@ module Asciidoctor
       end
 
       def init_float_box _node, block_width, block_height, float_to
-        gap = ::Array === (gap = @theme.image_float_gap) ? gap.dup : [gap, gap]
+        gap = ::Array === (gap = @theme.image_float_gap) ? (gap.drop 0) : [gap, gap]
         float_w = block_width + (gap[0] ||= 12)
         float_h = block_height + (gap[1] ||= 6)
         box_l = bounds.left + (float_to == 'right' ? 0 : float_w)

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

@@ -13,6 +13,10 @@ Asciidoctor::AbstractBlock.prepend (Module.new do
     blocks[-1]
   end
 
+  def first_child?
+    self == parent.blocks[0]
+  end
+
   def last_child?
     self == parent.blocks[-1]
   end

data/lib/asciidoctor/pdf/ext/core/file.rb

@@ -9,6 +9,6 @@ File.singleton_class.prepend (Module.new do
 
   # NOTE: JRuby < 9.4 doesn't implement this method; JRuby 9.4 implements it incorrectly
   def absolute_path? path
-    (::Pathname.new path).absolute? && !(%r/\A[[:alpha:]][[:alnum:]\-+]*:\/\/\S/.match? path)
+    (Pathname.new path).absolute? && !(%r/\A[[:alpha:]][[:alnum:]\-+]*:\/\/\S/.match? path)
   end
 end) if RUBY_ENGINE == 'jruby'

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

@@ -4,7 +4,7 @@ Prawn::Font::AFM.instance_variable_set :@hide_m17n_warning, true
 
 require 'prawn/icon'
 
-Prawn::Icon::Compatibility.prepend (::Module.new { def warning *_args; end })
+Prawn::Icon::Compatibility.prepend (Module.new { def warning *_args; end })
 
 module Asciidoctor
   module Prawn
@@ -1002,9 +1002,16 @@ module Asciidoctor
       # start_new_page. Using start_new_page can mangle the calculation of content block's extent.
       #
       def arrange_block node, &block
-        keep_together = (node.option? 'unbreakable') && !at_page_top?
+        if at_page_top?
+          at_top = true
+        else
+          at_top = true if node.first_child? && (node.parent.attr? 'pdf-at-top')
+          keep_together = true if node.option? 'unbreakable'
+        end
+        node.set_attr 'pdf-at-top', '' if at_top
         doc = node.document
         block_for_scratch = proc do
+          at_top = node.set_attr 'pdf-at-top', '' if !at_top && at_page_top?
           push_scratch doc
           instance_exec(&block)
         ensure
@@ -1012,6 +1019,8 @@ module Asciidoctor
         end
         extent = dry_run keep_together: keep_together, onto: [self, keep_together], &block_for_scratch
         scratch? ? block_for_scratch.call : (yield extent)
+      ensure
+        node.remove_attr 'pdf-at-top' if at_top
       end
 
       # This method installs an on_page_create_callback that stops processing if the first page is

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

@@ -7,6 +7,7 @@ class Prawn::Font::AFM
     ?\u200b => '',
     ?\u202f => ?\u00a0,
     ?\u2009 => ' ',
+    ?\u2063 => ?\u00ad,
     ?\u25e6 => '-',
     ?\u25aa => ?\u00b7,
   }

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

@@ -32,21 +32,26 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
     end
   end
 
-  # TODO: remove when upgrading to prawn-2.5.0
+  # help Prawn correctly resolve which font to analyze, including the font style
   def analyze_glyphs_for_fallback_font_support fragment_hash
     fragment_font = fragment_hash[:font] || (original_font = @document.font.family)
+    effective_font_styles = @document.font_styles
+    fragment_font_opts = {}
     if (fragment_font_styles = fragment_hash[:styles])
-      if fragment_font_styles.include? :bold
-        fragment_font_opts = { style: (fragment_font_styles.include? :italic) ? :bold_italic : :bold }
-      elsif fragment_font_styles.include? :italic
-        fragment_font_opts = { style: :italic }
+      effective_font_styles.merge fragment_font_styles
+      if effective_font_styles.include? :bold
+        fragment_font_opts[:style] = (effective_font_styles.include? :italic) ? :bold_italic : :bold
+      elsif effective_font_styles.include? :italic
+        fragment_font_opts[:style] = :italic
       end
+    elsif !effective_font_styles.empty?
+      fragment_font_opts[:style] = @document.resolve_font_style effective_font_styles
     end
-    fallback_fonts = @fallback_fonts.dup
+    fallback_fonts = @fallback_fonts.drop 0
     font_glyph_pairs = []
     @document.save_font do
       fragment_hash[:text].each_char do |char|
-        font_glyph_pairs << [(find_font_for_this_glyph char, fragment_font, fragment_font_opts || {}, fallback_fonts.dup), char]
+        font_glyph_pairs << [(find_font_for_this_glyph char, fragment_font, fragment_font_opts, (fallback_fonts.drop 0)), char]
       end
     end
     # NOTE: don't add a :font to fragment if it wasn't there originally
@@ -61,7 +66,7 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
       current_font
     elsif fallback_fonts_to_check.empty?
       if logger.info? && !doc.scratch?
-        fonts_checked = @fallback_fonts.dup.unshift original_font
+        fonts_checked = [original_font].concat @fallback_fonts
         missing_chars = (doc.instance_variable_defined? :@missing_chars) ?
             (doc.instance_variable_get :@missing_chars) : (doc.instance_variable_set :@missing_chars, {})
         previous_fonts_checked = (missing_chars[char] ||= [])

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

@@ -3,7 +3,7 @@
 Prawn::SVG::Elements::Image.prepend (Module.new do
   def image_dimensions data
     unless (handler = find_image_handler data)
-      raise ::Prawn::SVG::Elements::Base::SkipElementError, 'Unsupported image type supplied to image tag'
+      raise Prawn::SVG::Elements::Base::SkipElementError, 'Unsupported image type supplied to image tag'
     end
     image = handler.new data
     [image.width.to_f, image.height.to_f]

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

@@ -136,7 +136,7 @@ module Rouge
             fragment[:color] = fg
           end
           if style_rules[:bold]
-            fragment[:styles] = style_rules[:italic] ? BoldItalicStyle.dup : BoldStyle.dup
+            fragment[:styles] = (style_rules[:italic] ? BoldItalicStyle : BoldStyle).dup
           elsif style_rules[:italic]
             fragment[:styles] = ItalicStyle.dup
           end

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

@@ -379,7 +379,7 @@ module Asciidoctor
           if fragment
             fragment = fragment.dup
             fragment[:styles] = fragment[:styles].dup if fragment.key? :styles
-            fragment[:callback] = fragment[:callback].dup if fragment.key? :callback
+            fragment[:callback] = fragment[:callback].drop 0 if fragment.key? :callback
           else
             fragment = {}
           end

data/lib/asciidoctor/pdf/optimizer.rb

@@ -11,7 +11,7 @@ File.singleton_class.alias_method :exists?, :exist? unless File.respond_to? :exi
 
 RGhost::GSAlone.prepend (Module.new do
   def initialize params, debug
-    (@params = params.dup).push(*(@params.pop.split File::PATH_SEPARATOR))
+    (@params = params.drop 0).push(*(@params.pop.split File::PATH_SEPARATOR))
     @debug = debug
   end
 

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -22,7 +22,7 @@ module Asciidoctor
       LoneVariableRx = /^\$([a-z0-9_-]+)$/
       HexColorEntryRx = /^(?<k> *\p{Graph}+): +(?!null$)(?<q>["']?)(?<h>#)?(?<v>\h\h\h\h{0,3})\k<q> *(?:#.*)?$/
       MultiplyDivideOpRx = %r((-?\d+(?:\.\d+)?) +([*/^]) +(-?\d+(?:\.\d+)?))
-      AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+\-]) +(-?\d+(?:\.\d+)?)/
+      AddSubtractOpRx = /(-?\d+(?:\.\d+)?) +([+-]) +(-?\d+(?:\.\d+)?)/
       PrecisionFuncRx = /^(round|floor|ceil)\(/
       RoleAlignKeyRx = /(?:_text)?_align$/
 

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.8'
+    VERSION = '2.3.10'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.3.10
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-25 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor