asciidoctor-pdf 2.3.9 → 2.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c0a40b569d9103d197f7063f91e12ef370e22fe2b591cc628097ae78ac8dc2
-  data.tar.gz: af5b79bc2a7ce74f9bddd471bc6751c56ef0119b7c417a7bd5473d2f13638fbd
+  metadata.gz: f69f8ddf5bab91f37bd488a5d630c068f028d8d9f80e47ccbd601efeb23cfd4a
+  data.tar.gz: 2a66022080892dade89fdfab63e60d08e619ec0cf184a793267871464668cb53
 SHA512:
-  metadata.gz: c2b0972adc236388028ecbd29af29f0bbd18889a2bd7229b2508769831db3882fd6123b500be4a11ce317c569e35fb5531dfafb1ffa7cd0a892199df50dcd33f
-  data.tar.gz: 25c2b33f2c6427ad23fbbb0215b8c9a0f0bc84312d6751b13a5ee664db9e7b44e2c4bbaab419d0e89e266644cb0714175c18b2d80da69396dfc32459a54f9ff4
+  metadata.gz: 81129fe018764cbf1a2caa7d34a4a9affaf1e69288252535f9082730a785a8e2daa93eb3aa640d3368c6780c094a275dca5269a11b487764909f3a503bf5dd30
+  data.tar.gz: c68746b1ebbb456fd4e501a5815c2e338ffc5f09ec896757efe83a261f54533c7d7f913b251208f7122e6decae21bd51ffcfcee01ddf67682756878c44781ea6

data/CHANGELOG.adoc

@@ -5,6 +5,39 @@
 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.11 (2024-01-23) - @mojavelinux
+
+Enhancements::
+
+* upgrade prawn-svg dependency to 0.33.x (PR #2469)
+
+Improvements::
+
+* extract shared `smallcaps` method from `TextTransform#smallcaps_pcdata` to make it easier to override
+* assign node to `@node` instance variable on table instance to make it easer to access from Prawn::Table extension (#2471)
+
+Bug Fixes::
+
+* ensure color spaces are set on page before adding running content (#2477)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.11[git tag] | {url-repo}/compare/v2.3.10\...v2.3.11[full diff]
+
+== 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::

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.9, 2023-06-28
+v2.3.11, 2024-01-23
 // Settings:
 :experimental:
 :idprefix:

data/asciidoctor-pdf.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'matrix', '~> 0.4' # required until prawn >= 2.5.0 is released
   s.add_runtime_dependency 'prawn-table', '~> 0.2.0'
   s.add_runtime_dependency 'prawn-templates', '~> 0.1.0'
-  s.add_runtime_dependency 'prawn-svg', '~> 0.32.0'
+  s.add_runtime_dependency 'prawn-svg', '~> 0.33.0'
   s.add_runtime_dependency 'prawn-icon', '~> 3.0.0'
   s.add_runtime_dependency 'concurrent-ruby', '~> 1.1'
   s.add_runtime_dependency 'treetop', '~> 1.6.0'

data/lib/asciidoctor/pdf/converter.rb

@@ -166,6 +166,7 @@ module Asciidoctor
         doc.attributes['outline-title'] = '' if doc.attr_unspecified? 'outline-title'
         doc.attributes['pagenums'] = '' if doc.attr_unspecified? 'pagenums'
 
+        # NOTE: & prefix required here to pass resolved method as block of on_page_create method
         on_page_create(&(method :init_page).curry[doc])
 
         marked_page_number = page_number
@@ -377,7 +378,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'
@@ -632,7 +633,7 @@ module Asciidoctor
           return convert_abstract sect
         elsif (index_section = sectname == 'index') && @index.empty?
           # override numbered_title to hide entry from TOC
-          sect.define_singleton_method :numbered_title, &->(*) { '' }
+          sect.define_singleton_method :numbered_title, ->(*) { '' }
           return
         end
         title = sect.numbered_title formal: true
@@ -1048,7 +1049,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 +1070,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 +1422,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,16 +1803,13 @@ 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
                 rendered_w = (svg_obj.resize height: (rendered_h = available_h)).output_width if rendered_h > available_h
               end
               add_dest_for_block node if node.id
-              # NOTE: workaround to fix Prawn not adding fill and stroke commands on page that only has an image;
-              # breakage occurs when running content (stamps) are added to page
-              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
               # NOTE: prawn-svg does not compute :at for alignment correctly in column box, so resort to our own logic
@@ -1844,16 +1842,13 @@ 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
                 rendered_w = (image_info.calc_image_dimensions height: (rendered_h = available_h))[0] if rendered_h > available_h
               end
               add_dest_for_block node if node.id
-              # NOTE: workaround to fix Prawn not adding fill and stroke commands on page that only has an image;
-              # breakage occurs when running content (stamps) are added to page
-              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
               left = bounds.left
@@ -2030,15 +2025,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?
@@ -2149,7 +2144,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
@@ -2268,6 +2263,7 @@ module Asciidoctor
 
         left_padding = right_padding = nil
         table table_data, table_settings do
+          instance_variable_set :@node, node
           # NOTE: cell_style must be applied manually to be compatible with both prawn-table 0.2.2 and prawn-table 0.2.3
           cells.style cell_style
           @column_widths = column_widths unless column_widths.empty?
@@ -3590,7 +3586,16 @@ module Asciidoctor
 
         pagenums_enabled = doc.attr? 'pagenums'
         periphery_layout_cache = {}
-        # NOTE: this block is invoked during PDF generation, after #write -> #render_file and thus after #convert_document
+        # NOTE: Prawn fails to properly set color spaces on empty pages, but repeater relies on them
+        # prefer simpler fix below call to repeat; keep this workaround in case that workaround stops working
+        #(content_start_page_number..num_pages).each do |pgnum|
+        #  next if (disable_on_pages.include? pgnum) || (pg = state.pages[pgnum - 1]).imported_page? || !pg.graphic_state.color_space.empty?
+        #  go_to_page pgnum
+        #  set_color_space :fill, (color_space graphic_state.fill_color)
+        #  set_color_space :stroke, (color_space graphic_state.stroke_color)
+        #end
+        #go_to_page content_start_page_number if page_number != content_start_page_number
+        # NOTE: this block is invoked during PDF generation, during call to #write -> #render_file and thus after #convert_document
         repeat (content_start_page_number..num_pages), dynamic: true do
           pgnum = page_number
           # NOTE: don't write on pages which are imported / inserts (otherwise we can get a corrupt PDF)
@@ -3701,7 +3706,12 @@ module Asciidoctor
             end
           end
         end
-
+        # NOTE: force repeater to consult color spaces on current page instead of the page on which repeater was created
+        # if this stops working, use the commented code above repeat call instead
+        unless (repeater_graphic_state = repeaters[-1].instance_variable_get :@graphic_state).singleton_methods.include? :color_space
+          # NOTE: must convert override method to proc since we're are changing bind argument
+          repeater_graphic_state.define_singleton_method :color_space, (method :page_color_space).to_proc
+        end
         go_to_page prev_page_number
         nil
       end
@@ -3861,7 +3871,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
@@ -3935,7 +3945,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
@@ -4382,7 +4392,6 @@ module Asciidoctor
 
       def start_new_chapter chapter
         start_new_page unless at_page_top?
-        # TODO: must call update_colors before advancing to next page if start_new_page is called in ink_chapter_title
         start_new_page if @ppbook && verso_page? && !(chapter.option? 'nonfacing')
       end
 
@@ -4909,7 +4918,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)
@@ -5062,6 +5071,10 @@ module Asciidoctor
         nil
       end
 
+      def page_color_space
+        page.graphic_state.color_space
+      end
+
       def remove_tmp_files
         @tmp_files.reject! {|_, path| path ? (unlink_tmp_file path) : true }
       end

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

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

@@ -59,12 +59,16 @@ module Asciidoctor
 
       def smallcaps_pcdata string
         if XMLMarkupRx.match? string
-          string.gsub(PCDATAFilterRx) { $2 ? ($2.tr LowerAlphaChars, SmallCapsChars) : $1 }
+          string.gsub(PCDATAFilterRx) { $2 ? (smallcaps $2) : $1 }
         else
-          string.tr LowerAlphaChars, SmallCapsChars
+          smallcaps string
         end
       end
 
+      def smallcaps string
+        string.tr LowerAlphaChars, SmallCapsChars
+      end
+
       # Apply the text transform to the specified text.
       #
       # Supported transform values are "uppercase", "lowercase", or "none" (passed

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.9'
+    VERSION = '2.3.11'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.9
+  version: 2.3.11
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement