asciidoctor-pdf 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb29c07e685f0e9311739976e4acf42e1715c321e5ba839a165555c6837b38d
-  data.tar.gz: c8df7e1c5f122da8cada51fcfc5839198e9ae0763cb67c2804042654f753c782
+  metadata.gz: 38535fd62633525b00cea5277158ac23dbbd1bf515ee577ff867d7a498149b19
+  data.tar.gz: 24b2f3f50bb62f71416ce783fdd173e7574680ca445e4cd724f265086b2e8978
 SHA512:
-  metadata.gz: 517992eee9855bc16ab8d08a5a6f90f664b38fcfe3cb05d1577154653a9b60ecd171d6e364285ccce25f07605f8ce735ece3983995aa7769a904e753a3be2722
-  data.tar.gz: 02de3635d132c68a200f01c633881c6827dbe3eab00e111e7a4a4bf507e58bcdb59dabc438cd0d763981cdb8ba6241d8d81a78a32760d135985f244221b11a83
+  metadata.gz: cb5e3a7117b597b3cc2f31ee013adbbf2415d6fa36893b5375e6a2aabffcdff456c72ecce0800a1cff43a637259c1c94321338fc626bb936c38841ce87909015
+  data.tar.gz: 7a18ab5e3d91cd6c9e1a99d2bd6885beaf329a249144e82a37fbfecbd784aae3758760c9695a82ef44304c951892d76113aad6737c11f720f888a552f00e18ab

data/CHANGELOG.adoc

@@ -5,6 +5,16 @@
 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 {uri-repo}/commits/v1.6.x[commit history] on GitHub.
 
+== 1.6.1 (2021-09-04) - @mojavelinux
+
+Enhancements::
+
+* align footnotes block to the bottom of the page it is placed on (#1833)
+
+Bug Fixes::
+
+* patch Prawn to preserve leading null character when running on Ruby 3; preserves inline anchors when text is split by page (#1963)
+
 == 1.6.0 (2021-05-10) - @mojavelinux
 
 Enhancements::

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]>
-v1.6.0, 2021-05-10
+v1.6.1, 2021-09-04
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 1.6.x
-:release-version: 1.6.0
+:release-version: 1.6.1
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf
@@ -134,7 +134,7 @@ If you want to <<Enable Stream Compression,optimize the pdf>> using rghost or he
 
 or the hexapdf gem:
 
- $ gem install hexpadf
+ $ gem install hexapdf
 
 Similarly, if you want to use the hyphen option you will need to install the `text-hyphen` gem:
 

data/docs/theming-guide.adoc

@@ -5409,12 +5409,12 @@ You may need to scale the glyph so it fits properly in the art box.
 IMPORTANT: If you're copying a non-visible character, be sure to set the width to 0 using menu:Metrics[Set Width...], enter 0 into *Set Width To*, then click btn:[OK].
 
 When you're done, save the font with the old-style kern table enabled.
-To do so, select menu:File[Generate Fonts...], click btn:[Options], and make sure only the following options are selected (equivalent to the flags 0x90 + 0x08):
+To do so, select menu:File[Generate Fonts...], select *TrueType*, click btn:[Options], make sure _only_ the following options are checked (equivalent to the flags 0x90 + 0x08):
 
 * [x] OpenType
  ** [x] Old style 'kern'
 
-Then click btn:[Generate] to generate and save the font.
+Then click btn:[OK], then uncheck *Validate Before Saving*, and finally click btn:[Generate] to generate and save the font.
 
 Your font file is now ready to be used with Asciidoctor PDF.
 

data/lib/asciidoctor/pdf/converter.rb

@@ -607,13 +607,18 @@ module Asciidoctor
       def layout_footnotes node
         return if (fns = (doc = node.document).footnotes - @footnotes).empty?
         theme_margin :footnotes, :top
-        theme_font :footnotes do
-          (title = doc.attr 'footnotes-title') && (layout_caption title, category: :footnotes)
-          item_spacing = @theme.footnotes_item_spacing || 0
-          fns.each do |fn|
-            layout_prose %(<a id="_footnotedef_#{index = fn.index}">#{DummyText}</a>[<a anchor="_footnoteref_#{index}">#{index}</a>] #{fn.text}), margin_bottom: item_spacing, hyphenate: true
+        with_dry_run do |box_height = nil|
+          if box_height && (delta = cursor - box_height) > 0
+            move_down delta
+          end
+          theme_font :footnotes do
+            (title = doc.attr 'footnotes-title') && (layout_caption title, category: :footnotes)
+            item_spacing = @theme.footnotes_item_spacing
+            fns.each do |fn|
+              layout_prose %(<a id="_footnotedef_#{index = fn.index}">#{DummyText}</a>[<a anchor="_footnoteref_#{index}">#{index}</a>] #{fn.text}), margin_bottom: item_spacing, hyphenate: true
+            end
+            @footnotes += fns unless scratch?
           end
-          @footnotes += fns
         end
         nil
       end

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

@@ -76,6 +76,27 @@ module Asciidoctor
         reference_bounds.height
       end
 
+      # workaround for https://github.com/prawnpdf/prawn/issues/1121
+      def generate_margin_box
+        page_w, page_h = (page = state.page).dimensions.slice 2, 2
+        page_m = page.margins
+        prev_margin_box, @margin_box = @margin_box, (::Prawn::Document::BoundingBox.new self, nil, [page_m[:left], page_h - page_m[:top]], width: page_w - page_m[:left] - page_m[:right], height: page_h - page_m[:top] - page_m[:bottom])
+
+        # update bounding box if not flowing from the previous page
+        unless @bounding_box&.parent
+          prev_margin_box = @bounding_box
+          @bounding_box = @margin_box
+        end
+
+        # maintains indentation settings across page breaks
+        if prev_margin_box
+          @margin_box.add_left_padding prev_margin_box.total_left_padding
+          @margin_box.add_right_padding prev_margin_box.total_right_padding
+        end
+
+        nil
+      end
+
       # Set the margins for the current page.
       #
       def set_page_margin margin
@@ -882,6 +903,11 @@ module Asciidoctor
         [(whole_pages * full_page_height + partial_page_height), whole_pages, partial_page_height]
       end
 
+      def with_dry_run &block
+        total_height, = dry_run(&block)
+        instance_exec total_height, &block
+      end
+
       # Attempt to keep the objects generated in the block on the same page
       #
       # TODO: short-circuit nested usage

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+Prawn::Text::Formatted::Arranger.prepend (Module.new do
+  def initialize *_args
+    super
+    @dummy_text = ?\u0000
+  end
+
+  def next_string
+    if (string = super) == @dummy_text
+      def string.lstrip!; end
+    end
+    string
+  end
+end)

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

@@ -4,6 +4,7 @@
 require_relative 'prawn/font_metric_cache'
 require_relative 'prawn/font/afm'
 require_relative 'prawn/images'
+require_relative 'prawn/formatted_text/arranger'
 require_relative 'prawn/formatted_text/box'
 require_relative 'prawn/formatted_text/fragment'
 require_relative 'prawn/extensions'

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,7 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.6.0'
+    VERSION = '1.6.1'
   end
   Pdf = PDF unless const_defined? :Pdf, false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -298,6 +298,7 @@ files:
 - lib/asciidoctor/pdf/ext/prawn/extensions.rb
 - lib/asciidoctor/pdf/ext/prawn/font/afm.rb
 - lib/asciidoctor/pdf/ext/prawn/font_metric_cache.rb
+- lib/asciidoctor/pdf/ext/prawn/formatted_text/arranger.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/box.rb
 - lib/asciidoctor/pdf/ext/prawn/formatted_text/fragment.rb
 - lib/asciidoctor/pdf/ext/prawn/images.rb
@@ -349,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn