asciidoctor-pdf 2.3.6 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe3647066c0eb782783dc3c76aa5b179637088729e48cbf49659c6a755ee92b
-  data.tar.gz: 945e6675e7d2e4073bbb3779824f6e65d75d237da22416c39212f3e501175606
+  metadata.gz: 5a1b77004c38f0efc5a577f0ab5222f42b66398f70d5347e333d906616734aeb
+  data.tar.gz: 42ebc021e2b392e1b159ed0c473250b67d7e6c1f308dd7af282c61d6464538b5
 SHA512:
-  metadata.gz: 69dfbad655ec87a98630d269654b007a9590b5107ce68e9c9b0c66fcead3d8735afa865d7bb8260af81c7f36cf9848a974655f950b0ae8538448adc994e84f2d
-  data.tar.gz: 469e1fe5e4d2d3f4e9dcf2b46f2fefb85fc45011710c751d52d4c09f86d4e212098e7a386af17ce6fe4ebe452efe613f57148373b667b1872e2a8a76d4eff53f
+  metadata.gz: '03019b94151e1fdfc90e3d4cfc2cd25b115f936300e4982a0b62903108ed54429dbaee451b0b6d86a6b10d51a7db6da87acd0f34065773c2438f32fd0fd1e899'
+  data.tar.gz: f91b9506aa4242e9c253e0cbb5bce32666253a4af775891ab1378b5c3d48d390af45683f159fa9ce6cb26865da8f5f46320558e5929b57a41194958c83736eda

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.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 santizing 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::
+
+* don't crash if source block with custom subs is empty and source highlighter is enabled
+* add workaround for JRuby on Windows when value of `imagesdir` attribute is absolute and contains non-ASCII characters
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.7[git tag] | {url-repo}/compare/v2.3.6\...v2.3.7[full diff]
+
 == 2.3.6 (2023-04-09) - @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.6, 2023-04-09
+v2.3.8, 2023-06-25
 // Settings:
 :experimental:
 :idprefix:

data/lib/asciidoctor/pdf/converter.rb

@@ -1079,8 +1079,9 @@ module Asciidoctor
                   callouts_enabled = false
                 end
                 subs[highlight_idx] = :specialcharacters
+                source_string = node.content || ''
                 # NOTE: indentation guards will be added by the source highlighter logic
-                source_string = expand_tabs unescape_xml (sanitize node.content, compact: false)
+                source_string = expand_tabs unescape_xml (sanitize source_string, compact: false) unless source_string.empty?
                 node.lines.replace saved_lines if saved_lines
               end
             else

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

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 File.singleton_class.prepend (Module.new do
+  # NOTE: see https://github.com/jruby/jruby/issues/7750
+  def absolute_path path, dir = nil
+    return super unless dir && !(absolute_path? path)
+    super File.join dir, path
+  end
+
   # 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)

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/version.rb

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

metadata

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