asciidoctor-pdf 2.3.12 → 2.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d4fcd7f484c87480980add66936d91a6fd83a96509a1a0bf54edbd297827d9
-  data.tar.gz: f87f24fe33309886cdad555f0a31981a6c23d50192611ee954fe25c722031bd7
+  metadata.gz: 39b6ad360fe1b653c7f0498edad3e45c8f76549e035f9dcdab76f088df362cbd
+  data.tar.gz: 81a541dc83a1aa325c3586fae64947e68128387634810512be01898b2096f684
 SHA512:
-  metadata.gz: c8496b8e15d1a3ea1c65da73e3a1233a71475fa972e384559a74a06e6b92d8454367dece149793719f915d687a1382160b75c38e86e21c62fc833f4bc1e6214b
-  data.tar.gz: 6c74e398c951bfc82637cfb8fe701f0c38849841a327016f987795451db0541c76d1a68a84c08a443d3142f8012f5b313feb6bd9993c3910929848a39a289fa4
+  metadata.gz: e6fd8480e6c642612fe12656aef7208afee65fa6a126b56aa366d11dc11078271fc1744cb92d3849131f3c0948d5ccff6c4a1041a779b4244ebc9fbd768d26b8
+  data.tar.gz: 17378df2c24a571bb63334b4b2fe030f00ad9010dcbfeadef0fd4b626551984897841af0916228eac5bd11ff44f134ea9e6abf46cdf6a4a9a570995eca11bdeb

data/CHANGELOG.adoc

@@ -5,6 +5,43 @@
 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)
+* 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
+
+{url-repo}/releases/tag/v2.3.13[git tag] | {url-repo}/compare/v2.3.12\...v2.3.13[full diff]
+
 == 2.3.12 (2024-02-02) - @mojavelinux
 
 Improvements::

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.12, 2024-02-02
+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

@@ -109,7 +109,7 @@ module Asciidoctor
       MeasurementPartsRx = /^(\d+(?:\.\d+)?)(in|mm|cm|p[txc])?$/
       PageSizeRx = /^(?:\[(#{MeasurementRxt}), ?(#{MeasurementRxt})\]|(#{MeasurementRxt})(?: x |x)(#{MeasurementRxt})|\S+)$/
       CalloutExtractRx = %r((?:(?://|#|--|;;) ?)?(\\)?<!?(|--)(\d+|\.)\2> ?(?=(?:\\?<!?\2(?:\d+|\.)\2> ?)*$))
-      ImageAttributeValueRx = /^image:{1,2}(.*?)\[(.*?)\]$/
+      ImageAttributeValueRx = /^\Aimage:{1,2}(.*?)\[(.*?)\]$\Z/
       StopPunctRx = /[.!?;:]$/
       UriBreakCharsRx = %r((?:/|\?|&amp;|#)(?!$))
       UriBreakCharRepl = %(\\&#{ZeroWidthSpace})
@@ -174,7 +174,7 @@ module Asciidoctor
         ink_cover_page doc, :front
         has_front_cover = page_number > marked_page_number
         doctype = doc.doctype
-        if (has_title_page = (title_page_on = doctype == 'book' || (doc.attr? 'title-page')) && (start_title_page doc))
+        if (has_title_page = (title_as_page = doctype == 'book' || (doc.attr? 'title-page')) && (start_title_page doc))
           # NOTE: the base font must be set before any content is written to the main or scratch document
           font @theme.base_font_family, size: @root_font_size, style: @theme.base_font_style
           if perform_on_single_page { ink_title_page doc }
@@ -189,7 +189,7 @@ module Asciidoctor
           font @theme.base_font_family, size: @root_font_size, style: @theme.base_font_style
         end
 
-        unless title_page_on
+        unless title_as_page
           body_start_page_number = page_number
           theme_font :heading, level: 1 do
             ink_general_heading doc, doc.doctitle, align: (@theme.heading_h1_text_align&.to_sym || :center), level: 1, role: :doctitle
@@ -200,10 +200,10 @@ module Asciidoctor
 
         indent_section do
           toc_num_levels = (doc.attr 'toclevels', 2).to_i
-          if (insert_toc = (doc.attr? 'toc') && !((toc_placement = doc.attr 'toc-placement') == 'macro' || toc_placement == 'preamble') && !(get_entries_for_toc doc).empty?)
+          if (toc_at_top = (doc.attr? 'toc') && !((toc_placement = doc.attr 'toc-placement') == 'macro' || toc_placement == 'preamble') && !(get_entries_for_toc doc).empty?)
             start_new_page if @ppbook && verso_page?
             add_dest_for_block doc, id: 'toc', y: (at_page_top? ? page_height : nil)
-            @toc_extent = allocate_toc doc, toc_num_levels, cursor, (title_page_on && theme.toc_break_after != 'auto')
+            @toc_extent = allocate_toc doc, toc_num_levels, cursor, (title_as_page && theme.toc_break_after != 'auto')
           else
             @toc_extent = nil
           end
@@ -215,7 +215,7 @@ module Asciidoctor
             min_start_at = 1
           end
 
-          if title_page_on
+          if title_as_page
             zero_page_offset = has_front_cover ? 1 : 0
             first_page_offset = has_title_page ? zero_page_offset.next : zero_page_offset
             body_offset = (body_start_page_number = page_number) - 1
@@ -228,8 +228,10 @@ module Asciidoctor
               when 'title'
                 running_content_start_at = 'toc' unless has_title_page
               when 'toc'
-                running_content_start_at = 'body' unless insert_toc
+                uses_start_at_toc = true
+                running_content_start_at = 'body' unless toc_at_top
               when 'after-toc'
+                uses_start_at_after_toc = true
                 running_content_start_at = 'body'
               end
             end
@@ -248,8 +250,10 @@ module Asciidoctor
               when 'title'
                 page_numbering_start_at = 'toc' unless has_title_page
               when 'toc'
-                page_numbering_start_at = 'body' unless insert_toc
+                uses_start_at_toc = true
+                page_numbering_start_at = 'body' unless toc_at_top
               when 'after-toc'
+                uses_start_at_after_toc = true
                 page_numbering_start_at = 'body'
               end
             end
@@ -303,12 +307,17 @@ module Asciidoctor
           end
 
           if (toc_extent = @toc_extent)
-            if title_page_on && !insert_toc
-              if @theme.running_content_start_at == 'after-toc' || @theme.page_numbering_start_at == 'after-toc' # rubocop:disable Style/SoleNestedConditional
-                last_toc_page = toc_extent.to.page
-                last_toc_page += 1 if @ppbook && (recto_page? last_toc_page)
-                num_front_matter_pages[0] = last_toc_page if @theme.running_content_start_at == 'after-toc'
-                num_front_matter_pages[1] = last_toc_page if @theme.page_numbering_start_at == 'after-toc'
+            if title_as_page && !toc_at_top && (uses_start_at_toc || uses_start_at_after_toc)
+              if uses_start_at_toc
+                toc_offset = toc_extent.from.page - 1
+                num_front_matter_pages[0] = toc_offset if @theme.running_content_start_at == 'toc'
+                num_front_matter_pages[1] = toc_offset if @theme.page_numbering_start_at == 'toc'
+              end
+              if uses_start_at_after_toc
+                after_toc_offset = toc_extent.to.page
+                after_toc_offset += 1 if @ppbook && (recto_page? after_toc_offset)
+                num_front_matter_pages[0] = after_toc_offset if @theme.running_content_start_at == 'after-toc'
+                num_front_matter_pages[1] = after_toc_offset if @theme.page_numbering_start_at == 'after-toc'
               end
             end
             toc_page_nums = ink_toc doc, toc_num_levels, toc_extent.from.page, toc_extent.from.cursor, num_front_matter_pages[1]
@@ -1449,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
@@ -1712,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'
@@ -1781,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'
@@ -1833,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
@@ -2368,8 +2377,16 @@ module Asciidoctor
         if ((doc = node.document).attr? 'toc-placement', placement) && (doc.attr? 'toc') && !(get_entries_for_toc doc).empty?
           start_toc_page node, placement if (is_book = doc.doctype == 'book')
           add_dest_for_block node, id: (node.id || 'toc') if is_macro
-          toc_extent = @toc_extent = allocate_toc doc, (doc.attr 'toclevels', 2).to_i, cursor, (title_page_on = is_book || (doc.attr? 'title-page'))
-          @index.start_page_number = toc_extent.to.page + 1 if title_page_on && @theme.page_numbering_start_at == 'after-toc'
+          toc_extent = @toc_extent = allocate_toc doc, (doc.attr 'toclevels', 2).to_i, cursor, (title_as_page = is_book || (doc.attr? 'title-page'))
+          if title_as_page
+            if @theme.page_numbering_start_at == 'toc'
+              @index.start_page_number = toc_extent.from.page
+            elsif @theme.page_numbering_start_at == 'after-toc'
+              new_start_page_number = toc_extent.to.page + 1
+              new_start_page_number += 1 if @ppbook && (verso_page? new_start_page_number)
+              @index.start_page_number = new_start_page_number
+            end
+          end
           if is_macro
             @disable_running_content[:header] += toc_extent.page_range if node.option? 'noheader'
             @disable_running_content[:footer] += toc_extent.page_range if node.option? 'nofooter'
@@ -4296,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/formatted_text/box.rb

@@ -33,7 +33,9 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
   end
 
   # help Prawn correctly resolve which font to analyze, including the font style
+  # also instruct Prawn to ignore fragment for inline image since the text is just a placeholder
   def analyze_glyphs_for_fallback_font_support fragment_hash
+    return [fragment_hash] if fragment_hash[:image_obj]
     fragment_font = fragment_hash[:font] || (original_font = @document.font.family)
     effective_font_styles = @document.font_styles
     fragment_font_opts = {}

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.12'
+    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.12
+  version: 2.3.14
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-02 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