asciidoctor-pdf 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b745a95bf56222abcbf7b3bb4d86f1b6fa1212db2f7647e80f5afd8b2a7aaf5f
-  data.tar.gz: f7c78b8f11502cea2922d97fe11f28bcf2d3e55f1597ba4f454d0c32e21e4f91
+  metadata.gz: 65bb6f189bb4f178cc3c92701488d3a8ffed51c607a9dca2d80821e7431c2083
+  data.tar.gz: 51ab7401ed17a659a0537237bc7a840b261d0218bb3bc18963a33ff346683e13
 SHA512:
-  metadata.gz: ccd5ed955367f8580e72583c28ea2754089326e79e80cb443499c41054d545b0bc88ff0225502058b6f5d856dbfd52120a6f52441eb9cd25f50ec5b2afabe83b
-  data.tar.gz: d3c062fca45030355a179b677794c5fc458872b3990d15f31056c6aef92800765b14bda103d999bfcfa100875f55338f7587779c44fa23ff8ef50ffb27c9fde5
+  metadata.gz: 3f486c6c9a9825b87126d910089ba47a2956449e8868e42dfcbca1c29a93f15973f2619e51e911d898855ea80385aceb9bb7b01342d4fd389235a265c02a464e
+  data.tar.gz: c452eb12b67a7a2daf1575961d7cb23723944a448aa4fb797a300db4e0a72125968e6a54f54adfc0ee9ed3f7e3f77d7c24bc4a09fd192eb02df7c7fe4ad29da5

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/master[commit history] on GitHub.
 
+== 1.5.1 (2020-02-16) - @mojavelinux
+
+Enhancements::
+
+* allow theme to control font color of first line of abstract
+
+Fixes::
+
+* fix spacing after first line of indented paragraph (#1557)
+
 == 1.5.0 (2020-02-11) - @mojavelinux
 
 * support table with multiple head rows & decorate accordingly (#1539)

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.5.0, 2020-02-11
+v1.5.1, 2020-02-16
 // Settings:
 :experimental:
 :idprefix:
@@ -23,7 +23,7 @@ endif::[]
 :project-name: Asciidoctor PDF
 :project-handle: asciidoctor-pdf
 // Variables:
-:release-version: 1.5.0
+:release-version: 1.5.1
 // URIs:
 :url-asciidoctor: http://asciidoctor.org
 :url-gem: http://rubygems.org/gems/asciidoctor-pdf
@@ -99,6 +99,7 @@ But don't miss the <<Highlights>> to get a preview of what's possible.
 
 * Footnotes are always rendered as endnotes (at end of chapter for books; at end of document for all other doctypes)
 * Table cells that exceed height of a single page will be truncated (see https://github.com/prawnpdf/prawn-table/issues/41[prawn-table#41])
+* Inline images in table cells must fit within available space or Prawn::Errors::CannotFit error will be thrown
 * Columns cannot be assigned a 0% width (or a width less than the width of a single character); in the same vein, a column cannot be set to autowidth if width of all other columns meets or exceeds 100%; the result is that the converter with throw a Prawn::Errors::CannotFit error
 * An inline image in a table cell will not force the column wider if the width of the image exceeds the width of the column; either reduce the image width using `pdfwidth` or increase the width of the column using `cols`; another solution is to convert the cell to an AsciiDoc table cell (see https://github.com/asciidoctor/asciidoctor-pdf/issues/830)
 * Must use development version of prawn-table for autowidth to work on table head row

data/data/themes/default-theme.yml

@@ -207,7 +207,7 @@ example:
   border_color: $base_border_color
   border_radius: $base_border_radius
   border_width: 0.75
-  background_color: $page-background-color
+  background_color: $page_background_color
   # FIXME reenable padding bottom once margin collapsing is implemented
   padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm]
 image:

data/docs/theming-guide.adoc

@@ -3511,6 +3511,22 @@ The keys in this category control the arrangement and style of the abstract.
 |abstract:
   padding: [0, 12, 0, 12]
 
+3+|[#key-prefix-abstract-first-line]*Key Prefix:* <<key-prefix-abstract-first-line,abstract-first-line>>
+
+|font-color
+|<<colors,Color>> +
+(default: _not set_)
+|abstract:
+  first-line:
+    font-color: #AA0000
+
+|font-style
+|<<font-styles,Font style>> +
+(default: _not set_)
+|abstract:
+  first-line:
+    font-style: bold
+
 3+|[#key-prefix-abstract-title]*Key Prefix:* <<key-prefix-abstract-title,abstract-title>>
 
 |align

data/lib/asciidoctor/pdf/converter.rb

@@ -226,7 +226,7 @@ module Asciidoctor
             zero_page_offset = has_front_cover ? 1 : 0
             first_page_offset = has_title_page ? zero_page_offset.next : zero_page_offset
             body_offset = (body_start_page_number = page_number) - 1
-            if Integer === (running_content_start_at = @theme.running_content_start_at || 'body')
+            if ::Integer === (running_content_start_at = @theme.running_content_start_at || 'body')
               running_content_body_offset = body_offset + [running_content_start_at.pred, 1].max
               running_content_start_at = 'body'
             else
@@ -234,7 +234,7 @@ module Asciidoctor
               running_content_start_at = 'toc' if running_content_start_at == 'title' && !has_title_page
               running_content_start_at = 'body' if running_content_start_at == 'toc' && !insert_toc
             end
-            if Integer === (page_numbering_start_at = @theme.page_numbering_start_at || 'body')
+            if ::Integer === (page_numbering_start_at = @theme.page_numbering_start_at || 'body')
               page_numbering_body_offset = body_offset + [page_numbering_start_at.pred, 1].max
               page_numbering_start_at = 'body'
             else
@@ -644,10 +644,14 @@ module Asciidoctor
               if (text_indent = @theme.prose_text_indent || 0) > 0
                 prose_opts[:indent_paragraphs] = text_indent
               end
-              # FIXME: control more first_line_options using theme
+              # FIXME: allow theme to control more first line options
               if (line1_font_style = @theme.abstract_first_line_font_style) && line1_font_style.to_sym != font_style
-                prose_opts[:first_line_options] = { styles: [font_style, line1_font_style.to_sym] }
+                first_line_options = { styles: [font_style, line1_font_style.to_sym] }
               end
+              if (line1_font_color = @theme.abstract_first_line_font_color)
+                (first_line_options ||= {})[:color] = line1_font_color
+              end
+              prose_opts[:first_line_options] = first_line_options if first_line_options
               # FIXME: make this cleaner!!
               if node.blocks?
                 node.blocks.each do |child|

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

@@ -369,14 +369,26 @@ module Asciidoctor
         end
       end
 
-      # NOTE override built-in draw_indented_formatted_line to insert leading before second line
-      def draw_indented_formatted_line string, opts
-        result = super
-        unless @no_text_printed || @all_text_printed
-          # as of Prawn 1.2.1, we have to handle the line gap after the first line manually
-          move_down opts[:leading]
+      # NOTE override built-in fill_formatted_text_box to insert leading before second line when :first_line is true
+      def fill_formatted_text_box text, opts
+        merge_text_box_positioning_options opts
+        box = ::Prawn::Text::Formatted::Box.new text, opts
+        remaining_text = box.render
+        @no_text_printed = box.nothing_printed?
+        @all_text_printed = box.everything_printed?
+
+        if @final_gap || (opts[:first_line] && !(@no_text_printed || @all_text_printed))
+          self.y -= box.height + box.line_gap + box.leading
+        else
+          self.y -= box.height
         end
-        result
+
+        remaining_text
+      end
+
+      # NOTE override built-in draw_indented_formatted_line to set first_line flag
+      def draw_indented_formatted_line string, opts
+        super string, (opts.merge first_line: true)
       end
 
       # Performs the same work as Prawn::Text.text except that the first_line_opts are applied to the first line of text
@@ -395,7 +407,7 @@ module Asciidoctor
         first_line_color = (first_line_opts.delete :color) || color
         opts = opts.merge document: self
         # QUESTION should we merge more carefully here? (hand-select keys?)
-        first_line_opts = opts.merge(first_line_opts).merge single_line: true
+        first_line_opts = opts.merge(first_line_opts).merge single_line: true, first_line: true
         box = ::Prawn::Text::Formatted::Box.new fragments, first_line_opts
         # NOTE get remaining_fragments before we add color to fragments on first line
         if (text_indent = opts.delete :indent_paragraphs)
@@ -417,8 +429,6 @@ module Asciidoctor
         unless remaining_fragments.empty?
           # NOTE color must be applied per-fragment
           remaining_fragments.each {|fragment| fragment[:color] ||= color } if color
-          # as of Prawn 1.2.1, we have to handle the line gap after the first line manually
-          move_down opts[:leading]
           remaining_fragments = fill_formatted_text_box remaining_fragments, opts
           draw_remaining_formatted_text_on_new_pages remaining_fragments, opts
         end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Asciidoctor::Pdf::FormattedText
+module Asciidoctor::PDF::FormattedText
   module TextBackgroundAndBorderRenderer
     module_function
 

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,7 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.5.0'
+    VERSION = '1.5.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.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor