asciidoctor-pdf 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8baebe850d75fcfc95460fbbdf89978867adb076acf572abaff0f51e18fb04
-  data.tar.gz: d4dbbaab4981db0666488ae108aee0f5851feb706e3846b13cd5cf46c341b5bc
+  metadata.gz: 5dbb3a6c2c5b664510e19714de969553f3943994b4be273238c646e41274885f
+  data.tar.gz: f6495e965c651113bbc61383d82a18db4fb78a7df64644801bd10fba1c6ed078
 SHA512:
-  metadata.gz: 26b1c9830deeb0a39494e9cdb85fa5c2e2295efe8b3d527525b27c6dcf420a8ab94e06eeaca3431425e9cf547150d372bab49813af946cdd5ea0e155d6aad1f0
-  data.tar.gz: d584830d1eb1f76a005b48cf6a20030311d40184254d4ddfbd752f99a66c27feab85292c79012af0c9c4b7272a1727f402828f1c6d992228660ccbf78be44d2a
+  metadata.gz: 0b93162e6b69d1c32cf3365c08f78457f80cb1588a98c847b0ddfa6946074ba1c7c163009434243d9c78d87e6982c84b2c74eb06fbb72003f003854fbadea926
+  data.tar.gz: 2cc9d0d4d64ac4ae889e54cf272339019ec91a812ba38f22f28b81abb8daa6af086941e8b50bb95a70f1f1028dd06879952fd51da4219fc46db523f4757ca774

data/CHANGELOG.adoc

@@ -5,6 +5,54 @@
 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.2.0 (2022-07-22) - @mojavelinux
+
+Enhancements::
+
+* allow page background image to be specified per layout using `+{page-layout}+` attribute reference in path (#1739)
+* allow page margin for rotated page to be configured independently using `page-margin-rotated` theme key or `pdf-page-margin-rotated` document attribute (#1719)
+* allow orphan detection to be enabled for all section titles and discrete headings by setting `heading-min-height-after` to `auto` in theme (#2268)
+* set `docimagesdir` attribute when attribute substitutions are applied to value from theme (#2278)
+* start page numbering and running content on empty verso page before first chapter of prepress book if `start-at` value is 0 (#2252)
+* don't force page break after TOC with automatic placement in article if `title-page` attribute is set and value of `toc-break-after` theme key is `auto` (#1768)
+* add `--theme` option to CLI as shorthand for `-a pdf-theme` (#2250)
+* add `--sourcemap` option to CLI to enable `:sourcemap` option on processor (#2265)
+* broaden support for relative font sizes in theme to more than just inline elements; document support for relative font sizes
+* allow theme to control font properties of marker for ordered list using `olist-marker` category (#2279)
+* allow theme to control font style of marker (per marker or all markers) for unordered list
+
+Improvements::
+
+* add internal `Document#attr_unspecified?` method to simplify check for an attribute which has not been set or unset
+
+Bug Fixes::
+
+* always set `imagesdir` attribute to value of `themesdir` when resolving images from theme
+* allow `top` keys in `title-page` theme category to accept a fixed value (e.g., `1in`) (#2269)
+* prevent orphan detection for heading (section title or discrete heading) from modifying document state (#2288)
+
+Compliance::
+
+* configure table borders in way that is compatible with prawn-table > 0.2.2
+* don't coerce font size < 1 to relative font size; relative font size should be specified in units
+
+=== Details
+
+{url-repo}/releases/tag/v2.2.0[git tag] | {url-repo}/compare/v2.1.6\...v2.2.0[full diff]
+
+== 2.1.6 (2022-07-19) - @mojavelinux
+
+Bug Fixes::
+
+* resolve font size for monospaced cell when font size value on `codespan` key in theme is relative (#2281)
+
+== 2.1.5 (2022-07-10) - @mojavelinux
+
+Bug Fixes::
+
+* fix position of background color on caption with outside margin (#2271)
+* don't allow font scale to compound when entering nested table (#2276)
+
 == 2.1.4 (2022-06-26) - @mojavelinux
 
 Improvements::
@@ -17,10 +65,6 @@ Bug Fixes::
 * apply text-tranform from custom role on phrase after attributes have been resolved (#2263)
 * make URL check more strict so image target containing a colon is not mistaken as a URL
 
-=== Details
-
-{url-repo}/releases/tag/v2.1.4[git tag] | {url-repo}/compare/v2.1.3\...v2.1.4[full diff]
-
 == 2.1.3 (2022-06-23) - @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.4, 2022-06-26
+v2.2.0, 2022-07-22
 // Settings:
 :experimental:
 :idprefix:

data/bin/asciidoctor-pdf

@@ -1,24 +1,43 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-if File.file?(asciidoctor_pdf = (File.expand_path '../../lib/asciidoctor/pdf.rb', __FILE__))
+if File.file? (asciidoctor_pdf = File.join (File.dirname __dir__), 'lib/asciidoctor/pdf.rb')
   require asciidoctor_pdf
 else
   require 'asciidoctor/pdf'
 end
 require 'asciidoctor/cli'
 
-options = Asciidoctor::Cli::Options.new backend: 'pdf', header_footer: true
+# FIXME: provide an API in Asciidoctor for sub-projects to prepend version information
+options = (Asciidoctor::Cli::Options.new backend: 'pdf', header_footer: true).extend (Module.new do
+  def print_version os = $stdout
+    os.write %(Asciidoctor PDF #{Asciidoctor::PDF::VERSION} using )
+    super
+  end
+end)
 
-# FIXME provide an API in Asciidoctor for sub-components to print version information
-unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
-  $stdout.write %(Asciidoctor PDF #{Asciidoctor::PDF::VERSION} using )
-  options.print_version
-  exit 0
+args = ARGV.dup
+
+if (theme_idx = args.index {|it| it == '--theme' || (it.start_with? '--theme=') })
+  if (theme_arg = args[theme_idx]).length > 7
+    args[theme_idx..theme_idx] = ['-a', %(pdf#{theme_arg.slice 1, theme_arg.length})]
+  elsif (val = args[theme_idx + 1]) && !(val.start_with? '-')
+    args[theme_idx] = '-a'
+    args[theme_idx + 1] = %(pdf-theme=#{val})
+  end
+end
+
+if (Gem::Version.new Asciidoctor::VERSION) < (Gem::Version.new '2.1.0') && (args.include? '--sourcemap')
+  args.delete '--sourcemap'
+  Asciidoctor::Extensions.register do
+    preprocessor do
+      process {|doc| (doc.sourcemap = true) && nil }
+    end
+  end
 end
 
-# FIXME This is a really bizarre API. Please make me simpler.
-case (result = options.parse! ARGV)
+# FIXME: This is a really bizarre API. Please make me simpler.
+case (result = options.parse! args)
 when Integer
   exit result
 else

data/bin/asciidoctor-pdf-optimize

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-optimizer = File.absolute_path '../lib/asciidoctor/pdf/optimizer.rb', __dir__
-if File.exist? optimizer
+if File.file? (optimizer = File.join (File.dirname __dir__), 'lib/asciidoctor/pdf/optimizer.rb')
   require optimizer
 else
   require 'asciidoctor/pdf/optimizer'

data/lib/asciidoctor/pdf/converter.rb

@@ -27,8 +27,6 @@ module Asciidoctor
 
       attr_accessor :font_scale
 
-      attr_reader :root_font_size
-
       attr_reader :index
 
       attr_reader :theme
@@ -162,11 +160,11 @@ module Asciidoctor
         doc.promote_preface_block
         init_pdf doc
         # set default value for outline, outline-title, and pagenums attributes if not otherwise set
-        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')
+        doc.attributes['outline'] = '' if doc.attr_unspecified? 'outline'
+        doc.attributes['outline-title'] = '' if doc.attr_unspecified? 'outline-title'
+        doc.attributes['pagenums'] = '' if doc.attr_unspecified? 'pagenums'
 
-        on_page_create(&(method :init_page))
+        on_page_create(&(method :init_page).curry[doc])
 
         marked_page_number = page_number
         # NOTE: a new page will already be started (page_number = 2) if the front cover image is a PDF
@@ -181,7 +179,7 @@ module Asciidoctor
           end
           start_new_page
         else
-          @page_margin_by_side[:cover] = @page_margin_by_side[:recto] if @media == 'prepress' && page_number == 0
+          @page_margin[:cover] = @page_margin[page.layout][:recto] if @media == 'prepress' && page_number == 0
           start_new_page unless page&.empty? # rubocop:disable Lint/SafeNavigationWithEmpty
           # NOTE: the base font must be set before any content is written to the main or scratch document
           # this method is called inside ink_title_page if the title page is active
@@ -202,19 +200,24 @@ module Asciidoctor
           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
+            @toc_extent = allocate_toc doc, toc_num_levels, cursor, (title_page_on && theme.toc_break_after != 'auto')
           else
             @toc_extent = nil
           end
 
-          start_new_page if @ppbook && verso_page? && !(((next_block = doc.first_child)&.context == :preamble ? next_block.first_child : next_block)&.option? 'nonfacing')
+          if @ppbook && verso_page? && !(((next_block = doc.first_child)&.context == :preamble ? next_block.first_child : next_block)&.option? 'nonfacing')
+            min_start_at = 0
+            start_new_page
+          else
+            min_start_at = 1
+          end
 
           if title_page_on
             zero_page_offset = has_front_cover ? 1 : 0
             first_page_offset = has_title_page ? zero_page_offset.next : zero_page_offset
             body_offset = (body_start_page_number = page_number) - 1
             if ::Integer === (running_content_start_at = @theme.running_content_start_at)
-              running_content_body_offset = body_offset + [running_content_start_at.pred, 0].max
+              running_content_body_offset = body_offset + [running_content_start_at.pred, min_start_at.pred].max
               running_content_start_at = 'body'
             else
               running_content_body_offset = body_offset
@@ -228,7 +231,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, 0].max
+              page_numbering_body_offset = body_offset + [page_numbering_start_at.pred, min_start_at.pred].max
               page_numbering_start_at = 'body'
             else
               page_numbering_body_offset = body_offset
@@ -353,7 +356,6 @@ module Asciidoctor
         @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'
           @folio_placement = { basis: :physical }
@@ -364,6 +366,13 @@ module Asciidoctor
         else
           @folio_placement = { basis: :virtual }
         end
+        @page_margin = { cover: page_margin }
+        @page_margin[:portrait] = @page_margin[:landscape] = { recto: (page_margin_recto = page_margin), verso: (page_margin_verso = page_margin) }
+        if (rotated_page_margin = resolve_page_margin (doc.attr 'pdf-page-margin-rotated') || theme.page_margin_rotated)
+          rotated_page_margin = expand_margin_value rotated_page_margin
+          @edge_shorthand_cache = nil
+          @page_margin[PageLayouts[(PageLayouts.index page.layout) - 1]] = { recto: rotated_page_margin, verso: rotated_page_margin.dup }
+        end
         if @media == 'prepress'
           @ppbook = doc.doctype == 'book'
           if (page_margin_outer = theme.page_margin_outer)
@@ -375,17 +384,7 @@ module Asciidoctor
         else
           @ppbook = nil
         end
-        if (bg_image = resolve_background_image doc, theme, 'page-background-image')&.first
-          @page_bg_image = { verso: bg_image, recto: bg_image }
-        else
-          @page_bg_image = { verso: nil, recto: nil }
-        end
-        if (bg_image = resolve_background_image doc, theme, 'page-background-image-verso')
-          @page_bg_image[:verso] = bg_image[0] && bg_image
-        end
-        if (bg_image = resolve_background_image doc, theme, 'page-background-image-recto')
-          @page_bg_image[:recto] = bg_image[0] && bg_image
-        end
+        @page_bg_image = {}
         @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'
@@ -398,8 +397,7 @@ module Asciidoctor
         @base_text_align = (text_align = doc.attr 'text-align') && (TextAlignmentNames.include? text_align) ? text_align : theme.base_text_align
         @base_line_height = theme.base_line_height
         @cjk_line_breaks = doc.attr? 'scripts', 'cjk'
-        if (hyphen_lang = (doc.attr 'hyphens') ||
-            (((doc.attribute_locked? 'hyphens') || ((doc.instance_variable_get :@attributes_modified).include? 'hyphens')) ? nil : @theme.base_hyphens)) &&
+        if (hyphen_lang = (doc.attr 'hyphens') || ((doc.attr_unspecified? 'hyphens') ? @theme.base_hyphens : nil)) &&
             ((defined? ::Text::Hyphen::VERSION) || !(Helpers.require_library 'text/hyphen', 'text-hyphen', :warn).nil?)
           hyphen_lang = doc.attr 'lang' if !(::String === hyphen_lang) || hyphen_lang.empty?
           hyphen_lang = 'en_us' if hyphen_lang.nil_or_empty? || hyphen_lang == 'en'
@@ -437,34 +435,7 @@ module Asciidoctor
       end
 
       def build_pdf_options doc, theme
-        case (page_margin = (doc.attr 'pdf-page-margin') || theme.page_margin)
-        when ::Array
-          if page_margin.empty?
-            page_margin = nil
-          else
-            page_margin = page_margin.slice 0, 4 if page_margin.length > 4
-            page_margin = page_margin.map {|v| ::Numeric === v ? v : (str_to_pt v.to_s) }
-          end
-        when ::Numeric
-          page_margin = [page_margin]
-        when ::String
-          if page_margin.empty?
-            page_margin = nil
-          elsif (page_margin.start_with? '[') && (page_margin.end_with? ']')
-            if (page_margin = (page_margin.slice 1, page_margin.length - 2).rstrip).empty?
-              page_margin = nil
-            else
-              if (page_margin = page_margin.split ',', -1).length > 4
-                page_margin = page_margin.slice 0, 4
-              end
-              page_margin = page_margin.map {|v| str_to_pt v.rstrip }
-            end
-          else
-            page_margin = [(str_to_pt page_margin)]
-          end
-        else
-          page_margin = nil
-        end
+        page_margin = resolve_page_margin (doc.attr 'pdf-page-margin') || theme.page_margin
 
         if (doc.attr? 'pdf-page-size') && PageSizeRx =~ (doc.attr 'pdf-page-size')
           # e.g, [8.5in, 11in]
@@ -917,7 +888,7 @@ module Asciidoctor
             label_width = label_min_width || (icon_size * 1.5)
           elsif (icon_path = has_icon || !(icon_path = (@theme[%(admonition_icon_#{type})] || {})[:image]) ?
               (get_icon_image_path node, type) :
-              (ThemeLoader.resolve_theme_asset (apply_subs_discretely doc, icon_path, subs: [:attributes]), @themesdir)) &&
+              (ThemeLoader.resolve_theme_asset (apply_subs_discretely doc, icon_path, subs: [:attributes], imagesdir: @themesdir), @themesdir)) &&
               (::File.readable? icon_path)
             icons = true
             # TODO: introduce @theme.admonition_image_width? or use size key from admonition_icon_<name>?
@@ -1464,7 +1435,8 @@ module Asciidoctor
           end
           max_term_width += (term_padding[1] + term_padding[3])
           term_column_width = [max_term_width, bounds.width * 0.5].min
-          table table_data, position: :left, cell_style: { border_width: 0 }, column_widths: [term_column_width] do
+          table table_data, position: :left, column_widths: [term_column_width] do
+            cells.style border_width: 0
             @pdf.ink_table_caption node if node.title?
           end
           theme_margin :prose, :bottom, (next_enclosed_block actual_node) #unless actual_node.nested?
@@ -1633,6 +1605,9 @@ module Asciidoctor
               marker = node.parent.style == 'decimal' && index.abs < 10 ? %(#{index < 0 ? '-' : ''}0#{index.abs}.) : %(#{index}.)
               dir = (node.parent.option? 'reversed') ? :pred : :next
               @list_numerals << (index.public_send dir)
+              [:font_color, :font_family, :font_size, :font_style, :line_height].each do |prop|
+                marker_style[prop] = @theme[%(olist_marker_#{prop})] || marker_style[prop]
+              end
             end
           end
         else # :ulist
@@ -1647,7 +1622,7 @@ module Asciidoctor
             else
               marker = @theme[%(ulist_marker_#{marker_type}_content)] || Bullets[marker_type]
             end
-            [:font_color, :font_family, :font_size, :line_height].each do |prop|
+            [:font_color, :font_family, :font_size, :font_style, :line_height].each do |prop|
               marker_style[prop] = @theme[%(ulist_marker_#{marker_type}_#{prop})] || @theme[%(ulist_marker_#{prop})] || marker_style[prop]
             end if marker
           end
@@ -1658,8 +1633,9 @@ module Asciidoctor
             log :info, 'deprecated fa icon set found in theme; use fas, far, or fab instead'
             marker_style[:font_family] = FontAwesomeIconSets.find {|candidate| (icon_font_data candidate).yaml[candidate].value? marker } || 'fas'
           end
+          marker_style[:font_style] &&= marker_style[:font_style].to_sym
           marker_gap = rendered_width_of_char 'x'
-          font marker_style[:font_family], marker_style[:font_size] do
+          font marker_style[:font_family], size: marker_style[:font_size], style: marker_style[:font_style] do
             marker_width = rendered_width_of_string marker
             # NOTE: compensate if character_spacing is not applied to first character
             # see https://github.com/prawnpdf/prawn/commit/c61c5d48841910aa11b9e3d6f0e01b68ce435329
@@ -1678,6 +1654,7 @@ module Asciidoctor
                   color: marker_style[:font_color],
                   inline_format: false,
                   line_height: marker_style[:line_height],
+                  style: marker_style[:font_style],
                   margin: 0,
                   normalize: false,
                   single_line: true
@@ -1942,10 +1919,10 @@ module Asciidoctor
         if at_page_top?
           if page_layout && page_layout != page.layout && page.empty?
             delete_current_page
-            advance_page layout: page_layout
+            advance_page layout: page_layout, margin: @page_margin[page_layout][page_side nil, @folio_placement[:inverted]]
           end
         elsif page_layout
-          advance_page layout: page_layout
+          advance_page layout: page_layout, margin: @page_margin[page_layout][page_side nil, @folio_placement[:inverted]]
         else
           advance_page
         end
@@ -1996,6 +1973,7 @@ module Asciidoctor
         num_cols = node.columns.size
         table_header_size = false
         theme = @theme
+        prev_font_scale, @font_scale = @font_scale, 1 if node.document.nested?
 
         tbl_bg_color = resolve_theme_color :table_background_color
         # QUESTION: should we fallback to page background color? (which is never transparent)
@@ -2135,7 +2113,7 @@ module Asciidoctor
                 end
                 # NOTE: line metrics get applied when AsciiDoc content is converted
                 cell_line_metrics = nil
-                asciidoc_cell = ::Prawn::Table::Cell::AsciiDoc.new self, (cell_data.merge content: cell.inner_document, padding: body_cell_padding)
+                asciidoc_cell = ::Prawn::Table::Cell::AsciiDoc.new self, (cell_data.merge content: cell.inner_document, padding: body_cell_padding, root_font_size: @root_font_size)
                 cell_data = { content: asciidoc_cell, source_location: cell.source_location }
               end
               if cell_line_metrics
@@ -2240,10 +2218,10 @@ module Asciidoctor
           # NOTE: position is handled by this method
           position: :left,
           # NOTE: the border color, style, and width of the outer frame is set in the table callback block
-          cell_style: { border_color: grid_color.values, border_lines: grid_style.values, border_width: grid_width.values },
           width: table_width,
           column_widths: column_widths,
         }
+        cell_style = { border_color: grid_color.values, border_lines: grid_style.values, border_width: grid_width.values }
 
         # QUESTION: should we support nth; should we support sequence of roles?
         case node.attr 'stripes', nil, 'table-stripes'
@@ -2259,6 +2237,8 @@ module Asciidoctor
 
         left_padding = right_padding = nil
         table table_data, table_settings do
+          # NOTE: cell_style must be applied manually to be compatible with both prawn-table 0.2.2 and prawn-table 0.2.3
+          cells.style cell_style
           @column_widths = column_widths unless column_widths.empty?
           # NOTE: call width to capture resolved table width
           table_width = width
@@ -2339,6 +2319,8 @@ module Asciidoctor
         theme_margin :block, :bottom, (next_enclosed_block node)
       rescue ::Prawn::Errors::CannotFit
         log :error, (message_with_context 'cannot fit contents of table cell into specified column width', source_location: node.source_location)
+      ensure
+        @font_scale = prev_font_scale if prev_font_scale
       end
 
       def convert_thematic_break node
@@ -2428,7 +2410,7 @@ module Asciidoctor
             # QUESTION: should we insert breakable chars into URI when building fragment instead?
             %(#{anchor}<a href="#{target}"#{attrs.join}>#{breakable_uri text}</a>)
           # NOTE: @media may not be initialized if method is called before convert phase
-          elsif (doc.attr? 'show-link-uri') || !(@media == 'screen' || (doc.attribute_locked? 'show-link-uri') || ((doc.instance_variable_get :@attributes_modified).include? 'show-link-uri'))
+          elsif (doc.attr? 'show-link-uri') || (@media != 'screen' && (doc.attr_unspecified? 'show-link-uri'))
             # QUESTION: should we insert breakable chars into URI when building fragment instead?
             # TODO: allow style of printed link to be controlled by theme
             %(#{anchor}<a href="#{target}"#{attrs.join}>#{text}</a> [<font size="0.85em">#{breakable_uri bare_target}</font>&#93;)
@@ -2792,6 +2774,11 @@ module Asciidoctor
         if (imagesdir = opts[:imagesdir])
           imagesdir_to_restore = doc.attr 'imagesdir'
           doc.set_attr 'imagesdir', imagesdir
+          remove_docimagesdir = doc.set_attr 'docimagesdir', (::File.absolute_path imagesdir_to_restore.to_s, (doc.attr 'docdir', '')), false
+        end
+        if (page_layout = opts[:page_layout])
+          page_layout_to_restore = doc.attr 'page-layout'
+          doc.set_attr 'page-layout', page.layout.to_s
         end
         # FIXME: get sub_attributes to handle drop-line w/o a warning
         doc.set_attr 'attribute-missing', 'skip' unless (attribute_missing = doc.attr 'attribute-missing') == 'skip'
@@ -2800,20 +2787,26 @@ 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'
-        imagesdir_to_restore ? (doc.set_attr 'imagesdir', imagesdir_to_restore) : (doc.remove_attr 'imagesdir') if imagesdir
+        page_layout_to_restore ? (doc.set_attr 'page-layout', page_layout_to_restore) : (doc.remove_attr 'page-layout') if page_layout
+        if imagesdir
+          imagesdir_to_restore ? (doc.set_attr 'imagesdir', imagesdir_to_restore) : (doc.remove_attr 'imagesdir')
+          doc.remove_attr 'docimagesdir' if remove_docimagesdir
+        end
         value
       end
 
       # Position the cursor for where to ink the specified section title or discrete heading node.
       #
-      # This method computes whether there is enough room on the page to prevent the specified node
-      # from being orphaned. If there is not enough room, the method will advance the cursor to
+      # This method computes whether there's enough room on the page to prevent the specified node
+      # from being orphaned. If there's not enough room, the method will advance the cursor to
       # the next page. This method is not called if the cursor is already at the top of the page or
       # whether this node has no node that follows it in document order.
       def arrange_heading node, title, opts
-        if node.option? 'breakable'
+        if (min_height_after = @theme.heading_min_height_after) == 'auto' || (node.option? 'breakable')
           orphaned = nil
+          doc = node.document
           dry_run single_page: true do
+            push_scratch doc
             start_page = page
             theme_font :heading, level: opts[:level] do
               if opts[:part]
@@ -2828,6 +2821,8 @@ module Asciidoctor
               page.tare_content_stream
               orphaned = stop_if_first_page_empty { node.context == :section ? (traverse node) : (convert node.next_sibling) }
             end
+          ensure
+            pop_scratch doc
           end
           advance_page if orphaned
         else
@@ -2838,9 +2833,7 @@ module Asciidoctor
               heading_h = (height_of_typeset_text title) +
                 (@theme[%(heading_h#{hlevel}_margin_top)] || @theme.heading_margin_top) +
                 (@theme[%(heading_h#{hlevel}_margin_bottom)] || @theme.heading_margin_bottom) + h_padding_t + h_padding_b
-              if (min_height_after = @theme.heading_min_height_after) && (node.context == :section ? node.blocks? : !node.last_child?)
-                heading_h += min_height_after
-              end
+              heading_h += min_height_after if min_height_after && (node.context == :section ? node.blocks? : !node.last_child?)
               cursor >= heading_h
             end
             advance_page unless h_fits
@@ -3103,7 +3096,8 @@ module Asciidoctor
           end
           unless scratch? || !(bg_color = @theme[%(#{category_caption}_background_color)] || @theme.caption_background_color)
             caption_height = height_of_typeset_text string
-            fill_at = [bounds.left, cursor + (margin[:top] || 0)]
+            fill_at = [bounds.left, cursor]
+            fill_at[1] -= (margin[:top] || 0) unless at_page_top?
             float { bounding_box(fill_at, width: container_width, height: caption_height) { fill_bounds bg_color } }
           end
           indent(*indent_by) do
@@ -3141,7 +3135,7 @@ module Asciidoctor
             open_graphics_state if face == :front
             return
           elsif image_path == '~'
-            @page_margin_by_side[:cover] = @page_margin_by_side[:recto] if @media == 'prepress'
+            @page_margin[:cover] = @page_margin[page.layout][:recto] if @media == 'prepress'
             return
           end
 
@@ -3272,7 +3266,7 @@ module Asciidoctor
 
       def allocate_running_content_layout doc, page, periphery, cache
         cache[layout = page.layout] ||= begin
-          page_margin_recto = @page_margin_by_side[:recto]
+          page_margin_recto = @page_margin[layout][:recto]
           trim_margin_recto = @theme[%(#{periphery}_recto_margin)] || @theme[%(#{periphery}_margin)] || [0, 'inherit', 0, 'inherit']
           trim_margin_recto = (expand_margin_value trim_margin_recto).map.with_index {|v, i| i.odd? && v == 'inherit' ? page_margin_recto[i] : v.to_f }
           trim_content_margin_recto = @theme[%(#{periphery}_recto_content_margin)] || @theme[%(#{periphery}_content_margin)] || [0, 'inherit', 0, 'inherit']
@@ -3282,7 +3276,7 @@ module Asciidoctor
           else
             trim_padding_recto = trim_content_margin_recto
           end
-          page_margin_verso = @page_margin_by_side[:verso]
+          page_margin_verso = @page_margin[layout][:verso]
           trim_margin_verso = @theme[%(#{periphery}_verso_margin)] || @theme[%(#{periphery}_margin)] || [0, 'inherit', 0, 'inherit']
           trim_margin_verso = (expand_margin_value trim_margin_verso).map.with_index {|v, i| i.odd? && v == 'inherit' ? page_margin_verso[i] : v.to_f }
           trim_content_margin_verso = @theme[%(#{periphery}_verso_content_margin)] || @theme[%(#{periphery}_content_margin)] || [0, 'inherit', 0, 'inherit']
@@ -3677,7 +3671,7 @@ module Asciidoctor
             logo_image_attrs = (AttributeList.new $2).parse %w(alt width height)
             if logo_image_from_theme
               relative_to_imagesdir = false
-              logo_image_path = apply_subs_discretely doc, $1, subs: [:attributes]
+              logo_image_path = apply_subs_discretely doc, $1, subs: [:attributes], imagesdir: @themesdir
               logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless doc.is_uri? logo_image_path
             else
               relative_to_imagesdir = true
@@ -3687,7 +3681,7 @@ module Asciidoctor
             logo_image_attrs = {}
             relative_to_imagesdir = false
             if logo_image_from_theme
-              logo_image_path = apply_subs_discretely doc, logo_image_path, subs: [:attributes]
+              logo_image_path = apply_subs_discretely doc, logo_image_path, subs: [:attributes], imagesdir: @themesdir
               logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless doc.is_uri? logo_image_path
             end
           end
@@ -3773,12 +3767,12 @@ module Asciidoctor
         end
       end
 
-      def allocate_toc doc, toc_num_levels, toc_start_cursor, title_page_on
+      def allocate_toc doc, toc_num_levels, toc_start_cursor, break_after_toc
         toc_start_page_number = page_number
         to_page = nil
         extent = dry_run onto: self do
           to_page = (ink_toc doc, toc_num_levels, toc_start_page_number, toc_start_cursor).end
-          theme_margin :block, :bottom unless title_page_on
+          theme_margin :block, :bottom unless break_after_toc
         end
         # NOTE: patch for custom converters that allocate extra TOC pages without actually creating them
         if to_page > extent.to.page
@@ -3786,7 +3780,7 @@ module Asciidoctor
           extent.to.cursor = bounds.height
         end
         # NOTE: reserve pages for the toc; leaves cursor on page after last page in toc
-        if title_page_on
+        if break_after_toc
           extent.each_page { start_new_page }
         else
           extent.each_page {|first_page| start_new_page unless first_page }
@@ -4057,18 +4051,14 @@ module Asciidoctor
             return []
           elsif (image_path.include? ':') && image_path =~ ImageAttributeValueRx
             image_attrs = (AttributeList.new $2).parse %w(alt width)
-            if from_theme
-              image_path = apply_subs_discretely doc, $1, subs: [:attributes]
-              image_relative_to = @themesdir
-            else
-              image_path = $1
-              image_relative_to = true
-            end
-          elsif from_theme
-            image_path = apply_subs_discretely doc, image_path, subs: [:attributes]
-            image_relative_to = @themesdir
+            image_path = $1
+            image_relative_to = true
+          end
+          if from_theme
+            image_path = apply_subs_discretely doc, image_path, subs: [:attributes], imagesdir: (image_relative_to = @themesdir), page_layout: page.layout.to_s
+          elsif image_path.include? '{page-layout}'
+            image_path = image_path.sub '{page-layout}', page.layout.to_s
           end
-
           image_path, image_format = ::Asciidoctor::Image.target_and_format image_path, image_attrs
           image_path = resolve_image_path doc, image_path, image_format, image_relative_to
 
@@ -4282,6 +4272,27 @@ module Asciidoctor
         end
       end
 
+      def resolve_page_margin value
+        return if value.nil_or_empty?
+        case value
+        when ::Array
+          value = value.slice 0, 4 if value.length > 4
+          value.map {|v| ::Numeric === v ? v : (str_to_pt v.to_s) }
+        when ::Numeric
+          [value]
+        when ::String
+          if (value.start_with? '[') && (value.end_with? ']')
+            return if (value = (value.slice 1, value.length - 2).rstrip).empty?
+            if (value = value.split ',', -1).length > 4
+              value = value.slice 0, 4
+            end
+            value.map {|v| str_to_pt v.rstrip }
+          else
+            [(str_to_pt value)]
+          end
+        end
+      end
+
       def resolve_text_align_from_role roles, query_theme: false, remove_predefined: false
         if (align_role = roles.reverse.find {|r| TextAlignmentRoles.include? r })
           roles.replace roles - TextAlignmentRoles if remove_predefined
@@ -4334,17 +4345,17 @@ module Asciidoctor
         elsif @ppbook && page_number > 0 && recto_page?
           start_new_page
         end
-        side = page_side (recycle ? nil : page_number + 1), @folio_placement[:inverted]
-        prev_bg_image = @page_bg_image[side]
-        prev_bg_color = @page_bg_color
         if (bg_image = resolve_background_image doc, @theme, 'title-page-background-image')
-          @page_bg_image[side] = bg_image[0] && bg_image
+          side = page_side (recycle ? nil : page_number + 1), @folio_placement[:inverted]
+          prev_bg_image = get_page_bg_image doc, @theme, (layout = page.layout), side
+          @page_bg_image[layout][side] = bg_image[0] && bg_image
         end
         if (bg_color = resolve_theme_color :title_page_background_color)
+          prev_bg_color = @page_bg_color
           @page_bg_color = bg_color
         end
-        recycle ? float { init_page self } : start_new_page
-        @page_bg_image[side] = prev_bg_image if bg_image
+        recycle ? float { init_page doc, self } : start_new_page
+        @page_bg_image[layout][side] = prev_bg_image if bg_image
         @page_bg_color = prev_bg_color if bg_color
         true
       end
@@ -4431,7 +4442,12 @@ module Asciidoctor
         if opts.key? :level
           hlevel_category = %(#{category}_h#{opts[:level]})
           family = @theme[%(#{hlevel_category}_font_family)] || @theme[%(#{category}_font_family)] || @theme.base_font_family || font_family
-          size = (@theme[%(#{hlevel_category}_font_size)] || @theme[%(#{category}_font_size)] || @root_font_size) * @font_scale
+          if (size = @theme[%(#{hlevel_category}_font_size)] || @theme[%(#{category}_font_size)])
+            scale = @font_scale unless ::String === size
+          else
+            scale = @font_scale
+            size = @root_font_size
+          end
           style = @theme[%(#{hlevel_category}_font_style)] || @theme[%(#{category}_font_style)]
           color = @theme[%(#{hlevel_category}_font_color)] || @theme[%(#{category}_font_color)]
           kerning = resolve_font_kerning @theme[%(#{hlevel_category}_font_kerning)] || @theme[%(#{category}_font_kerning)]
@@ -4441,7 +4457,11 @@ module Asciidoctor
         else
           inherited_font = font_info
           family = @theme[%(#{category}_font_family)] || inherited_font[:family]
-          size = (size = @theme[%(#{category}_font_size)]) ? size * @font_scale : inherited_font[:size]
+          if (size = @theme[%(#{category}_font_size)])
+            scale = @font_scale unless ::String === size
+          else
+            size = inherited_font[:size]
+          end
           style = @theme[%(#{category}_font_style)] || inherited_font[:style]
           color = @theme[%(#{category}_font_color)]
           kerning = resolve_font_kerning @theme[%(#{category}_font_kerning)]
@@ -4457,6 +4477,7 @@ module Asciidoctor
 
         result = nil
         font family, size: size, style: style&.to_sym do
+          @font_size *= scale if scale
           result = yield
         ensure
           @font_color = prev_color if color
@@ -4793,6 +4814,23 @@ module Asciidoctor
         (code.start_with? '\u') ? ([((code.slice 2, code.length).to_i 16)].pack 'U1') : code
       end
 
+      def get_page_bg_image doc, theme_, layout, side
+        (@page_bg_image[layout] ||= begin
+          if (bg_image = resolve_background_image doc, theme_, 'page-background-image')&.first
+            val = { verso: bg_image, recto: bg_image }
+          else
+            val = { verso: nil, recto: nil }
+          end
+          if (bg_image = resolve_background_image doc, theme_, 'page-background-image-verso')
+            val[:verso] = bg_image[0] && bg_image
+          end
+          if (bg_image = resolve_background_image doc, theme_, 'page-background-image-recto')
+            val[:recto] = bg_image[0] && bg_image
+          end
+          val
+        end)[side]
+      end
+
       def get_icon_image_path node, type, resolve = true
         doc = node.document
         doc.remove_attr 'data-uri' if (data_uri_enabled = doc.attr? 'data-uri')
@@ -4816,18 +4854,17 @@ module Asciidoctor
         @float_box = { page: page_number, top: box_t, right: box_r, bottom: box_b, left: box_l, width: box_w, height: box_h, gap: gap }
       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, cover pages, image pages, and pages in the scratch document
-      def init_page *_args
+      def init_page doc, _self
         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
+        if @media == 'prepress' && (next_page_margin = page_number == 1 ? @page_margin[:cover] : @page_margin[page.layout][next_page_side]) != page_margin
           set_page_margin next_page_margin
         end
         unless @page_bg_color == 'FFFFFF'
           fill_absolute_bounds @page_bg_color
           tare = true
         end
-        if (bg_image_path, bg_image_opts = @page_bg_image[next_page_side])
+        if (bg_image_path, bg_image_opts = get_page_bg_image doc, @theme, (layout = page.layout), next_page_side)
           begin
             if bg_image_opts[:format] == 'pdf'
               # NOTE: pages that use PDF for the background do not support a background color or running content
@@ -4838,9 +4875,10 @@ module Asciidoctor
             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]
-            @page_bg_image[next_page_side] = nil
+            facing_page_side = PageSides[(PageSides.index next_page_side) - 1]
+            bg_image_by_side = @page_bg_image[layout]
+            bg_image_by_side[facing_page_side] = nil if bg_image_by_side[facing_page_side] == bg_image_by_side[next_page_side]
+            bg_image_by_side[next_page_side] = nil
             log :warn, %(could not embed page background image: #{bg_image_path}; #{$!.message})
           end
         end
@@ -5011,7 +5049,9 @@ module Asciidoctor
       end
 
       def resolve_top val
-        if val.end_with? 'vh'
+        if ::Numeric === val
+          @y - val
+        elsif val.end_with? 'vh'
           page_height * (1 - (val.to_f / 100))
         elsif val.end_with? '%'
           @y - effective_page_height * (val.to_f / 100)
@@ -5103,20 +5143,17 @@ module Asciidoctor
         @label = :scratch
         @save_state = nil
         @scratch_depth = 0
-        # NOTE: don't need background image in scratch document; can cause marshal error anyway
-        saved_page_bg_image, @page_bg_image = @page_bg_image, { verso: nil, recto: nil }
         # NOTE: pdfmark has a reference to the Asciidoctor::Document, which we don't want to serialize
         saved_pdfmark, @pdfmark = @pdfmark, nil
         # IMPORTANT: don't set font before using marshal as it causes serialization to fail
         result = yield
         @pdfmark = saved_pdfmark
-        @page_bg_image = saved_page_bg_image
         @label = :primary
         result
       end
 
       def init_scratch originator
-        if @media == 'prepress' && page_margin != (page_margin_recto = @page_margin_by_side[:recto])
+        if @media == 'prepress' && page_margin != (page_margin_recto = @page_margin[page.layout][: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

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

@@ -23,4 +23,9 @@ class Asciidoctor::Document
     end
     nil
   end
+
+  # Internal: Returns whether the specified attribute has never been set and is not locked.
+  def attr_unspecified? name
+    !((attribute_locked? name) || (@attributes_modified.include? name))
+  end
 end

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

@@ -371,14 +371,16 @@ module Asciidoctor
           else
             super points.to_f
           end
-        # NOTE: assume em value (since a font size of 1 is extremely unlikely)
-        elsif points <= 1
-          super @font_size * points
         else
           super points
         end
       end
 
+      def set_font font, size = nil
+        @font = font
+        font_size size if size
+      end
+
       def resolve_font_style styles
         if styles.include? :bold
           (styles.include? :italic) ? :bold_italic : :bold
@@ -1121,6 +1123,10 @@ 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.
       #
+      # The block passed to dry run should take steps to avoid leaving the document state modified.
+      # This can be done by calling `push_scratch doc` at the start of the block and `pop_scratch`
+      # in the ensure clause of the block.
+      #
       # 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).
@@ -1133,7 +1139,7 @@ module Asciidoctor
       #
       # 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 layout: page.layout
+        (scratch_pdf = scratch).start_new_page layout: page.layout, margin: page_margin
         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/ext/prawn-table/cell/asciidoc.rb

@@ -7,6 +7,7 @@ module Prawn
         include ::Asciidoctor::Logging
 
         attr_accessor :align
+        attr_accessor :root_font_size
         attr_accessor :valign
 
         def initialize pdf, opts = {}
@@ -109,7 +110,7 @@ module Prawn
           prev_font_color, pdf.font_color = pdf.font_color, font_color if font_color
           font_family ||= font_info[:family]
           if font_size
-            prev_font_scale, pdf.font_scale = pdf.font_scale, (font_size.to_f / @pdf.root_font_size)
+            prev_font_scale, pdf.font_scale = pdf.font_scale, (font_size.to_f / @root_font_size)
           else
             font_size = font_info[:size]
           end

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.1.4'
+    VERSION = '2.2.0'
   end
 end

metadata

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