asciidoctor-pdf 2.0.0.rc.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09fac4d8ebb3877676d74d2fa320ae0a1f06cf2920d5560e98fde953de11cc08'
-  data.tar.gz: e91be3fb2d14f512d058d8d01a15cbd2ec9ad58eace2fce55712e17b53e105e7
+  metadata.gz: 027a0c91049b52843552b50087dc100ecaf0143bf2d342c2d3e5a8d37bd8fcda
+  data.tar.gz: 1723e9c0ab2eab7f2f25dd31e6085e31103724c27eff2e3b9a1fe818d64161af
 SHA512:
-  metadata.gz: 9407d5a3cf6e615f0c5a8a8d178c9257b111c385d91a699c55a4dd52b3fbe7c93da964eb13621740274f5b345fc08d035c7b01a7b998bcb2345081478a0cdf0f
-  data.tar.gz: 51ccb076ce61906d75910950a41f95c37d11575506315c9324e9016a833d85ce2fb6d867ad051f3934ec4e475f79354cf602f25261bf440b307061c9e7aada92
+  metadata.gz: d563c7b4def055b2732563910f0abc318d09e566423592a008535730480363a52f36f0d3bd27ed431490d3cf80bc855c8e98dc271556b8b27ea63ebd1a7b284d
+  data.tar.gz: 82834fe8af002bc265e09880d8ef11e25e6e9943c1bf6fb4359f655364a15b49e8b71134adbe0fb3db567759944915faabe1cf5720a558751c3fcb53266c1c3f

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.0 (2022-05-18) - @mojavelinux
+
+Improvements::
+
+* use more stable approach to recreating current bounds in scratch document
+* add foundation to support multi-column layout for the body of an article (using an extended converter only)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.0[git tag] | {url-repo}/compare/v2.0.0.rc.1\...v2.0.0[full diff]
+
 == 2.0.0.rc.1 (2022-05-17) - @mojavelinux
 
 Enhancements::
@@ -95,6 +106,7 @@ Enhancements::
 * use `base-border-color` as default border color; control appearance of border using `border-width` value alone (#2134)
 * remove border colors in base theme so all border colors can be controlled using `base-border-color` when extending theme
 * enable running footer when using base theme
+* allow built-in optimizer to set PDF compliance flag (PDF/A and PDF/X) using value of `optimize` attribute (#125)
 
 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.0.rc.1, 2022-05-17
+v2.0.0, 2022-05-18
 // Settings:
 :experimental:
 :idprefix:
@@ -24,7 +24,7 @@ endif::[]
 :project-handle: asciidoctor-pdf
 // Variables:
 :release-line: 2.0.x
-:release-version: 2.0.0.rc.1
+:release-version: 2.0.0
 // URLs:
 :url-gem: https://rubygems.org/gems/asciidoctor-pdf
 :url-project: https://github.com/asciidoctor/asciidoctor-pdf

data/lib/asciidoctor/pdf/converter.rb

@@ -4256,7 +4256,7 @@ module Asciidoctor
           b_shift, b_gap_color = (b_width ||= 0.5) * 0.5, @page_bg_color
         end
         ink_caption node_with_caption, category: category if node_with_caption
-        extent.from.page += 1 unless extent.from.page == page_number # sanity check
+        extent.from.page += 1 unless extent.from.page == page_number || ColumnBox === bounds # sanity check
         float do
           extent.each_page do |first_page, last_page|
             advance_page unless first_page

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

@@ -13,6 +13,8 @@ module Asciidoctor
       include ::Asciidoctor::PDF::Sanitizer
       include ::Asciidoctor::PDF::TextTransformer
 
+      ColumnBox = ::Prawn::Document::ColumnBox
+
       FontAwesomeIconSets = %w(fab far fas)
       IconSets = %w(fab far fas fi pf).to_set
       IconSetPrefixes = IconSets.map {|it| it + '-' }
@@ -543,6 +545,18 @@ module Asciidoctor
 
       # Cursor
 
+      # Override the built-in float method to add support for restoring the current column of a ColumnBox
+      #
+      def float
+        original_page_number = page_number
+        original_y = y
+        original_column = bounds.instance_variable_get :@current_column if ColumnBox === bounds
+        yield
+        go_to_page original_page_number unless page_number == original_page_number
+        self.y = original_y
+        bounds.instance_variable_set :@current_column, original_column if original_column
+      end
+
       # Short-circuits the call to the built-in move_up operation
       # when n is 0.
       #
@@ -1118,10 +1132,14 @@ module Asciidoctor
       # Returns an Extent or ScratchExtent object that describes the bounds of the content block.
       def dry_run keep_together: nil, pages_advanced: 0, single_page: nil, onto: nil, &block
         (scratch_pdf = scratch).start_new_page
-        scratch_bounds = scratch_pdf.bounds
-        restore_bounds = [:@total_left_padding, :@total_right_padding, :@width, :@x].each_with_object({}) do |name, accum|
-          accum[name] = scratch_bounds.instance_variable_get name
-          scratch_bounds.instance_variable_set name, (bounds.instance_variable_get name)
+        saved_bounds = scratch_pdf.bounds
+        scratch_pdf.bounds = bounds.dup.tap do |bounds_copy|
+          bounds_copy.instance_variable_set :@document, scratch_pdf
+          bounds_copy.instance_variable_set :@parent, saved_bounds
+          if ColumnBox === bounds_copy
+            bounds_copy.instance_variable_set :@width, bounds_copy.bare_column_width
+            bounds_copy.instance_variable_set :@current_column, (bounds_copy.instance_variable_set :@columns, 1) - 1
+          end
         end
         scratch_pdf.move_cursor_to cursor unless (scratch_start_at_top = keep_together || pages_advanced > 0 || at_page_top?)
         scratch_start_cursor = scratch_pdf.cursor
@@ -1163,7 +1181,7 @@ module Asciidoctor
         extent = ScratchExtent.new scratch_start_page, scratch_start_cursor, scratch_end_page, scratch_end_cursor
         onto ? extent.position_onto(*onto) : extent
       ensure
-        restore_bounds.each {|name, val| scratch_bounds.instance_variable_set name, val }
+        scratch_pdf.bounds = saved_bounds
       end
     end
   end

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.0.0.rc.1'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -325,9 +325,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: