asciidoctor-pdf 2.3.15 → 2.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b65e5da741e3df4c56f2e6ee79a9500dbd28a7c3f27d1ffea9c66bbb4d7031d
-  data.tar.gz: 41020f7cff7695528dac65d0d6368b4688f1fc00895a6ed68c9bf0d1c34ab594
+  metadata.gz: 493c0b612bcd07229becd5c1c53decdeaec3aeff63851556901c942257b091a9
+  data.tar.gz: 609bd614ebf487afc8b078b63a6b7e2e34d9f4377fecd0bffc718b673d63c6e1
 SHA512:
-  metadata.gz: cd72a63d48e8f29937bc6613257924d169fa3e878e3b5ab23a846fdc3fcccc1ee2471f800c380deee22b14b624b9db2383b8e00de62d21408467e3a3c77047b8
-  data.tar.gz: ada67363d0d5a5e551a4f9b499d31ce273d831e9de6c3c259130739c5b006f06937315f3130d25b89cf32a4b332deb3da23487cca9b856fd6753e24d2a4e027b
+  metadata.gz: 6bb6846fa124db582fe86992eace65b4d1263403971198f8d78cf8f2f33556dfdb3104ccff0f15dd27c316d94d65c3b3dd554f7b6e9527cfaf5ccffca8f642b5
+  data.tar.gz: 4fba487e7098185b900a2a6dbcafdf7e29ab345945562f832841ef4d06acfca76dc3d11f1c8b0fd80cc636f8102ae2239656049dee0ddd7861adff020ae1edde

data/CHANGELOG.adoc

@@ -5,6 +5,37 @@
 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.17 (2024-06-01) - @mojavelinux
+
+Improvements::
+
+* always use /Producer field in document info to credit Asciidoctor PDF and Prawn, even when author is set (#2510)
+* map `producer` attribute to /Producer field in document info to override or default value (#2510)
+* map `publisher` attribute to /Creator field instead of /Producer field in document info; use author as fallback (#2510)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.17[git tag] | {url-repo}/compare/v2.3.16\...v2.3.17[full diff]
+
+== 2.3.16 (2024-05-31) - @mojavelinux
+
+Improvements::
+
+* don't hyphenate autolink when hyphenation is enabled (#2521) (*@meonkeys*)
+* add support for base64-encoded SVG image reference in SVG (#2512)
+
+Bug Fixes::
+
+* duplicate attributes on table when wrapping table in breakable or unbreakable container (#2520)
+
+Compliance::
+
+* lock version of rexml (pulled in by asciidoctor-diagram and prawn-svg) to fix incompatibility
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.16[git tag] | {url-repo}/compare/v2.3.15\...v2.3.16[full diff]
+
 == 2.3.15 (2024-03-12) - @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.15, 2024-03-12
+v2.3.17, 2024-06-01
 // Settings:
 :experimental:
 :idprefix:

data/asciidoctor-pdf.gemspec

@@ -42,6 +42,7 @@ 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

@@ -525,13 +525,12 @@ module Asciidoctor
         end
         info[:Subject] = (sanitize doc.attr 'subject').as_pdf if doc.attr? 'subject'
         info[:Keywords] = (sanitize doc.attr 'keywords').as_pdf if doc.attr? 'keywords'
-        info[:Producer] = (sanitize doc.attr 'publisher').as_pdf if doc.attr? 'publisher'
+        info[:Creator] = (doc.attr? 'publisher') ? (sanitize doc.attr 'publisher').as_pdf : (info[:Author] || '')
+        info[:Producer] = (sanitize doc.attr 'producer').as_pdf if doc.attr? 'producer'
         if doc.attr? 'reproducible'
-          info[:Creator] = 'Asciidoctor PDF, based on Prawn'.as_pdf
-          info[:Producer] ||= (info[:Author] || info[:Creator])
+          info[:Producer] ||= 'Asciidoctor PDF, based on Prawn'.as_pdf
         else
-          info[:Creator] = %(Asciidoctor PDF #{::Asciidoctor::PDF::VERSION}, based on Prawn #{::Prawn::VERSION}).as_pdf
-          info[:Producer] ||= (info[:Author] || info[:Creator])
+          info[:Producer] ||= %(Asciidoctor PDF #{::Asciidoctor::PDF::VERSION}, based on Prawn #{::Prawn::VERSION}).as_pdf
           # NOTE: since we don't track the creation date of the input file, we map the ModDate header to the last modified
           # date of the input document and the CreationDate header to the date the PDF was produced by the converter.
           info[:ModDate] = (::Time.parse doc.attr 'docdatetime') rescue (now ||= ::Time.now)
@@ -1989,6 +1988,8 @@ module Asciidoctor
         if !at_page_top? && ((unbreakable = node.option? 'unbreakable') || ((node.option? 'breakable') && (node.id || node.title?)))
           # 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)
+          # NOTE: we need to duplicate the attributes so that the unbreakable/breakable option is preserved on subsequent conversions
+          table_dup.instance_variable_set :@attributes, node.attributes.dup
           if unbreakable
             table_dup.remove_attr 'unbreakable-option'
             table_container.set_attr 'unbreakable-option'

data/lib/asciidoctor/pdf/ext/prawn-svg/loaders/data.rb

@@ -2,5 +2,5 @@
 
 class Prawn::SVG::Loaders::Data
   remove_const :REGEXP
-  REGEXP = %r(\Adata:image/(?:png|jpe?g);base64(?:;[a-z0-9]+)*,)i
+  REGEXP = %r(\Adata:image/(?:png|jpe?g|svg\+xml);base64(?:;[a-z0-9]+)*,)i
 end

data/lib/asciidoctor/pdf/text_transformer.rb

@@ -8,6 +8,7 @@ module Asciidoctor
       TagFilterRx = /(<[^>]+>)|([^<]+)/
       ContiguousCharsRx = /\p{Graph}+/
       WordRx = /\p{Word}+/
+      BareClassRx = / class="bare[" ]/
       Hyphen = '-'
       SoftHyphen = ?\u00ad
       LowerAlphaChars = 'a-z'
@@ -31,7 +32,15 @@ module Asciidoctor
 
       def hyphenate_words_pcdata string, hyphenator
         if XMLMarkupRx.match? string
-          string.gsub(PCDATAFilterRx) { $2 ? (hyphenate_words $2, hyphenator) : $1 }
+          skipping = false
+          string.gsub PCDATAFilterRx do
+            if $2
+              skipping ? $2 : (hyphenate_words $2, hyphenator)
+            else
+              skipping = skipping ? $1 != '</a>' : ($1.start_with? '<a ') && (BareClassRx.match? $1)
+              $1
+            end
+          end
         else
           hyphenate_words string, hyphenator
         end

data/lib/asciidoctor/pdf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.15
+  version: 2.3.17
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -137,6 +137,20 @@ 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
@@ -350,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn