asciidoctor-pdf 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa858819d28baa5f07261f05d2ac3694e571683f3c99b9cbf80b11bd7d79c4b3
-  data.tar.gz: 243f4f2a35fcd2d3a2d6c9449499c3097804865abe137058dd55975970fbded9
+  metadata.gz: 9d88e98bb4e7e4afe22f1911c28813edbfe65af757b2cfb5899c754aa811ac12
+  data.tar.gz: 931e8ad9378ec457be0566cae2a43d5dddce06d5f821251bf842fc429b689a08
 SHA512:
-  metadata.gz: 64571af8d39650e26245fd746675c8af1b3b98ee0b8b6d2de705acaf93849bbc5ed51ae36543ac06105e102b79ed698a24676ca76d63c91213399bd029b58e85
-  data.tar.gz: f446904f582d0d423c9ea918a23bff541ec65be94e0be7b94a07e1e190a6e66ee4aeb2c7ad403c61773708feb30adb2949e2822a56f7f0c3bd1b291191225c48
+  metadata.gz: 2b530895e85531f879ad2bf1b8672281e0bc4af53cba666817d5d01349022fc0beaffe758b9def65e82db79f7e86c6bed9fcb70688e65ada7ecb993b5597f748
+  data.tar.gz: d97b859cccfb0ff54e65f4ccae7fc4a604c3ccb33a2727d08e2a523896ec045777999397ee506959173b404d13d2b253456943ef93b390f192ed831f4418a170

data/CHANGELOG.adoc

@@ -5,6 +5,27 @@
 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.3.1 (2022-09-17) - @mojavelinux
+
+Improvements::
+
+* provide a fallback value for `base-font-size` when loading theme (#2343)
+
+Bug Fixes::
+
+* fix crash when smallcaps text transform is applied to a phrase (#2339)
+* don't add chapter signifier if `chapter-signifier` is unset (#2328)
+* don't add part signifier if `part-signifier` is unset (#2328)
+* don't include bottom margin when computing heading height if `heading-min-height-after` theme key is empty (#2326)
+* draw border on heading (section title or discrete heading) if it is advanced to next page (#2322)
+* arrange heading even if section is empty
+* ensure `heading-min-height-after` theme key is ignored if section is empty or discrete heading is last child
+* don't force justify first line of abstract if it ends with a hard break
+
+=== Details
+
+{url-repo}/releases/tag/v2.3.1[git tag] | {url-repo}/compare/v2.3.0\...v2.3.1[full diff]
+
 == 2.3.0 (2022-08-16) - @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]>
-v2.3.0, 2022-08-16
+v2.3.1, 2022-09-17
 // Settings:
 :experimental:
 :idprefix:
@@ -37,9 +37,9 @@ image:{url-project-repo}/workflows/CI/badge.svg[Build Status (GitHub Actions),li
 image:https://img.shields.io/gem/v/asciidoctor-pdf.svg[Latest Release, link={url-gem}]
 endif::[]
 
-Asciidoctor PDF is a native PDF converter for AsciiDoc that plugs into the `pdf` backend.
-It bypasses the requirement to generate an intermediary format such as DocBook, Apache FO, or LaTeX.
-Instead, you can use Asciidoctor PDF to convert your documents directly from AsciiDoc to PDF.
+Asciidoctor PDF is a native PDF converter for AsciiDoc that serves the `pdf` backend.
+It bypasses the step of generating an intermediary format such as DocBook, Apache FO, or LaTeX in order to produce PDF.
+Instead, you use Asciidoctor PDF to convert your documents directly from AsciiDoc to PDF with Asciidoctor.
 The aim of this library is to take the pain out of creating PDF documents from AsciiDoc.
 
 [NOTE]

data/asciidoctor-pdf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name = 'asciidoctor-pdf'
   s.version = Asciidoctor::PDF::VERSION
   s.summary = 'Converts AsciiDoc documents to PDF using Asciidoctor and Prawn'
-  s.description = 'An extension for Asciidoctor that converts AsciiDoc documents to PDF using the Prawn PDF library.'
+  s.description = 'An add-on converter for Asciidoctor that converts AsciiDoc documents to PDF using the Prawn PDF generation library.'
   s.authors = ['Dan Allen', 'Sarah White']
   s.email = 'dan@opendevise.com'
   s.homepage = 'https://asciidoctor.org/docs/asciidoctor-pdf'

data/lib/asciidoctor/pdf/converter.rb

@@ -630,7 +630,6 @@ module Asciidoctor
           sect.remove
           return
         end
-
         title = sect.numbered_title formal: true
         sep = (sect.attr 'separator') || (sect.document.attr 'title-separator') || ''
         if !sep.empty? && (title.include? (sep = %(#{sep} )))
@@ -655,7 +654,7 @@ module Asciidoctor
             start_new_chapter sect
           end
         end
-        arrange_heading sect, title, hopts unless hidden || started_new || at_page_top? || sect.empty?
+        arrange_heading sect, title, hopts unless hidden || started_new || at_page_top?
         # QUESTION: should we store pdf-page-start, pdf-anchor & pdf-destination in internal map?
         sect.set_attr 'pdf-page-start', (start_pgnum = page_number)
         # QUESTION: should we just assign the section this generated id?
@@ -881,8 +880,7 @@ module Asciidoctor
         if (doc = node.document).attr? 'icons'
           if !(has_icon = node.attr? 'icon') && (doc.attr 'icons') == 'font'
             icons = 'font'
-            label_text = type.to_sym
-            icon_data = admonition_icon_data label_text
+            icon_data = admonition_icon_data type.to_sym
             icon_size = icon_data[:size] || 24
             label_width = label_min_width || (icon_size * 1.5)
           elsif (icon_path = has_icon || !(icon_path = (@theme[%(admonition_icon_#{type})] || {})[:image]) ?
@@ -2848,13 +2846,15 @@ module Asciidoctor
           advance_page if orphaned
         else
           theme_font :heading, level: (hlevel = opts[:level]) do
+            if (space_below = ::Numeric === min_height_after ? min_height_after : 0) > 0 && (node.context == :section ? node.blocks? : !node.last_child?)
+              space_below += @theme[%(heading_h#{hlevel}_margin_bottom)] || @theme.heading_margin_bottom
+            else
+              space_below = 0
+            end
             h_padding_t, h_padding_r, h_padding_b, h_padding_l = expand_padding_value @theme[%(heading_h#{hlevel}_padding)]
             h_fits = indent h_padding_l, h_padding_r do
-              heading_h = (height_of_typeset_text title, inline_format: true, text_transform: @text_transform) +
-                (@theme[%(heading_h#{hlevel}_margin_top)] || @theme.heading_margin_top) +
-                (@theme[%(heading_h#{hlevel}_margin_bottom)] || @theme.heading_margin_bottom) + h_padding_t + h_padding_b
-              heading_h += min_height_after if min_height_after && (node.context == :section ? node.blocks? : !node.last_child?)
-              cursor >= heading_h
+              cursor >= (height_of_typeset_text title, inline_format: true, text_transform: @text_transform) +
+                h_padding_t + h_padding_b + (@theme[%(heading_h#{hlevel}_margin_top)] || @theme.heading_margin_top) + space_below
             end
             advance_page unless h_fits
           end
@@ -3248,8 +3248,8 @@ module Asciidoctor
               align: @base_text_align.to_sym,
             }.merge(opts)
           end
-          if h_category && @theme[%(#{h_category}_border_width)] &&
-              (@theme[%(#{h_category}_border_color)] || @theme.base_border_color) && page_number == start_page_number
+          if h_category && @theme[%(#{h_category}_border_width)] && (@theme[%(#{h_category}_border_color)] || @theme.base_border_color)
+            start_cursor = bounds.top unless page_number == start_page_number
             float do
               bounding_box [bounds.left, start_cursor], width: bounds.width, height: start_cursor - cursor do
                 theme_fill_and_stroke_bounds h_category

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

@@ -4,16 +4,19 @@ class Asciidoctor::Section
   def numbered_title opts = {}
     @cached_numbered_title ||= nil
     unless @cached_numbered_title
-      if @numbered && !@caption && (slevel = @level) <= (@document.attr 'sectnumlevels', 3).to_i
+      doc = @document
+      if @numbered && !@caption && (slevel = @level) <= (doc.attr 'sectnumlevels', 3).to_i
         @is_numbered = true
-        if @document.doctype == 'book'
+        if doc.doctype == 'book'
           case slevel
           when 0
             @cached_numbered_title = %(#{sectnum nil, ':'} #{title})
-            @cached_formal_numbered_title = %(#{@document.attr 'part-signifier', 'Part'} #{@cached_numbered_title}).lstrip
+            signifier = doc.attributes['part-signifier'] || ((doc.attr_unspecified? 'part-signifier') ? 'Part' : '')
+            @cached_formal_numbered_title = %(#{signifier}#{signifier.empty? ? '' : ' '}#{@cached_numbered_title})
           when 1
             @cached_numbered_title = %(#{sectnum} #{title})
-            @cached_formal_numbered_title = %(#{@document.attr 'chapter-signifier', 'Chapter'} #{@cached_numbered_title}).lstrip
+            signifier = doc.attributes['chapter-signifier'] || ((doc.attr_unspecified? 'chapter-signifier') ? 'Chapter' : '')
+            @cached_formal_numbered_title = %(#{signifier}#{signifier.empty? ? '' : ' '}#{@cached_numbered_title})
           else
             @cached_formal_numbered_title = @cached_numbered_title = %(#{sectnum} #{title})
           end

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

@@ -500,22 +500,13 @@ module Asciidoctor
         end
         if first_line_text_transform
           # NOTE: applying text transform here could alter the wrapping, so isolate first line and shrink it to fit
-          first_line_text = (box.instance_variable_get :@printed_lines)[0]
-          unless first_line_text == fragments[0][:text]
-            original_fragments, fragments = fragments, []
-            original_fragments.reduce '' do |traced, fragment|
-              fragments << fragment
-              # NOTE: we could just do a length comparison here
-              if (traced += fragment[:text]).start_with? first_line_text
-                fragment[:text] = fragment[:text][0...-(traced.length - first_line_text.length)]
-                break
-              end
-              traced
-            end
-          end
-          fragments.each {|fragment| fragment[:text] = transform_text fragment[:text], first_line_text_transform }
+          first_line_fragments = (box.instance_variable_get :@arranger).consumed
+          fragments = first_line_fragments.map {|fragment| fragment.merge text: (transform_text fragment[:text], first_line_text_transform) }
           first_line_options[:overflow] = :shrink_to_fit
-          @final_gap = first_line_options[:force_justify] = true if remaining_fragments
+          if remaining_fragments
+            @final_gap = true
+            first_line_options[:force_justify] = true if first_line_options[:align] == :justify && first_line_fragments[-1][:text] != ?\n
+          end
         end
         if text_indent
           indent(text_indent) { fill_formatted_text_box fragments, first_line_options }

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

@@ -176,8 +176,10 @@ module Asciidoctor
                   end
                   if (text_transform = fragment.delete :text_transform)
                     text = (text_chunks = extract_text pcdata).join
-                    text_io = StringIO.new transform_text text, text_transform
-                    restore_text pcdata, text_chunks.each_with_object([]) {|chunk, accum| accum << (text_io.read chunk.length) }
+                    chars = (StringIO.new transform_text text, text_transform).each_char
+                    restore_text pcdata, (text_chunks.each_with_object [] do |chunk, accum|
+                      accum << chunk.length.times.map { chars.next }.join
+                    end)
                   end
                   # NOTE: decorate child fragments with inherited properties from this element
                   apply pcdata, fragments, fragment

data/lib/asciidoctor/pdf/optimizer.rb

@@ -39,6 +39,7 @@ module Asciidoctor
 
       attr_reader :quality
       attr_reader :compatibility_level
+      attr_reader :compliance
 
       def initialize quality = 'default', compatibility_level = '1.4', compliance = 'PDF'
         @quality = QUALITY_NAMES[quality]

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -83,6 +83,7 @@ module Asciidoctor
             theme_data.base_text_align ||= 'left'
             theme_data.base_line_height ||= 1
             theme_data.base_font_color ||= '000000'
+            theme_data.base_font_size ||= 12
             theme_data.code_font_family ||= (theme_data.codespan_font_family || 'Courier')
             theme_data.conum_font_family ||= (theme_data.codespan_font_family || 'Courier')
             if (heading_font_family = theme_data.heading_font_family)

data/lib/asciidoctor/pdf/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '2.3.0'
+    VERSION = '2.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-pdf
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -193,8 +193,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description: An extension for Asciidoctor that converts AsciiDoc documents to PDF
-  using the Prawn PDF library.
+description: An add-on converter for Asciidoctor that converts AsciiDoc documents
+  to PDF using the Prawn PDF generation library.
 email: dan@opendevise.com
 executables:
 - asciidoctor-pdf