asciidoctor-pdf 2.1.5 → 2.3.0

data/lib/asciidoctor/pdf/converter.rb

@@ -46,8 +46,9 @@ module Asciidoctor
         tip: { name: 'far-lightbulb', stroke_color: '111111', size: 24 },
         warning: { name: 'fas-exclamation-triangle', stroke_color: 'BF6900', size: 24 },
       }
-      TextAlignmentNames = %w(justify left center right)
-      TextAlignmentRoles = %w(text-justify text-left text-center text-right)
+      TextAlignmentNames = { 'justify' => true, 'left' => true, 'center' => true, 'right' => true }
+      IndentableTextAlignments = { justify: true, left: true }
+      TextAlignmentRoles = { 'text-justify' => true, 'text-left' => true, 'text-center' => true, 'text-right' => true }
       TextDecorationStyleTable = { 'underline' => :underline, 'line-through' => :strikethrough }
       FontKerningTable = { 'normal' => true, 'none' => false }
       BlockFloatNames = %w(left right)
@@ -102,6 +103,7 @@ module Asciidoctor
         'filled' => (?\u2776..?\u277f).to_a + (?\u24eb..?\u24f4).to_a,
       }
       TypographicQuotes = %w(“ ” ‘ ’)
+      InlineFormatSniffRx = /[<&]/
       SimpleAttributeRefRx = /(?<!\\)\{\w+(?:-\w+)*\}/
       MeasurementRxt = '\\d+(?:\\.\\d+)?(?:in|cm|mm|p[txc])?'
       MeasurementPartsRx = /^(\d+(?:\.\d+)?)(in|mm|cm|p[txc])?$/
@@ -160,11 +162,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
@@ -179,7 +181,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
@@ -200,19 +202,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
@@ -226,7 +233,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
@@ -351,7 +358,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 }
@@ -362,6 +368,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)
@@ -373,17 +386,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'
@@ -393,11 +396,10 @@ module Asciidoctor
         @font_scale = 1
         @font_color = theme.base_font_color
         @text_decoration_width = theme.base_text_decoration_width
-        @base_text_align = (text_align = doc.attr 'text-align') && (TextAlignmentNames.include? text_align) ? text_align : theme.base_text_align
+        @base_text_align = (text_align = doc.attr 'text-align') && TextAlignmentNames[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'
@@ -435,34 +437,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]
@@ -560,8 +535,10 @@ module Asciidoctor
           elsif (theme_name = doc.attr 'pdf-theme')
             theme = ThemeLoader.load_theme theme_name, (user_themesdir = (doc.attr 'pdf-themesdir')&.sub '{docdir}', (doc.attr 'docdir'))
             @themesdir = theme.__dir__
-          else
+          elsif (doc.attr 'media', 'screen') == 'screen'
             @themesdir = (theme = ThemeLoader.load_theme).__dir__
+          else
+            @themesdir = (theme = ThemeLoader.load_theme 'default-for-print').__dir__
           end
           prepare_theme theme
         rescue
@@ -604,6 +581,7 @@ module Asciidoctor
         theme.code_linenum_font_color ||= '999999'
         theme.callout_list_margin_top_after_code ||= 0
         theme.role_unresolved_font_color ||= 'FF0000'
+        theme.footnotes_margin_top ||= 'auto'
         theme.footnotes_item_spacing ||= 0
         theme.index_columns ||= 2
         theme.index_column_gap ||= theme.base_font_size
@@ -768,22 +746,16 @@ module Asciidoctor
             pagenums = consolidate_ranges term.dests.map {|dest| dest[:page] }.uniq
           end
           pagenums.each do |pagenum|
-            # NOTE: addresses a very minor kerning issue for text adjacent to the comma
-            if (prev_fragment = term_fragments[-1]).size == 1
-              if ::String === pagenum
-                term_fragments[-1] = prev_fragment.merge text: %(#{prev_fragment[:text]}, #{pagenum})
-                next
-              else
-                term_fragments[-1] = prev_fragment.merge text: %(#{prev_fragment[:text]}, )
-              end
+            if ::String === pagenum
+              term_fragments << ({ text: %(, #{pagenum}) })
             else
-              term_fragments << ({ text: ', ' })
+              term_fragments << { text: ', ' }
+              term_fragments << pagenum
             end
-            term_fragments << (::String === pagenum ? { text: pagenum } : pagenum)
           end
         end
         subterm_indent = @theme.description_list_description_indent
-        typeset_formatted_text term_fragments, (calc_line_metrics @base_line_height), align: :left, color: @font_color, hanging_indent: subterm_indent * 2
+        typeset_formatted_text term_fragments, (calc_line_metrics @base_line_height), align: :left, color: @font_color, hanging_indent: subterm_indent * 2, consolidate: true
         indent subterm_indent do
           term.subterms.each do |subterm|
             convert_index_term subterm, pagenum_sequence_style
@@ -809,10 +781,7 @@ module Asciidoctor
               ink_prose node.title, align: (@theme.abstract_title_text_align || @base_text_align).to_sym, margin_top: @theme.heading_margin_top, margin_bottom: @theme.heading_margin_bottom, line_height: (@theme.heading_line_height || @theme.base_line_height)
             end if node.title?
             theme_font :abstract do
-              prose_opts = { align: (@theme.abstract_text_align || @base_text_align).to_sym, hyphenate: true }
-              if (text_indent = @theme.prose_text_indent) > 0
-                prose_opts[:indent_paragraphs] = text_indent
-              end
+              prose_opts = { align: (@theme.abstract_text_align || @base_text_align).to_sym, hyphenate: true, margin_bottom: 0 }
               # FIXME: allow theme to control more first line options
               if (line1_font_style = @theme.abstract_first_line_font_style&.to_sym) && line1_font_style != font_style
                 case line1_font_style
@@ -833,14 +802,11 @@ module Asciidoctor
               prose_opts[:first_line_options] = first_line_options if first_line_options
               # FIXME: make this cleaner!!
               if node.blocks?
-                last_block = node.last_child
                 node.blocks.each do |child|
                   if child.context == :paragraph
                     child.document.playback_attributes child.attributes
-                    prose_opts[:margin_bottom] = 0 if child == last_block
-                    ink_prose child.content, ((text_align = resolve_text_align_from_role child.roles) ? (prose_opts.merge align: text_align) : prose_opts.dup)
+                    convert_paragraph child, prose_opts.dup
                     prose_opts.delete :first_line_options
-                    prose_opts.delete :margin_bottom
                   else
                     # FIXME: this could do strange things if the wrong kind of content shows up
                     child.convert
@@ -850,7 +816,10 @@ module Asciidoctor
                 if (text_align = resolve_text_align_from_role node.roles)
                   prose_opts[:align] = text_align
                 end
-                ink_prose string, (prose_opts.merge margin_bottom: 0)
+                if IndentableTextAlignments[prose_opts[:align]] && (text_indent = @theme.prose_text_indent) > 0
+                  prose_opts[:indent_paragraphs] = text_indent
+                end
+                ink_prose string, prose_opts
               end
             end
           end
@@ -859,16 +828,19 @@ module Asciidoctor
         theme_margin :block, :bottom, (next_enclosed_block node)
       end
 
-      def convert_paragraph node
+      def convert_paragraph node, opts = nil
         add_dest_for_block node if node.id
 
-        prose_opts = { margin_bottom: 0, hyphenate: true }
+        prose_opts = opts || { margin_bottom: 0, hyphenate: true }
         if (text_align = resolve_text_align_from_role (roles = node.roles), query_theme: true, remove_predefined: true)
           prose_opts[:align] = text_align
+        else
+          text_align = @base_text_align.to_sym
         end
         role_keys = roles.map {|role| %(role_#{role}) } unless roles.empty?
-        if (text_indent = @theme.prose_text_indent) > 0 ||
-            ((text_indent = @theme.prose_text_indent_inner) > 0 && node.previous_sibling&.context == :paragraph)
+        if IndentableTextAlignments[text_align] &&
+            ((text_indent = @theme.prose_text_indent) > 0 ||
+            ((text_indent = @theme.prose_text_indent_inner) > 0 && node.previous_sibling&.context == :paragraph))
           prose_opts[:indent_paragraphs] = text_indent
         end
         if (bottom_gutter = @bottom_gutters[-1][node])
@@ -915,7 +887,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>?
@@ -1073,7 +1045,7 @@ module Asciidoctor
             else
               highlighter = nil
             end
-            prev_subs = (subs = node.subs).dup
+            saved_subs = (subs = node.subs).dup
             callouts_enabled = subs.include? :callouts
             highlight_idx = subs.index :highlight
             # NOTE: scratch? here only applies if listing block is nested inside another block
@@ -1083,16 +1055,33 @@ module Asciidoctor
                 # switch the :highlight sub back to :specialcharacters
                 subs[highlight_idx] = :specialcharacters
               else
-                prev_subs = nil
+                saved_subs = nil
               end
               source_string = guard_indentation node.content
             elsif highlight_idx
               # NOTE: the source highlighter logic below handles the highlight and callouts subs
-              subs.replace subs - [:highlight, :callouts]
-              # NOTE: indentation guards will be added by the source highlighter logic
-              source_string = expand_tabs node.content
+              if (subs - [:highlight, :callouts]).empty?
+                subs.clear
+                # NOTE: indentation guards will be added by the source highlighter logic
+                source_string = expand_tabs node.content
+              else
+                if callouts_enabled
+                  saved_lines = node.lines.dup
+                  subs.delete :callouts
+                  prev_subs = subs.dup
+                  subs.clear
+                  source_string, conum_mapping = extract_conums node.content
+                  node.lines.replace (source_string.split LF)
+                  subs.replace prev_subs
+                  callouts_enabled = false
+                end
+                subs[highlight_idx] = :specialcharacters
+                # NOTE: indentation guards will be added by the source highlighter logic
+                source_string = expand_tabs unescape_xml (sanitize node.content, compact: false)
+                node.lines.replace saved_lines if saved_lines
+              end
             else
-              highlighter = prev_subs = nil
+              highlighter = saved_subs = nil
               source_string = guard_indentation node.content
             end
           else
@@ -1184,7 +1173,7 @@ module Asciidoctor
             # NOTE: only format if we detect a need (callouts or inline formatting)
             source_chunks = (XMLMarkupRx.match? source_string) ? (text_formatter.format source_string) : [text: source_string]
           end
-          node.subs.replace prev_subs if prev_subs
+          node.subs.replace saved_subs if saved_subs
           adjusted_font_size = ((node.option? 'autofit') || (node.document.attr? 'autofit-option')) ? (compute_autofit_font_size source_chunks, :code) : nil
         end
 
@@ -1308,7 +1297,7 @@ module Asciidoctor
                 content = guard_indentation node.content
                 ink_prose content,
                   normalize: false,
-                  align: :left,
+                  align: (resolve_text_align_from_role node.roles) || :left,
                   hyphenate: true,
                   margin_bottom: 0,
                   bottom_gutter: (attribution ? nil : @bottom_gutters[-1][node])
@@ -1462,7 +1451,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?
@@ -1631,6 +1621,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
@@ -1645,7 +1638,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
@@ -1656,8 +1649,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
@@ -1676,6 +1670,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
@@ -1703,7 +1698,7 @@ module Asciidoctor
             alignment = float_to.to_sym
           elsif (alignment = node.attr 'align')
             alignment = (BlockAlignmentNames.include? alignment) ? alignment.to_sym : :left
-          elsif !(alignment = node.roles.reverse.find {|r| BlockAlignmentNames.include? r }&.to_sym)
+          elsif !(alignment = node.roles.reverse.find {|role| BlockAlignmentNames.include? role }&.to_sym)
             alignment = @theme.image_align&.to_sym || :left
           end
         end
@@ -1937,14 +1932,16 @@ module Asciidoctor
           page_layout = nil
         end
 
-        if at_page_top?
+        if at_page_top? && !(node.option? 'always')
           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
+          bounds.current_column = bounds.last_column if ColumnBox === bounds && !(node.has_role? 'column')
+          advance_page layout: page_layout, margin: @page_margin[page_layout][page_side nil, @folio_placement[:inverted]]
         else
+          bounds.current_column = bounds.last_column if ColumnBox === bounds && !(node.has_role? 'column')
           advance_page
         end
       end
@@ -2217,7 +2214,7 @@ module Asciidoctor
 
         if node.option? 'autowidth'
           table_width = (node.attr? 'width') ? bounds.width * ((node.attr 'tablepcwidth') / 100.0) :
-              (((node.has_role? 'stretch') || (node.has_role? 'spread')) ? bounds.width : nil)
+              (((node.has_role? 'stretch')) ? bounds.width : nil)
           column_widths = []
         else
           table_width = bounds.width * ((node.attr 'tablepcwidth') / 100.0)
@@ -2239,10 +2236,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'
@@ -2258,6 +2255,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
@@ -2381,6 +2380,9 @@ module Asciidoctor
           node.content
         elsif node.content_model != :compound && (string = node.content)
           prose_opts = opts.merge hyphenate: true, margin_bottom: 0
+          if (text_align = resolve_text_align_from_role node.roles)
+            prose_opts[:align] = text_align
+          end
           if (bottom_gutter = @bottom_gutters[-1][node])
             prose_opts[:bottom_gutter] = bottom_gutter
           end
@@ -2429,7 +2431,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;)
@@ -2496,9 +2498,9 @@ module Asciidoctor
           else
             label = index
           end
-          %(#{anchor}<sup>[<a anchor="_footnotedef_#{index}">#{label}</a>]</sup>)
+          %(<sup class="wj">#{anchor}[<a anchor="_footnotedef_#{index}">#{label}</a>]</sup>)
         elsif node.type == :xref
-          %(<sup><font color="#{theme.role_unresolved_font_color}">[#{node.text}]</font></sup>)
+          %(<sup class="wj"><font color="#{theme.role_unresolved_font_color}">[#{node.text}]</font></sup>)
         else
           log :warn, %(unknown footnote type: #{node.type.inspect})
           nil
@@ -2793,6 +2795,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'
@@ -2801,20 +2808,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]
@@ -2829,19 +2842,18 @@ 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
           theme_font :heading, level: (hlevel = opts[:level]) do
             h_padding_t, h_padding_r, h_padding_b, h_padding_l = expand_padding_value @theme[%(heading_h#{hlevel}_padding)]
             h_fits = indent h_padding_l, h_padding_r do
-              # FIXME: this height doesn't account for impact of text transform or inline formatting
-              heading_h = (height_of_typeset_text title) +
+              heading_h = (height_of_typeset_text title, inline_format: true, text_transform: @text_transform) +
                 (@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
@@ -3010,8 +3022,16 @@ module Asciidoctor
       end
 
       def height_of_typeset_text string, opts = {}
+        if (transform = opts[:text_transform])
+          string = transform_text string, transform
+        end
+        if (inline_format = opts[:inline_format]) && (InlineFormatSniffRx.match? string)
+          fragments = parse_text string, inline_format: inline_format
+        else
+          fragments = [{ text: string }]
+        end
         line_metrics = (calc_line_metrics opts[:line_height] || @base_line_height)
-        (height_of string, leading: line_metrics.leading, final_gap: line_metrics.final_gap) + line_metrics.padding_top + (opts[:single_line] ? 0 : line_metrics.padding_bottom)
+        (height_of_formatted fragments, leading: line_metrics.leading, final_gap: line_metrics.final_gap) + line_metrics.padding_top + (opts[:single_line] ? 0 : line_metrics.padding_bottom)
       end
 
       # Render the caption in the current document. If the dry_run option is true, return the height.
@@ -3103,7 +3123,7 @@ module Asciidoctor
             opts = opts.merge inherited
           end
           unless scratch? || !(bg_color = @theme[%(#{category_caption}_background_color)] || @theme.caption_background_color)
-            caption_height = height_of_typeset_text string
+            caption_height = height_of_typeset_text string, inline_format: true, text_transform: @text_transform
             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 } }
@@ -3143,7 +3163,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
 
@@ -3164,9 +3184,9 @@ module Asciidoctor
       def ink_footnotes node
         return if (fns = (doc = node.document).footnotes - @rendered_footnotes).empty?
         theme_margin :block, :bottom if node.context == :document || node == node.document.last_child
-        theme_margin :footnotes, :top
+        theme_margin :footnotes, :top unless (valign_bottom = @theme.footnotes_margin_top == 'auto')
         with_dry_run do |extent|
-          if (single_page_height = extent&.single_page_height) && (delta = cursor - single_page_height - 0.0001) > 0
+          if valign_bottom && (single_page_height = extent&.single_page_height) && (delta = cursor - single_page_height - 0.0001) > 0
             move_down delta
           end
           theme_font :footnotes do
@@ -3274,7 +3294,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']
@@ -3284,7 +3304,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']
@@ -3679,7 +3699,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
@@ -3689,7 +3709,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
@@ -3775,12 +3795,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
@@ -3788,7 +3808,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 }
@@ -4059,18 +4079,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
 
@@ -4284,9 +4300,30 @@ 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
+        if (align_role = roles.reverse.find {|role| TextAlignmentRoles[role] })
+          roles.replace roles - TextAlignmentRoles.keys if remove_predefined
           (align_role.slice 5, align_role.length).to_sym
         elsif query_theme
           roles.reverse.each do |role|
@@ -4336,17 +4373,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
@@ -4433,7 +4470,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)]
@@ -4443,7 +4485,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)]
@@ -4459,6 +4505,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
@@ -4518,6 +4565,7 @@ module Asciidoctor
       # QUESTION: combine with typeset_text?
       def typeset_formatted_text fragments, line_metrics, opts = {}
         opts = { leading: line_metrics.leading, initial_gap: line_metrics.padding_top, final_gap: line_metrics.final_gap }.merge opts
+        fragments = consolidate_fragments fragments if opts.delete :consolidate
         if (hanging_indent = (opts.delete :hanging_indent) || 0) > 0
           indent hanging_indent do
             formatted_text fragments, (opts.merge indent_paragraphs: -hanging_indent)
@@ -4727,6 +4775,20 @@ module Asciidoctor
         end
       end
 
+      def consolidate_fragments fragments
+        return fragments unless fragments.size > 1
+        accum = []
+        prev_fragment = nil
+        fragments.each do |fragment|
+          if prev_fragment && fragment == (prev_fragment.merge text: (fragment_text = fragment[:text]))
+            prev_fragment[:text] += fragment_text
+          else
+            accum << (prev_fragment = fragment)
+          end
+        end
+        accum
+      end
+
       def conum_glyph number
         @conum_glyphs[number - 1]
       end
@@ -4795,6 +4857,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')
@@ -4818,18 +4897,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
@@ -4840,9 +4918,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
@@ -5013,7 +5092,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)
@@ -5105,20 +5186,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