asciidoctor-pdf 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2109e7ec140c759820252d4c7f0f155c2d7bf4adfcad9d34fddb8cf4bc81a260
-  data.tar.gz: c18e3fb15231f968d907fc05693f6c4d7f9fbedfd29e368b0dc355f44d2e4254
+  metadata.gz: f7753392586bac4a044601fefa9ecb58745e02fc37434dd5a26e020692890e65
+  data.tar.gz: 301fe3fef546588aacba4ca8d9c5afd91d4a19a816f07a8fcc66121c8f58f626
 SHA512:
-  metadata.gz: 4e51a465c863440441cae24e429bbf84d9fb782e2c711958d5b72dfa585ba4b1b7c9c94b92d8155b2cea0d72eec276fac6e4669ea8a50c175ff8ed82ab91eb8d
-  data.tar.gz: a62b653261f3194d51a738cc4b1cf46f4a78a6ba0c1687fbeb06bf5049ecc9d65a20edd7acc463a2f4b473d1248795ce39902b214b87b019cbc8485d394a32f3
+  metadata.gz: b26fe1f74b22bd73eba166190d21afebafdc1630dba5fee8174aa946b463d81b7e620cb8f400e803507f050c6dd48a1d732a1273a78fc1cd0e958da69a0a3c9c
+  data.tar.gz: 15cd75342088585a51f19cb342a8023fbc2aa6d0cd89fff72385370172059ac10c98fa51b8126845ce40436fcd89dc0c1f47aa763df14dad24ba2bcd95f92205

data/CHANGELOG.adoc

@@ -5,6 +5,19 @@
 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::

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.2, 2022-06-17
+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

data/lib/asciidoctor/pdf/converter.rb

@@ -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|
@@ -1273,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
@@ -2341,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
@@ -4817,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
@@ -4837,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]
@@ -5031,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
 
@@ -5114,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

@@ -924,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]
@@ -936,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
@@ -1112,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

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.1.2'
+    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.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor