asciidoctor-pdf 2.0.5 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c80f2acfd251ff6721a173c153551989ca3372a3a51ddbf628176f24dd84f5f
-  data.tar.gz: 19c675f8b088711366559a831dcea41e2008a242dc4e19a321f7e40df50e1acf
+  metadata.gz: cd47554913fab2e3f8002491a92c430e0dbfe48b9177705470ffa7c64155289b
+  data.tar.gz: 580c0c9e6a46e5614927f42c4ad309e303dd69681bf10ddb674241cd930e6b31
 SHA512:
-  metadata.gz: 994846a17ff30b567e29a7a14f63c8d74348ac1644a4bd9ce1d85e687736c8f0a241a5f1fa91a84c52b3ecb9c66ef68701162bdf53fd7e5733c4e6df7b19f81b
-  data.tar.gz: 3889ba7c0cee283800c613a6d8d5e2c34b29d1cccb3d68a5d83c09c9ff300e1550c6cf28ffdc5b3b3873a35f14b6ad2b90a75f6e97431d0667c6c4b62a1e5a79
+  metadata.gz: 326e87435e664dde2e944b878d2c5c9a5b71cfd285da78115331a8cd14e20f2aaa0cb2b81779bc99ca8642df004ef03f60386a971e9176eb03d17755a9db951b
+  data.tar.gz: 7d7cd662e4bbe5df6d10c057e2f00a1a1c800f0e5a3e4f7731c94b657b0bf6ec51599e88d42dbd806a1e4bf991e54282c4efb820b0d39912ed34a74d25f89ff4

data/CHANGELOG.adoc

@@ -5,6 +5,56 @@
 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.0.8 (2022-06-08) - @mojavelinux
+
+Improvements::
+
+* encapsulate logic to adjust column box inside float and dry run
+* automatically set height on column box if not specified; update value automatically when reflowing margins
+
+Bug Fixes::
+
+* correctly compute value of to cursor on extent when column box starts below top of page (#2230)
+* fix crash in `ColumnBox#move_past_bottom` when `:reflow_margins` option is not set
+* fix x position of SVG when advanced to next column of column box
+* `at_page_top?` should consider top of column box to be top of page
+* prevent SVG image taller than column from being advanced to next column
+* don't push section that follows index section in article to new page if last page of index does not extend to bottom of page
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.8[git tag] | {url-repo}/compare/v2.0.7\...v2.0.8[full diff]
+
+== 2.0.7 (2022-06-03) - @mojavelinux
+
+Improvements::
+
+* don't recommend prawn-gmagick if PNG or JPG is corrupt or incomplete
+* add helper method to determine when to recommend the prawn-gmagick gem
+
+Bug Fixes::
+
+* fix crash when doctitle or section title with automatic ID contains inline image without explicit width (#2228)
+* use prawn-gmagick, if available, to read raster image referenced by SVG (#2223)
+* allow image path in SVG to refer to any location within Asciidoctor jail (no restriction if safe mode is unsafe) (#1941)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.7[git tag] | {url-repo}/compare/v2.0.6\...v2.0.7[full diff]
+
+== 2.0.6 (2022-05-30) - @mojavelinux
+
+Bug Fixes::
+
+* indent content of collapsible block and apply bottom margin to match style of HTML output (#2219)
+* patch prawn-gmagick to reread bit depth of a PNG image if it extracts the wrong value (#2216)
+* interpret width of SVG correctly when width is defined in file using px units (#2215)
+* don't crash if inline role defines border width but not border color
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.6[git tag] | {url-repo}/compare/v2.0.5\...v2.0.6[full diff]
+
 == 2.0.5 (2022-05-26) - @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.0.5, 2022-05-26
+v2.0.8, 2022-06-08
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 2.0.x
-:release-version: 2.0.5
+:release-version: 2.0.8
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf
@@ -62,7 +62,7 @@ Asciidoctor PDF converts an AsciiDoc document directly to a PDF document.
 The style and layout of the PDF are controlled by a dedicated theme file.
 To the degree possible, Asciidoctor PDF supports all the features of AsciiDoc that are supported by Asciidoctor.
 It also provides {url-project-docs}/features/[PDF-specific features].
-However, there are {url-project-docs}/features/#limitations[certain limits] imposed by the PDF format and the PDF library this extension uses.
+However, there are {url-project-docs}/features/#limitations[certain limitations] imposed by the PDF format and the PDF library this extension uses.
 
 Asciidoctor PDF uses the Prawn gem and Prawn's extensions, such as prawn-svg and prawn-table, to generate a PDF document.
 {url-prawn}[Prawn] is a general purpose PDF generator for Ruby that features high-level APIs for common needs like setting up the page and inserting images and low-level APIs for positioning and rendering text and graphics.
@@ -182,7 +182,7 @@ Asciidoctor creates the output file in the same directory as the input file by d
 Open the [.path]_basic-example.pdf_ file with a PDF viewer to see the result.
 
 .Example PDF document rendered in a PDF viewer
-image::docs/modules/ROOT/images/basic-example-pdf-screenshot.png[Screenshot of PDF document,960,540,pdfwidth=100%]
+image::docs/modules/ROOT/images/basic-example-pdf-screenshot.png[Screenshot of PDF document,960,pdfwidth=100%]
 
 For more information about how to use Asciidoctor PDF and PDF-specific AsciiDoc syntax, see the {url-project-docs}/[Asciidoctor PDF documentation].
 

data/lib/asciidoctor/pdf/converter.rb

@@ -6,9 +6,6 @@ require_relative 'pdfmark'
 require_relative 'roman_numeral'
 require_relative 'section_info_by_page'
 
-autoload :StringIO, 'stringio'
-autoload :Tempfile, 'tempfile'
-
 module Asciidoctor
   module PDF
     class Converter < ::Prawn::Document
@@ -23,6 +20,8 @@ module Asciidoctor
 
       attr_reader :cache_uri
 
+      attr_reader :jail_dir
+
       attr_accessor :font_color
 
       attr_accessor :font_scale
@@ -153,7 +152,7 @@ module Asciidoctor
           log :warn, %(missing convert handler for #{name} node in #{@backend} backend)
         end
         # NOTE: inline node handlers generate HTML-like strings; all other handlers write directly to the PDF object
-        ::Asciidoctor::Inline === node ? result : self
+        node.inline? ? result : self
       end
 
       def convert_document doc
@@ -163,7 +162,6 @@ module Asciidoctor
         doc.attributes['outline'] = '' unless (doc.attribute_locked? 'outline') || ((doc.instance_variable_get :@attributes_modified).include? 'outline')
         doc.attributes['outline-title'] = '' unless (doc.attribute_locked? 'outline-title') || ((doc.instance_variable_get :@attributes_modified).include? 'outline-title')
         doc.attributes['pagenums'] = '' unless (doc.attribute_locked? 'pagenums') || ((doc.instance_variable_get :@attributes_modified).include? 'pagenums')
-        #assign_missing_section_ids doc
 
         on_page_create(&(method :init_page))
 
@@ -339,7 +337,11 @@ module Asciidoctor
         #@page_opts = { size: pdf_opts[:page_size], layout: pdf_opts[:page_layout] }
         ((::Prawn::Document.instance_method :initialize).bind self).call pdf_opts
         renderer.min_version (@pdf_version = PDFVersions[doc.attr 'pdf-version'])
-        @media = doc.attr 'media', 'screen'
+        @tmp_files ||= {}
+        @allow_uri_read = doc.attr? 'allow-uri-read'
+        @cache_uri = doc.attr? 'cache-uri'
+        @jail_dir = doc.safe < ::Asciidoctor::SafeMode::SAFE ? nil : doc.base_dir
+        @media ||= doc.attr 'media', 'screen'
         @page_margin_by_side = { recto: (page_margin_recto = page_margin), verso: (page_margin_verso = page_margin), cover: page_margin }
         case doc.attr 'pdf-folio-placement', (@media == 'prepress' ? 'physical' : 'virtual')
         when 'physical'
@@ -364,13 +366,6 @@ module Asciidoctor
         else
           @ppbook = nil
         end
-        # QUESTION: should ThemeLoader handle registering fonts instead?
-        register_fonts theme.font_catalog, ((doc.attr 'pdf-fontsdir')&.sub '{docdir}', (doc.attr 'docdir')) || 'GEM_FONTS_DIR'
-        default_kerning theme.base_font_kerning != 'none'
-        @fallback_fonts = Array theme.font_fallbacks
-        @allow_uri_read = doc.attr? 'allow-uri-read'
-        @cache_uri = doc.attr? 'cache-uri'
-        @tmp_files = {}
         if (bg_image = resolve_background_image doc, theme, 'page-background-image')&.first
           @page_bg_image = { verso: bg_image, recto: bg_image }
         else
@@ -383,6 +378,10 @@ module Asciidoctor
           @page_bg_image[:recto] = bg_image[0] && bg_image
         end
         @page_bg_color = resolve_theme_color :page_background_color, 'FFFFFF'
+        # QUESTION: should ThemeLoader handle registering fonts instead?
+        register_fonts theme.font_catalog, ((doc.attr 'pdf-fontsdir')&.sub '{docdir}', (doc.attr 'docdir')) || 'GEM_FONTS_DIR'
+        default_kerning theme.base_font_kerning != 'none'
+        @fallback_fonts = Array theme.font_fallbacks
         @root_font_size = theme.base_font_size
         @font_scale = 1
         @font_color = theme.base_font_color
@@ -703,6 +702,7 @@ module Asciidoctor
       def convert_index_section node
         space_needed_for_category = @theme.description_list_term_spacing + (2 * (height_of_typeset_text 'A'))
         pagenum_sequence_style = node.document.attr 'index-pagenum-sequence-style'
+        end_cursor = nil
         column_box [0, cursor], columns: @theme.index_columns, width: bounds.width, reflow_margins: true, spacer: @theme.index_column_gap do
           @index.categories.each do |category|
             bounds.move_past_bottom if space_needed_for_category > cursor
@@ -714,7 +714,10 @@ module Asciidoctor
             category.terms.each {|term| convert_index_list_item term, pagenum_sequence_style }
             @theme.prose_margin_bottom > cursor ? bounds.move_past_bottom : (move_down @theme.prose_margin_bottom)
           end
+          end_cursor = cursor if bounds.current_column == 0
         end
+        # Q: could we move this logic into column_box?
+        move_cursor_to end_cursor if end_cursor
         nil
       end
 
@@ -939,7 +942,7 @@ module Asciidoctor
                           height: label_height,
                           fallback_font_name: fallback_svg_font_name,
                           enable_web_requests: allow_uri_read ? (method :load_open_uri).to_proc : false,
-                          enable_file_requests_with_root: (::File.dirname icon_path),
+                          enable_file_requests_with_root: { base: (::File.dirname icon_path), root: @jail_dir },
                           cache_images: cache_uri
                         svg_obj.resize height: label_height if svg_obj.document.sizing.output_height > label_height
                         svg_obj.draw
@@ -1167,8 +1170,26 @@ module Asciidoctor
       alias convert_literal convert_code
       alias convert_listing_or_literal convert_code
 
+      def convert_collapsible node
+        id = node.id
+        title = (collapsible_marker = %(\u25bc )) + (node.title? ? node.title : 'Details')
+        indent_by = theme_font(:caption) { rendered_width_of_string collapsible_marker }
+        if !at_page_top? && (id || (node.option? 'unbreakable'))
+          arrange_block node do
+            add_dest_for_block node if id
+            tare_first_page_content_stream { ink_caption title }
+            indent(indent_by) { traverse node }
+          end
+        else
+          add_dest_for_block node if id
+          tare_first_page_content_stream { ink_caption title }
+          indent(indent_by) { traverse node }
+        end
+        theme_margin :block, :bottom, (next_enclosed_block node)
+      end
+
       def convert_example node
-        return convert_open node if node.option? 'collapsible'
+        return convert_collapsible node if node.option? 'collapsible'
         caption_bottom = @theme.example_caption_end&.to_sym == :bottom
         arrange_block node do |extent|
           add_dest_for_block node if node.id
@@ -1193,14 +1214,12 @@ module Asciidoctor
         if !at_page_top? && (has_title || id || (node.option? 'unbreakable'))
           arrange_block node do
             add_dest_for_block node if id
-            tare_first_page_content_stream do
-              node.context == :example ? (ink_caption %(\u25bc #{node.title})) : (ink_caption node, labeled: false)
-            end if has_title
+            tare_first_page_content_stream { ink_caption node, labeled: false } if has_title
             traverse node
           end
         else
           add_dest_for_block node if id
-          node.context == :example ? (ink_caption %(\u25bc #{node.title})) : (ink_caption node, labeled: false) if has_title
+          ink_caption node, labeled: false if has_title
           traverse node
         end
       end
@@ -1718,7 +1737,7 @@ module Asciidoctor
                 file_request_root = false
               else
                 svg_data = ::File.read image_path, mode: 'r:UTF-8'
-                file_request_root = ::File.dirname image_path
+                file_request_root = { base: (::File.dirname image_path), root: @jail_dir }
               end
               svg_obj = ::Prawn::SVG::Interface.new svg_data, self,
                 position: alignment,
@@ -1736,6 +1755,7 @@ module Asciidoctor
               if (rendered_h = svg_size.output_height) > (available_h = cursor - caption_h)
                 unless pinned || at_page_top?
                   advance_page
+                  (svg_obj.options[:at] = svg_obj.position)[0] += bounds.left if ColumnBox === bounds
                   available_h = cursor - caption_h
                 end
                 rendered_w = (svg_obj.resize height: (rendered_h = available_h)).output_width if rendered_h > available_h
@@ -1798,7 +1818,7 @@ module Asciidoctor
           end
         rescue => e
           raise if ::StopIteration === e
-          on_image_error :exception, node, target, (opts.merge align: alignment, message: %(could not embed image: #{image_path}; #{e.message}#{::Prawn::Errors::UnsupportedImageType === e && !(defined? ::GMagick::Image) ? '; install prawn-gmagick gem to add support' : ''}))
+          on_image_error :exception, node, target, (opts.merge align: alignment, message: %(could not embed image: #{image_path}; #{e.message}#{(recommend_prawn_gmagick? e, image_format) ? %(; install prawn-gmagick gem to add support for #{image_format&.upcase || 'unknown'} image format) : ''}))
         end
       end
 
@@ -2492,14 +2512,19 @@ module Asciidoctor
           # NOTE: an image with a data URI is handled using a temporary file
           elsif (image_path = resolve_image_path node, target, image_format)
             if ::File.readable? image_path
+              class_attr = (role = node.role) ? %( class="#{role}") : ''
+              fit_attr = (fit = node.attr 'fit') ? %( fit="#{fit}") : ''
               if (width = resolve_explicit_width node.attributes)
-                width += (intrinsic_image_dimensions image_path, image_format)[:width].to_s if node.parent.context == :table_cell && ::String === width && (width.end_with? '%')
+                if node.parent.context == :table_cell && ::String === width && (width.end_with? '%')
+                  width += (intrinsic_image_dimensions image_path, image_format)[:width].to_s
+                end
+                width_attr = %( width="#{width}")
+              elsif state # check that converter is initialized
+                width_attr = %( width="#{(intrinsic_image_dimensions image_path, image_format)[:width]}")
               else
-                width = (intrinsic_image_dimensions image_path, image_format)[:width]
+                width_attr = ' width="auto"' # defer operation until arranger runs
               end
-              class_attr = (role = node.role) ? %( class="#{role}") : ''
-              fit_attr = (fit = node.attr 'fit') ? %( fit="#{fit}") : ''
-              img = %(<img src="#{image_path}" format="#{image_format}" alt="#{encode_quotes node.attr 'alt'}" width="#{width}"#{class_attr}#{fit_attr}>)
+              img = %(<img src="#{image_path}" format="#{image_format}" alt="#{encode_quotes node.attr 'alt'}"#{width_attr}#{class_attr}#{fit_attr}>)
             else
               log :warn, %(image to embed not found or not readable: #{image_path})
               img = %([#{node.attr 'alt'}&#93;)
@@ -3001,7 +3026,7 @@ module Asciidoctor
             end
           end
         end
-        theme_font_cascade [:caption, category_caption] do
+        theme_font_cascade ['caption', category_caption] do
           if ((opts.delete :end) || (opts.delete :side) || :top) == :top
             margin = { top: caption_margin_outside, bottom: caption_margin_inside }
           else
@@ -3825,6 +3850,27 @@ module Asciidoctor
         end
       end
 
+      # Retrieve the intrinsic image dimensions for the specified path in pt.
+      #
+      # Returns a Hash containing :width and :height keys that map to the image's
+      # intrinsic width and height values (in pt).
+      def intrinsic_image_dimensions path, format
+        if format == 'svg'
+          # NOTE: prawn-svg automatically converts intrinsic width and height to pt
+          img_obj = ::Prawn::SVG::Interface.new (::File.read path, mode: 'r:UTF-8'), self, {}
+          img_size = img_obj.document.sizing
+          { width: img_size.output_width, height: img_size.output_height }
+        else
+          # NOTE: build_image_object caches image data previously loaded
+          # NOTE: build_image_object computes intrinsic width and height in px
+          _, img_size = ::File.open(path, 'rb') {|fd| build_image_object fd }
+          { width: (to_pt img_size.width, :px), height: (to_pt img_size.height, :px) }
+        end
+      rescue
+        # NOTE: image can't be read, so it won't be used anyway
+        { width: 0, height: 0 }
+      end
+
       # Sends the specified message to the log unless this method is called from the scratch document
       def log severity, message = nil, &block
         logger.send severity, message, &block unless scratch?
@@ -4033,7 +4079,7 @@ module Asciidoctor
       def resolve_image_options image_path, image_format, image_attrs, opts = {}
         if image_format == 'svg'
           image_opts = {
-            enable_file_requests_with_root: (::File.dirname image_path),
+            enable_file_requests_with_root: { base: (::File.dirname image_path), root: @jail_dir },
             enable_web_requests: allow_uri_read ? (method :load_open_uri).to_proc : false,
             cache_images: cache_uri,
             fallback_font_name: fallback_svg_font_name,
@@ -4120,6 +4166,7 @@ module Asciidoctor
         else
           imagesdir = relative_to
         end
+        @tmp_files ||= {}
         # NOTE: base64 logic currently used for inline images
         if ::Base64 === image_path
           return @tmp_files[image_path] if @tmp_files.key? image_path
@@ -4346,7 +4393,7 @@ module Asciidoctor
       end
 
       def theme_font_cascade categories, &block
-        if ::Array === (category = (categories = categories.dup).shift)
+        if ::Array === (category = (categories = categories.uniq).shift)
           category, opts = category
         else
           opts = {}

data/lib/asciidoctor/pdf/ext/prawn/document/column_box.rb

@@ -1,20 +1,35 @@
 # frozen_string_literal: true
 
 Prawn::Document::ColumnBox.prepend (Module.new do
-  def absolute_bottom
-    stretchy? ? @parent.absolute_bottom : super
-  end
+  attr_accessor :current_column
 
   def move_past_bottom
     (doc = @document).y = @y
     return if (@current_column = (@current_column + 1) % @columns) > 0
-    @y = (par = @parent).absolute_top if @reflow_margins
+    par = @parent
+    if (reset_y = @reflow_margins) && (reset_y == true || reset_y > doc.page_number)
+      @y = par.absolute_top
+      @height = par.height unless stretchy?
+    end
     initial_margins = doc.page.margins
     par.move_past_bottom
     if doc.page.margins != initial_margins
-      doc.bounds = self.class.new doc, par, (margin_box = doc.margin_box).absolute_top_left,
-        columns: @columns, reflow_margins: true, spacer: @spacer, width: margin_box.width
+      doc.bounds = self.class.new doc, par, [(margin_box = doc.margin_box).absolute_left, @y],
+        columns: @columns, reflow_margins: @reflow_margins, spacer: @spacer, width: margin_box.width, height: @height
+    end
+    nil
+  end
+
+  # Rearranges the column box into a single column, where the original columns are in a single file. Used
+  # for the purpose of computing the extent of content in a scratch document.
+  def single_file
+    if @reflow_margins && @parent.absolute_top > @y && @columns > @current_column + 1
+      # defer reflow margins until all columns on current page have been exhausted
+      @reflow_margins = @document.page_number + (@columns - @current_column)
     end
+    @width = bare_column_width
+    @columns = 1
+    @current_column = 0
     nil
   end
 end)

data/lib/asciidoctor/pdf/ext/prawn/extensions.rb

@@ -251,16 +251,17 @@ module Asciidoctor
       # Returns whether the cursor is at the top of the page (i.e., margin box).
       #
       def at_page_top?
-        @y == @margin_box.absolute_top
+        @y == (ColumnBox === bounds ? bounds : @margin_box).absolute_top
       end
 
       # Prevents at_page_top? from returning true while yielding to the specified block.
       #
       def conceal_page_top
-        margin_box.instance_variable_set :@y, (old_top = margin_box.absolute_top) + 0.0001
+        old_top = (outer_bounds = ColumnBox === bounds ? bounds : @margin_box).absolute_top
+        outer_bounds.instance_variable_set :@y, old_top + 0.0001
         yield
       ensure
-        margin_box.instance_variable_set :@y, old_top
+        outer_bounds.instance_variable_set :@y, old_top
       end
 
       # Returns whether the current page is the last page in the document.
@@ -560,11 +561,11 @@ module Asciidoctor
       def float
         original_page_number = page_number
         original_y = y
-        original_column = bounds.instance_variable_get :@current_column if ColumnBox === bounds
+        original_column = bounds.current_column if ColumnBox === bounds
         yield
         go_to_page original_page_number unless page_number == original_page_number
         self.y = original_y
-        bounds.instance_variable_set :@current_column, original_column if original_column
+        bounds.current_column = original_column if original_column
       end
 
       # Short-circuits the call to the built-in move_up operation
@@ -721,6 +722,12 @@ module Asciidoctor
         end
       end
 
+      # Wraps the column_box method and automatically sets the height unless the :height option is specified.
+      def column_box point, options, &block
+        options[:height] = cursor unless options.key? :height
+        super
+      end
+
       # A flowing version of bounding_box. If the content runs to another page, the cursor starts at
       # the top of the page instead of from the original cursor position. Similar to span, except
       # the :position option is limited to a numeric value and additional options are passed through
@@ -1146,10 +1153,7 @@ module Asciidoctor
         scratch_pdf.bounds = bounds.dup.tap do |bounds_copy|
           bounds_copy.instance_variable_set :@document, scratch_pdf
           bounds_copy.instance_variable_set :@parent, saved_bounds
-          if ColumnBox === bounds_copy
-            bounds_copy.instance_variable_set :@width, bounds_copy.bare_column_width
-            bounds_copy.instance_variable_set :@current_column, (bounds_copy.instance_variable_set :@columns, 1) - 1
-          end
+          bounds_copy.single_file if ColumnBox === bounds_copy
         end
         scratch_pdf.move_cursor_to cursor unless (scratch_start_at_top = keep_together || pages_advanced > 0 || at_page_top?)
         scratch_start_cursor = scratch_pdf.cursor

data/lib/asciidoctor/pdf/ext/prawn/images.rb

@@ -33,25 +33,8 @@ module Asciidoctor
         end
       end
 
-      # Retrieve the intrinsic image dimensions for the specified path in pt.
-      #
-      # Returns a Hash containing :width and :height keys that map to the image's
-      # intrinsic width and height values (in pt).
-      def intrinsic_image_dimensions path, format
-        if format == 'svg'
-          # NOTE: prawn-svg computes intrinsic width and height in pt
-          img_obj = ::Prawn::SVG::Interface.new (::File.read path, mode: 'r:UTF-8'), self, {}
-          img_size = img_obj.document.sizing
-          { width: img_size.output_width, height: img_size.output_height }
-        else
-          # NOTE: build_image_object caches image data previously loaded
-          # NOTE: build_image_object computes intrinsic width and height in px
-          _, img_size = ::File.open(path, 'rb') {|fd| build_image_object fd }
-          { width: (to_pt img_size.width, :px), height: (to_pt img_size.height, :px) }
-        end
-      rescue
-        # NOTE: image cannot be read, so it won't be used anyway
-        { width: 0, height: 0 }
+      def recommend_prawn_gmagick? err, image_format
+        ::Prawn::Errors::UnsupportedImageType === err && !(defined? ::GMagick::Image) && ((err.message.include? 'PNG') || (%w(jpg png).none? image_format))
       end
     end
 

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+begin
+  require 'prawn/gmagick'
+rescue LoadError # rubocop:disable Lint/SuppressedException
+end unless defined? GMagick::Image
+
+Gmagick.prepend (Module.new do
+  def initialize image_blob
+    super
+    # apply patch for https://github.com/packetmonkey/prawn-gmagick/issues/19
+    if bits != 8 && (GMagick::Image.format image_blob) == 'PNG'
+      (io = StringIO.new image_blob).read 8
+      chunk_size = io.read 4
+      self.bits = ((io.read chunk_size.unpack1 'N').unpack 'NNC')[-1] if (io.read 4) == 'IHDR'
+    end
+  end
+end) if defined? GMagick::Image

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Prawn::SVG::Calculators::DocumentSizing.prepend (Module.new do
+  def initialize *_args
+    super
+    @document_width = @document_width.to_f * 0.75 if @document_width&.end_with? 'px'
+    @document_height = @document_height.to_f * 0.75 if @document_height&.end_with? 'px'
+  end
+end)

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+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'
+    end
+    image = handler.new data
+    [image.width.to_f, image.height.to_f]
+  end
+
+  def find_image_handler data
+    Prawn.image_handler.find data rescue nil
+  end
+end)

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+Prawn::SVG::Loaders::File.prepend (Module.new do
+  attr_reader :jail_path
+
+  def initialize root_path
+    if Hash === root_path
+      @jail_path = root_path[:root]
+      root_path = root_path[:base]
+      super
+    else
+      super
+      @jail_path = self.root_path
+    end
+  end
+
+  def assert_valid_path! path
+    if jail_path && !(path.start_with? %(#{jail_path}#{File::SEPARATOR}))
+      raise Prawn::SVG::UrlLoader::Error, %(file path points to location outside of jail #{jail_path})
+    end
+  end
+end)

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

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require 'prawn-svg'
+require_relative 'prawn-svg/calculators/document_sizing'
+require_relative 'prawn-svg/elements/image'
 require_relative 'prawn-svg/loaders/data'
+require_relative 'prawn-svg/loaders/file'
 require_relative 'prawn-svg/loaders/web'
 require_relative 'prawn-svg/url_loader'
 # NOTE: disable system fonts since they're non-portable

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

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# NOTE: patch float precision constant so prawn-table does not fail to arrange cells that span columns (see #1835)
+Prawn.send :remove_const, :FLOAT_PRECISION
+Prawn::FLOAT_PRECISION = 1e-3
+
 # the following are organized under the Asciidoctor::Prawn namespace
 require_relative 'prawn/document/column_box'
 require_relative 'prawn/font_metric_cache'

data/lib/asciidoctor/pdf/ext.rb

@@ -4,5 +4,6 @@ require_relative 'ext/core'
 require_relative 'ext/asciidoctor'
 require_relative 'ext/pdf-core'
 require_relative 'ext/prawn'
+require_relative 'ext/prawn-gmagick'
 require_relative 'ext/prawn-svg'
 require_relative 'ext/prawn-table'

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

@@ -48,10 +48,11 @@ module Asciidoctor::PDF::FormattedText
           drop = scratch
         end
         image_path = fragment[:image_path]
-        image_w = fragment[:image_width] || '100%'
-
-        # NOTE: intrinsic width is stored behind % symbol
-        if (pctidx = image_w.index '%') && pctidx + 1 < image_w.length
+        image_format = fragment[:image_format]
+        if (image_w = fragment[:image_width] || '100%') == 'auto'
+          image_w = nil # use intrinsic width
+        elsif (pctidx = image_w.index '%') && pctidx + 1 < image_w.length
+          # NOTE: intrinsic width is stored behind % symbol
           pct = (image_w.slice 0, pctidx).to_f / 100
           intrinsic_w = (image_w.slice pctidx + 1, image_w.length).to_f
           image_w = [available_w, pct * intrinsic_w].min
@@ -62,26 +63,33 @@ module Asciidoctor::PDF::FormattedText
         max_image_h = fragment[:image_fit] == 'line' ? [available_h, doc.font.height].min : available_h
 
         # TODO: make helper method to calculate width and height of image
-        if fragment[:image_format] == 'svg'
+        if image_format == 'svg'
           svg_obj = ::Prawn::SVG::Interface.new ::File.read(image_path, mode: 'r:UTF-8'), doc,
             at: doc.bounds.top_left,
             width: image_w,
             fallback_font_name: doc.fallback_svg_font_name,
             enable_web_requests: doc.allow_uri_read ? (doc.method :load_open_uri).to_proc : false,
-            enable_file_requests_with_root: (::File.dirname image_path),
+            enable_file_requests_with_root: { base: (::File.dirname image_path), root: doc.jail_dir },
             cache_images: doc.cache_uri
           svg_size = svg_obj.document.sizing
           # NOTE: the best we can do is make the image fit within full height of bounds
           if (image_h = svg_size.output_height) > max_image_h
             image_w = (svg_obj.resize height: (image_h = max_image_h)).output_width
-          else
+          elsif image_w
             image_w = svg_size.output_width
+          else
+            fragment[:image_width] = (image_w = svg_size.output_width).to_s
+            image_w = available_w if image_w > available_w
           end
           fragment[:image_obj] = svg_obj
         else
           # TODO: cache image info based on path (Prawn caches based on SHA1 of content)
           # NOTE: image_obj is constrained to image_width by renderer
           image_obj, image_info = ::File.open(image_path, 'rb') {|fd| doc.build_image_object fd }
+          unless image_w
+            fragment[:image_width] = (image_w = to_pt image_info.width, :px).to_s
+            image_w = available_w if image_w > available_w
+          end
           if (image_h = image_w * (image_info.height.fdiv image_info.width)) > max_image_h
             # NOTE: the best we can do is make the image fit within full height of bounds
             image_w = (image_h = max_image_h) * (image_info.width.fdiv image_info.height)
@@ -117,7 +125,7 @@ module Asciidoctor::PDF::FormattedText
         fragment[:image_width] = fragment[:width] = image_w
         fragment[:image_height] = image_h
       rescue
-        logger.warn %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! && !(defined? ::GMagick::Image) ? '; install prawn-gmagick gem to add support' : ''}) unless scratch
+        logger.warn %(could not embed image: #{image_path}; #{$!.message}#{(doc.recommend_prawn_gmagick? $!, image_format) ? %(; install prawn-gmagick gem to add support for #{image_format&.upcase || 'unknown'} image format) : ''}) unless scratch
         drop = true # delegate to cleanup logic in ensure block
       ensure
         # NOTE: skip rendering image in scratch document or if image can't be loaded

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

@@ -36,8 +36,7 @@ module Asciidoctor::PDF::FormattedText
         end
         pdf.fill_color prev_fill_color
       end
-      if (border_width = data[:border_width])
-        border_color = data[:border_color]
+      if (border_width = data[:border_width]) && (border_color = data[:border_color])
         prev_stroke_color = pdf.stroke_color
         prev_line_width = pdf.line_width
         pdf.stroke_color border_color

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -69,7 +69,7 @@ module Asciidoctor
       # NOTE: base theme is loaded "as is" (no post-processing)
       def self.load_base_theme
         ::File.open BaseThemePath, mode: 'r:UTF-8' do |io|
-          (::OpenStruct.new ::YAML.safe_load io, aliases: true, filename: BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
+          (::OpenStruct.new ::YAML.safe_load io, filename: BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
         end
       end
 

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.5'
+    VERSION = '2.0.8'
   end
 end

data/lib/asciidoctor/pdf.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
+autoload :Set, 'set'
+autoload :StringIO, 'stringio'
+autoload :Tempfile, 'tempfile'
+require 'time' unless defined? Time.parse
 require_relative 'pdf/version'
 require 'asciidoctor'
 require 'prawn'
-# NOTE: patch float precision constant so prawn-table does not fail to arrange cells that span columns (see #1835)
-Prawn.send :remove_const, :FLOAT_PRECISION
-Prawn::FLOAT_PRECISION = 1e-3
 require 'prawn/templates'
-begin
-  require 'prawn/gmagick'
-rescue LoadError # rubocop:disable Lint/SuppressedException
-end unless defined? GMagick::Image
-autoload :Set, 'set'
-require 'time' unless defined? Time.parse
 require_relative 'pdf/measurements'
 require_relative 'pdf/sanitizer'
 require_relative 'pdf/text_transformer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.8
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -258,8 +258,12 @@ files:
 - lib/asciidoctor/pdf/ext/core/string.rb
 - lib/asciidoctor/pdf/ext/pdf-core.rb
 - lib/asciidoctor/pdf/ext/pdf-core/page.rb
+- lib/asciidoctor/pdf/ext/prawn-gmagick.rb
 - 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/loaders/data.rb
+- lib/asciidoctor/pdf/ext/prawn-svg/loaders/file.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/loaders/web.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/url_loader.rb
 - lib/asciidoctor/pdf/ext/prawn-table.rb