asciidoctor-pdf 2.0.0.rc.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09fac4d8ebb3877676d74d2fa320ae0a1f06cf2920d5560e98fde953de11cc08'
-  data.tar.gz: e91be3fb2d14f512d058d8d01a15cbd2ec9ad58eace2fce55712e17b53e105e7
+  metadata.gz: c06c3e7edce9f473ace6df96c041850636e6561860f21a12725410370527ac27
+  data.tar.gz: a6fd22809163ed0d4fa07b8f2a51e0e20227e69f03a9af884c5512ff79d39a06
 SHA512:
-  metadata.gz: 9407d5a3cf6e615f0c5a8a8d178c9257b111c385d91a699c55a4dd52b3fbe7c93da964eb13621740274f5b345fc08d035c7b01a7b998bcb2345081478a0cdf0f
-  data.tar.gz: 51ccb076ce61906d75910950a41f95c37d11575506315c9324e9016a833d85ce2fb6d867ad051f3934ec4e475f79354cf602f25261bf440b307061c9e7aada92
+  metadata.gz: 397e550c0519ac08cab6af6f2ea2d598419a79c928a420d54ca296124a6ee6175a4005904c38c4a45e6cbdd5f01b61d410b673ad4133a018aafc69737b4c4c44
+  data.tar.gz: 19d24ba2f84be03ebff16a738224b1025a52e7a0d77c8dc1c3ffcc44d4c2a825989425da4ad00a886b3456c427287cd4b00b3943bbe13e4b9a4fb48b4842bb62

data/CHANGELOG.adoc

@@ -5,6 +5,40 @@
 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.0.2 (2022-05-22) - @mojavelinux
+
+Bug Fixes::
+
+* use specified column widths to avoid bugs in column width calculation when using colspans (#1368)
+* advance table to next page if rowspan in first row does not fit in space remaining on current page (#403)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.2[git tag] | {url-repo}/compare/v2.0.1\...v2.0.2[full diff]
+
+== 2.0.1 (2022-05-21) - @mojavelinux
+
+Bug Fixes::
+
+* scale inline image to fit within available height of page, accounting for the top padding of the line height and the bottom gutter (#2193)
+* short-circuit formatted text routine and log error if fragments in first line cannot fit on an empty page
+* break and wrap long contiguous text in source block when linenums is enabled (#2198)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.1[git tag] | {url-repo}/compare/v2.0.0\...v2.0.1[full diff]
+
+== 2.0.0 (2022-05-18) - @mojavelinux
+
+Improvements::
+
+* use more stable approach to recreating current bounds in scratch document
+* add foundation to support multi-column layout for the body of an article (using an extended converter only)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.0[git tag] | {url-repo}/compare/v2.0.0.rc.1\...v2.0.0[full diff]
+
 == 2.0.0.rc.1 (2022-05-17) - @mojavelinux
 
 Enhancements::
@@ -95,6 +129,7 @@ Enhancements::
 * use `base-border-color` as default border color; control appearance of border using `border-width` value alone (#2134)
 * remove border colors in base theme so all border colors can be controlled using `base-border-color` when extending theme
 * enable running footer when using base theme
+* allow built-in optimizer to set PDF compliance flag (PDF/A and PDF/X) using value of `optimize` attribute (#125)
 
 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.0.0.rc.1, 2022-05-17
+v2.0.2, 2022-05-22
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 2.0.x
-:release-version: 2.0.0.rc.1
+:release-version: 2.0.2
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf

data/lib/asciidoctor/pdf/converter.rb

@@ -152,7 +152,7 @@ module Asciidoctor
           # TODO: delegate to convert_method_missing
           log :warn, %(missing convert handler for #{name} node in #{@backend} backend)
         end
-        # NOTE: inline nodes generate pseudo-HTML strings; the remainder write directly to PDF object
+        # NOTE: inline node handlers generate HTML-like strings; all other handlers write directly to the PDF object
         ::Asciidoctor::Inline === node ? result : self
       end
 
@@ -717,7 +717,7 @@ module Asciidoctor
             when 'page'
               pagenums = term.dests.uniq {|dest| dest[:page] }.map {|dest| %(<a anchor="#{dest[:anchor]}">#{dest[:page]}</a>) }
             when 'range'
-              first_anchor_per_page = term.dests.each_with_object({}) {|dest, accum| accum[dest[:page]] ||= dest[:anchor] }
+              first_anchor_per_page = {}.tap {|accum| term.dests.each {|dest| accum[dest[:page]] ||= dest[:anchor] } }
               pagenums = (consolidate_ranges first_anchor_per_page.keys).map do |range|
                 anchor = first_anchor_per_page[(range.include? '-') ? (range.partition '-')[0] : range]
                 %(<a anchor="#{anchor}">#{range}</a>)
@@ -814,7 +814,7 @@ module Asciidoctor
         if (text_align = resolve_text_align_from_role (roles = node.roles), query_theme: true, remove_predefined: true)
           prose_opts[:align] = text_align
         end
-        role_keys = roles.map {|role| %(role_#{role}).to_sym } unless roles.empty?
+        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)
           prose_opts[:indent_paragraphs] = text_indent
@@ -1081,7 +1081,7 @@ module Asciidoctor
                   highlight_lines = nil
                 else
                   pg_highlight_bg_color = pg_block_styles[:highlight_background_color]
-                  highlight_lines = highlight_lines.map {|linenum| [linenum, pg_highlight_bg_color] }.to_h
+                  highlight_lines = {}.tap {|accum| highlight_lines.each {|linenum| accum[linenum] = pg_highlight_bg_color } }
                 end
               end
               if (node.option? 'linenums') || (node.attr? 'linenums')
@@ -1120,7 +1120,7 @@ module Asciidoctor
               lexer ||= ::Rouge::Lexers::PlainText
               source_string, conum_mapping = extract_conums source_string if callouts_enabled
               if (node.attr? 'highlight') && !(hl_lines = (node.resolve_lines_to_highlight source_string, (node.attr 'highlight'))).empty?
-                formatter_opts[:highlight_lines] = hl_lines.map {|linenum| [linenum, true] }.to_h
+                formatter_opts[:highlight_lines] = {}.tap {|accum| hl_lines.each {|linenum| accum[linenum] = true } }
               end
               fragments = formatter.format (lexer.lex source_string), formatter_opts rescue [text: source_string]
               source_chunks = conum_mapping ? (restore_conums fragments, conum_mapping) : fragments
@@ -1396,7 +1396,7 @@ module Asciidoctor
           end
           theme_margin :prose, :bottom, (next_enclosed_block actual_node) #unless actual_node.nested?
         when 'qanda'
-          @list_numerals << '1'
+          @list_numerals << 1
           convert_list node
           @list_numerals.pop
         else
@@ -2167,6 +2167,7 @@ module Asciidoctor
 
         left_padding = right_padding = nil
         table table_data, table_settings do
+          @column_widths = column_widths unless column_widths.empty?
           # NOTE: call width to capture resolved table width
           table_width = width
           @pdf.ink_table_caption node, alignment, table_width, caption_max_width if node.title? && caption_end == :top
@@ -3261,64 +3262,70 @@ module Asciidoctor
             end
           end
 
-          colspec_dict = PageSides.each_with_object({}) do |side, acc|
-            side_trim_content_width = trim_content_width[side]
-            if (custom_colspecs = @theme[%(#{periphery}_#{side}_columns)] || @theme[%(#{periphery}_columns)])
-              case (colspecs = (custom_colspecs.to_s.tr ',', ' ').split).size
-              when 0, 1
-                colspecs = { left: '0', center: colspecs[0] || '100', right: '0' }
-              when 2
-                colspecs = { left: colspecs[0], center: '0', right: colspecs[1] }
-              else # 3
-                colspecs = { left: colspecs[0], center: colspecs[1], right: colspecs[2] }
-              end
-              tot_width = 0
-              side_colspecs = colspecs.map do |col, spec|
-                if (alignment_char = spec.chr).to_i.to_s == alignment_char
-                  alignment = :left
-                  rel_width = spec.to_f
-                else
-                  alignment = AlignmentTable[alignment_char]
-                  rel_width = (spec.slice 1, spec.length).to_f
+          colspec_dict = {}.tap do |acc|
+            PageSides.each do |side|
+              side_trim_content_width = trim_content_width[side]
+              if (custom_colspecs = @theme[%(#{periphery}_#{side}_columns)] || @theme[%(#{periphery}_columns)])
+                case (colspecs = (custom_colspecs.to_s.tr ',', ' ').split).size
+                when 0, 1
+                  colspecs = { left: '0', center: colspecs[0] || '100', right: '0' }
+                when 2
+                  colspecs = { left: colspecs[0], center: '0', right: colspecs[1] }
+                else # 3
+                  colspecs = { left: colspecs[0], center: colspecs[1], right: colspecs[2] }
                 end
-                tot_width += rel_width
-                [col, align: alignment, width: rel_width, x: 0]
-              end.to_h
-              # QUESTION: should we allow the columns to overlap (capping width at 100%)?
-              side_colspecs.each {|_, colspec| colspec[:width] = (colspec[:width] / tot_width) * side_trim_content_width }
-              side_colspecs[:right][:x] = (side_colspecs[:center][:x] = side_colspecs[:left][:width]) + side_colspecs[:center][:width]
-              acc[side] = side_colspecs
-            else
-              acc[side] = {
-                left: { align: :left, width: side_trim_content_width, x: 0 },
-                center: { align: :center, width: side_trim_content_width, x: 0 },
-                right: { align: :right, width: side_trim_content_width, x: 0 },
-              }
+                tot_width = 0
+                side_colspecs = {}.tap do |accum|
+                  colspecs.each do |col, spec|
+                    if (alignment_char = spec.chr).to_i.to_s == alignment_char
+                      alignment = :left
+                      rel_width = spec.to_f
+                    else
+                      alignment = AlignmentTable[alignment_char]
+                      rel_width = (spec.slice 1, spec.length).to_f
+                    end
+                    tot_width += rel_width
+                    accum[col] = { align: alignment, width: rel_width, x: 0 }
+                  end
+                end
+                # QUESTION: should we allow the columns to overlap (capping width at 100%)?
+                side_colspecs.each {|_, colspec| colspec[:width] = (colspec[:width] / tot_width) * side_trim_content_width }
+                side_colspecs[:right][:x] = (side_colspecs[:center][:x] = side_colspecs[:left][:width]) + side_colspecs[:center][:width]
+                acc[side] = side_colspecs
+              else
+                acc[side] = {
+                  left: { align: :left, width: side_trim_content_width, x: 0 },
+                  center: { align: :center, width: side_trim_content_width, x: 0 },
+                  right: { align: :right, width: side_trim_content_width, x: 0 },
+                }
+              end
             end
           end
 
-          content_dict = PageSides.each_with_object({}) do |side, acc|
-            side_content = {}
-            ColumnPositions.each do |position|
-              next if (val = @theme[%(#{periphery}_#{side}_#{position}_content)]).nil_or_empty?
-              val = val.to_s unless ::String === val
-              if (val.include? ':') && val =~ ImageAttributeValueRx
-                attrlist = $2
-                image_attrs = (AttributeList.new attrlist).parse %w(alt width)
-                image_path, image_format = ::Asciidoctor::Image.target_and_format $1, image_attrs
-                if (image_path = resolve_image_path doc, image_path, image_format, @themesdir) && (::File.readable? image_path)
-                  image_opts = resolve_image_options image_path, image_format, image_attrs, container_size: [colspec_dict[side][position][:width], trim_content_height[side]]
-                  side_content[position] = [image_path, image_opts, image_attrs['link']]
+          content_dict = {}.tap do |acc|
+            PageSides.each do |side|
+              side_content = {}
+              ColumnPositions.each do |position|
+                next if (val = @theme[%(#{periphery}_#{side}_#{position}_content)]).nil_or_empty?
+                val = val.to_s unless ::String === val
+                if (val.include? ':') && val =~ ImageAttributeValueRx
+                  attrlist = $2
+                  image_attrs = (AttributeList.new attrlist).parse %w(alt width)
+                  image_path, image_format = ::Asciidoctor::Image.target_and_format $1, image_attrs
+                  if (image_path = resolve_image_path doc, image_path, image_format, @themesdir) && (::File.readable? image_path)
+                    image_opts = resolve_image_options image_path, image_format, image_attrs, container_size: [colspec_dict[side][position][:width], trim_content_height[side]]
+                    side_content[position] = [image_path, image_opts, image_attrs['link']]
+                  else
+                    # NOTE: allows inline image handler to report invalid reference and replace with alt text
+                    side_content[position] = %(image:#{image_path}[#{attrlist}])
+                  end
                 else
-                  # NOTE: allows inline image handler to report invalid reference and replace with alt text
-                  side_content[position] = %(image:#{image_path}[#{attrlist}])
+                  side_content[position] = val
                 end
-              else
-                side_content[position] = val
               end
-            end
 
-            acc[side] = side_content
+              acc[side] = side_content
+            end
           end
 
           if (trim_bg_color = trim_styles[:bg_color]) || trim_bg_image || trim_border_width > 0
@@ -3866,18 +3873,17 @@ module Asciidoctor
 
       def register_fonts font_catalog, fonts_dir
         return unless font_catalog
-        dirs = (fonts_dir.split ValueSeparatorRx, -1).map do |dir|
-          dir == 'GEM_FONTS_DIR' || dir.empty? ? ThemeLoader::FontsDir : dir
-        end
+        dirs = (fonts_dir.split ValueSeparatorRx, -1).map {|dir| dir == 'GEM_FONTS_DIR' || dir.empty? ? ThemeLoader::FontsDir : dir }
         font_catalog.each do |key, styles|
-          styles = styles.each_with_object({}) do |(style, path), accum|
-            found = dirs.any? do |dir|
-              resolved_font_path = font_path path, dir
-              accum[style.to_sym] = resolved_font_path if ::File.readable? resolved_font_path
+          register_font key => ({}.tap do |accum|
+            styles.each do |style, path|
+              found = dirs.any? do |dir|
+                resolved_font_path = font_path path, dir
+                accum[style.to_sym] = resolved_font_path if ::File.readable? resolved_font_path
+              end
+              raise ::Errno::ENOENT, ((File.absolute_path? path) ? %(#{path} not found) : %(#{path} not found in #{fonts_dir.gsub ValueSeparatorRx, ' or '})) unless found
             end
-            raise ::Errno::ENOENT, ((File.absolute_path? path) ? %(#{path} not found) : %(#{path} not found in #{fonts_dir.gsub ValueSeparatorRx, ' or '})) unless found
-          end
-          register_font key => styles
+          end)
         end
       end
 
@@ -4256,7 +4262,7 @@ module Asciidoctor
           b_shift, b_gap_color = (b_width ||= 0.5) * 0.5, @page_bg_color
         end
         ink_caption node_with_caption, category: category if node_with_caption
-        extent.from.page += 1 unless extent.from.page == page_number # sanity check
+        extent.from.page += 1 unless extent.from.page == page_number || ColumnBox === bounds # sanity check
         float do
           extent.each_page do |first_page, last_page|
             advance_page unless first_page
@@ -4578,14 +4584,16 @@ module Asciidoctor
       def consolidate_ranges nums
         if nums.size > 1
           prev = nil
-          nums.each_with_object [] do |num, accum|
+          accum = []
+          nums.each do |num|
             if prev && (prev.to_i + 1) == num.to_i
               accum[-1][1] = num
             else
               accum << [num]
             end
             prev = num
-          end.map {|range| range.join '-' }
+          end
+          accum.map {|range| range.join '-' }
         else
           nums
         end
@@ -4930,14 +4938,16 @@ module Asciidoctor
           result = yield
         else
           email = nil
-          original_attrs = AuthorAttributeNames.each_with_object({}) do |(prop_name, attr_name), accum|
-            accum[attr_name] = doc.attr attr_name
-            if (val = author[prop_name])
-              doc.set_attr attr_name, val
-              # NOTE: email attribute could be a url
-              email = val if prop_name == :email
-            else
-              doc.remove_attr attr_name
+          original_attrs = {}.tap do |accum|
+            AuthorAttributeNames.each do |prop_name, attr_name|
+              accum[attr_name] = doc.attr attr_name
+              if (val = author[prop_name])
+                doc.set_attr attr_name, val
+                # NOTE: email attribute could be a url
+                email = val if prop_name == :email
+              else
+                doc.remove_attr attr_name
+              end
             end
           end
           doc.set_attr 'url', ((email.include? '@') ? %(mailto:#{email}) : email) if email

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

@@ -4,7 +4,7 @@ Prawn::Font::AFM.instance_variable_set :@hide_m17n_warning, true
 
 require 'prawn/icon'
 
-Prawn::Icon::Compatibility.send :prepend, (::Module.new { def warning *_args; end })
+Prawn::Icon::Compatibility.prepend (::Module.new { def warning *_args; end })
 
 module Asciidoctor
   module Prawn
@@ -13,6 +13,8 @@ module Asciidoctor
       include ::Asciidoctor::PDF::Sanitizer
       include ::Asciidoctor::PDF::TextTransformer
 
+      ColumnBox = ::Prawn::Document::ColumnBox
+
       FontAwesomeIconSets = %w(fab far fas)
       IconSets = %w(fab far fas fi pf).to_set
       IconSetPrefixes = IconSets.map {|it| it + '-' }
@@ -429,15 +431,19 @@ module Asciidoctor
 
       # NOTE: override built-in fill_formatted_text_box to insert leading before second line when :first_line is true
       def fill_formatted_text_box text, options
-        if (initial_gap = options[:initial_gap]) && (first_text = text[0]) && first_text[:from_page] != page_number
+        if (initial_gap = options[:initial_gap]) && !text.empty? && text[0][:from_page] != page_number
           self.y -= initial_gap
         end
         merge_text_box_positioning_options options
         box = ::Prawn::Text::Formatted::Box.new text, options
-        remaining_text = box.render
+        remaining_fragments = box.render
         @no_text_printed = box.nothing_printed?
         @all_text_printed = box.everything_printed?
-        remaining_text[0][:from_page] = page_number unless remaining_text.empty?
+        unless remaining_fragments.empty? || (remaining_fragments[0][:from_page] ||= page_number) == page_number
+          log :error, %(cannot fit formatted text on page: #{remaining_fragments.map {|it| it[:image_path] || it[:text] }.join})
+          page.tare_content_stream
+          remaining_fragments = {}
+        end
 
         if @final_gap || (options[:first_line] && !(@no_text_printed || @all_text_printed))
           self.y -= box.height + box.line_gap + box.leading
@@ -445,7 +451,7 @@ module Asciidoctor
           self.y -= box.height
         end
 
-        remaining_text
+        remaining_fragments
       end
 
       # NOTE: override built-in draw_indented_formatted_line to set first_line flag
@@ -481,7 +487,13 @@ module Asciidoctor
         else
           remaining_fragments = box.render dry_run: true
         end
-        remaining_fragments.empty? ? (remaining_fragments = nil) : (remaining_fragments[0][:from_page] = page_number)
+        if remaining_fragments.empty?
+          remaining_fragments = nil
+        elsif (remaining_fragments[0][:from_page] ||= page_number) != page_number
+          log :error, %(cannot fit formatted text on page: #{remaining_fragments.map {|it| it[:image_path] || it[:text] }.join})
+          page.tare_content_stream
+          remaining_fragments = nil
+        end
         if first_line_text_transform
           # NOTE: applying text transform here could alter the wrapping, so isolate first line and shrink it to fit
           first_line_text = (box.instance_variable_get :@printed_lines)[0]
@@ -543,6 +555,18 @@ module Asciidoctor
 
       # Cursor
 
+      # Override the built-in float method to add support for restoring the current column of a ColumnBox
+      #
+      def float
+        original_page_number = page_number
+        original_y = y
+        original_column = bounds.instance_variable_get :@current_column if ColumnBox === bounds
+        yield
+        go_to_page original_page_number unless page_number == original_page_number
+        self.y = original_y
+        bounds.instance_variable_set :@current_column, original_column if original_column
+      end
+
       # Short-circuits the call to the built-in move_up operation
       # when n is 0.
       #
@@ -1118,10 +1142,14 @@ 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
-        scratch_bounds = scratch_pdf.bounds
-        restore_bounds = [:@total_left_padding, :@total_right_padding, :@width, :@x].each_with_object({}) do |name, accum|
-          accum[name] = scratch_bounds.instance_variable_get name
-          scratch_bounds.instance_variable_set name, (bounds.instance_variable_get name)
+        saved_bounds = scratch_pdf.bounds
+        scratch_pdf.bounds = bounds.dup.tap do |bounds_copy|
+          bounds_copy.instance_variable_set :@document, scratch_pdf
+          bounds_copy.instance_variable_set :@parent, saved_bounds
+          if ColumnBox === bounds_copy
+            bounds_copy.instance_variable_set :@width, bounds_copy.bare_column_width
+            bounds_copy.instance_variable_set :@current_column, (bounds_copy.instance_variable_set :@columns, 1) - 1
+          end
         end
         scratch_pdf.move_cursor_to cursor unless (scratch_start_at_top = keep_together || pages_advanced > 0 || at_page_top?)
         scratch_start_cursor = scratch_pdf.cursor
@@ -1163,7 +1191,7 @@ module Asciidoctor
         extent = ScratchExtent.new scratch_start_page, scratch_start_cursor, scratch_end_page, scratch_end_cursor
         onto ? extent.position_onto(*onto) : extent
       ensure
-        restore_bounds.each {|name, val| scratch_bounds.instance_variable_set name, val }
+        scratch_pdf.bounds = saved_bounds
       end
     end
   end

data/lib/asciidoctor/pdf/ext/prawn/formatted_text/protect_bottom_gutter.rb

@@ -2,12 +2,15 @@
 
 module Prawn::Text::Formatted::ProtectBottomGutter
   def enough_height_for_this_line?
-    return super unless @arranger.finished?
-    begin
-      @height -= @bottom_gutter
+    if @arranger.finished? && @arranger.fragments.none? {|it| it.format_state[:full_height] }
+      begin
+        @height -= @bottom_gutter
+        super
+      ensure
+        @height += @bottom_gutter
+      end
+    else
       super
-    ensure
-      @height += @bottom_gutter
     end
   end
 end

data/lib/asciidoctor/pdf/ext/prawn-table.rb

@@ -1,6 +1,17 @@
 # frozen_string_literal: true
 
 require 'prawn/table'
+
+Prawn::Table.prepend (Module.new do
+  def initial_row_on_initial_page
+    return 0 if fits_on_page? @pdf.bounds.height
+    height_required = (row (0..number_of_header_rows)).height_with_span
+    return -1 if fits_on_page? height_required, true
+    @pdf.bounds.move_past_bottom
+    0
+  end
+end)
+
 require_relative 'prawn-table/cell'
 require_relative 'prawn-table/cell/asciidoc'
 require_relative 'prawn-table/cell/text'

data/lib/asciidoctor/pdf/formatted_text/inline_image_arranger.rb

@@ -38,7 +38,7 @@ module Asciidoctor::PDF::FormattedText
       return if (raw_image_fragments = fragments.select {|f| (f.key? :image_path) && !(f.key? :image_obj) }).empty?
       scratch = doc.scratch?
       available_w = available_width
-      available_h = doc.page.empty? ? doc.cursor : doc.bounds.height
+      available_h = doc.bounds.height
       last_fragment = {}
       raw_image_fragments.each do |fragment|
         if fragment[:object_id] == last_fragment[:object_id]
@@ -96,6 +96,10 @@ module Asciidoctor::PDF::FormattedText
           if (f_height = image_h) > (line_font = doc.font).height * 1.5
             # align with descender (equivalent to vertical-align: bottom in CSS)
             fragment[:ascender] = f_height - (fragment[:descender] = line_font.descender)
+            if f_height == available_h
+              fragment[:ascender] -= (doc.calc_line_metrics (doc.instance_variable_get :@base_line_height), line_font, doc.font_size).padding_top
+              fragment[:full_height] = true
+            end
             doc.font_size (fragment[:size] = f_height * (doc.font_size / line_font.height))
             # align with baseline (roughly equivalent to vertical-align: baseline in CSS)
             #fragment[:ascender] = f_height

data/lib/asciidoctor/pdf/formatted_text/source_wrap.rb

@@ -11,15 +11,15 @@ module Asciidoctor
         def wrap array
           return super unless array[0][:linenum] # sanity check
           initialize_wrap array
+          @line_wrap.extend SourceLineWrap
           highlight_line = stop = nil
           unconsumed = @arranger.unconsumed
           until stop
             if (first_fragment = unconsumed[0])[:linenum]
               linenum_text = first_fragment[:text]
-              linenum_spacer ||= { text: (NoBreakSpace.encode linenum_text.encoding) + (' ' * (linenum_text.length - 1)) }
+              linenum_spacer ||= { text: (NoBreakSpace.encode linenum_text.encoding) + (' ' * (linenum_text.length - 1)), linenum: :spacer }
               highlight_line = (second_fragment = unconsumed[1])[:highlight] ? second_fragment.dup : nil
-            else
-              # NOTE: a wrapped line
+            else # wrapped line
               first_fragment[:text] = first_fragment[:text].lstrip
               @arranger.unconsumed.unshift highlight_line if highlight_line
               @arranger.unconsumed.unshift linenum_spacer.dup
@@ -43,6 +43,12 @@ module Asciidoctor
           @arranger.unconsumed
         end
       end
+
+      module SourceLineWrap
+        def update_line_status_based_on_last_output
+          @arranger.current_format_state[:linenum] ? nil : super
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/pdf/formatted_text/transform.rb

@@ -95,22 +95,24 @@ module Asciidoctor
                 styles: (to_styles theme.menu_font_style),
               }.compact,
             }
-            revise_roles = [].to_set
-            theme.each_pair.each_with_object @theme_settings do |(key, val), accum|
-              next unless (key = key.to_s).start_with? 'role_'
-              role, key = (key.slice 5, key.length).split '_', 2
-              if (prop = ThemeKeyToFragmentProperty[key])
-                (accum[role] ||= {})[prop] = val
-              #elsif key == 'font_kerning'
-              #  unless (resolved_val = val == 'none' ? false : (val == 'normal' ? true : nil)).nil?
-              #    (accum[role] ||= {})[:kerning] = resolved_val
-              #  end
-              elsif key == 'font_style' || key == 'text_decoration'
-                revise_roles << role
+            @theme_settings.tap do |accum|
+              revise_roles = [].to_set
+              theme.each_pair do |key, val|
+                next unless (key = key.to_s).start_with? 'role_'
+                role, key = (key.slice 5, key.length).split '_', 2
+                if (prop = ThemeKeyToFragmentProperty[key])
+                  (accum[role] ||= {})[prop] = val
+                #elsif key == 'font_kerning'
+                #  unless (resolved_val = val == 'none' ? false : (val == 'normal' ? true : nil)).nil?
+                #    (accum[role] ||= {})[:kerning] = resolved_val
+                #  end
+                elsif key == 'font_style' || key == 'text_decoration'
+                  revise_roles << role
+                end
+              end
+              revise_roles.each do |role|
+                (accum[role] ||= {})[:styles] = to_styles theme[%(role_#{role}_font_style)], theme[%(role_#{role}_text_decoration)]
               end
-            end
-            revise_roles.each_with_object @theme_settings do |role, accum|
-              (accum[role] ||= {})[:styles] = to_styles theme[%(role_#{role}_font_style)], theme[%(role_#{role}_text_decoration)]
             end
             @theme_settings['line-through'] = { styles: [:strikethrough].to_set } unless @theme_settings.key? 'line-through'
             @theme_settings['underline'] = { styles: [:underline].to_set } unless @theme_settings.key? 'underline'
@@ -276,8 +278,10 @@ module Asciidoctor
               when '#' # hex string (e.g., #FF0000)
                 fragment[:color] = value.length == 7 ? (value.slice 1, 6) : (value.slice 1, 3).each_char.map {|c| c * 2 }.join if HexColorRx.match? value
               when '[' # CMYK array (e.g., [50, 100, 0, 0])
-                fragment[:color] = ((((value.slice 1, value.length).chomp ']').split ', ', 4).each_with_object ::Array.new 4, 0).with_index do |(it, accum), idx|
-                  accum[idx] = (ival = it.to_i) == (fval = it.to_f) ? ival : fval
+                fragment[:color] = [0, 0, 0, 0].tap do |accum|
+                  (((value.slice 1, value.length).chomp ']').split ', ', 4).each_with_index do |it, idx|
+                    accum[idx] = (ival = it.to_i) == (fval = it.to_f) ? ival : fval
+                  end
                 end
               else # assume a 6-character hex color (internal only)
                 fragment[:color] = value

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -15,9 +15,7 @@ module Asciidoctor
       BaseThemePath = ::File.join ThemesDir, 'base-theme.yml'
       BundledThemeNames = (::Dir.children ThemesDir).map {|it| it.slice 0, it.length - 10 }
       DeprecatedCategoryKeys = { 'blockquote' => 'quote', 'key' => 'kbd', 'literal' => 'codespan', 'outline_list' => 'list' }
-      DeprecatedKeys = %w(base heading heading_h1 heading_h2 heading_h3 heading_h4 heading_h5 heading_h6 title_page abstract abstract_title admonition_label sidebar_title toc_title).each_with_object({ 'table_caption_side' => 'table_caption_end' }) do |prefix, accum|
-        accum[%(#{prefix}_align)] = %(#{prefix}_text_align)
-      end
+      DeprecatedKeys = { 'table_caption_side' => 'table_caption_end' }.tap {|accum| %w(base heading heading_h1 heading_h2 heading_h3 heading_h4 heading_h5 heading_h6 title_page abstract abstract_title admonition_label sidebar_title toc_title).each {|prefix| accum[%(#{prefix}_align)] = %(#{prefix}_text_align) } }
       PaddingBottomHackKeys = %w(example_padding quote_padding sidebar_padding verse_padding)
 
       VariableRx = /\$([a-z0-9_-]+)/
@@ -159,10 +157,12 @@ module Asciidoctor
         elsif key == 'font_fallbacks'
           data[key] = ::Array === val ? val.map {|name| expand_vars name.to_s, data } : []
         elsif key.start_with? 'admonition_icon_'
-          data[key] = val.map do |(key2, val2)|
-            key2 = key2.tr '-', '_' if key2.include? '-'
-            [key2.to_sym, (key2.end_with? '_color') ? (to_color evaluate val2, data) : (evaluate val2, data)]
-          end.to_h if val
+          data[key] = {}.tap do |accum|
+            val.each do |key2, val2|
+              key2 = key2.tr '-', '_' if key2.include? '-'
+              accum[key2.to_sym] = (key2.end_with? '_color') ? (to_color evaluate val2, data) : (evaluate val2, data)
+            end
+          end if val
         elsif ::Hash === val
           if (rekey = DeprecatedCategoryKeys[key])
             logger.warn %(the #{key.tr '_', '-'} theme category is deprecated; use the #{rekey.tr '_', '-'} category instead)

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.0.rc.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -325,9 +325,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: