asciidoctor-pdf 2.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d912c0aa04b380a6b2a69420f01a3c4795bb897dd3b1fbc22316ec38f333905
-  data.tar.gz: 6a717bfc06aa32799bc4bfb24c0e67b621709eac500efb1e78c1cf9f42d06afc
+  metadata.gz: ff0a79d0d99869a25e820f003920cb1cbb8485f103c73c6f51e6cb74b97ddcb5
+  data.tar.gz: 318f9318f55317e4483f8e566a58db5aa4407642e75a2ece66dfa1f2f150c8bf
 SHA512:
-  metadata.gz: 69b76de214031c839abed9c1de5a0df55925ff638e4f9eab327e8970b66e78b499a1e9966bf7df436767a71728f6e6396608ad821feebf7a995de0585ca00861
-  data.tar.gz: 5f86394d598bdd7aa2c574912f95213cefa0620f375a34c35ff15d00369c0ca36b2dcec836ac95c460f9222f5ca24fa2b7573dd85448a5b5677cba5c1d2dd164
+  metadata.gz: d1ea1f2ad102f118e1de4d90ce4cf763db78f691ac6ddf5c93d9f2183b3fc0736a6767d20272d8b86815f0902088b2c42ed3dc72e59d587934d6738428271712
+  data.tar.gz: e686737ae4e56e8bd1f82bb916fb49bf77d937d226fec53f24753144d43304efe99e55c42dcaca27372e08ab1695dd3c711e727687ebbf17bc38a99a99b9ef5d

data/CHANGELOG.adoc

@@ -5,13 +5,50 @@
 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.4 (2022-05-25) - @mojavelinux
+
+Bug Fixes::
+
+* fix calculation of TOC extent when TOC entry has children but no ID (#2208)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.4[git tag] | {url-repo}/compare/v2.0.3\...v2.0.4[full diff]
+
+== 2.0.3 (2022-05-25) - @mojavelinux
+
+Improvements::
+
+* compute the optimize settings in init_pdf and store as Hash instead of after writing the PDF file
+
+Bug Fixes::
+
+* adjust TrimBox to fit inside of BleedBox when using optimizer and compliance is PDF/X (#2203)
+* set height of resized image to available height to avoid float precision error when scaling down image to fit page (#2205)
+* prevent content on title page from overrunning the bounds of a single page and warn; restriction applies to `ink_title_page`
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.3[git tag] | {url-repo}/compare/v2.0.2\...v2.0.3[full diff]
+
+== 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 and the bottom gutter (#2193)
-* short-circuit formatted_text routine and log error if fragments in first line cannot fit on a new page
-* break and wrap long contiguous text in source block when linenums are enabled (#2198)
+* 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
 

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.1, 2022-05-21
+v2.0.4, 2022-05-25
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 2.0.x
-:release-version: 2.0.1
+:release-version: 2.0.4
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf
@@ -97,14 +97,7 @@ Pass the name of the gem to the `gem install` command as follows:
 Installing Asciidoctor PDF will install a number of other gems mentioned in these docs, including asciidoctor, prawn, prawn-svg, prawn-table, prawn-icon, and ttfunk.
 For the most part, the versions of these dependencies are locked to the version of Asciidoctor PDF.
 
-If you're using Ruby 3.1 or better, you must also install the matrix gem until Prawn 2.5.0 or better is released.
-
- $ gem install matrix
-
-The matrix gem used to be bundled in the Ruby distribution, but was split out starting in Ruby 3.1.
-This requirement will be lifted once Prawn declares it as a runtime dependency.
-
-For further installation information, see {url-project-docs}/install/[the installation documentation].
+For further installation information about installing Asciidoctor PDF, see {url-project-docs}/install/[the installation documentation].
 For troubleshooting help, see {url-project-docs}/install/#installation-troubleshooting[Installation troubleshooting].
 
 === Install a prerelease or development version

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
 
@@ -174,7 +174,9 @@ module Asciidoctor
         if (has_title_page = (title_page_on = doc.doctype == 'book' || (doc.attr? 'title-page')) && (start_title_page doc))
           # NOTE: the base font must be set before any content is written to the main or scratch document
           font @theme.base_font_family, size: @root_font_size, style: @theme.base_font_style
-          ink_title_page doc
+          if perform_on_single_page { ink_title_page doc }
+            log :warn, 'the title page contents has been truncated to prevent it from overrunning the bounds of a single page'
+          end
           start_new_page
         else
           @page_margin_by_side[:cover] = @page_margin_by_side[:recto] if @media == 'prepress' && page_number == 0
@@ -321,6 +323,7 @@ module Asciidoctor
         stamp_foreground_image doc, has_front_cover
         ink_cover_page doc, :back
         add_dest_for_top doc
+        state.pages.each {|it| fit_trim_box it } if (@optimize&.[] :compliance)&.start_with? 'PDF/X'
         nil
       end
 
@@ -411,8 +414,14 @@ module Asciidoctor
         # NOTE: we have to init Pdfmark class here while we have reference to the doc
         @pdfmark = (doc.attr? 'pdfmark') ? (Pdfmark.new doc) : nil
         # NOTE: defer instantiating optimizer until we know min pdf version
-        if (@optimize = doc.attr 'optimize')
-          @optimize = nil unless (defined? ::Asciidoctor::PDF::Optimizer) || !(Helpers.require_library OptimizerRequirePath, 'rghost', :warn).nil? # rubocop:disable Style/SoleNestedConditional
+        if (optimize = doc.attr 'optimize') &&
+            ((defined? ::Asciidoctor::PDF::Optimizer) || !(Helpers.require_library OptimizerRequirePath, 'rghost', :warn).nil?)
+          @optimize = (optimize.include? ',') ?
+            ([:quality, :compliance].zip (optimize.split ',', 2)).to_h :
+            ((optimize.include? '/') ? { compliance: optimize } : { quality: optimize })
+          fit_trim_box if @optimize[:compliance]&.start_with? 'PDF/X'
+        else
+          @optimize = nil
         end
         allocate_scratch_prototype
         self
@@ -1110,11 +1119,11 @@ module Asciidoctor
               end
               if (srclang = node.attr 'language')
                 if srclang.include? '?'
-                  if (lexer = ::Rouge::Lexer.find_fancy srclang) && lexer.tag == 'php' && !(node.option? 'mixed') && !((lexer_opts = lexer.options).key? 'start_inline')
+                  if (lexer = ::Rouge::Lexer.find_fancy srclang)&.tag == 'php' && !(node.option? 'mixed') && !((lexer_opts = lexer.options).key? 'start_inline')
                     lexer = lexer.class.new lexer_opts.merge 'start_inline' => true
                   end
-                elsif (lexer = ::Rouge::Lexer.find srclang)
-                  lexer = lexer.new start_inline: true if lexer.tag == 'php' && !(node.option? 'mixed')
+                elsif (lexer = ::Rouge::Lexer.find srclang)&.tag == 'php' && !(node.option? 'mixed')
+                  lexer = lexer.new start_inline: true
                 end
               end
               lexer ||= ::Rouge::Lexers::PlainText
@@ -1205,10 +1214,10 @@ module Asciidoctor
           b_left_width = nil
           b_width = nil if (b_width = @theme[%(#{category}_border_width)]) == 0
         end
-        if (attribution = (node.attr? 'attribution') && (node.attr 'attribution'))
+        if (attribution = node.attr 'attribution')
           # NOTE: temporary workaround to allow bare & to be used without having to wrap value in single quotes
           attribution = escape_amp attribution if attribution.include? '&'
-          if (citetitle = node.attr 'citetitle') && (citetitle.include? '&')
+          if (citetitle = node.attr 'citetitle')&.include? '&'
             citetitle = escape_amp citetitle
           end
         end
@@ -1760,7 +1769,7 @@ module Asciidoctor
                   advance_page
                   available_h = cursor - caption_h
                 end
-                rendered_w, rendered_h = image_info.calc_image_dimensions height: available_h if rendered_h > available_h
+                rendered_w = (image_info.calc_image_dimensions height: (rendered_h = available_h))[0] if rendered_h > available_h
               end
               add_dest_for_block node if node.id
               # NOTE: workaround to fix Prawn not adding fill and stroke commands on page that only has an image;
@@ -2167,6 +2176,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
@@ -3607,7 +3617,6 @@ module Asciidoctor
           end
         end
 
-        # TODO: prevent content from spilling to next page
         theme_font :title_page do
           if (title_top = @theme.title_page_title_top)
             @y = resolve_top title_top
@@ -3747,9 +3756,9 @@ module Asciidoctor
         hanging_indent = @theme.toc_hanging_indent
         entries.each do |entry|
           next if (num_levels_for_entry = (entry.attr 'toclevels', num_levels).to_i) < (entry_level = entry.level + 1).pred ||
-            !(entry_anchor = (entry.attr 'pdf-anchor') || entry.id) ||
             ((entry.option? 'notitle') && entry == entry.document.last_child && entry.empty?)
           theme_font :toc, level: entry_level do
+            next unless (entry_anchor = (entry.attr 'pdf-anchor') || entry.id)
             entry_title = entry.context == :section ? entry.numbered_title : (entry.title? ? entry.title : (entry.xreftext 'basic'))
             next if entry_title.empty?
             entry_title = transform_text entry_title, @text_transform if @text_transform
@@ -4402,13 +4411,8 @@ module Asciidoctor
           pdf_doc.render_file target
           # QUESTION: restore attributes first?
           @pdfmark&.generate_file target
-          if (quality = @optimize)
-            if quality.include? ','
-              quality, compliance = quality.split ',', 2
-            elsif quality.include? '/'
-              quality, compliance = nil, quality
-            end
-            (Optimizer.new quality, pdf_doc.min_version, compliance).optimize_file target
+          if (optimize = @optimize)
+            (Optimizer.new optimize[:quality], pdf_doc.min_version, optimize[:compliance]).optimize_file target
           end
           to_file = true
         end
@@ -4635,6 +4639,15 @@ module Asciidoctor
         (max_height = bounds.height) < preferred_size ? max_height : preferred_size
       end
 
+      def fit_trim_box page_ = page
+        page_.dictionary.data[:TrimBox].tap do |trim_box|
+          trim_box[0] += 1e-4
+          trim_box[1] += 1e-4
+          trim_box[2] -= 1e-4
+          trim_box[3] -= 1e-4
+        end
+      end
+
       def font_path font_file, fonts_dir
         # resolve relative to built-in font dir unless path is absolute
         ::File.absolute_path font_file, fonts_dir

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/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.1'
+    VERSION = '2.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-21 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor