asciidoctor-pdf 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc9b0baae841d33e6205109c5aeacbb88bc196e6396b5dac8df187e0d209f9c
-  data.tar.gz: 21fd8ea4cebcb721dc273fa1a8f81104ec8f14f6a4c1a6f396bf6194f5e2309d
+  metadata.gz: f7753392586bac4a044601fefa9ecb58745e02fc37434dd5a26e020692890e65
+  data.tar.gz: 301fe3fef546588aacba4ca8d9c5afd91d4a19a816f07a8fcc66121c8f58f626
 SHA512:
-  metadata.gz: 956e66763693837a9483919f0b8b0428adbda5858efbfa75aa7b3a2fc04aff92a8e666643f7aae74ee01b656c1b9ad16984173dec4d0b0552bf668d0ad73d024
-  data.tar.gz: e6e2ca9d393d1eafbea531bdf9b828d50075bf398723ecca99549175331aa9f1422a9640128ccbf511e8ec97db3e7ce0c6d763a3bc28aeadf92fc6fd2a130f77
+  metadata.gz: b26fe1f74b22bd73eba166190d21afebafdc1630dba5fee8174aa946b463d81b7e620cb8f400e803507f050c6dd48a1d732a1273a78fc1cd0e958da69a0a3c9c
+  data.tar.gz: 15cd75342088585a51f19cb342a8023fbc2aa6d0cd89fff72385370172059ac10c98fa51b8126845ce40436fcd89dc0c1f47aa763df14dad24ba2bcd95f92205

data/CHANGELOG.adoc

@@ -5,6 +5,48 @@
 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.3 (2022-06-23) - @mojavelinux
+
+Bug Fixes::
+
+* interpret `start-at` theme keys with value `1` correctly (as `1` instead of `2`) (#2255)
+* restore column layout after importing page(s) from PDF (#2253)
+* fix crash when border color is transparent (`thematic-break-border-color`, `admonition-column-rule`, `quote-border-color`, `verse-border-color`)
+* ensure page margin is restored after imported page
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.3[git tag] | {url-repo}/compare/v2.1.2\...v2.1.3[full diff]
+
+== 2.1.2 (2022-06-17) - @mojavelinux
+
+Bug Fixes::
+
+* apply page layout from main document to new page in scratch document (#2248)
+* use correct logic to insert page before TOC with automatic placement when doctype=book and media=prepress
+* use `get_entries_for_toc` to determine if the TOC is non-empty rather than `Document#sections?`
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.2[git tag] | {url-repo}/compare/v2.1.1\...v2.1.2[full diff]
+
+== 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.3, 2022-06-23
 // Settings:
 :experimental:
 :idprefix:
@@ -22,8 +22,6 @@ endif::[]
 // Aliases:
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
-// Variables:
-:release-line: 2.1.x
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf
@@ -46,7 +44,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

@@ -198,8 +198,8 @@ 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') && doc.sections?)
-            start_toc_page doc, toc_placement if title_page_on
+          if (insert_toc = (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
           else
@@ -213,7 +213,7 @@ module Asciidoctor
             first_page_offset = has_title_page ? zero_page_offset.next : zero_page_offset
             body_offset = (body_start_page_number = page_number) - 1
             if ::Integer === (running_content_start_at = @theme.running_content_start_at)
-              running_content_body_offset = body_offset + [running_content_start_at.pred, 1].max
+              running_content_body_offset = body_offset + [running_content_start_at.pred, 0].max
               running_content_start_at = 'body'
             else
               running_content_body_offset = body_offset
@@ -227,7 +227,7 @@ module Asciidoctor
               end
             end
             if ::Integer === (page_numbering_start_at = @theme.page_numbering_start_at)
-              page_numbering_body_offset = body_offset + [page_numbering_start_at.pred, 1].max
+              page_numbering_body_offset = body_offset + [page_numbering_start_at.pred, 0].max
               page_numbering_start_at = 'body'
             else
               page_numbering_body_offset = body_offset
@@ -263,12 +263,12 @@ module Asciidoctor
           else
             body_offset = body_start_page_number - 1
             if ::Integer === (running_content_start_at = @theme.running_content_start_at)
-              running_content_body_offset = body_offset + [running_content_start_at.pred, 1].max
+              running_content_body_offset = body_offset + [running_content_start_at.pred, 0].max
             else
               running_content_body_offset = body_offset
             end
             if ::Integer === (page_numbering_start_at = @theme.page_numbering_start_at)
-              page_numbering_body_offset = body_offset + [page_numbering_start_at.pred, 1].max
+              page_numbering_body_offset = body_offset + [page_numbering_start_at.pred, 0].max
             elsif page_numbering_start_at == 'cover' && has_front_cover
               page_numbering_body_offset = 0
             else
@@ -371,8 +371,6 @@ module Asciidoctor
           if (page_margin_inner = theme.page_margin_inner)
             page_margin_recto[3] = page_margin_verso[1] = page_margin_inner
           end
-          # NOTE: prepare scratch document to use page margin from recto side (which has same width as verso side)
-          set_page_margin page_margin_recto unless page_margin_recto == page_margin
         else
           @ppbook = nil
         end
@@ -581,6 +579,7 @@ module Asciidoctor
       end
 
       def prepare_theme theme
+        theme.base_border_color = nil if theme.base_border_color == 'transparent'
         theme.base_font_color ||= '000000'
         theme.base_font_size ||= 12
         theme.base_font_style = theme.base_font_style&.to_sym || :normal
@@ -943,7 +942,7 @@ module Asciidoctor
             if extent
               label_height = extent.single_page_height || cursor
               if (rule_width = @theme.admonition_column_rule_width || 0) > 0 &&
-                  (rule_color = @theme.admonition_column_rule_color || @theme.base_border_color)
+                  (rule_color = resolve_theme_color :admonition_column_rule_color, @theme.base_border_color, nil)
                 rule_style = @theme.admonition_column_rule_style&.to_sym || :solid
                 float do
                   extent.each_page do |first_page, last_page|
@@ -1108,7 +1107,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
@@ -1270,7 +1272,7 @@ module Asciidoctor
         category = node.context == :quote ? :quote : :verse
         # NOTE: b_width and b_left_width are mutually exclusive
         if (b_left_width = @theme[%(#{category}_border_left_width)]) && b_left_width > 0
-          b_color = @theme[%(#{category}_border_color)] || @theme.base_border_color
+          b_left_width = nil unless (b_color = resolve_theme_color %(#{category}_border_color), @theme.base_border_color, nil)
         else
           b_left_width = nil
           b_width = nil if (b_width = @theme[%(#{category}_border_width)]) == 0
@@ -1787,7 +1789,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 +1805,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 +1815,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})
@@ -2331,9 +2340,11 @@ module Asciidoctor
 
       def convert_thematic_break node
         pad_box @theme.thematic_break_padding || [@theme.thematic_break_margin_top, 0] do
-          stroke_horizontal_rule @theme.thematic_break_border_color,
-            line_width: @theme.thematic_break_border_width,
-            line_style: (@theme.thematic_break_border_style&.to_sym || :solid)
+          if (b_color = resolve_theme_color :thematic_break_border_color)
+            stroke_horizontal_rule b_color,
+              line_width: @theme.thematic_break_border_width,
+              line_style: (@theme.thematic_break_border_style&.to_sym || :solid)
+          end
         end
         conceal_page_top { theme_margin :block, :bottom, (next_enclosed_block node) }
       end
@@ -2342,7 +2353,7 @@ module Asciidoctor
         # NOTE: only allow document to have a single managed toc
         return if @toc_extent
         is_macro = (placement = opts[:placement] || 'macro') == 'macro'
-        if ((doc = node.document).attr? 'toc-placement', placement) && (doc.attr? 'toc') && doc.sections?
+        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'))
@@ -2792,13 +2803,7 @@ module Asciidoctor
         value = (value.split LF).delete_if {|line| SimpleAttributeRefRx.match? line }.join LF if opts[:drop_lines_with_unresolved_attributes] && (value.include? '{')
         value = value.gsub '\{', '{' if escaped_attr_ref
         doc.set_attr 'attribute-missing', attribute_missing unless attribute_missing == 'skip'
-        if imagesdir
-          if imagesdir_to_restore
-            doc.set_attr 'imagesdir', imagesdir_to_restore
-          else
-            doc.remove_attr 'imagesdir'
-          end
-        end
+        imagesdir_to_restore ? (doc.set_attr 'imagesdir', imagesdir_to_restore) : (doc.remove_attr 'imagesdir') if imagesdir
         value
       end
 
@@ -4389,7 +4394,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
@@ -4813,18 +4818,17 @@ module Asciidoctor
       end
 
       # NOTE: init_page is called within a float context; this will suppress prawn-svg messing with the cursor
-      # NOTE: init_page is not called for imported pages, front and back cover pages, and other image pages
+      # NOTE: init_page is not called for imported pages, cover pages, image pages, and pages in the scratch document
       def init_page *_args
         next_page_side = page_side nil, @folio_placement[:inverted]
         if @media == 'prepress' && (next_page_margin = @page_margin_by_side[page_number == 1 ? :cover : next_page_side]) != page_margin
           set_page_margin next_page_margin
         end
         unless @page_bg_color == 'FFFFFF'
-          tare = true
           fill_absolute_bounds @page_bg_color
+          tare = true
         end
         if (bg_image_path, bg_image_opts = @page_bg_image[next_page_side])
-          tare = true
           begin
             if bg_image_opts[:format] == 'pdf'
               # NOTE: pages that use PDF for the background do not support a background color or running content
@@ -4833,6 +4837,7 @@ module Asciidoctor
             else
               canvas { image bg_image_path, ({ position: :center, vposition: :center }.merge bg_image_opts) }
             end
+            tare = true
           rescue
             facing_page_side = (PageSides - [next_page_side])[0]
             @page_bg_image[facing_page_side] = nil if @page_bg_image[facing_page_side] == @page_bg_image[next_page_side]
@@ -5027,10 +5032,8 @@ module Asciidoctor
       # QUESTION: should we pass a category as an argument?
       # QUESTION: should we make this a method on the theme ostruct? (e.g., @theme.resolve_color key, fallback)
       def resolve_theme_color key, fallback_color = nil, transparent_color = fallback_color
-        if (color = @theme[key])
+        if (color = @theme[key] || fallback_color)
           color == 'transparent' ? transparent_color : color
-        else
-          fallback_color
         end
       end
 
@@ -5110,6 +5113,10 @@ module Asciidoctor
       end
 
       def init_scratch originator
+        if @media == 'prepress' && page_margin != (page_margin_recto = @page_margin_by_side[:recto])
+          # NOTE: prepare scratch document to use page margin from recto side (which has same width as verso side)
+          set_page_margin page_margin_recto
+        end
         @scratch_prototype = originator.instance_variable_get :@scratch_prototype
         @tmp_files = originator.instance_variable_get :@tmp_files
         text_formatter.scratch = true

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

@@ -6,20 +6,23 @@ Prawn::Document::ColumnBox.prepend (Module.new do
   def move_past_bottom
     (doc = @document).y = @y
     return if (@current_column = (@current_column + 1) % @columns) > 0
-    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
+    parent_ = @parent
+    reset_top parent_ if (reflow_at = @reflow_margins) && (reflow_at == true || reflow_at > doc.page_number)
     initial_margins = doc.page.margins
-    par.move_past_bottom
+    parent_.move_past_bottom
     if doc.page.margins != initial_margins
-      doc.bounds = self.class.new doc, par, [(margin_box = doc.margin_box).absolute_left, @y],
+      doc.bounds = self.class.new doc, parent_, [(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
 
+  def reset_top parent_ = @parent
+    @current_column = 0
+    @height = parent_.height unless stretchy?
+    @y = parent_.absolute_top
+  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

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?
@@ -923,6 +924,8 @@ module Asciidoctor
       def import_page file, options = {}
         prev_page_layout = page.layout
         prev_page_size = page.size
+        prev_page_margin = page_margin
+        prev_bounds = bounds
         state.compress = false if state.compress # can't use compression if using template
         prev_text_rendering_mode = (defined? @text_rendering_mode) ? @text_rendering_mode : nil
         delete_current_page if options[:replace]
@@ -935,11 +938,15 @@ module Asciidoctor
           # NOTE: set page size & layout explicitly in case imported page differs
           # I'm not sure it's right to start a new page here, but unfortunately there's no other
           # way atm to prevent the size & layout of the imported page from affecting subsequent pages
-          advance_page size: prev_page_size, layout: prev_page_layout if options.fetch :advance, true
+          if options.fetch :advance, true
+            advance_page layout: prev_page_layout, margin: prev_page_margin, size: prev_page_size
+            (@bounding_box = prev_bounds).reset_top if ColumnBox === prev_bounds
+          end
         elsif options.fetch :advance_if_missing, true
           delete_current_page
           # NOTE: see previous comment
-          advance_page size: prev_page_size, layout: prev_page_layout
+          advance_page layout: prev_page_layout, margin: prev_page_margin, size: prev_page_size
+          @y = (@bounding_box = prev_bounds).reset_top if ColumnBox === prev_bounds
         else
           delete_current_page
         end
@@ -972,11 +979,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
@@ -1111,7 +1118,8 @@ module Asciidoctor
       # This method performs all work in a scratch document (or documents). It begins by starting a
       # new page in the scratch document, first creating the scratch document if necessary. It then
       # applies all the settings from the main document to the scratch document that impact
-      # rendering. This includes the bounds, the cursor position, and the font settings.
+      # rendering. This includes the bounds, the cursor position, and the font settings. This method
+      # assumes that the content area remains constant when content flows from one page to the next.
       #
       # From this point, the number of attempts the method makes is determined by the value of the
       # keep_together keyword parameter. If the value is true (or the parent document is inhibiting
@@ -1136,19 +1144,19 @@ 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
-        (scratch_pdf = scratch).start_new_page
+        (scratch_pdf = scratch).start_new_page layout: page.layout
         saved_bounds = scratch_pdf.bounds
         scratch_pdf.bounds = bounds.dup.tap do |bounds_copy|
           bounds_copy.instance_variable_set :@document, scratch_pdf

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

@@ -96,21 +96,24 @@ module Asciidoctor
               }.compact,
             }
             @theme_settings.tap do |accum|
-              revise_roles = [].to_set
+              roles_with_styles = [].to_set
               theme.each_pair do |key, val|
                 next unless (key = key.to_s).start_with? 'role_'
                 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
                 #  end
                 elsif key == 'font_style' || key == 'text_decoration'
-                  revise_roles << role
+                  roles_with_styles << role
                 end
               end
-              revise_roles.each do |role|
+              roles_with_styles.each do |role|
                 (accum[role] ||= {})[:styles] = to_styles theme[%(role_#{role}_font_style)], theme[%(role_#{role}_text_decoration)]
               end
             end

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.1.0'
+    VERSION = '2.1.3'
   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.3
 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-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor