asciidoctor-pdf 2.3.10 → 2.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53465d3756b672a087912f7052c98da2174506d348ae415702b6ad0923c35887
-  data.tar.gz: 81156616786953961b86a747720fdb1c92117a7645df0faba24b02e96bec4635
+  metadata.gz: f69f8ddf5bab91f37bd488a5d630c068f028d8d9f80e47ccbd601efeb23cfd4a
+  data.tar.gz: 2a66022080892dade89fdfab63e60d08e619ec0cf184a793267871464668cb53
 SHA512:
-  metadata.gz: 73d88491443fdafb5086bf4a122c3910631e547ef118b4ff4b23dffcbb315d7fb21a7335fc41db778b0d11bf5f851d3cae9df1b838fa342d3e5cf73cbe0f259d
-  data.tar.gz: cbd1fe371ed58d54c76770ef7abda45a080bb84dcbece1e5f60bda8a260668538ee5f71b92088b67ea71b9b29ed01cf6746fa9568a123366080a1e2fcdbb1c2e
+  metadata.gz: 81129fe018764cbf1a2caa7d34a4a9affaf1e69288252535f9082730a785a8e2daa93eb3aa640d3368c6780c094a275dca5269a11b487764909f3a503bf5dd30
+  data.tar.gz: c68746b1ebbb456fd4e501a5815c2e338ffc5f09ec896757efe83a261f54533c7d7f913b251208f7122e6decae21bd51ffcfcee01ddf67682756878c44781ea6

data/CHANGELOG.adoc

@@ -5,6 +5,25 @@
 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::

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.10, 2023-12-04
+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
@@ -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
@@ -1809,9 +1810,6 @@ module Asciidoctor
                 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
@@ -1851,9 +1849,6 @@ module Asciidoctor
                 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
@@ -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
@@ -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
 
@@ -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/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.10'
+    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.10
+  version: 2.3.11
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-04 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