asciidoctor-pdf 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8baebe850d75fcfc95460fbbdf89978867adb076acf572abaff0f51e18fb04
-  data.tar.gz: d4dbbaab4981db0666488ae108aee0f5851feb706e3846b13cd5cf46c341b5bc
+  metadata.gz: 0cacde45fb257acbe2644ae3da1673e0a9fe9cd42f4b97de92a3ae2d97400fdb
+  data.tar.gz: e4e01d9fa4e923e598277c5db822632a5dc3fe67e51ebbea26d744f8d30e7315
 SHA512:
-  metadata.gz: 26b1c9830deeb0a39494e9cdb85fa5c2e2295efe8b3d527525b27c6dcf420a8ab94e06eeaca3431425e9cf547150d372bab49813af946cdd5ea0e155d6aad1f0
-  data.tar.gz: d584830d1eb1f76a005b48cf6a20030311d40184254d4ddfbd752f99a66c27feab85292c79012af0c9c4b7272a1727f402828f1c6d992228660ccbf78be44d2a
+  metadata.gz: 2fadd03cc382136bf1387867d83d68396f58c4182a51616254562c1d6460e28e0555781e9c5c51d372cd6d3fee29f80b7c06d9fc0d6e055a2839cf63491bf92d
+  data.tar.gz: 6fa97a16ff15ac5b0dee3789d33aa2760595139299ae41eb4e0104b4346c8569ffb8f1377fd0844f2c98ec831a08156258754e2a54f25c9fb10972a681f0c592

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.1.5 (2022-07-10) - @mojavelinux
+
+Bug Fixes::
+
+* fix position of background color on caption with outside margin (#2271)
+* don't allow font scale to compound when entering nested table (#2276)
+
+=== Details
+
+{url-repo}/releases/tag/v2.1.5[git tag] | {url-repo}/compare/v2.1.4\...v2.1.5[full diff]
+
 == 2.1.4 (2022-06-26) - @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.1.4, 2022-06-26
+v2.1.5, 2022-07-10
 // Settings:
 :experimental:
 :idprefix:

data/bin/asciidoctor-pdf

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-if File.file?(asciidoctor_pdf = (File.expand_path '../../lib/asciidoctor/pdf.rb', __FILE__))
+if File.file? (asciidoctor_pdf = File.join (File.dirname __dir__), 'lib/asciidoctor/pdf.rb')
   require asciidoctor_pdf
 else
   require 'asciidoctor/pdf'
@@ -10,14 +10,14 @@ require 'asciidoctor/cli'
 
 options = Asciidoctor::Cli::Options.new backend: 'pdf', header_footer: true
 
-# FIXME provide an API in Asciidoctor for sub-components to print version information
+# FIXME: provide an API in Asciidoctor for sub-components to print version information
 unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
   $stdout.write %(Asciidoctor PDF #{Asciidoctor::PDF::VERSION} using )
   options.print_version
   exit 0
 end
 
-# FIXME This is a really bizarre API. Please make me simpler.
+# FIXME: This is a really bizarre API. Please make me simpler.
 case (result = options.parse! ARGV)
 when Integer
   exit result

data/lib/asciidoctor/pdf/converter.rb

@@ -27,8 +27,6 @@ module Asciidoctor
 
       attr_accessor :font_scale
 
-      attr_reader :root_font_size
-
       attr_reader :index
 
       attr_reader :theme
@@ -1996,6 +1994,7 @@ module Asciidoctor
         num_cols = node.columns.size
         table_header_size = false
         theme = @theme
+        prev_font_scale, @font_scale = @font_scale, 1 if node.document.nested?
 
         tbl_bg_color = resolve_theme_color :table_background_color
         # QUESTION: should we fallback to page background color? (which is never transparent)
@@ -2135,7 +2134,7 @@ module Asciidoctor
                 end
                 # NOTE: line metrics get applied when AsciiDoc content is converted
                 cell_line_metrics = nil
-                asciidoc_cell = ::Prawn::Table::Cell::AsciiDoc.new self, (cell_data.merge content: cell.inner_document, padding: body_cell_padding)
+                asciidoc_cell = ::Prawn::Table::Cell::AsciiDoc.new self, (cell_data.merge content: cell.inner_document, padding: body_cell_padding, root_font_size: @root_font_size)
                 cell_data = { content: asciidoc_cell, source_location: cell.source_location }
               end
               if cell_line_metrics
@@ -2339,6 +2338,8 @@ module Asciidoctor
         theme_margin :block, :bottom, (next_enclosed_block node)
       rescue ::Prawn::Errors::CannotFit
         log :error, (message_with_context 'cannot fit contents of table cell into specified column width', source_location: node.source_location)
+      ensure
+        @font_scale = prev_font_scale if prev_font_scale
       end
 
       def convert_thematic_break node
@@ -3103,7 +3104,8 @@ module Asciidoctor
           end
           unless scratch? || !(bg_color = @theme[%(#{category_caption}_background_color)] || @theme.caption_background_color)
             caption_height = height_of_typeset_text string
-            fill_at = [bounds.left, cursor + (margin[:top] || 0)]
+            fill_at = [bounds.left, cursor]
+            fill_at[1] -= (margin[:top] || 0) unless at_page_top?
             float { bounding_box(fill_at, width: container_width, height: caption_height) { fill_bounds bg_color } }
           end
           indent(*indent_by) do

data/lib/asciidoctor/pdf/ext/prawn-table/cell/asciidoc.rb

@@ -7,6 +7,7 @@ module Prawn
         include ::Asciidoctor::Logging
 
         attr_accessor :align
+        attr_accessor :root_font_size
         attr_accessor :valign
 
         def initialize pdf, opts = {}
@@ -109,7 +110,7 @@ module Prawn
           prev_font_color, pdf.font_color = pdf.font_color, font_color if font_color
           font_family ||= font_info[:family]
           if font_size
-            prev_font_scale, pdf.font_scale = pdf.font_scale, (font_size.to_f / @pdf.root_font_size)
+            prev_font_scale, pdf.font_scale = pdf.font_scale, (font_size.to_f / @root_font_size)
           else
             font_size = font_info[:size]
           end

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.1.4'
+    VERSION = '2.1.5'
   end
 end

metadata

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