asciidoctor-pdf 2.0.3 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b41dc215a6b942da9191850d15cf3e68224f1b633147b2df34a5e1e88756f797
-  data.tar.gz: 929dd071b2dc29b6d6f4500efb87e1ffa251c9413ae1e8076a14285bca51a600
+  metadata.gz: be0ccb9b1f50f98f904f500c7b2bf0118157714825e28739ab80df39ff101bf9
+  data.tar.gz: 1ce0fafde09b3e41ad86782397e0034bc8bd6f82d06dff01346bf055ead214d0
 SHA512:
-  metadata.gz: 17d8c003b47e99e0e7156027783ff1fa1e8298767b82de209f40a523e40d6d1f35f7263c1b673bb686082a474a219c9fda26e3f2894852f51374dd554844aae2
-  data.tar.gz: 9711e5816aa9c9893ddaf139c717fb125d285b5788d42ebac4473660148f66126b1eccc1f389d781e4fc13ccb02010f9a909fa69580b7239765b907a160a4a3b
+  metadata.gz: ea8d2b78a501da0ce41cc9dabf88f19fe1926262725661012c4f5f00ffc10f34e1a479ca4cf6b66a6601d4f9f2ada928fc23eb0cb422b391503955f21b072a8d
+  data.tar.gz: 3916e7d631167b57babd839b9f352932ca3df05022a4487195a2d8c8ee07165bdccb0127cd447d1e525f23a6bd2ef88d7710ad63075ec70c5763e5e7b8f6a237

data/CHANGELOG.adoc

@@ -5,6 +5,40 @@
 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.6 (2022-05-30) - @mojavelinux
+
+Bug Fixes::
+
+* indent content of collapsible block and apply bottom margin to match style of HTML output (#2219)
+* patch prawn-gmagick to reread bit depth of a PNG image if it extracts the wrong value (#2216)
+* interpret width of SVG correctly when width is defined in file using px units (#2215)
+* don't crash if inline role defines border width but not border color
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.6[git tag] | {url-repo}/compare/v2.0.5\...v2.0.6[full diff]
+
+== 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::
+
+* fix calculation of TOC extent when TOC entry has children but no ID (#2208)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.4[git tag] | {url-repo}/compare/v2.0.3\...v2.0.4[full diff]
+
 == 2.0.3 (2022-05-25) - @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.0.3, 2022-05-25
+v2.0.6, 2022-05-30
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 2.0.x
-:release-version: 2.0.3
+:release-version: 2.0.6
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf

data/lib/asciidoctor/pdf/converter.rb

@@ -6,9 +6,6 @@ require_relative 'pdfmark'
 require_relative 'roman_numeral'
 require_relative 'section_info_by_page'
 
-autoload :StringIO, 'stringio'
-autoload :Tempfile, 'tempfile'
-
 module Asciidoctor
   module PDF
     class Converter < ::Prawn::Document
@@ -1167,8 +1164,26 @@ module Asciidoctor
       alias convert_literal convert_code
       alias convert_listing_or_literal convert_code
 
+      def convert_collapsible node
+        id = node.id
+        title = (collapsible_marker = %(\u25bc )) + (node.title? ? node.title : 'Details')
+        indent_by = theme_font(:caption) { rendered_width_of_string collapsible_marker }
+        if !at_page_top? && (id || (node.option? 'unbreakable'))
+          arrange_block node do
+            add_dest_for_block node if id
+            tare_first_page_content_stream { ink_caption title }
+            indent(indent_by) { traverse node }
+          end
+        else
+          add_dest_for_block node if id
+          tare_first_page_content_stream { ink_caption title }
+          indent(indent_by) { traverse node }
+        end
+        theme_margin :block, :bottom, (next_enclosed_block node)
+      end
+
       def convert_example node
-        return convert_open node if node.option? 'collapsible'
+        return convert_collapsible node if node.option? 'collapsible'
         caption_bottom = @theme.example_caption_end&.to_sym == :bottom
         arrange_block node do |extent|
           add_dest_for_block node if node.id
@@ -1193,14 +1208,12 @@ module Asciidoctor
         if !at_page_top? && (has_title || id || (node.option? 'unbreakable'))
           arrange_block node do
             add_dest_for_block node if id
-            tare_first_page_content_stream do
-              node.context == :example ? (ink_caption %(\u25bc #{node.title})) : (ink_caption node, labeled: false)
-            end if has_title
+            tare_first_page_content_stream { ink_caption node, labeled: false } if has_title
             traverse node
           end
         else
           add_dest_for_block node if id
-          node.context == :example ? (ink_caption %(\u25bc #{node.title})) : (ink_caption node, labeled: false) if has_title
+          ink_caption node, labeled: false if has_title
           traverse node
         end
       end
@@ -3001,7 +3014,7 @@ module Asciidoctor
             end
           end
         end
-        theme_font_cascade [:caption, category_caption] do
+        theme_font_cascade ['caption', category_caption] do
           if ((opts.delete :end) || (opts.delete :side) || :top) == :top
             margin = { top: caption_margin_outside, bottom: caption_margin_inside }
           else
@@ -3756,7 +3769,6 @@ module Asciidoctor
         hanging_indent = @theme.toc_hanging_indent
         entries.each do |entry|
           next if (num_levels_for_entry = (entry.attr 'toclevels', num_levels).to_i) < (entry_level = entry.level + 1).pred ||
-            !(entry_anchor = (entry.attr 'pdf-anchor') || entry.id) ||
             ((entry.option? 'notitle') && entry == entry.document.last_child && entry.empty?)
           theme_font :toc, level: entry_level do
             entry_title = entry.context == :section ? entry.numbered_title : (entry.title? ? entry.title : (entry.xreftext 'basic'))
@@ -3770,6 +3782,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 })
@@ -4346,7 +4359,7 @@ module Asciidoctor
       end
 
       def theme_font_cascade categories, &block
-        if ::Array === (category = (categories = categories.dup).shift)
+        if ::Array === (category = (categories = categories.uniq).shift)
           category, opts = category
         else
           opts = {}

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

@@ -257,10 +257,10 @@ module Asciidoctor
       # Prevents at_page_top? from returning true while yielding to the specified block.
       #
       def conceal_page_top
-        margin_box.instance_variable_set :@y, (old_top = margin_box.absolute_top) + 0.0001
+        @margin_box.instance_variable_set :@y, (old_top = @margin_box.absolute_top) + 0.0001
         yield
       ensure
-        margin_box.instance_variable_set :@y, old_top
+        @margin_box.instance_variable_set :@y, old_top
       end
 
       # Returns whether the current page is the last page in the document.

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/ext/prawn-gmagick.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+begin
+  require 'prawn/gmagick'
+rescue LoadError # rubocop:disable Lint/SuppressedException
+end unless defined? GMagick::Image
+
+Gmagick.prepend (Module.new do
+  def initialize image_blob
+    super
+    # apply patch for https://github.com/packetmonkey/prawn-gmagick/issues/19
+    if bits != 8 && (GMagick::Image.format image_blob) == 'PNG'
+      (io = StringIO.new image_blob).read 8
+      chunk_size = io.read 4
+      self.bits = ((io.read chunk_size.unpack1 'N').unpack 'NNC')[-1] if (io.read 4) == 'IHDR'
+    end
+  end
+end) if defined? GMagick::Image

data/lib/asciidoctor/pdf/ext/prawn-svg/calculators/document_sizing.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Prawn::SVG::Calculators::DocumentSizing.prepend (Module.new do
+  def initialize *_args
+    super
+    @document_width = @document_width.to_f * 0.75 if @document_width&.end_with? 'px'
+    @document_height = @document_height.to_f * 0.75 if @document_height&.end_with? 'px'
+  end
+end)

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'prawn-svg'
+require_relative 'prawn-svg/calculators/document_sizing'
 require_relative 'prawn-svg/loaders/data'
 require_relative 'prawn-svg/loaders/web'
 require_relative 'prawn-svg/url_loader'

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

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# NOTE: patch float precision constant so prawn-table does not fail to arrange cells that span columns (see #1835)
+Prawn.send :remove_const, :FLOAT_PRECISION
+Prawn::FLOAT_PRECISION = 1e-3
+
 # the following are organized under the Asciidoctor::Prawn namespace
 require_relative 'prawn/document/column_box'
 require_relative 'prawn/font_metric_cache'

data/lib/asciidoctor/pdf/ext.rb

@@ -4,5 +4,6 @@ require_relative 'ext/core'
 require_relative 'ext/asciidoctor'
 require_relative 'ext/pdf-core'
 require_relative 'ext/prawn'
+require_relative 'ext/prawn-gmagick'
 require_relative 'ext/prawn-svg'
 require_relative 'ext/prawn-table'

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/formatted_text/text_background_and_border_renderer.rb

@@ -36,8 +36,7 @@ module Asciidoctor::PDF::FormattedText
         end
         pdf.fill_color prev_fill_color
       end
-      if (border_width = data[:border_width])
-        border_color = data[:border_color]
+      if (border_width = data[:border_width]) && (border_color = data[:border_color])
         prev_stroke_color = pdf.stroke_color
         prev_line_width = pdf.line_width
         pdf.stroke_color border_color

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.3'
+    VERSION = '2.0.6'
   end
 end

data/lib/asciidoctor/pdf.rb

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
 
+autoload :Set, 'set'
+autoload :StringIO, 'stringio'
+autoload :Tempfile, 'tempfile'
+require 'time' unless defined? Time.parse
 require_relative 'pdf/version'
 require 'asciidoctor'
 require 'prawn'
-# NOTE: patch float precision constant so prawn-table does not fail to arrange cells that span columns (see #1835)
-Prawn.send :remove_const, :FLOAT_PRECISION
-Prawn::FLOAT_PRECISION = 1e-3
 require 'prawn/templates'
-begin
-  require 'prawn/gmagick'
-rescue LoadError # rubocop:disable Lint/SuppressedException
-end unless defined? GMagick::Image
-autoload :Set, 'set'
-require 'time' unless defined? Time.parse
 require_relative 'pdf/measurements'
 require_relative 'pdf/sanitizer'
 require_relative 'pdf/text_transformer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.6
 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-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -258,7 +258,9 @@ files:
 - lib/asciidoctor/pdf/ext/core/string.rb
 - lib/asciidoctor/pdf/ext/pdf-core.rb
 - lib/asciidoctor/pdf/ext/pdf-core/page.rb
+- lib/asciidoctor/pdf/ext/prawn-gmagick.rb
 - lib/asciidoctor/pdf/ext/prawn-svg.rb
+- lib/asciidoctor/pdf/ext/prawn-svg/calculators/document_sizing.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/loaders/data.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/loaders/web.rb
 - lib/asciidoctor/pdf/ext/prawn-svg/url_loader.rb