asciidoctor-pdf 2.3.17 → 2.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 493c0b612bcd07229becd5c1c53decdeaec3aeff63851556901c942257b091a9
-  data.tar.gz: 609bd614ebf487afc8b078b63a6b7e2e34d9f4377fecd0bffc718b673d63c6e1
+  metadata.gz: 465fb67274afdfc25ce6bddf7a7f0f8a7079bcc828d11cd86472c30f62b6cf5c
+  data.tar.gz: e034a8cbedf9329cdd48d2cc03063ca146ae9cf1ed28e2417b878ce14b4ca680
 SHA512:
-  metadata.gz: 6bb6846fa124db582fe86992eace65b4d1263403971198f8d78cf8f2f33556dfdb3104ccff0f15dd27c316d94d65c3b3dd554f7b6e9527cfaf5ccffca8f642b5
-  data.tar.gz: 4fba487e7098185b900a2a6dbcafdf7e29ab345945562f832841ef4d06acfca76dc3d11f1c8b0fd80cc636f8102ae2239656049dee0ddd7861adff020ae1edde
+  metadata.gz: a8da14edb4931a36dcfe223d1ccbe9dbaf6aa3c0a443818412062850158a5c7f15eebb6b3cbe39824440b9c9613d232ee2537a5d77ec156d491e8e619139694a
+  data.tar.gz: 991f86d8acdddb6e4ec1773d5db27fce3673ec4f8a0c4b7889a6095ef69c52d1e08b0dc63fcdde797beaf4f4d12bea49f11595f67e576d5da7594386f9c76f6e

data/CHANGELOG.adoc

@@ -5,6 +5,36 @@
 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.19 (2024-10-11) - @mojavelinux
+
+Improvements::
+
+* replace OpenStruct with internal ThemeData class for storing theme data (#2535)
+
+Bug Fixes::
+
+* support horizontal alignment on AsciiDoc table cell that only contains paragraphs (#2358)
+* don't allow AsciiDoc table cell to overrun bottom of page on which it fits (#2538)
+* don't look for NULL glyph in fallback font as this can impact line height (#2541)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.19[git tag] | {url-repo}/compare/v2.3.18\...v2.3.19[full diff]
+
+== 2.3.18 (2024-07-27) - @mojavelinux
+
+Bug Fixes::
+
+* position foreground image correctly when page layout changes (#2528)
+
+Compliance::
+
+* release lock on version of rexml (pulled in by asciidoctor-diagram and prawn-svg) now that incompatibility is resolved
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.18[git tag] | {url-repo}/compare/v2.3.17\...v2.3.18[full diff]
+
 == 2.3.17 (2024-06-01) - @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.17, 2024-06-01
+v2.3.19, 2024-10-11
 // Settings:
 :experimental:
 :idprefix:

data/asciidoctor-pdf.gemspec

@@ -42,7 +42,6 @@ Gem::Specification.new do |s|
   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 'rexml', '3.2.6' # lock rexml to 3.2.6 since 3.2.7 and up breaks Ruby
   s.add_runtime_dependency 'treetop', '~> 1.6.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'

data/lib/asciidoctor/pdf/converter.rb

@@ -4397,14 +4397,17 @@ module Asciidoctor
         if (first_page = (has_front_cover ? (pages.slice 1, pages.size) : pages).find {|it| !it.imported_page? }) &&
             (first_page_num = (pages.index first_page) + 1) &&
             (fg_image = resolve_background_image doc, @theme, 'page-foreground-image') && fg_image[0]
-          go_to_page first_page_num
-          create_stamp 'foreground-image' do
-            canvas { image fg_image[0], ({ position: :center, vposition: :center }.merge fg_image[1]) }
-          end
-          stamp 'foreground-image'
-          (first_page_num.next..page_count).each do |num|
+          stamps = ::Set.new
+          (first_page_num..page_count).each do |num|
             go_to_page num
-            stamp 'foreground-image' unless page.imported_page?
+            next if page.imported_page?
+            unless stamps.include? (stamp_name = %(foreground-image-#{page.layout}))
+              create_stamp stamp_name do
+                canvas { image fg_image[0], ({ position: :center, vposition: :center }.merge fg_image[1]) }
+              end
+              stamps << stamp_name
+            end
+            stamp stamp_name
           end
         end
       end

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

@@ -61,8 +61,8 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
     form_fragments_from_like_font_glyph_pairs font_glyph_pairs, fragment_hash
   end
 
-  # TODO: remove once Prawn 2.5 is released
   def find_font_for_this_glyph char, current_font, current_font_opts = {}, fallback_fonts_to_check = [], original_font = current_font
+    return current_font if char == ?\u0000 # never look for NUL character in fallback fonts as it's not rendered
     (doc = @document).font current_font, current_font_opts
     if doc.font.glyph_present? char
       current_font

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

@@ -73,9 +73,8 @@ module Prawn
           end
           # NOTE: draw_bounded_content automatically adds FPTolerance to width and height
           pdf.bounds.instance_variable_set :@width, spanned_content_width
-          padding_adjustment = content.context == :document ? padding_bottom : 0
-          # NOTE: we've already reserved the space, so just let the box stretch to bottom of the content area
-          pdf.bounds.instance_variable_set :@height, (pdf.y - pdf.page.margins[:bottom] - padding_adjustment)
+          # NOTE: we've already reserved the space, so just let the box stretch to the maximum that could fit on a page
+          pdf.bounds.instance_variable_set :@height, (pdf.margin_box.height - padding_top - padding_bottom)
           if @valign != :top && (excess_y = spanned_content_height - natural_content_height) > 0
             # QUESTION: could this cause a unexpected page overrun?
             pdf.move_down(@valign == :center ? (excess_y.fdiv 2) : excess_y)
@@ -116,11 +115,16 @@ module Prawn
             font_size = font_info[:size]
           end
           font_style ||= font_info[:style]
+          if (@align == :center || @align == :right) && content.blocks.map(&:context).uniq == [:paragraph]
+            prev_text_align = pdf.instance_variable_get :@base_text_align
+            pdf.instance_variable_set :@base_text_align, @align
+          end
           pdf.font font_family, size: font_size, style: font_style do
             yield
           ensure
             pdf.font_color = prev_font_color if prev_font_color
             pdf.font_scale = prev_font_scale if prev_font_scale
+            pdf.instance_variable_set :@base_text_align, prev_text_align if prev_text_align
           end
         end
       end

data/lib/asciidoctor/pdf/theme_data.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Asciidoctor
+  module PDF
+    class ThemeData
+      attr_reader :table
+
+      def initialize data = nil
+        @table = (data || {}).transform_keys(&:to_sym)
+      end
+
+      def [] name
+        @table[name.to_sym]
+      end
+
+      def []= name, value
+        @table[name.to_sym] = value
+      end
+
+      def each_pair &block
+        @table.each_pair(&block)
+      end
+
+      def eql? other
+        @table.to_h.eql? other.to_h
+      end
+
+      def delete_field name
+        @table.delete name
+      end
+
+      def dup
+        ThemeData.new @table
+      end
+
+      def method_missing name, *args
+        if (name_str = name.to_s).end_with? '='
+          @table[name_str.chop.to_sym] = args[0]
+        else
+          @table[name]
+        end
+      end
+
+      def respond_to? name, _include_all = false
+        @table.key? name.to_sym
+      end
+
+      def respond_to_missing? name, _include_all = false
+        @table.key? name.to_sym
+      end
+
+      def to_h
+        @table
+      end
+    end
+  end
+end

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ostruct'
+require_relative 'theme_data'
 require_relative 'measurements'
 
 module Asciidoctor
@@ -69,7 +69,7 @@ module Asciidoctor
       # NOTE: base theme is loaded "as is" (no post-processing)
       def self.load_base_theme
         ::File.open BaseThemePath, mode: 'r:UTF-8' do |io|
-          (::OpenStruct.new ::YAML.safe_load io, filename: BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
+          (ThemeData.new ::YAML.safe_load io, filename: BaseThemePath).tap {|theme| theme.__dir__ = ThemesDir }
         end
       end
 
@@ -78,7 +78,7 @@ module Asciidoctor
         if theme_path == BaseThemePath
           load_base_theme
         else
-          theme_data = load_file theme_path, (::OpenStruct.new base_font_size: 12), theme_dir
+          theme_data = load_file theme_path, (ThemeData.new base_font_size: 12), theme_dir
           unless (::File.dirname theme_path) == ThemesDir
             theme_data.base_text_align ||= 'left'
             theme_data.base_line_height ||= 1
@@ -102,12 +102,12 @@ module Asciidoctor
           line.sub(HexColorEntryRx) { %(#{(m = $~)[:k]}: #{m[:h] || (m[:k].end_with? 'color') ? "'#{m[:v]}'" : m[:v]}) }
         end.join unless (::File.dirname filename) == ThemesDir
         yaml_data = ::YAML.safe_load data, aliases: true, filename: filename
-        (loaded = (theme_data ||= ::OpenStruct.new).__loaded__ ||= ::Set.new).add filename
+        (loaded = (theme_data ||= ThemeData.new).__loaded__ ||= ::Set.new).add filename
         if ::Hash === yaml_data && (extends = yaml_data.delete 'extends')
           (Array extends).each do |extend_path|
             extend_path = extend_path.slice 0, extend_path.length - 11 if (force = extend_path.end_with? ' !important')
             if extend_path == 'base'
-              theme_data = ::OpenStruct.new theme_data.to_h.merge load_base_theme.to_h if (loaded.add? 'base') || force
+              theme_data = ThemeData.new theme_data.to_h.merge load_base_theme.to_h if (loaded.add? 'base') || force
               next
             elsif BundledThemeNames.include? extend_path
               extend_path, extend_theme_dir = resolve_theme_file extend_path, ThemesDir
@@ -123,7 +123,7 @@ module Asciidoctor
       end
 
       def load hash, theme_data = nil
-        ::Hash === hash ? hash.reduce(theme_data || ::OpenStruct.new) {|data, (key, val)| process_entry key, val, data, true } : (theme_data || ::OpenStruct.new)
+        ::Hash === hash ? hash.reduce(theme_data || ThemeData.new) {|data, (key, val)| process_entry key, val, data, true } : (theme_data || ThemeData.new)
       end
 
       private

data/lib/asciidoctor/pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.17
+  version: 2.3.19
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-01 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -137,20 +137,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +325,7 @@ files:
 - lib/asciidoctor/pdf/sanitizer.rb
 - lib/asciidoctor/pdf/section_info_by_page.rb
 - lib/asciidoctor/pdf/text_transformer.rb
+- lib/asciidoctor/pdf/theme_data.rb
 - lib/asciidoctor/pdf/theme_loader.rb
 - lib/asciidoctor/pdf/version.rb
 homepage: https://asciidoctor.org/docs/asciidoctor-pdf
@@ -364,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn