asciidoctor-pdf 2.3.19 → 2.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 465fb67274afdfc25ce6bddf7a7f0f8a7079bcc828d11cd86472c30f62b6cf5c
-  data.tar.gz: e034a8cbedf9329cdd48d2cc03063ca146ae9cf1ed28e2417b878ce14b4ca680
+  metadata.gz: c14c6b1955b9d36bc085d127fef49bf8f90f3a035e8b6e3d196bf6fe4ee22323
+  data.tar.gz: a0755e6cfb29974f58b94f6785fb871ca99bf7101b18e1a60b6e7c7cada9f3e9
 SHA512:
-  metadata.gz: a8da14edb4931a36dcfe223d1ccbe9dbaf6aa3c0a443818412062850158a5c7f15eebb6b3cbe39824440b9c9613d232ee2537a5d77ec156d491e8e619139694a
-  data.tar.gz: 991f86d8acdddb6e4ec1773d5db27fce3673ec4f8a0c4b7889a6095ef69c52d1e08b0dc63fcdde797beaf4f4d12bea49f11595f67e576d5da7594386f9c76f6e
+  metadata.gz: bdd80f2e12b579772e5f0d433f2e002e56ff864f71400baaafa178a6a139817e875651b5feb494fc7b5a25907ef3f4ba331b622fda563befe65e0a3c38687d60
+  data.tar.gz: 7922d5ac110d170fe242070ef65d324bd8ff9fd5bd7820111324d9cfb878070238f2b9057808beb5c1aee33aad94062590ef21f388a3efef45a6d98b84fec71f

data/CHANGELOG.adoc

@@ -5,6 +5,32 @@
 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.20 (2025-09-17) - @mojavelinux
+
+Improvements::
+
+* add symbols for shift, command, option, and return keys to the fallback font
+* render horizontal dlist without using prawn-table, allowing the description to exceed the height of one page (#2591)
+* allow relative font size for sub and sup to be set independently (support combined setting for backwards compatibility)
+* allow value of `base-font-size-min` and `<category>-font-size-min` theme keys to be relative (e.g., 0.75em) (#2547)
+* respect `hide-uri-scheme` attribute when appending URL to link text when media is print or prepress (#2583)
+
+Bug Fixes::
+
+* always force NULL character to have 0 width, even if missing from font (#2585)
+* don't drop line in running content if attribute reference resolves to text that contains attribute reference (not originally present)
+* correctly calculate extent for block in columns that starts below doctitle (#2579)
+* support internal link on image (value of link attribute starts with #) (#2572)
+
+Compliance::
+
+* suppress warning about the use of Ruby's logger gem when loading Asciidoctor
+* ignore error if bigdecimal gem cannot be eagerly required
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.20[git tag] | {url-repo}/compare/v2.3.19\...v2.3.20[full diff]
+
 == 2.3.19 (2024-10-11) - @mojavelinux
 
 Improvements::

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.19, 2024-10-11
+v2.3.20, 2025-09-17
 // Settings:
 :experimental:
 :idprefix:

data/asciidoctor-pdf.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'prawn-templates', '~> 0.1.0'
   s.add_runtime_dependency 'prawn-svg', '~> 0.34.0'
   s.add_runtime_dependency 'prawn-icon', '~> 3.0.0'
-  s.add_runtime_dependency 'concurrent-ruby', '~> 1.1'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.3'
   s.add_runtime_dependency 'treetop', '~> 1.6.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'

data/lib/asciidoctor/pdf/converter.rb

@@ -104,7 +104,7 @@ module Asciidoctor
       }
       TypographicQuotes = %w(“ ” ‘ ’)
       InlineFormatSniffRx = /[<&]/
-      SimpleAttributeRefRx = /(?<!\\)\{\w+(?:-\w+)*\}/
+      SimpleAttributeRefRx = /(?<!\\)\{(\w+(?:-\w+)*)\}/
       MeasurementRxt = '\\d+(?:\\.\\d+)?(?:in|cm|mm|p[txc])?'
       MeasurementPartsRx = /^(\d+(?:\.\d+)?)(in|mm|cm|p[txc])?$/
       PageSizeRx = /^(?:\[(#{MeasurementRxt}), ?(#{MeasurementRxt})\]|(#{MeasurementRxt})(?: x |x)(#{MeasurementRxt})|\S+)$/
@@ -1421,55 +1421,62 @@ module Asciidoctor
           convert_list list
           markers.pop
         when 'horizontal'
-          table_data = []
-          term_padding = term_padding_no_blocks = term_font_color = term_transform = desc_padding = term_line_metrics = term_inline_format = term_kerning = nil
+          ink_caption node, category: :description_list, labeled: false if node.title?
           max_term_width = 0
+          term_height = term_padding = term_font_styles = term_transform = desc_padding = term_line_metrics = term_inline_format = term_kerning = nil
           theme_font :description_list_term do
-            term_font_color = @font_color
+            term_height = height_of_typeset_text 'A'
             term_transform = @text_transform
             term_inline_format = (term_font_styles = font_styles).empty? ? true : [inherited: { styles: term_font_styles }]
             term_line_metrics = calc_line_metrics @base_line_height
-            term_padding_no_blocks = [term_line_metrics.padding_top, 10, term_line_metrics.padding_bottom, 10]
-            (term_padding = (term_padding_no_blocks.drop 0))[2] += @theme.prose_margin_bottom * 0.5
+            term_padding = [term_line_metrics.padding_top, 10, term_line_metrics.padding_bottom, 10]
             desc_padding = [0, 10, 0, 10]
             term_kerning = default_kerning?
           end
-          actual_node, node = node, node.dup
-          (node.instance_variable_set :@blocks, node.items.map(&:dup)).each do |item|
+          prose_height = height_of_typeset_text 'A'
+          items = node.items.map do |item|
             terms, desc = item
-            term_text = terms.map(&:text).join ?\n
-            term_text = transform_text term_text, term_transform if term_transform
-            if (term_width = width_of term_text, inline_format: term_inline_format, kerning: term_kerning) > max_term_width
-              max_term_width = term_width
-            end
-            row_data = [{
-              text_color: term_font_color,
-              kerning: term_kerning,
-              content: term_text,
-              inline_format: term_inline_format,
-              padding: desc&.blocks? ? term_padding : term_padding_no_blocks,
-              leading: term_line_metrics.leading,
-              # FIXME: prawn-table doesn't have support for final_gap option
-              #final_gap: term_line_metrics.final_gap,
-              valign: :top,
-            }]
-            if desc
-              desc_container = Block.new node, :open
-              desc_container << (Block.new desc_container, :paragraph, source: (desc.instance_variable_get :@text), subs: :default) if desc.text?
-              desc.blocks.each {|b| desc_container << b.dup } if desc.blocks?
-              row_data << { content: (::Prawn::Table::Cell::AsciiDoc.new self, content: (item[1] = desc_container), text_color: @font_color, padding: desc_padding, valign: :top, source_location: desc.source_location) }
-            else
-              row_data << {}
+            terms_as_text = terms.map do |term|
+              term_text = term_transform ? (transform_text term.text, term_transform) : term.text
+              if (term_width = width_of term_text, inline_format: term_inline_format, kerning: term_kerning) > max_term_width
+                max_term_width = term_width
+              end
+              term_text
             end
-            table_data << row_data
+            [terms_as_text, desc]
           end
-          max_term_width += (term_padding[1] + term_padding[3])
-          term_column_width = [max_term_width, bounds.width * 0.5].min
-          table table_data, position: :left, column_widths: [term_column_width] do
-            cells.style border_width: 0
-            @pdf.ink_table_caption node if node.title?
+          term_side_padding = term_padding[1] + (term_left = term_padding[3])
+          max_term_width += term_side_padding
+          term_column_width = [max_term_width, bounds.width * 0.5 - term_side_padding].min
+          term_spacing = @theme.description_list_term_spacing
+          items.each do |terms_as_text, desc|
+            advance_page if !at_page_top? && cursor < [((term_spacing + term_height) * terms_as_text.size) - term_spacing, desc ? prose_height : 0].max
+            initial_y = y
+            initial_page_number = page_number
+            indent term_left, (bounds.width - term_column_width) do
+              theme_font :description_list_term do
+                terms_as_text.each_with_index do |term_text, idx|
+                  ink_prose term_text, margin_top: (idx > 0 ? term_spacing : 0), margin_bottom: 0, align: :left, normalize_line_height: true, styles: term_font_styles
+                end
+              end
+            end
+            if desc # rubocop:disable Style/Next
+              after_term_y = y
+              after_term_page_number = page_number
+              go_to_page initial_page_number if page_number > initial_page_number
+              @y = initial_y
+              indent term_column_width + desc_padding[3], desc_padding[1] do
+                traverse_list_item desc, :dlist_desc, normalize_line_height: true, margin_bottom: ((next_enclosed_block desc, descend: true) ? nil : 0)
+              end
+              if page_number < after_term_page_number
+                go_to_page after_term_page_number
+                @y = after_term_y
+              elsif y > after_term_y
+                @y = after_term_y
+              end
+            end
           end
-          theme_margin :prose, :bottom, (next_enclosed_block actual_node) #unless actual_node.nested?
+          theme_margin :prose, :bottom, (next_enclosed_block node) unless node.nested?
         when 'qanda'
           @list_numerals << 1
           convert_list node
@@ -2459,6 +2466,7 @@ module Asciidoctor
             %(#{anchor}<a href="#{target}"#{attrs.join}>#{breakable_uri text}</a>)
           # NOTE: @media may not be initialized if method is called before convert phase
           elsif (doc.attr? 'show-link-uri') || (@media != 'screen' && (doc.attr_unspecified? 'show-link-uri'))
+            bare_target = (bare_target.split UriSchemeBoundaryRx, 2)[1] || bare_target if doc.attr? 'hide-uri-scheme'
             # QUESTION: should we insert breakable chars into URI when building fragment instead?
             # TODO: allow style of printed link to be controlled by theme
             %(#{anchor}<a href="#{target}"#{attrs.join}>#{text}</a> [<font size="0.85em">#{breakable_uri bare_target}</font>&#93;)
@@ -2639,7 +2647,11 @@ module Asciidoctor
             img = %([#{node.attr 'alt'}&#93;)
           end
         end
-        (node.attr? 'link') ? %(<a href="#{node.attr 'link'}">#{img}</a>) : img
+        if (node.attr? 'link') && (link = node.attr 'link')
+          link.chr == '#' ? %(<a anchor="#{link.slice 1}">#{img}</a>) : %(<a href="#{link}">#{img}</a>)
+        else
+          img
+        end
       end
 
       def convert_inline_indexterm node
@@ -2831,8 +2843,11 @@ module Asciidoctor
         # FIXME: get sub_attributes to handle drop-line w/o a warning
         doc.set_attr 'attribute-missing', 'skip' unless (attribute_missing = doc.attr 'attribute-missing') == 'skip'
         value = value.gsub '\{', '\\\\\\{' if (escaped_attr_ref = value.include? '\{')
+        value_before_subs = value
         value = (subs = opts[:subs]) ? (doc.apply_subs value, subs) : (doc.apply_subs value)
-        value = (value.split LF).delete_if {|line| SimpleAttributeRefRx.match? line }.join LF if opts[:drop_lines_with_unresolved_attributes] && (value.include? '{')
+        if opts[:drop_lines_with_unresolved_attributes] && (value.include? '{')
+          value = (value.split LF).delete_if {|line| SimpleAttributeRefRx =~ line && (value_before_subs.include? '{' + $1 + '}') }.join LF
+        end
         value = value.gsub '\{', '{' if escaped_attr_ref
         doc.set_attr 'attribute-missing', attribute_missing unless attribute_missing == 'skip'
         page_layout_to_restore ? (doc.set_attr 'page-layout', page_layout_to_restore) : (doc.remove_attr 'page-layout') if page_layout
@@ -4724,7 +4739,12 @@ module Asciidoctor
           image_y = y - image_opts[:vposition]
         end unless (image_y = image_opts[:y])
 
-        link_annotation [image_x, (image_y - image_height), (image_x + image_width), image_y], Border: [0, 0, 0], A: { Type: :Action, S: :URI, URI: uri.as_pdf }
+        loc = [image_x, (image_y - image_height), (image_x + image_width), image_y]
+        if uri.chr == '#'
+          link_annotation loc, Border: [0, 0, 0], Dest: (uri.slice 1)
+        else
+          link_annotation loc, Border: [0, 0, 0], A: { Type: :Action, S: :URI, URI: uri.as_pdf }
+        end
       end
 
       def admonition_icon_data key
@@ -4805,7 +4825,7 @@ module Asciidoctor
         padding = expand_padding_value @theme[%(#{category}_padding)]
         if actual_width > (available_width = bounds.width - padding[3].to_f - padding[1].to_f)
           adjusted_font_size = ((available_width * font_size).to_f / actual_width).truncate 4
-          if (min = @theme[%(#{category}_font_size_min)] || @theme.base_font_size_min) && adjusted_font_size < min
+          if (min = @theme[%(#{category}_font_size_min)] || @theme.base_font_size_min) && adjusted_font_size < (min = resolve_font_size min)
             min
           else
             adjusted_font_size
@@ -4813,6 +4833,19 @@ module Asciidoctor
         end
       end
 
+      def resolve_font_size value
+        return value unless ::String === value
+        if value.end_with? 'rem'
+          @root_font_size * value.to_f
+        elsif value.end_with? 'em'
+          font_size * value.to_f
+        elsif value.end_with? '%'
+          font_size * (value.to_f / 100)
+        else
+          value.to_f
+        end
+      end
+
       def consolidate_ranges nums
         if nums.size > 1
           prev = nil

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

@@ -1146,7 +1146,11 @@ module Asciidoctor
           bounds_copy.instance_variable_set :@parent, saved_bounds
           bounds_copy.single_file if ColumnBox === bounds_copy
         end
-        scratch_pdf.move_cursor_to cursor unless (scratch_start_at_top = keep_together || pages_advanced > 0 || at_page_top?)
+        if !(scratch_start_at_top = keep_together || pages_advanced > 0 || at_page_top?)
+          scratch_pdf.move_cursor_to cursor
+        elsif ColumnBox === bounds
+          scratch_pdf.move_cursor_to scratch_pdf.bounds.top
+        end
         scratch_start_cursor = scratch_pdf.cursor
         scratch_start_page = scratch_pdf.page_number
         inhibit_new_page = state.on_page_create_callback == InhibitNewPageProc

data/lib/asciidoctor/pdf/ext/prawn/font/ttf.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+Prawn::Font::TTF.prepend (Module.new do
+  def character_width_by_code code
+    return 0 if code == 0
+    super
+  end
+end)

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

@@ -9,7 +9,7 @@ Prawn::Text::Formatted::Arranger.prepend (Module.new do
     super
     @dummy_text = ?\u0000
     @normalize_line_height = false
-    @sub_and_sup_relative_size = 0.583
+    @sub_relative_size = @sup_relative_size = 0.583
   end
 
   def format_array= array
@@ -38,13 +38,18 @@ Prawn::Text::Formatted::Arranger.prepend (Module.new do
   end
 
   def apply_font_size size, styles
-    if (subscript? styles) || (superscript? styles)
+    if (sub = subscript? styles) || (superscript? styles)
       size ||= @document.font_size
+      if instance_variable_defined? :@sub_and_sup_relative_size
+        relative_size = @sub_and_sup_relative_size
+      else
+        relative_size = sub ? @sub_relative_size : @sup_relative_size
+      end
       if String === size
         units = (size.end_with? 'em', '%') ? ((size.end_with? '%') ? '%' : 'em') : ''
-        size = %(#{size.to_f * @sub_and_sup_relative_size}#{units})
+        size = %(#{size.to_f * relative_size}#{units})
       else
-        size *= @sub_and_sup_relative_size
+        size *= relative_size
       end
       @document.font_size(size) { yield }
     elsif size

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

@@ -8,6 +8,7 @@ Prawn::FLOAT_PRECISION = 1e-3
 require_relative 'prawn/document/column_box'
 require_relative 'prawn/font_metric_cache'
 require_relative 'prawn/font/afm'
+require_relative 'prawn/font/ttf'
 require_relative 'prawn/images'
 require_relative 'prawn/formatted_text/arranger'
 require_relative 'prawn/formatted_text/box'

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

@@ -212,8 +212,12 @@ module Asciidoctor
                       fragment[:callback] = [TextBackgroundAndBorderRenderer] | fragment[:callback]
                     end
                   end if attributes.key? :class
-                  if inherited && (link = inherited[:link])
-                    fragment[:link] = link
+                  if inherited
+                    if (link = inherited[:link])
+                      fragment[:link] = link
+                    elsif (anchor = inherited[:anchor])
+                      fragment[:anchor] = anchor
+                    end
                   end
                   if (img_w = attributes[:width])
                     fragment[:image_width] = img_w

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.19'
+    VERSION = '2.3.20'
   end
 end

data/lib/asciidoctor/pdf.rb

@@ -2,7 +2,10 @@
 
 proc do
   old_verbose, $VERBOSE = $VERBOSE, nil
-  require 'bigdecimal' # eagerly require bigdecimal without warnings to avoid warning caused by ttfunk 1.7.0
+  begin
+    require 'bigdecimal' # try to eagerly require bigdecimal with warnings off to avoid warning caused by ttfunk 1.7.0
+  rescue Exception # rubocop:disable Lint/SuppressedException,Lint/RescueException
+  end
   $VERBOSE = old_verbose
 end.call
 
@@ -11,7 +14,11 @@ autoload :StringIO, 'stringio'
 autoload :Tempfile, 'tempfile'
 require 'time' unless defined? Time.parse
 require_relative 'pdf/version'
-require 'asciidoctor'
+proc do
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  require 'asciidoctor' # avoid warning in Ruby 3.4 caused by use of logger
+  $VERBOSE = old_verbose
+end.call
 require 'prawn'
 require 'prawn/templates'
 require_relative 'pdf/measurements'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.19
+  version: 2.3.20
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +290,7 @@ files:
 - lib/asciidoctor/pdf/ext/prawn/document/column_box.rb
 - lib/asciidoctor/pdf/ext/prawn/extensions.rb
 - lib/asciidoctor/pdf/ext/prawn/font/afm.rb
+- lib/asciidoctor/pdf/ext/prawn/font/ttf.rb
 - lib/asciidoctor/pdf/ext/prawn/font_metric_cache.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/arranger.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/box.rb
@@ -351,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn