asciidoctor-pdf 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc9b0baae841d33e6205109c5aeacbb88bc196e6396b5dac8df187e0d209f9c
-  data.tar.gz: 21fd8ea4cebcb721dc273fa1a8f81104ec8f14f6a4c1a6f396bf6194f5e2309d
+  metadata.gz: bfcc8354e8152f540a4510dbddc39d38d577ee958aa51fbfb10b92d965abaa0c
+  data.tar.gz: 68848a664ded97d88c45e2d8357f3880a5e10f4b6cc0f0c44b014cd85088d1ea
 SHA512:
-  metadata.gz: 956e66763693837a9483919f0b8b0428adbda5858efbfa75aa7b3a2fc04aff92a8e666643f7aae74ee01b656c1b9ad16984173dec4d0b0552bf668d0ad73d024
-  data.tar.gz: e6e2ca9d393d1eafbea531bdf9b828d50075bf398723ecca99549175331aa9f1422a9640128ccbf511e8ec97db3e7ce0c6d763a3bc28aeadf92fc6fd2a130f77
+  metadata.gz: b1fb4074705e06fb70c188278e677c69f696e832d28d5ad49e6135b218ef36416abfaebfdedd980ff094579ae509d5006b59a52c57cf62374e9bdd69822b3714
+  data.tar.gz: 07acff80d3d5c04e5ba8fbf591bbf3d952685bd0de605ac0e60645bbe478eafd1013451d4085abf8e2a41a996f5c4d8bba885377a1878a301ad75e144c0d2316

data/CHANGELOG.adoc

@@ -5,6 +5,23 @@
 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.1.1 (2022-06-15) - @mojavelinux
+
+Improvements::
+
+* store zero-based column on Extent for extensions to use to position cursor at start of extent
+
+Bug Fixes::
+
+* place block image in SVG format in correct column when align is left and page columns are enabled (#2241)
+* accurately trap LoadError from CodeRay if source language is not recognized on code block
+* only draw rounded rectangle around phrase if `border-radius` is > 0
+* use `base-border-color` value if border width is set on role for inline phrase but not border color
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.1[git tag] | {url-repo}/compare/v2.1.0\...v2.1.1[full diff]
+
 == 2.1.0 (2022-06-11) - @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.1.0, 2022-06-11
+v2.1.1, 2022-06-15
 // Settings:
 :experimental:
 :idprefix:
@@ -46,7 +46,7 @@ The aim of this library is to take the pain out of creating PDF documents from A
 
 [NOTE]
 ====
-The documentation for the latest, stable release of Asciidoctor PDF 2.0.x is available at {url-project-docs}/.
+The documentation for the latest, stable release of Asciidoctor PDF is available at {url-project-docs}/.
 
 If you're looking for the documentation for Asciidoctor PDF 1.6, refer to the {url-project-repo}/tree/v1.6.x#readme[README] in the v1.6.x branch.
 Asciidoctor PDF 1.6 is no longer being developed and will reach EOL later this year.

data/lib/asciidoctor/pdf/converter.rb

@@ -1108,7 +1108,10 @@ module Asciidoctor
             srclang = node.attr 'language', 'text'
             begin
               ::CodeRay::Scanners[(srclang = (srclang.start_with? 'html+') ? (srclang.slice 5, srclang.length).to_sym : srclang.to_sym)]
-            rescue ::ArgumentError
+            rescue
+              until ::LoadError === (cause ||= $!) || ::ArgumentError === cause
+                raise $! unless (cause = cause.cause)
+              end
               srclang = :text
             end
             fragments = (::CodeRay.scan source_string, srclang).to_prawn
@@ -1787,7 +1790,6 @@ module Asciidoctor
                 file_request_root = { base: (::File.dirname image_path), root: @jail_dir }
               end
               svg_obj = ::Prawn::SVG::Interface.new svg_data, self,
-                position: alignment,
                 width: width,
                 fallback_font_name: fallback_svg_font_name,
                 enable_web_requests: allow_uri_read ? (method :load_open_uri).to_proc : false,
@@ -1804,7 +1806,6 @@ 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
@@ -1815,7 +1816,16 @@ module Asciidoctor
               update_colors if graphic_state.color_space.empty?
               ink_caption node, category: :image, end: :top, block_align: alignment, block_width: rendered_w, max_width: caption_max_width if caption_end == :top && node.title?
               image_y = y
-              image_cursor = cursor
+              # NOTE: prawn-svg does not compute :at for alignment correctly in column box, so resort to our own logic
+              case alignment
+              when :center
+                left = bounds.left + (available_w - rendered_w) * 0.5
+              when :right
+                left = bounds.left + available_w - rendered_w
+              else
+                left = bounds.left
+              end
+              svg_obj.options[:at] = [left, (image_cursor = cursor)]
               svg_obj.draw # NOTE: cursor advances automatically
               svg_obj.document.warnings.each do |img_warning|
                 log :warn, %(problem encountered in image: #{image_path}; #{img_warning})
@@ -4389,7 +4399,7 @@ module Asciidoctor
           b_shift, b_gap_color = (b_width ||= 0.5) * 0.5, @page_bg_color
         end
         ink_caption node_with_caption, category: category if node_with_caption
-        extent.from.page += 1 unless extent.from.page == page_number || ColumnBox === bounds # sanity check
+        extent.from.page = page_number unless extent.from.page == page_number # sanity check
         float do
           extent.each_page do |first_page, last_page|
             advance_page unless first_page

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

@@ -34,13 +34,14 @@ module Asciidoctor
       # - :final_gap determines whether a gap is added below the last line
       LineMetrics = ::Struct.new :height, :leading, :padding_top, :padding_bottom, :final_gap
 
-      Position = ::Struct.new :page, :cursor
+      Position = ::Struct.new :page, :column, :cursor
 
       Extent = ::Struct.new :current, :from, :to do
-        def initialize current_page, current_cursor, start_page, start_cursor, end_page, end_cursor
-          self.from = self.current = Position.new current_page, current_cursor
-          self.from = Position.new start_page, start_cursor unless start_page == current_page && start_cursor == current_cursor
-          self.to = Position.new end_page, end_cursor
+        def initialize current_page, current_column, current_cursor, from_page, from_column, from_cursor, to_page, to_cursor
+          self.current = Position.new current_page, current_column, current_cursor
+          self.from = Position.new from_page, from_column, from_cursor
+          self.from = current if from == current
+          self.to = Position.new to_page, nil, to_cursor
         end
 
         def each_page
@@ -64,23 +65,23 @@ module Asciidoctor
 
       ScratchExtent = ::Struct.new :from, :to do
         def initialize start_page, start_cursor, end_page, end_cursor
-          self.from = Position.new start_page, start_cursor
-          self.to = Position.new end_page, end_cursor
+          self.from = Position.new start_page, 0, start_cursor
+          self.to = Position.new end_page, 0, end_cursor
         end
 
         def position_onto pdf, keep_together = nil
           current_page = pdf.page_number
+          current_column = ColumnBox === pdf.bounds ? (column_box = pdf.bounds).current_column : 0
           current_cursor = pdf.cursor
-          from_page = current_page + (advance_by = from.page - 1)
-          to_page = current_page + (to.page - 1)
-          if advance_by > 0
+          if (advance_by = from.page - 1) > 0
             advance_by.times { pdf.advance_page }
           elsif keep_together && single_page? && !(try_to_fit_on_previous current_cursor)
             pdf.advance_page
-            from_page += 1
-            to_page += 1
           end
-          Extent.new current_page, current_cursor, from_page, from.cursor, to_page, to.cursor
+          from_page = pdf.page_number
+          from_column = column_box&.current_column || 0
+          to_page = from_page + (to.page - from.page)
+          Extent.new current_page, current_column, current_cursor, from_page, from_column, from.cursor, to_page, to.cursor
         end
 
         def single_page?
@@ -972,11 +973,11 @@ module Asciidoctor
         state.on_page_create_callback = saved_callback
       end
 
-      # This method is a smarter version of start_new_page. It calls start_new_page
-      # if the current page is the last page of the document. Otherwise, it simply
-      # advances to the next existing page.
+      # This method is a smarter version of start_new_page. It only calls start_new_page options are
+      # specified and the current page is the last page in the document. Otherwise, it advances the
+      # cursor to the next page (or column) using Bounds#move_past_bottom.
       def advance_page options = {}
-        !options.empty? && last_page? ? (start_new_page options) : bounds.move_past_bottom
+        options.empty? || !last_page? ? bounds.move_past_bottom : (start_new_page options)
       end
 
       # Start a new page without triggering the on_page_create callback
@@ -1136,15 +1137,15 @@ module Asciidoctor
       # Note that if the block has content that itself requires a dry run, that nested dry run will
       # be performed in a separate scratch document.
       #
-      # opts - A Hash of options that configure the dry run computation:
-      #        :keep_together - A Boolean indicating whether an attempt should be made to keep the
-      #        content on the same page (optional, default: false).
-      #        :single_page - A Boolean indicating whether the operation should stop if the content
-      #        exceeds the height of a single page.
-      #        :onto - The document onto which to position the scratch extent. If this option is
-      #        set, the method returns an Extent instead of a ScratchExtent (optional, default: nil)
-      #        :pages_advanced - The number of pages the content has been advanced during this
-      #        operation (internal only) (optional, default: 0)
+      # options - A Hash of options that configure the dry run computation:
+      #           :keep_together - A Boolean indicating whether an attempt should be made to keep
+      #           the content on the same page (optional, default: false).
+      #           :single_page - A Boolean indicating whether the operation should stop if the
+      #           content exceeds the height of a single page.
+      #           :onto - The document onto which to position the scratch extent. If this option is
+      #           set, the method returns an Extent instance (optional, default: false)
+      #           :pages_advanced - The number of pages the content has been advanced during this
+      #           operation (internal only) (optional, default: 0)
       #
       # Returns an Extent or ScratchExtent object that describes the bounds of the content block.
       def dry_run keep_together: nil, pages_advanced: 0, single_page: nil, onto: nil, &block

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

@@ -25,11 +25,11 @@ module Asciidoctor::PDF::FormattedText
         width = fragment.width
         height = fragment.height
       end
-      border_radius = data[:border_radius]
+      border_radius = data[:border_radius] || 0
       if (background_color = data[:background_color])
         prev_fill_color = pdf.fill_color
         pdf.fill_color background_color
-        if border_radius
+        if border_radius > 0
           pdf.fill_rounded_rectangle at, width, height, border_radius
         else
           pdf.fill_rectangle at, width, height
@@ -41,7 +41,7 @@ module Asciidoctor::PDF::FormattedText
         prev_line_width = pdf.line_width
         pdf.stroke_color border_color
         pdf.line_width border_width
-        border_radius ? (pdf.stroke_rounded_rectangle at, width, height, border_radius) : (pdf.stroke_rectangle at, width, height)
+        border_radius > 0 ? (pdf.stroke_rounded_rectangle at, width, height, border_radius) : (pdf.stroke_rectangle at, width, height)
         pdf.stroke_color prev_stroke_color
         pdf.line_width prev_line_width
       end

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

@@ -102,6 +102,9 @@ module Asciidoctor
                 role, key = (key.slice 5, key.length).split '_', 2
                 if (prop = ThemeKeyToFragmentProperty[key])
                   (accum[role] ||= {})[prop] = val
+                  if key == 'border_width' && val && !(theme[%(role_#{role}_border_color)])
+                    accum[role][:border_color] = theme.base_border_color
+                  end
                 #elsif key == 'font_kerning'
                 #  unless (resolved_val = val == 'none' ? false : (val == 'normal' ? true : nil)).nil?
                 #    (accum[role] ||= {})[:kerning] = resolved_val

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor