asciidoctor-pdf 2.3.5 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184bc10cddae48122341892c25f9d8cecdb3beeb85497e29a5171eae78185837
-  data.tar.gz: 3928a499726157b753b6d7a8241ccd7f5bfcd271c3bd671d691d608b58c04b54
+  metadata.gz: f1edfb9784918c61fecf4ae9023e92b2961442518878c826994159e8d3232cfb
+  data.tar.gz: 8d55eac503e02ef1191e9827057e29271de5cfa37579f83a2282512699fd2374
 SHA512:
-  metadata.gz: e3fa4c82f148cbe554b117fad1b86330658948ad2f1ec18de0b6e7d82304bdcf7999c57a45a6d0d4e3f71d1a6a0cb4e95931788abd9d8aba95652100c20e888e
-  data.tar.gz: 394395230c7c484ae2c3b214cf50f9d2e635897c25dbad3032a1d1c7f270a449ba3b096c901891cc109835273ac7f705940a6a8deedbcff00bbb2cdc2bb5bf17
+  metadata.gz: 26174878c46dfbe3e7f5050945bab49727d8b963c1e95bc76125f7999b62262eda1f29cdeaf03bea86e55bc14a5e480d3f703ed841ce9e1cc5194f6046cd3924
+  data.tar.gz: 9e2193b08b53f91f51c42175ce1d5ba7b589652da25f4e78d392be44e62a0249bd1b05c7ffbb5c9f18c753aefe6e60ad591f7774450d8c328fe3a4a8d5904424

data/CHANGELOG.adoc

@@ -5,6 +5,27 @@
 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.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::
+
+* rework `File.absolute_path?` patch so it returns correct response when running on JRuby
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.6[git tag] | {url-repo}/compare/v2.3.5\...v2.3.6[full diff]
+
 == 2.3.5 (2023-03-31) - @mojavelinux
 
 Enhancements::

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.5, 2023-03-31
+v2.3.7, 2023-04-16
 // 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
@@ -3709,7 +3710,7 @@ module Asciidoctor
             if logo_image_from_theme
               relative_to_imagesdir = false
               logo_image_path = apply_subs_discretely doc, $1, subs: [:attributes], imagesdir: @themesdir
-              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless doc.is_uri? logo_image_path
+              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless (::File.absolute_path? logo_image_path) || (doc.is_uri? logo_image_path)
             else
               relative_to_imagesdir = true
               logo_image_path = $1
@@ -3719,7 +3720,7 @@ module Asciidoctor
             relative_to_imagesdir = false
             if logo_image_from_theme
               logo_image_path = apply_subs_discretely doc, logo_image_path, subs: [:attributes], imagesdir: @themesdir
-              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless doc.is_uri? logo_image_path
+              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless (::File.absolute_path? logo_image_path) || (doc.is_uri? logo_image_path)
             end
           end
           if (::Asciidoctor::Image.target_and_format logo_image_path)[1] == 'pdf'

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

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
-class File
-  # NOTE: remove once minimum JRuby version is fully 2.7 compliant
-  def self.absolute_path? path
-    (::Pathname.new path).absolute?
-  end unless respond_to? :absolute_path?
-end
+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)
+  end
+end) if RUBY_ENGINE == 'jruby'

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.5'
+    VERSION = '2.3.7'
   end
 end

metadata

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