asciidoctor-pdf 2.3.4 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7fc3e4ac6264ca5d67d9c980104469ff87c54c52e869eec934a70bb938b99ca
-  data.tar.gz: 941b80f09b9828d4320f7e18dda3ec984885ef7cd9e6e71e7066692ce795814b
+  metadata.gz: ffe3647066c0eb782783dc3c76aa5b179637088729e48cbf49659c6a755ee92b
+  data.tar.gz: 945e6675e7d2e4073bbb3779824f6e65d75d237da22416c39212f3e501175606
 SHA512:
-  metadata.gz: '09df883eb6acf49084ae6b504c6f7c4a51cc9d3e1aa5119c960931c44d74bf65c7838a704b4a45d07bcf2b6a3089bd52e3ae76d5f8c29fe98cb2cac05cf1fec0'
-  data.tar.gz: f1a1bfdb597da670a59cebf59bd4989afe5f342cc4be4c1cc76a5f8fa6704d367395e5d7684a2c8d48f57cc5116ff422237c9e672a5ab9bdb2db6da21b9d98d5
+  metadata.gz: 69dfbad655ec87a98630d269654b007a9590b5107ce68e9c9b0c66fcead3d8735afa865d7bb8260af81c7f36cf9848a974655f950b0ae8538448adc994e84f2d
+  data.tar.gz: 469e1fe5e4d2d3f4e9dcf2b46f2fefb85fc45011710c751d52d4c09f86d4e212098e7a386af17ce6fe4ebe452efe613f57148373b667b1872e2a8a76d4eff53f

data/CHANGELOG.adoc

@@ -5,6 +5,34 @@
 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.3.6 (2023-04-09) - @mojavelinux
+
+Bug Fixes::
+
+* rework `File.absolute_path?` patch so it returns correct response when running on JRuby
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.6[git tag] | {url-repo}/compare/v2.3.5\...v2.3.6[full diff]
+
+== 2.3.5 (2023-03-31) - @mojavelinux
+
+Enhancements::
+
+* add `callout-list-marker-font-color` theme key to control color of conum marker in callout list (#2402)
+
+Bug Fixes::
+
+* catalog all footnotes found inside AsciiDoc table cells and render them in the footnotes list (#2410)
+* do not drop section that follows empty index (#2368)
+* restore bottom margin on table with `breakable` or `unbreakable` option (#2379)
+* honor theme settings for caption on table with `breakable` or `unbreakable` option (#2379)
+* use first recto page after toc when media is prepress and page numbering or running content start-at value is `after-toc` (#2398)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.5[git tag] | {url-repo}/compare/v2.3.4\...v2.3.5[full diff]
+
 == 2.3.4 (2022-10-29) - @mojavelinux
 
 Bug Fixes::

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor PDF: A native PDF converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.3.4, 2022-10-29
+v2.3.6, 2023-04-09
 // Settings:
 :experimental:
 :idprefix:

data/lib/asciidoctor/pdf/converter.rb

@@ -303,8 +303,12 @@ module Asciidoctor
 
           if (toc_extent = @toc_extent)
             if title_page_on && !insert_toc
-              num_front_matter_pages[0] = toc_extent.to.page if @theme.running_content_start_at == 'after-toc'
-              num_front_matter_pages[1] = toc_extent.to.page if @theme.page_numbering_start_at == 'after-toc'
+              if @theme.running_content_start_at == 'after-toc' || @theme.page_numbering_start_at == 'after-toc' # rubocop:disable Style/SoleNestedConditional
+                last_toc_page = toc_extent.to.page
+                last_toc_page += 1 if @ppbook && (recto_page? last_toc_page)
+                num_front_matter_pages[0] = last_toc_page if @theme.running_content_start_at == 'after-toc'
+                num_front_matter_pages[1] = last_toc_page if @theme.page_numbering_start_at == 'after-toc'
+              end
             end
             toc_page_nums = ink_toc doc, toc_num_levels, toc_extent.from.page, toc_extent.from.cursor, num_front_matter_pages[1]
           else
@@ -627,7 +631,8 @@ module Asciidoctor
           sect.context = :open
           return convert_abstract sect
         elsif (index_section = sectname == 'index') && @index.empty?
-          sect.remove
+          # override numbered_title to hide entry from TOC
+          sect.define_singleton_method :numbered_title, &->(*) { '' }
           return
         end
         title = sect.numbered_title formal: true
@@ -1244,7 +1249,7 @@ module Asciidoctor
         if !at_page_top? && (has_title || id || (node.option? 'unbreakable'))
           arrange_block node do
             add_dest_for_block node if id
-            tare_first_page_content_stream { ink_caption node, labeled: false } if has_title
+            tare_first_page_content_stream { ink_caption node, category: (node.style === 'table-container' ? :table : nil), labeled: false } if has_title
             traverse node
           end
         else
@@ -1364,9 +1369,10 @@ module Asciidoctor
         @list_numerals << (index = @list_numerals.pop).next
         theme_font :conum do
           marker_width = rendered_width_of_string %(#{marker = conum_glyph index}x)
+          marker_font_color = @theme.callout_list_marker_font_color || @font_color
           float do
             bounding_box [bounds.left, cursor], width: marker_width do
-              ink_prose marker, align: :center, inline_format: false, margin: 0
+              ink_prose marker, align: :center, inline_format: false, margin: 0, color: marker_font_color
             end
           end
         end
@@ -1968,13 +1974,15 @@ module Asciidoctor
 
       def convert_table node
         if !at_page_top? && ((unbreakable = node.option? 'unbreakable') || ((node.option? 'breakable') && (node.id || node.title?)))
-          (table_container = Block.new (table_dup = node.dup), :open) << table_dup
+          # NOTE: we use the current node as the parent so we can navigate back into the document model
+          (table_container = Block.new node, :open) << (table_dup = node.dup)
           if unbreakable
             table_dup.remove_attr 'unbreakable-option'
             table_container.set_attr 'unbreakable-option'
           else
             table_dup.remove_attr 'breakable-option'
           end
+          table_container.style = 'table-container'
           table_container.id, table_dup.id = table_dup.id, nil
           if table_dup.title?
             table_container.title = ''
@@ -3433,7 +3441,7 @@ module Asciidoctor
                 val = val.to_s unless ::String === val
                 if (val.include? ':') && val =~ ImageAttributeValueRx
                   attrlist = $2
-                  image_attrs = (AttributeList.new attrlist).parse %w(alt width)
+                  image_attrs = (::Asciidoctor::AttributeList.new attrlist).parse %w(alt width)
                   image_path, image_format = ::Asciidoctor::Image.target_and_format $1, image_attrs
                   image_path = apply_subs_discretely doc, image_path, subs: [:attributes], imagesdir: @themesdir
                   if (image_path = resolve_image_path doc, image_path, image_format, @themesdir) && (::File.readable? image_path)
@@ -3697,11 +3705,11 @@ module Asciidoctor
 
         if @theme.title_page_logo_display != 'none' && (logo_image_path = (doc.attr 'title-logo-image') || (logo_image_from_theme = @theme.title_page_logo_image))
           if (logo_image_path.include? ':') && logo_image_path =~ ImageAttributeValueRx
-            logo_image_attrs = (AttributeList.new $2).parse %w(alt width height)
+            logo_image_attrs = (::Asciidoctor::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], imagesdir: @themesdir
-              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless doc.is_uri? logo_image_path
+              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless (::File.absolute_path? logo_image_path) || (doc.is_uri? logo_image_path)
             else
               relative_to_imagesdir = true
               logo_image_path = $1
@@ -3711,7 +3719,7 @@ module Asciidoctor
             relative_to_imagesdir = false
             if logo_image_from_theme
               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
+              logo_image_path = ThemeLoader.resolve_theme_asset logo_image_path, @themesdir unless (::File.absolute_path? logo_image_path) || (doc.is_uri? logo_image_path)
             end
           end
           if (::Asciidoctor::Image.target_and_format logo_image_path)[1] == 'pdf'
@@ -4018,7 +4026,9 @@ module Asciidoctor
         end
         siblings = siblings.flatten if parent_context == :dlist
         if block != siblings[-1]
-          (self_idx = siblings.index block) && siblings[self_idx + 1]
+          context == :open && block.style == 'table-container' ?
+            (next_enclosed_block parent) :
+            (self_idx = siblings.index block) && siblings[self_idx + 1]
         elsif parent_context == :list_item || (parent_context == :open && parent.style != 'abstract') || parent_context == :section
           next_enclosed_block parent
         elsif list_item && (grandparent = parent.parent).context == :list_item
@@ -4086,7 +4096,7 @@ module Asciidoctor
           elsif image_path == 'none'
             return []
           elsif (image_path.include? ':') && image_path =~ ImageAttributeValueRx
-            image_attrs = (AttributeList.new $2).parse %w(alt width)
+            image_attrs = (::Asciidoctor::AttributeList.new $2).parse %w(alt width)
             image_path = $1
             image_relative_to = true
           end

data/lib/asciidoctor/pdf/ext/core/file.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-class File
-  # NOTE: remove once minimum JRuby version is fully 2.7 compliant
-  def self.absolute_path? path
-    (::Pathname.new path).absolute?
-  end unless respond_to? :absolute_path?
-end
+File.singleton_class.prepend (Module.new do
+  # NOTE: JRuby < 9.4 doesn't implement this method; JRuby 9.4 implements it incorrectly
+  def absolute_path? path
+    (::Pathname.new path).absolute? && !(%r/\A[[:alpha:]][[:alnum:]\-+]*:\/\/\S/.match? path)
+  end
+end) if RUBY_ENGINE == 'jruby'

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

@@ -12,6 +12,7 @@ module Prawn
 
         def initialize pdf, opts = {}
           @font_options = {}
+          @align = @valign = @root_font_size = nil
           super pdf, [], opts
         end
 
@@ -41,14 +42,12 @@ module Prawn
           apply_font_properties do
             extent = @pdf.dry_run keep_together: true, single_page: true do
               push_scratch parent_doc
-              doc.catalog[:footnotes] = parent_doc.catalog[:footnotes]
               # NOTE: we should be able to use cell.max_width, but returns 0 in some conditions (like when colspan > 1)
               indent cell.padding_left, bounds.width - cell.width + cell.padding_right do
                 move_down padding_y if padding_y > 0
                 conceal_page_top { traverse cell.content }
               end
               pop_scratch parent_doc
-              doc.catalog[:footnotes] = parent_doc.catalog[:footnotes]
             end
           end
           # NOTE: prawn-table doesn't support cells that exceed the height of a single page
@@ -89,6 +88,8 @@ module Prawn
           #   end
           # end
           start_page = pdf.page_number
+          parent_doc = (doc = content.document).nested? ? doc.parent_document : doc
+          doc.catalog[:footnotes] = parent_doc.catalog[:footnotes]
           # TODO: apply horizontal alignment; currently it is necessary to specify alignment on content blocks
           apply_font_properties { pdf.traverse content }
           if (extra_pages = pdf.page_number - start_page) > 0

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.4'
+    VERSION = '2.3.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.6
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn