asciidoctor-pdf 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0a79d0d99869a25e820f003920cb1cbb8485f103c73c6f51e6cb74b97ddcb5
-  data.tar.gz: 318f9318f55317e4483f8e566a58db5aa4407642e75a2ece66dfa1f2f150c8bf
+  metadata.gz: 3c80f2acfd251ff6721a173c153551989ca3372a3a51ddbf628176f24dd84f5f
+  data.tar.gz: 19c675f8b088711366559a831dcea41e2008a242dc4e19a321f7e40df50e1acf
 SHA512:
-  metadata.gz: d1ea1f2ad102f118e1de4d90ce4cf763db78f691ac6ddf5c93d9f2183b3fc0736a6767d20272d8b86815f0902088b2c42ed3dc72e59d587934d6738428271712
-  data.tar.gz: e686737ae4e56e8bd1f82bb916fb49bf77d937d226fec53f24753144d43304efe99e55c42dcaca27372e08ab1695dd3c711e727687ebbf17bc38a99a99b9ef5d
+  metadata.gz: 994846a17ff30b567e29a7a14f63c8d74348ac1644a4bd9ce1d85e687736c8f0a241a5f1fa91a84c52b3ecb9c66ef68701162bdf53fd7e5733c4e6df7b19f81b
+  data.tar.gz: 3889ba7c0cee283800c613a6d8d5e2c34b29d1cccb3d68a5d83c09c9ff300e1550c6cf28ffdc5b3b3873a35f14b6ad2b90a75f6e97431d0667c6c4b62a1e5a79

data/CHANGELOG.adoc

@@ -5,6 +5,17 @@
 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.0.5 (2022-05-26) - @mojavelinux
+
+Bug Fixes::
+
+* do not filter TOC entries without an ID when computing the TOC extent (#2210)
+* fix width of multi-word phrase with background and border offset (#2059)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.5[git tag] | {url-repo}/compare/v2.0.4\...v2.0.5[full diff]
+
 == 2.0.4 (2022-05-25) - @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.0.4, 2022-05-25
+v2.0.5, 2022-05-26
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 2.0.x
-:release-version: 2.0.4
+:release-version: 2.0.5
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf

data/lib/asciidoctor/pdf/converter.rb

@@ -3758,7 +3758,6 @@ module Asciidoctor
           next if (num_levels_for_entry = (entry.attr 'toclevels', num_levels).to_i) < (entry_level = entry.level + 1).pred ||
             ((entry.option? 'notitle') && entry == entry.document.last_child && entry.empty?)
           theme_font :toc, level: entry_level do
-            next unless (entry_anchor = (entry.attr 'pdf-anchor') || entry.id)
             entry_title = entry.context == :section ? entry.numbered_title : (entry.title? ? entry.title : (entry.xreftext 'basic'))
             next if entry_title.empty?
             entry_title = transform_text entry_title, @text_transform if @text_transform
@@ -3770,6 +3769,7 @@ module Asciidoctor
                 ink_prose entry_title, anchor: true, normalize: false, hanging_indent: hanging_indent, normalize_line_height: true, margin: 0
               end
             else
+              entry_anchor = (entry.attr 'pdf-anchor') || entry.id
               if !(physical_pgnum = entry.attr 'pdf-page-start') &&
                   (target_page_ref = (get_dest entry_anchor)&.first) &&
                   (target_page_idx = state.pages.index {|candidate| candidate.dictionary == target_page_ref })

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

@@ -5,8 +5,12 @@ Prawn::Text::Formatted::Fragment.prepend (Module.new do
 
   # Prevent fragment from being written by discarding the text, optionally forcing the width to 0
   def conceal force_width_to_zero = false
-    @text = ''
-    @width = 0 if force_width_to_zero
+    if force_width_to_zero
+      @width = 0
+      @text = ''
+    else
+      @text = ' ' * space_count # preserve space_count so width is still computed correctly
+    end
   end
 
   # Don't strip soft hyphens when repacking unretrieved fragments

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

@@ -9,11 +9,16 @@ module Asciidoctor::PDF::FormattedText
       text = fragment.text
       x = fragment.left
       y = fragment.baseline
-      align = fragment.format_state[:align]
-      if (align == :center || align == :right) && (gap_width = fragment.width - (document.width_of text)) != 0
-        x += gap_width * (align == :center ? 0.5 : 1)
+      align = (format_state = fragment.format_state)[:align]
+      if align == :center || align == :right
+        gap_width = (format_state.key? :width) ?
+          fragment.width - (document.width_of text) :
+          (format_state[:border_offset] || 0) * 2
+        x += gap_width * (align == :center ? 0.5 : 1) if gap_width > 0
+      end
+      document.word_spacing fragment.word_spacing do
+        document.draw_text! text, at: [x, y], kerning: document.default_kerning?
       end
-      document.draw_text! text, at: [x, y]
       fragment.conceal
     end
   end

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor