asciidoctor-pdf 2.3.13 → 2.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c9cfc31dfbf69e0d550a21fcb6cfa92f8e8310ea03f7e45e058af969b6e671b
-  data.tar.gz: d994b9f9e4b7cceaedabc388e868806f3769a8dbcfa0ba043d1061a7e0cdb939
+  metadata.gz: 39b6ad360fe1b653c7f0498edad3e45c8f76549e035f9dcdab76f088df362cbd
+  data.tar.gz: 81a541dc83a1aa325c3586fae64947e68128387634810512be01898b2096f684
 SHA512:
-  metadata.gz: ecf1efe60ea4baa8935f7fb952c70303d8beda90d6d28684c7492fa0135dc71961699f82fbca808a12e16a29e975f645fd4e4a2ae84579ee4966fdba5a89f558
-  data.tar.gz: 2ebd69f420f484b423853519e034c54c36070b37a70accf3cf8ef83406db66c7f96bb0c8f8e0f141a67a8059a8cbdba88253dde6c75468c94864d37df3fa11c2
+  metadata.gz: e6fd8480e6c642612fe12656aef7208afee65fa6a126b56aa366d11dc11078271fc1744cb92d3849131f3c0948d5ccff6c4a1041a779b4244ebc9fbd768d26b8
+  data.tar.gz: 17378df2c24a571bb63334b4b2fe030f00ad9010dcbfeadef0fd4b626551984897841af0916228eac5bd11ff44f134ea9e6abf46cdf6a4a9a570995eca11bdeb

data/CHANGELOG.adoc

@@ -5,14 +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.14 (2024-03-08) - @mojavelinux
+
+Improvements::
+
+* upgrade prawn-svg to 0.34 to add support for SVG referenced by image tag (SVG in SVG)
+
+Bug Fixes::
+
+* propagate source location to table cell for description in horizontal dlist so it is included in truncation warning message (#2502)
+* eradicate use of the base64 library to fix warning about base64 gem when using Ruby >= 3.3
+* upgrade prawn-svg to 0.34 to fix warning about base64 gem when using Ruby >= 3.3; apply additional patch to fix bug in prawn-svg
+
+Build / Infrastructure::
+
+* bump upper Ruby version to 3.3 in CI workflow
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.14[git tag] | {url-repo}/compare/v2.3.13\...v2.3.14[full diff]
+
 == 2.3.13 (2024-02-16) - @mojavelinux
 
+Improvements::
+
+* support toc start at value for page numbering and running content when toc is added using macro (#2489)
+
 Bug Fixes::
 
 * don't drop text on line above inline image macro in running content value (#2495)
 * when looking for a value that only contains an image macro, match the whole string instead of per line (#2495)
 * don't warn about missing character in fallback font when inline image is advanced to next page (#2492)
-* support toc start at value for page numbering and running content when toc is added using macro (#2489)
 * fix page number of index entries in prepress book when page numbering starts at toc or after toc and toc is inserted using macro (#2487)
 
 === Details

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.13, 2024-02-16
+v2.3.14, 2024-03-08
 // 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.33.0'
+  s.add_runtime_dependency 'prawn-svg', '~> 0.34.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

@@ -1458,7 +1458,7 @@ module Asciidoctor
               desc_container = Block.new node, :open
               desc_container << (Block.new desc_container, :paragraph, source: (desc.instance_variable_get :@text), subs: :default) if desc.text?
               desc.blocks.each {|b| desc_container << b.dup } if desc.blocks?
-              row_data << { content: (::Prawn::Table::Cell::AsciiDoc.new self, content: (item[1] = desc_container), text_color: @font_color, padding: desc_padding, valign: :top) }
+              row_data << { content: (::Prawn::Table::Cell::AsciiDoc.new self, content: (item[1] = desc_container), text_color: @font_color, padding: desc_padding, valign: :top, source_location: desc.source_location) }
             else
               row_data << {}
             end
@@ -1721,7 +1721,7 @@ module Asciidoctor
         if image_format == 'gif' && !(defined? ::GMagick::Image)
           log :warn, %(GIF image format not supported. Install the prawn-gmagick gem or convert #{target} to PNG.)
           image_path = nil
-        elsif ::Base64 === target
+        elsif ::Asciidoctor::Image::Base64Encoded === target
           image_path = target
         elsif (image_path = resolve_image_path node, target, image_format, (opts.fetch :relative_to_imagesdir, true))
           if image_format == 'pdf'
@@ -1790,8 +1790,8 @@ module Asciidoctor
           rendered_h = rendered_w = nil
           span_page_width_if align_to_page do
             if image_format == 'svg'
-              if ::Base64 === image_path
-                svg_data = ::Base64.decode64 image_path
+              if ::Asciidoctor::Image::Base64Encoded === image_path
+                svg_data = image_path.unpack1 'm'
                 file_request_root = false
               else
                 svg_data = ::File.read image_path, mode: 'r:UTF-8'
@@ -1842,8 +1842,8 @@ module Asciidoctor
             else
               # FIXME: this code really needs to be better organized!
               # NOTE: use low-level API to access intrinsic dimensions; build_image_object caches image data previously loaded
-              image_obj, image_info = ::Base64 === image_path ?
-                  ::StringIO.open((::Base64.decode64 image_path), 'rb') {|fd| build_image_object fd } :
+              image_obj, image_info = ::Asciidoctor::Image::Base64Encoded === image_path ?
+                  ::StringIO.open((image_path.unpack1 'm'), 'rb') {|fd| build_image_object fd } :
                   ::File.open(image_path, 'rb') {|fd| build_image_object fd }
               actual_w = to_pt image_info.width, :px
               width = actual_w * scale if scale
@@ -4313,11 +4313,11 @@ module Asciidoctor
         end
         @tmp_files ||= {}
         # NOTE: base64 logic currently used for inline images
-        if ::Base64 === image_path
+        if ::Asciidoctor::Image::Base64Encoded === image_path
           return @tmp_files[image_path] if @tmp_files.key? image_path
           tmp_image = ::Tempfile.create %W(image- .#{image_format})
           tmp_image.binmode unless image_format == 'svg'
-          tmp_image.write ::Base64.decode64 image_path
+          tmp_image.write image_path.unpack1 'm'
           tmp_image.close
           @tmp_files[image_path] = tmp_image.path
         # NOTE: this will catch a classloader resource path on JRuby (e.g., uri:classloader:/path/to/image)

data/lib/asciidoctor/pdf/ext/asciidoctor/image.rb

@@ -2,6 +2,7 @@
 
 module Asciidoctor
   module Image
+    Base64Encoded = ::Module.new
     DataUriRx = %r(^data:image/(?<fmt>png|jpe?g|gif|pdf|bmp|tiff|svg\+xml);base64,(?<data>.*)$)
     FormatAliases = { 'jpg' => 'jpeg', 'svg+xml' => 'svg' }
 
@@ -11,7 +12,7 @@ module Asciidoctor
 
     def self.target_and_format image_path, attributes = nil
       if (image_path.start_with? 'data:') && (m = DataUriRx.match image_path)
-        [(m[:data].extend ::Base64), (FormatAliases.fetch m[:fmt], m[:fmt])]
+        [(m[:data].extend Base64Encoded), (FormatAliases.fetch m[:fmt], m[:fmt])]
       else
         [image_path, attributes&.[]('format') || ((ext = ::File.extname image_path).downcase.slice 1, ext.length)]
       end
@@ -20,7 +21,7 @@ module Asciidoctor
     def target_and_format
       image_path = inline? ? target : (attr 'target')
       if (image_path.start_with? 'data:') && (m = DataUriRx.match image_path)
-        [(m[:data].extend ::Base64), (FormatAliases.fetch m[:fmt], m[:fmt])]
+        [(m[:data].extend Base64Encoded), (FormatAliases.fetch m[:fmt], m[:fmt])]
       else
         [image_path, (attr 'format', nil, false) || ((ext = ::File.extname image_path).downcase.slice 1, ext.length)]
       end

data/lib/asciidoctor/pdf/ext/prawn-svg/elements/use.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# see https://github.com/mogest/prawn-svg/issues/164
+Prawn::SVG::Elements::Use.prepend (Module.new do
+  def parse
+    result = super
+    if @referenced_element_source.name == 'symbol' && !(@referenced_element_source.attributes.key? 'viewBox')
+      @referenced_element_class = Prawn::SVG::Elements::Container
+    end
+    result
+  end
+end)

data/lib/asciidoctor/pdf/ext/prawn-svg.rb

@@ -3,6 +3,7 @@
 require 'prawn-svg'
 require_relative 'prawn-svg/calculators/document_sizing'
 require_relative 'prawn-svg/elements/image'
+require_relative 'prawn-svg/elements/use'
 require_relative 'prawn-svg/loaders/data'
 require_relative 'prawn-svg/loaders/file'
 require_relative 'prawn-svg/loaders/web'

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.13'
+    VERSION = '2.3.14'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.3.14
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.33.0
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: prawn-icon
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - lib/asciidoctor/pdf/ext/prawn-svg.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/calculators/document_sizing.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/elements/image.rb
+- lib/asciidoctor/pdf/ext/prawn-svg/elements/use.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/loaders/data.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/loaders/file.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/loaders/web.rb
@@ -335,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn