asciidoctor-pdf 2.3.7 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1edfb9784918c61fecf4ae9023e92b2961442518878c826994159e8d3232cfb
-  data.tar.gz: 8d55eac503e02ef1191e9827057e29271de5cfa37579f83a2282512699fd2374
+  metadata.gz: f8c0a40b569d9103d197f7063f91e12ef370e22fe2b591cc628097ae78ac8dc2
+  data.tar.gz: af5b79bc2a7ce74f9bddd471bc6751c56ef0119b7c417a7bd5473d2f13638fbd
 SHA512:
-  metadata.gz: 26174878c46dfbe3e7f5050945bab49727d8b963c1e95bc76125f7999b62262eda1f29cdeaf03bea86e55bc14a5e480d3f703ed841ce9e1cc5194f6046cd3924
-  data.tar.gz: 9e2193b08b53f91f51c42175ce1d5ba7b589652da25f4e78d392be44e62a0249bd1b05c7ffbb5c9f18c753aefe6e60ad591f7774450d8c328fe3a4a8d5904424
+  metadata.gz: c2b0972adc236388028ecbd29af29f0bbd18889a2bd7229b2508769831db3882fd6123b500be4a11ce317c569e35fb5531dfafb1ffa7cd0a892199df50dcd33f
+  data.tar.gz: 25c2b33f2c6427ad23fbbb0215b8c9a0f0bc84312d6751b13a5ee664db9e7b44e2c4bbaab419d0e89e266644cb0714175c18b2d80da69396dfc32459a54f9ff4

data/CHANGELOG.adoc

@@ -5,6 +5,37 @@
 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.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::
+
+* do not attempt to fit inline image in normal table cell to computed height of cell (#2428)
+* support `fit=none` attribute on inline image to prevent image from being scaled down to fit available height (#2428)
+
+Bug Fixes::
+
+* 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::
+
+* bump upper Ruby version from 3.1 to 3.2 in CI workflow
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.8[git tag] | {url-repo}/compare/v2.3.7\...v2.3.8[full diff]
+
 == 2.3.7 (2023-04-16) - @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.7, 2023-04-16
+v2.3.9, 2023-06-28
 // Settings:
 :experimental:
 :idprefix:

data/lib/asciidoctor/pdf/converter.rb

@@ -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
@@ -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)

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

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/prawn-table/cell/text.rb

@@ -10,11 +10,9 @@ class Prawn::Table::Cell::Text
   def draw_content
     with_font do
       self.valign = [:center, -font.descender * 0.5] if valign == :center
+      (bounds = @pdf.bounds).instance_variable_set :@table_cell, true
       remaining_text = with_text_color do
-        (text_box \
-          width: spanned_content_width + FPTolerance,
-          height: spanned_content_height + FPTolerance,
-          at: [0, @pdf.cursor]).render
+        (text_box width: bounds.width, height: bounds.height, at: [0, @pdf.cursor]).render
       end
       unless remaining_text.empty? || @pdf.scratch?
         logger.error message_with_context %(the table cell on page #{@pdf.page_number} has been truncated; Asciidoctor PDF does not support table cell content that exceeds the height of a single page), source_location: @source_location

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

@@ -63,7 +63,15 @@ module Asciidoctor::PDF::FormattedText
           image_w = [available_w, pctidx ? (image_w.to_f / 100 * available_w) : image_w.to_f].min
         end
 
-        max_image_h = fragment[:image_fit] == 'line' ? [available_h, doc.font.height].min : available_h
+        if (fit = fragment[:image_fit]) === 'line'
+          max_image_h = [available_h, doc.font.height].min
+        elsif fit == 'none'
+          max_image_h = doc.margin_box.height
+        elsif doc.bounds.instance_variable_get :@table_cell
+          max_image_h = doc.bounds.parent.height
+        else
+          max_image_h = available_h
+        end
 
         # TODO: make helper method to calculate width and height of image
         if image_format == 'svg'

data/lib/asciidoctor/pdf/optimizer.rb

@@ -6,6 +6,9 @@ require 'rghost/gs_alone'
 require 'tmpdir'
 autoload :Open3, 'open3'
 
+# rghost still uses File.exists?
+File.singleton_class.alias_method :exists?, :exist? unless File.respond_to? :exists?
+
 RGhost::GSAlone.prepend (Module.new do
   def initialize params, debug
     (@params = params.dup).push(*(@params.pop.split File::PATH_SEPARATOR))

data/lib/asciidoctor/pdf/sanitizer.rb

@@ -19,11 +19,11 @@ module Asciidoctor
         'nbsp' => ' ',
         'quot' => '"',
       }).default = '?'
-      SanitizeXMLRx = /<[^>]+>/
+      SanitizeXMLRx = /<[^>]+>\0?/
       CharRefRx = /&(?:amp;)?(?:([a-z][a-z]+\d{0,2})|#(?:(\d\d\d{0,4})|x(\h\h\h{0,3})));/
       UnescapedAmpersandRx = /&(?!(?:[a-z][a-z]+\d{0,2}|#(?:\d\d\d{0,4}|x\h\h\h{0,3}));)/
 
-      # Strip leading, trailing and repeating whitespace, remove XML tags and
+      # Strip leading, trailing and repeating whitespace, remove XML tags along with an enclosed null character, and
       # resolve all entities in the specified string.
       #
       # FIXME: move to a module so we can mix it in elsewhere

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.7'
+    VERSION = '2.3.9'
   end
 end

metadata

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