asciidoctor-pdf 2.0.0.beta.1 → 2.0.0.beta.2

data/lib/asciidoctor/pdf/converter.rb

@@ -52,6 +52,7 @@ module Asciidoctor
       TextAlignmentRoles = %w(text-justify text-left text-center text-right)
       TextDecorationStyleTable = { 'underline' => :underline, 'line-through' => :strikethrough }
       FontKerningTable = { 'normal' => true, 'none' => false }
+      BlockFloatNames = %w(left right)
       BlockAlignmentNames = %w(left center right)
       (AlignmentTable = { '<' => :left, '=' => :center, '>' => :right }).default = :left
       ColumnPositions = [:left, :center, :right]
@@ -486,8 +487,9 @@ module Asciidoctor
         theme.code_linenum_font_color ||= '999999'
         theme.callout_list_margin_top_after_code ||= 0
         theme.role_unresolved_font_color ||= 'FF0000'
-        theme.index_columns ||= 2
         theme.footnotes_item_spacing ||= 0
+        theme.index_columns ||= 2
+        theme.index_column_gap ||= theme.base_font_size
         theme.kbd_separator ||= '+'
         theme.title_page_authors_delimiter ||= ', '
         theme.title_page_revision_delimiter ||= ', '
@@ -665,24 +667,24 @@ module Asciidoctor
           title, _, subtitle = title.rpartition sep
           title = %(#{title}\n<em class="subtitle">#{subtitle}</em>)
         end
-        hlevel = sect.level + 1
+        hlevel = sect.level.next
         align = (@theme[%(heading_h#{hlevel}_text_align)] || @theme.heading_text_align || @base_text_align).to_sym
         chapterlike = !(part = sectname == 'part') && (sectname == 'chapter' || (sect.document.doctype == 'book' && sect.level == 1))
         hidden = sect.option? 'notitle'
         hopts = { align: align, level: hlevel, part: part, chapterlike: chapterlike, outdent: !(part || chapterlike) }
         if part
           unless @theme.heading_part_break_before == 'auto'
-            start_new = true
+            started_new = true
             start_new_part sect
           end
         elsif chapterlike
           if @theme.heading_chapter_break_before != 'auto' ||
               (@theme.heading_part_break_after == 'always' && sect == sect.parent.sections[0])
-            start_new = true
+            started_new = true
             start_new_chapter sect
           end
         end
-        arrange_section sect, title, hopts unless hidden || start_new || at_page_top?
+        arrange_heading sect, title, hopts unless hidden || started_new || at_page_top? || !sect.blocks?
         # QUESTION: should we store pdf-page-start, pdf-anchor & pdf-destination in internal map?
         sect.set_attr 'pdf-page-start', (start_pgnum = page_number)
         # QUESTION: should we just assign the section this generated id?
@@ -753,14 +755,17 @@ module Asciidoctor
       end
 
       def convert_floating_title node
-        add_dest_for_block node if node.id
+        title = node.title
         hlevel = node.level.next
-        unless (align = resolve_alignment_from_role node.roles)
+        unless (align = resolve_text_align_from_role node.roles)
           align = (@theme[%(heading_h#{hlevel}_text_align)] || @theme.heading_text_align || @base_text_align).to_sym
         end
+        hopts = { align: align, level: hlevel, outdent: (parent = node.parent).context == :section }
+        arrange_heading node, title, hopts unless at_page_top? || node == parent.blocks[-1]
+        add_dest_for_block node if node.id
         # QUESTION: should we decouple styles from section titles?
         theme_font :heading, level: hlevel do
-          ink_general_heading node, node.title, align: align, level: hlevel, outdent: (node.parent.context == :section)
+          ink_general_heading node, title, hopts
         end
       end
 
@@ -778,11 +783,21 @@ module Asciidoctor
               end
               # 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
-                first_line_options = { styles: line1_font_style == :normal ? [] : [font_style, line1_font_style] }
+                case line1_font_style
+                when :normal
+                  first_line_options = { styles: [] }
+                when :normal_italic
+                  first_line_options = { styles: [:italic] }
+                else
+                  first_line_options = { styles: [font_style, line1_font_style] }
+                end
               end
               if (line1_font_color = @theme.abstract_first_line_font_color)
                 (first_line_options ||= {})[:color] = line1_font_color
               end
+              if (line1_text_transform = @theme.abstract_first_line_text_transform)
+                (first_line_options ||= {})[:text_transform] = line1_text_transform
+              end
               prose_opts[:first_line_options] = first_line_options if first_line_options
               # FIXME: make this cleaner!!
               if node.blocks?
@@ -791,7 +806,7 @@ module Asciidoctor
                   if child.context == :paragraph
                     child.document.playback_attributes child.attributes
                     prose_opts[:margin_bottom] = 0 if child == last_block
-                    ink_prose child.content, ((align = resolve_alignment_from_role child.roles) ? (prose_opts.merge align: align) : prose_opts.dup)
+                    ink_prose child.content, ((align = resolve_text_align_from_role child.roles) ? (prose_opts.merge align: align) : prose_opts.dup)
                     prose_opts.delete :first_line_options
                     prose_opts.delete :margin_bottom
                   else
@@ -800,7 +815,7 @@ module Asciidoctor
                   end
                 end
               elsif node.content_model != :compound && (string = node.content)
-                if (align = resolve_alignment_from_role node.roles)
+                if (align = resolve_text_align_from_role node.roles)
                   prose_opts[:align] = align
                 end
                 ink_prose string, (prose_opts.merge margin_bottom: 0)
@@ -824,39 +839,39 @@ module Asciidoctor
 
       def convert_paragraph node
         add_dest_for_block node if node.id
+
         prose_opts = { margin_bottom: 0, hyphenate: true }
-        if (align = resolve_alignment_from_role (roles = node.roles), use_theme: true)
+        if (align = resolve_text_align_from_role (roles = node.roles), query_theme: true, remove_predefined: true)
           prose_opts[:align] = align
-          roles -= TextAlignmentRoles
         end
-
+        role_keys = roles.map {|role| %(role_#{role}).to_sym } unless roles.empty?
         if (text_indent = @theme.prose_text_indent) > 0 ||
             ((text_indent = @theme.prose_text_indent_inner) > 0 &&
             (self_idx = (siblings = node.parent.blocks).index node) > 0 && siblings[self_idx - 1].context == :paragraph)
           prose_opts[:indent_paragraphs] = text_indent
         end
-
-        # TODO: check if we're within one line of the bottom of the page
-        # and advance to the next page if so (similar to logic for section titles)
-        ink_caption node, labeled: false if node.title?
-
         if (bottom_gutter = @bottom_gutters[-1][node])
           prose_opts[:bottom_gutter] = bottom_gutter
         end
 
-        if roles.empty?
-          ink_prose node.content, prose_opts
-        else
-          theme_font_cascade (roles.map {|role| %(role_#{role}).to_sym }) do
-            ink_prose node.content, prose_opts
+        block_next = next_enclosed_block node
+
+        insert_margin_bottom = proc do
+          if (margin_inner_val = @theme.prose_margin_inner) && block_next&.context == :paragraph
+            margin_bottom margin_inner_val
+          else
+            theme_margin :prose, :bottom, block_next
           end
         end
 
-        block_next = next_enclosed_block node
-        if (margin_inner_val = @theme.prose_margin_inner) && block_next&.context == :paragraph
-          margin_bottom margin_inner_val
+        if (float_box = (@float_box ||= nil))
+          ink_paragraph_in_float_box node, float_box, prose_opts, role_keys, block_next, insert_margin_bottom
         else
-          theme_margin :prose, :bottom, block_next
+          # TODO: check if we're within one line of the bottom of the page
+          # and advance to the next page if so (similar to logic for section titles)
+          ink_caption node, labeled: false if node.title?
+          role_keys ? theme_font_cascade(role_keys) { ink_prose node.content, prose_opts } : (ink_prose node.content, prose_opts)
+          insert_margin_bottom.call
         end
       end
 
@@ -1122,9 +1137,11 @@ module Asciidoctor
           add_dest_for_block node if node.id
           theme_fill_and_stroke_block :sidebar, extent if extent
           pad_box @theme.sidebar_padding, node do
-            theme_font :sidebar_title do
-              # QUESTION: should we allow margins of sidebar title to be customized?
-              ink_prose node.title, align: (@theme.sidebar_title_text_align || @theme.heading_text_align || @base_text_align).to_sym, margin_bottom: @theme.heading_margin_bottom, line_height: (@theme.heading_line_height || @theme.base_line_height)
+            tare_first_page_content_stream do
+              theme_font :sidebar_title do
+                # QUESTION: should we allow margins of sidebar title to be customized?
+                ink_prose node.title, align: (@theme.sidebar_title_text_align || @theme.heading_text_align || @base_text_align).to_sym, margin_bottom: @theme.heading_margin_bottom, line_height: (@theme.heading_line_height || @theme.base_line_height)
+              end
             end if node.title?
             theme_font :sidebar do
               traverse node
@@ -1135,13 +1152,15 @@ module Asciidoctor
       end
 
       def convert_colist node
-        margin_top @theme.callout_list_margin_top_after_code if !at_page_top? && ([:listing, :literal].include? node.parent.blocks[(node.parent.blocks.index node) - 1].context)
+        unless at_page_top? || (self_idx = (siblings = node.parent.blocks).index node) == 0 || !([:listing, :literal].include? siblings[self_idx - 1].context)
+          margin_top @theme.callout_list_margin_top_after_code
+        end
         add_dest_for_block node if node.id
         @list_numerals << 1
         last_item = node.items[-1]
         item_spacing = @theme.callout_list_item_spacing || @theme.list_item_spacing
         item_opts = { margin_bottom: item_spacing, normalize_line_height: true }
-        if (item_align = (resolve_alignment_from_role node.roles) || @theme.list_text_align&.to_sym)
+        if (item_align = (resolve_text_align_from_role node.roles) || @theme.list_text_align&.to_sym)
           item_opts[:align] = item_align
         end
         theme_font :callout_list do
@@ -1360,7 +1379,7 @@ module Asciidoctor
         ink_caption node, category: :list, labeled: false if node.title?
 
         opts = {}
-        if (align = resolve_alignment_from_role node.roles)
+        if (align = resolve_text_align_from_role node.roles)
           opts[:align] = align
         elsif node.style == 'bibliography'
           opts[:align] = :left
@@ -1553,9 +1572,13 @@ module Asciidoctor
 
         return on_image_error :missing, node, target, opts unless image_path
 
-        alignment = (alignment = node.attr 'align') ?
-          ((BlockAlignmentNames.include? alignment) ? alignment.to_sym : :left) :
-          (resolve_alignment_from_role node.roles) || @theme.image_align&.to_sym || :left
+        if (float_to = node.attr 'float') && ((BlockFloatNames.include? float_to) ? float_to : (float_to = nil))
+          alignment = float_to.to_sym
+        elsif (alignment = node.attr 'align')
+          alignment = (BlockAlignmentNames.include? alignment) ? alignment.to_sym : :left
+        else
+          alignment = (resolve_text_align_from_role node.roles) || @theme.image_align&.to_sym || :left
+        end
         # TODO: support cover (aka canvas) image layout using "canvas" (or "cover") role
         width = resolve_explicit_width node.attributes, bounds_width: (available_w = bounds.width), support_vw: true, use_fallback: true, constrain_to_bounds: true
         # TODO: add `to_pt page_width` method to ViewportWidth type
@@ -1563,6 +1586,7 @@ module Asciidoctor
 
         caption_end = @theme.image_caption_end&.to_sym || :bottom
         caption_max_width = @theme.image_caption_max_width
+        caption_max_width = 'fit-content' if float_to && !(caption_max_width&.start_with? 'fit-content')
         # NOTE: if width is not set explicitly and max-width is fit-content, caption height may not be accurate
         caption_h = node.title? ? (ink_caption node, category: :image, end: caption_end, block_align: alignment, block_width: width, max_width: caption_max_width, dry_run: true, force_top_margin: caption_end == :bottom) : 0
 
@@ -1570,7 +1594,7 @@ module Asciidoctor
         pinned = opts[:pinned]
 
         begin
-          rendered_w = nil
+          rendered_h = rendered_w = nil
           span_page_width_if align_to_page do
             if image_format == 'svg'
               if ::Base64 === image_path
@@ -1649,13 +1673,37 @@ module Asciidoctor
             end
           end
           ink_caption node, category: :image, end: :bottom, block_align: alignment, block_width: rendered_w, max_width: caption_max_width if caption_end == :bottom && node.title?
-          theme_margin :block, :bottom, (next_enclosed_block node) unless pinned
+          if !pinned && (block_next = next_enclosed_block node)
+            if float_to && (supports_float_wrapping? block_next) && rendered_w < bounds.width
+              init_float_box node, rendered_w, rendered_h + caption_h, float_to
+            else
+              theme_margin :block, :bottom, block_next
+            end
+          end
         rescue => e
           raise if ::StopIteration === e
           on_image_error :exception, node, target, (opts.merge message: %(could not embed image: #{image_path}; #{e.message}#{::Prawn::Errors::UnsupportedImageType === e && !(defined? ::GMagick::Image) ? '; install prawn-gmagick gem to add support' : ''}))
         end
       end
 
+      def supports_float_wrapping? node
+        node.context == :paragraph
+      end
+
+      def init_float_box _node, block_width, block_height, float_to
+        gap = ::Array === (gap = @theme.image_float_gap) ? gap.dup : [gap, gap]
+        float_w = block_width + (gap[0] ||= 12)
+        float_h = block_height + (gap[1] ||= 6)
+        box_l = bounds.left + (float_to == 'right' ? 0 : float_w)
+        box_t = cursor + block_height
+        box_w = bounds.width - float_w
+        box_r = box_l + box_w
+        box_h = [box_t, float_h].min
+        box_b = box_t - box_h
+        move_cursor_to box_t
+        @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
+
       def draw_image_border top, w, h, alignment
         if (Array @theme.image_border_width).any? {|it| it&.> 0 } && (@theme.image_border_color || @theme.base_border_color)
           if (@theme.image_border_fit || 'content') == 'auto'
@@ -1687,7 +1735,7 @@ module Asciidoctor
         theme_font :image_alt do
           alignment = (alignment = node.attr 'align') ?
             ((BlockAlignmentNames.include? alignment) ? alignment.to_sym : :left) :
-            (resolve_alignment_from_role node.roles) || (@theme.image_align&.to_sym || :left)
+            (resolve_text_align_from_role node.roles) || (@theme.image_align&.to_sym || :left)
           ink_prose alt_text_template % alt_text_vars, align: alignment, margin: 0, normalize: false, single_line: true
         end
         ink_caption node, category: :image, end: :bottom if node.title?
@@ -1742,7 +1790,7 @@ module Asciidoctor
       end
 
       # QUESTION: can we avoid arranging fragments multiple times (conums & autofit) by eagerly preparing arranger?
-      def convert_listing_or_literal node
+      def convert_code node
         extensions = []
         source_chunks = bg_color_override = font_color_override = adjusted_font_size = nil
         theme_font :code do
@@ -1889,17 +1937,31 @@ module Asciidoctor
         theme_margin :block, :bottom, (next_enclosed_block node)
       end
 
-      alias convert_listing convert_listing_or_literal
-      alias convert_literal convert_listing_or_literal
+      alias convert_listing convert_code
+      alias convert_literal convert_code
+      alias convert_listing_or_literal convert_code
 
       def convert_pass node
-        node = node.dup
-        (subs = node.subs.dup).unshift :specialcharacters
-        node.instance_variable_set :@subs, subs.uniq
-        convert_listing_or_literal node
+        theme_font :code do
+          typeset_formatted_text [text: (guard_indentation node.content), color: @theme.base_font_color], (calc_line_metrics @base_line_height)
+        end
+        theme_margin :block, :bottom, (next_enclosed_block node)
       end
 
-      alias convert_stem convert_listing_or_literal
+      def convert_stem node
+        arrange_block node do |extent|
+          add_dest_for_block node if node.id
+          tare_first_page_content_stream { theme_fill_and_stroke_block :code, extent, caption_node: node }
+          pad_box @theme.code_padding, node do
+            theme_font :code do
+              typeset_formatted_text [text: (guard_indentation node.content), color: @font_color],
+                (calc_line_metrics @base_line_height),
+                bottom_gutter: @bottom_gutters[-1][node]
+            end
+          end
+        end
+        theme_margin :block, :bottom, (next_enclosed_block node)
+      end
 
       # Extract callout marks from string, indexed by 0-based line number
       # Return an Array with the processed string as the first argument
@@ -2353,11 +2415,12 @@ module Asciidoctor
       end
 
       def convert_thematic_break node
-        theme_margin :thematic_break, :top
-        stroke_horizontal_rule @theme.thematic_break_border_color,
-          line_width: @theme.thematic_break_border_width,
-          line_style: (@theme.thematic_break_border_style&.to_sym || :solid)
-        theme_margin :thematic_break, ((block_next = next_enclosed_block node) ? :bottom : :top), block_next || true
+        pad_box @theme.thematic_break_padding || [@theme.thematic_break_margin_top, 0] do
+          stroke_horizontal_rule @theme.thematic_break_border_color,
+            line_width: @theme.thematic_break_border_width,
+            line_style: (@theme.thematic_break_border_style&.to_sym || :solid)
+        end
+        conceal_page_top { theme_margin :block, :bottom, (next_enclosed_block node) }
       end
 
       def convert_toc node, opts = {}
@@ -2405,26 +2468,16 @@ module Asciidoctor
       def convert_index_section node
         space_needed_for_category = @theme.description_list_term_spacing + (2 * (height_of_typeset_text 'A'))
         pagenum_sequence_style = node.document.attr 'index-pagenum-sequence-style'
-        column_box [0, cursor], columns: @theme.index_columns, width: bounds.width, reflow_margins: true do
-          def @bounding_box.move_past_bottom *args # rubocop:disable Lint/NestedMethodDefinition
-            super(*args)
-            @document.bounds = @parent = @document.margin_box if @current_column == 0 && @reflow_margins
-          end
+        column_box [0, cursor], columns: @theme.index_columns, width: bounds.width, reflow_margins: true, spacer: @theme.index_column_gap do
           @index.categories.each do |category|
-            # NOTE: cursor method always returns 0 inside column_box; breaks reference_bounds.move_past_bottom
-            bounds.move_past_bottom if space_needed_for_category > y - reference_bounds.absolute_bottom
+            bounds.move_past_bottom if space_needed_for_category > cursor
             ink_prose category.name,
               align: :left,
               inline_format: false,
               margin_bottom: @theme.description_list_term_spacing,
               style: @theme.description_list_term_font_style&.to_sym
             category.terms.each {|term| convert_index_list_item term, pagenum_sequence_style }
-            # NOTE: see previous note for why we can't use margin_bottom method
-            if @theme.prose_margin_bottom > y - reference_bounds.absolute_bottom
-              bounds.move_past_bottom
-            else
-              move_down @theme.prose_margin_bottom
-            end
+            @theme.prose_margin_bottom > cursor ? bounds.move_past_bottom : (move_down @theme.prose_margin_bottom)
           end
         end
         nil
@@ -2926,23 +2979,31 @@ module Asciidoctor
 
       alias start_new_part start_new_chapter
 
-      def arrange_section sect, title, opts
-        if sect.option? 'breakable'
+      # 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
+      # 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'
           orphaned = nil
           dry_run single_page: true do
             start_page = page
             theme_font :heading, level: opts[:level] do
               if opts[:part]
-                ink_part_title sect, title, opts
+                ink_part_title node, title, opts
               elsif opts[:chapterlike]
-                ink_chapter_title sect, title, opts
+                ink_chapter_title node, title, opts
               else
-                ink_general_heading sect, title, opts
+                ink_general_heading node, title, opts
               end
             end
             if page == start_page
               page.tare_content_stream
-              orphaned = stop_if_first_page_empty { traverse sect }
+              orphaned = stop_if_first_page_empty do
+                node.context == :section ? (traverse node) : (convert (siblings = node.parent.blocks)[(siblings.index node) + 1])
+              end
             end
           end
           start_new_page if orphaned
@@ -2954,7 +3015,10 @@ 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
-              heading_h += @theme.heading_min_height_after if @theme.heading_min_height_after && sect.blocks?
+              if (min_height_after = @theme.heading_min_height_after) &&
+                  (node.context == :section ? node.blocks? : node != node.parent.blocks[-1])
+                heading_h += min_height_after
+              end
               cursor >= heading_h
             end
             start_new_page unless h_fits
@@ -3021,6 +3085,64 @@ module Asciidoctor
         end
       end
 
+      # private
+      def ink_paragraph_in_float_box node, float_box, prose_opts, role_keys, block_next, insert_margin_bottom
+        @float_box = para_font_descender = para_font_size = end_cursor = nil
+        if role_keys
+          line_metrics = theme_font_cascade role_keys do
+            para_font_descender = font.descender
+            para_font_size = font_size
+            calc_line_metrics @base_line_height
+          end
+        else
+          para_font_descender = font.descender
+          para_font_size = font_size
+          line_metrics = calc_line_metrics @base_line_height
+        end
+        # allocate the space of at least one empty line below block
+        line_height_length = line_metrics.height + line_metrics.leading + line_metrics.padding_top
+        start_page_number = float_box[:page]
+        start_cursor = cursor
+        block_bottom = (float_box_bottom = float_box[:bottom]) + float_box[:gap][1]
+        # use :at to incorporate padding top from line metrics
+        # use :final_gap to incorporate padding bottom from line metrics
+        # use :draw_text_callback to track end cursor (requires applying :final_gap to result manually)
+        prose_opts.update \
+          at: [float_box[:left], start_cursor - line_metrics.padding_top],
+          width: float_box[:width],
+          height: [cursor, float_box[:height] - (float_box[:top] - start_cursor) + line_height_length].min,
+          final_gap: para_font_descender + line_metrics.padding_bottom,
+          draw_text_callback: (proc do |text, opts|
+            draw_text! text, opts
+            end_cursor = opts[:at][1] # does not include :final_gap value
+          end)
+        overflow_text = role_keys ?
+          theme_font_cascade(role_keys) { ink_prose node.content, prose_opts } :
+          (ink_prose node.content, prose_opts)
+        move_cursor_to end_cursor -= prose_opts[:final_gap] if end_cursor # ink_prose with :height does not move cursor
+        if overflow_text.empty?
+          if block_next && (supports_float_wrapping? block_next)
+            insert_margin_bottom.call
+            @float_box = float_box if page_number == start_page_number && cursor > start_cursor - prose_opts[:height]
+          elsif end_cursor > block_bottom
+            move_cursor_to block_bottom
+            theme_margin :block, :bottom, block_next
+          else
+            insert_margin_bottom.call
+          end
+        else
+          overflow_prose_opts = { align: prose_opts[:align] || @base_text_align.to_sym }
+          unless end_cursor
+            overflow_prose_opts[:indent_paragraphs] = prose_opts[:indent_paragraphs]
+            move_cursor_to float_box_bottom if start_cursor > float_box_bottom
+          end
+          role_keys ?
+            theme_font_cascade(role_keys) { typeset_formatted_text overflow_text, line_metrics, overflow_prose_opts } :
+            (typeset_formatted_text overflow_text, line_metrics, overflow_prose_opts)
+          insert_margin_bottom.call
+        end
+      end
+
       # NOTE: inline_format is true by default
       def ink_prose string, opts = {}
         top_margin = (margin = (opts.delete :margin)) || (opts.delete :margin_top) || 0
@@ -3043,12 +3165,13 @@ module Asciidoctor
             text_decoration_width: (opts.delete :text_decoration_width),
           }.compact
         end
-        typeset_text string, (calc_line_metrics (opts.delete :line_height) || @base_line_height), {
+        result = typeset_text string, (calc_line_metrics (opts.delete :line_height) || @base_line_height), {
           color: @font_color,
           inline_format: [inline_format_opts],
           align: @base_text_align.to_sym,
         }.merge(opts)
         margin_bottom bot_margin
+        result
       end
 
       def generate_manname_section node
@@ -3071,11 +3194,12 @@ module Asciidoctor
       # title (i.e., subject.title? returns true).
       def ink_caption subject, opts = {}
         if opts.delete :dry_run
-          force_top_margin = !at_page_top? if (force_top_margin = opts.delete :force_top_margin).nil?
           return (dry_run keep_together: true, single_page: :enforce do
-            # TODO: encapsulate this logic to force top margin to be applied
-            margin_box.instance_variable_set :@y, margin_box.absolute_top + 0.0001 if force_top_margin
-            ink_caption subject, opts
+            if opts.delete :force_top_margin
+              conceal_page_top { ink_caption subject, opts }
+            else
+              ink_caption subject, opts
+            end
           end).single_page_height
         end
         if ::Asciidoctor::AbstractBlock === subject
@@ -3103,11 +3227,22 @@ module Asciidoctor
         if (max_width = opts.delete :max_width) && max_width != 'none'
           if ::String === max_width
             if max_width.start_with? 'fit-content'
-              if max_width.end_with? 't', '()'
-                max_width = block_width || container_width
-              else
-                max_width = (block_width || container_width) * (max_width.slice 12, max_width.length - 1).to_f / 100.0
+              block_width ||= container_width
+              unless max_width.end_with? 't', '()'
+                max_width = block_width * (max_width.slice 12, max_width.length - 1).to_f / 100.0
+                if (caption_width_delta = block_width - max_width) > 0
+                  case align
+                  when :right
+                    indent_by[0] += caption_width_delta
+                  when :center
+                    indent_by[0] += caption_width_delta * 0.5
+                    indent_by[1] += caption_width_delta * 0.5
+                  else # :left, nil
+                    indent_by[1] += caption_width_delta
+                  end
+                end
               end
+              max_width = block_width
             elsif max_width.end_with? '%'
               max_width = [max_width.to_f / 100 * bounds.width, bounds.width].min
               block_align = align
@@ -3122,11 +3257,12 @@ module Asciidoctor
           if (remainder = container_width - max_width) > 0
             case block_align
             when :right
-              indent_by = [remainder, 0]
+              indent_by[0] += remainder
             when :center
-              indent_by = [(side_margin = remainder * 0.5), side_margin]
+              indent_by[0] += remainder * 0.5
+              indent_by[1] += remainder * 0.5
             else # :left, nil
-              indent_by = [0, remainder]
+              indent_by[1] += remainder
             end
           end
         end
@@ -3522,8 +3658,9 @@ module Asciidoctor
                         content = apply_subs_discretely doc, content, drop_lines_with_unresolved_attributes: true, imagesdir: @themesdir
                         content = transform_text content, @text_transform if @text_transform
                       end
-                      formatted_text_box (parse_text content, color: @font_color, inline_format: [normalize: true]),
+                      formatted_text_box (parse_text content, inline_format: [normalize: true]),
                         at: [left, bounds.top - trim_styles[:padding][side][0] - trim_styles[:content_offset] + ((Array trim_styles[:valign])[0] == :center ? font.descender * 0.5 : 0)],
+                        color: @font_color,
                         width: colwidth,
                         height: trim_styles[:prose_content_height][side],
                         align: colspec[:align],
@@ -4146,9 +4283,10 @@ module Asciidoctor
 
       # TODO: document me, esp the first line formatting functionality
       def typeset_text string, line_metrics, opts = {}
-        move_down line_metrics.padding_top
         opts = { leading: line_metrics.leading, final_gap: line_metrics.final_gap }.merge opts
         string = string.gsub CjkLineBreakRx, ZeroWidthSpace if @cjk_line_breaks
+        return text_box string, opts if opts[:height]
+        move_down line_metrics.padding_top
         if (hanging_indent = (opts.delete :hanging_indent) || 0) > 0
           indent hanging_indent do
             text string, (opts.merge indent_paragraphs: -hanging_indent)
@@ -4312,10 +4450,11 @@ module Asciidoctor
         end
       end
 
-      def resolve_alignment_from_role roles, use_theme: false
+      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
           (align_role.slice 5, align_role.length).to_sym
-        elsif use_theme
+        elsif query_theme
           roles.reverse.each do |role|
             if (align = @theme[%(role_#{role}_text_align)])
               return align.to_sym
@@ -4325,6 +4464,9 @@ module Asciidoctor
         end
       end
 
+      # Deprecated
+      alias resolve_alignment_from_role resolve_text_align_from_role
+
       # QUESTION: is this method still necessary?
       def resolve_imagesdir doc
         if (imagesdir = doc.attr 'imagesdir').nil_or_empty? || (imagesdir = imagesdir.chomp '/') == '.'
@@ -4669,9 +4811,12 @@ module Asciidoctor
       alias layout_running_content ink_running_content
 
       # intercepts "class CustomPDFConverter < (Asciidoctor::Converter.for 'pdf')"
-      def self.method_added method
-        if (method_name = method.to_s).start_with? 'layout_'
-          alias_method %(ink_#{method_name.slice 7, method_name.length}).to_sym, method
+      def self.method_added method_sym
+        if (method_name = method_sym.to_s).start_with? 'layout_'
+          alias_method %(ink_#{method_name.slice 7, method_name.length}).to_sym, method_sym
+        elsif method_name == 'convert_listing_or_literal' || method_name == 'convert_code'
+          alias_method :convert_listing, method_sym
+          alias_method :convert_literal, method_sym
         end
       end
 

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+Prawn::Document::ColumnBox.prepend (Module.new do
+  def absolute_bottom
+    stretchy? ? @parent.absolute_bottom : super
+  end
+
+  def move_past_bottom *_args
+    initial_page = @document.page
+    super
+    if (page = @document.page) != initial_page && page.margins != initial_page.margins
+      @document.bounds = self.class.new @document, @parent, (margin_box = @document.margin_box).absolute_top_left,
+        columns: @columns, reflow_margins: true, spacer: @spacer, width: margin_box.width
+    end
+  end
+end)