asciidoctor-pdf 2.3.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d88e98bb4e7e4afe22f1911c28813edbfe65af757b2cfb5899c754aa811ac12
-  data.tar.gz: 931e8ad9378ec457be0566cae2a43d5dddce06d5f821251bf842fc429b689a08
+  metadata.gz: 1581f65b075da9ee0793840f953f5c2562af23e5252d8c459d661bf3b59ad675
+  data.tar.gz: fab056a2621eed2b40f7ed3ebcfc96f3601beb2ce3634118bf9e12272874e184
 SHA512:
-  metadata.gz: 2b530895e85531f879ad2bf1b8672281e0bc4af53cba666817d5d01349022fc0beaffe758b9def65e82db79f7e86c6bed9fcb70688e65ada7ecb993b5597f748
-  data.tar.gz: d97b859cccfb0ff54e65f4ccae7fc4a604c3ccb33a2727d08e2a523896ec045777999397ee506959173b404d13d2b253456943ef93b390f192ed831f4418a170
+  metadata.gz: d4f89a9ba025c7ca1c4563e98b6e64167ae8822c920f0f5a2e1204ea4c6cc79b1e3f5680adbc79977e9ee193435523bdc61e5be465f2dcd55f2f151c98de0680
+  data.tar.gz: 5cdd5a6d92cd55d70d279cd0c42cf66afe436f8f76c4facd0747964921b0f29cfa8c6012998f4e842ddcfe87a5eed4838819a98d9303aeb0717fc012b7ff0b9f

data/CHANGELOG.adoc

@@ -5,6 +5,27 @@
 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.3 (2022-10-21) - @mojavelinux
+
+Bug Fixes::
+
+* fix crash if last fragment in TOC entry is not rendered (#2354)
+* pass `-dNEWPDF=false` to Ghostscript when optimizing PDF so it does not break internal links (#2355)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.3[git tag] | {url-repo}/compare/v2.3.2\...v2.3.3[full diff]
+
+== 2.3.2 (2022-09-17) - @mojavelinux
+
+Improvements::
+
+* provide fallback value for `base-font-size` theme key before processing keys (#2343)
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.2[git tag] | {url-repo}/compare/v2.3.1\...v2.3.2[full diff]
+
 == 2.3.1 (2022-09-17) - @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.1, 2022-09-17
+v2.3.3, 2022-10-21
 // Settings:
 :experimental:
 :idprefix:

data/lib/asciidoctor/pdf/converter.rb

@@ -557,7 +557,7 @@ module Asciidoctor
       def prepare_theme theme
         theme.base_border_color = nil if theme.base_border_color == 'transparent'
         theme.base_font_color ||= '000000'
-        theme.base_font_size ||= 12
+        theme.base_font_family ||= 'Helvetica'
         theme.base_font_style = theme.base_font_style&.to_sym || :normal
         theme.page_numbering_start_at ||= 'body'
         theme.running_content_start_at ||= 'body'
@@ -3903,12 +3903,19 @@ module Asciidoctor
               entry_title_fragments = text_formatter.format entry_title, inherited: entry_title_inherited
               line_metrics = calc_line_metrics @base_line_height
               indent 0, pgnum_label_placeholder_width do
-                (entry_title_fragments[-1][:callback] ||= []) << (last_fragment_pos = ::Asciidoctor::PDF::FormattedText::FragmentPositionRenderer.new)
+                fragment_positions = []
+                entry_title_fragments.each do |fragment|
+                  fragment_positions << (fragment_position = ::Asciidoctor::PDF::FormattedText::FragmentPositionRenderer.new)
+                  (fragment[:callback] ||= []) << fragment_position
+                end
                 typeset_formatted_text entry_title_fragments, line_metrics, hanging_indent: hanging_indent, normalize_line_height: true
-                start_dots = last_fragment_pos.right + hanging_indent
-                last_fragment_cursor = last_fragment_pos.top + line_metrics.padding_top
-                start_cursor = last_fragment_cursor if last_fragment_pos.page_number > start_page_number || (start_cursor - last_fragment_cursor) > line_metrics.height
+                break unless (last_fragment_position = fragment_positions.select(&:page_number)[-1])
+                start_dots = last_fragment_position.right + hanging_indent
+                last_fragment_cursor = last_fragment_position.top + line_metrics.padding_top
+                start_cursor = last_fragment_cursor if last_fragment_position.page_number > start_page_number || (start_cursor - last_fragment_cursor) > line_metrics.height
               end
+              # NOTE: this will leave behind a gap where this entry would have been
+              break unless start_dots
               end_cursor = cursor
               move_cursor_to start_cursor
               # NOTE: we're guaranteed to be on the same page as the final line of the entry

data/lib/asciidoctor/pdf/optimizer.rb

@@ -4,6 +4,7 @@ require 'pathname'
 require 'rghost'
 require 'rghost/gs_alone'
 require 'tmpdir'
+autoload :Open3, 'open3'
 
 RGhost::GSAlone.prepend (Module.new do
   def initialize params, debug
@@ -15,7 +16,11 @@ RGhost::GSAlone.prepend (Module.new do
     RGhost::Config.config_platform unless File.exist? RGhost::Config::GS[:path].to_s
     (cmd = @params.slice 1, @params.length).unshift RGhost::Config::GS[:path].to_s
     #puts cmd if @debug
-    system(*cmd)
+    _out, err, status = Open3.capture3(*cmd)
+    unless (lines = err.lines.each_with_object([]) {|l, accum| (l.include? '-dNEWPDF=') ? accum.pop : (accum << l) }).empty?
+      $stderr.write(*lines)
+    end
+    status.success?
   end
 end)
 
@@ -59,7 +64,7 @@ module Asciidoctor
           else
             inputs = target
           end
-          d = { Printed: false, CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level }
+          d = { CannotEmbedFontPolicy: '/Warning', CompatibilityLevel: @compatibility_level, NEWPDF: false, Printed: false }
           case @compliance
           when 'PDF/A', 'PDF/A-1', 'PDF/A-2', 'PDF/A-3'
             d[:PDFA] = ((@compliance.split '-', 2)[1] || 1).to_i

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -78,12 +78,11 @@ module Asciidoctor
         if theme_path == BaseThemePath
           load_base_theme
         else
-          theme_data = load_file theme_path, nil, theme_dir
+          theme_data = load_file theme_path, (::OpenStruct.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
             theme_data.base_font_color ||= '000000'
-            theme_data.base_font_size ||= 12
             theme_data.code_font_family ||= (theme_data.codespan_font_family || 'Courier')
             theme_data.conum_font_family ||= (theme_data.codespan_font_family || 'Courier')
             if (heading_font_family = theme_data.heading_font_family)

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.1'
+    VERSION = '2.3.3'
   end
 end

metadata

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