asciidoctor-pdf 1.5.0.rc.2 → 1.5.0.rc.3

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

@@ -7,6 +7,10 @@ module Asciidoctor
         # ignore since this isn't a real logger
       end
 
+      def info?
+        false
+      end
+
       def warn message = nil
         ::Kernel.warn %(asciidoctor: WARNING: #{message || (block_given? ? yield : '???')})
       end
@@ -17,9 +21,13 @@ module Asciidoctor
     end
   end
 
-  module LoggingShim
+  module Logging
     def logger
       StubLogger
     end
+
+    def message_with_context text, _context = {}
+      text
+    end
   end
 end

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

@@ -2,6 +2,7 @@
 
 require_relative 'core/object'
 require_relative 'core/array'
+require_relative 'core/file'
 require_relative 'core/hash'
 require_relative 'core/numeric'
 require_relative 'core/string'

data/lib/asciidoctor/pdf/ext/core/file.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class File
+  class << self
+    def absolute_path? path
+      (path.start_with? '/') || (ALT_SEPARATOR && (path.start_with? (absolute_path path).slice 0, 3))
+    end unless method_defined? :absolute_path?
+  end
+end

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

@@ -22,6 +22,8 @@ module Asciidoctor
         italic: [:italic].to_set,
         bold_italic: [:bold, :italic].to_set,
       }).default = ::Set.new
+      # NOTE must use a visible char for placeholder or else Prawn won't reserve space for the fragment
+      PlaceholderChar = ?\u2063
 
       # - :height is the height of a line
       # - :leading is spacing between adjacent lines
@@ -309,6 +311,12 @@ module Asciidoctor
         end
       end
 
+      # Override width of string to check for placeholder char, which uses character spacing to control width
+      #
+      def width_of_string string, options = {}
+        string == PlaceholderChar ? @character_spacing : super
+      end
+
       def icon_font_data family
         ::Prawn::Icon::FontData.load self, family
       end
@@ -751,6 +759,7 @@ module Asciidoctor
         start_new_page_discretely template: file, template_page: opts[:page]
         # prawn-templates sets text_rendering_mode to :unknown, which breaks running content; revert
         @text_rendering_mode = prev_text_rendering_mode
+        yield if block_given?
         if opts.fetch :advance, true
           # NOTE set page size & layout explicitly in case imported page differs
           # I'm not sure it's right to start a new page here, but unfortunately there's no other
@@ -824,6 +833,7 @@ module Asciidoctor
         @scratch ||= if defined? @prototype # rubocop:disable Naming/MemoizedInstanceVariableName
                        scratch = Marshal.load Marshal.dump @prototype
                        scratch.instance_variable_set :@prototype, @prototype
+                       scratch.instance_variable_set :@tmp_files, @tmp_files
                        # TODO: set scratch number on scratch document
                        scratch
                      else

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

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 class Prawn::Font::AFM
-  if defined? ::Asciidoctor::Logging
-    include ::Asciidoctor::Logging
-  else
-    include ::Asciidoctor::LoggingShim
-  end
+  include ::Asciidoctor::Logging
 
   FALLBACK_CHARS = {
     ?\u200b => '',
@@ -26,7 +22,7 @@ class Prawn::Font::AFM
     text.encode 'windows-1252', fallback: FALLBACK_CHARS
   rescue ::Encoding::UndefinedConversionError
     logger.warn %(The following text could not be fully converted to the Windows-1252 character set:
-#{text.gsub(/^/, '| ').rstrip})
+#{text.gsub(/^/, '| ').rstrip}) if logger.info? && !@document.scratch?
     text.encode 'windows-1252', undef: :replace, replace: ?\u00ac
   rescue ::Encoding::InvalidByteSequenceError
     raise Prawn::Errors::IncompatibleStringEncoding,

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 Prawn::Text::Formatted::Box.prepend (Module.new do
+  include ::Asciidoctor::Logging
+
   def draw_fragment_overlay_styles fragment
     if (underline = (styles = fragment.styles).include? :underline) || (styles.include? :strikethrough)
       (doc = fragment.document).save_graphics_state do
@@ -14,4 +16,42 @@ Prawn::Text::Formatted::Box.prepend (Module.new do
       end
     end
   end
+
+  def find_font_for_this_glyph char, current_font, fallback_fonts_to_check, original_font = current_font
+    @document.font current_font
+    if fallback_fonts_to_check.empty?
+      logger.warn %(Could not locate the character `#{char}' in the following fonts: #{([original_font].concat @fallback_fonts).join ', '}) if logger.info? && !@document.scratch?
+      current_font
+    elsif @document.font.glyph_present? char
+      current_font
+    else
+      find_font_for_this_glyph char, fallback_fonts_to_check.shift, fallback_fonts_to_check, original_font
+    end
+  end
+
+  def process_vertical_alignment text
+    return super if ::Symbol === (valign = @vertical_align)
+
+    return if defined? @vertical_alignment_processed
+    @vertical_alignment_processed = true
+
+    valign, offset = valign
+
+    if valign == :top
+      @at[1] -= offset
+      return
+    end
+
+    wrap text
+    h = height
+
+    case valign
+    when :center
+      @at[1] -= (@height - h + @descender) * 0.5 + offset
+    when :bottom
+      @at[1] -= (@height - h) + offset
+    end
+
+    @height = h
+  end
 end)

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

@@ -4,11 +4,9 @@ module Asciidoctor
   module PDF
     module FormattedText
       class Formatter
-        if defined? ::Asciidoctor::Logging
-          include ::Asciidoctor::Logging
-        else
-          include ::Asciidoctor::LoggingShim
-        end
+        include ::Asciidoctor::Logging
+
+        attr_accessor :scratch
 
         FormattingSnifferPattern = /[<&]/
         WHITESPACE = %( \t\n)
@@ -16,6 +14,7 @@ module Asciidoctor
         def initialize options = {}
           @parser = MarkupParser.new
           @transform = Transform.new merge_adjacent_text_nodes: true, theme: options[:theme]
+          @scratch = false
         end
 
         def format string, *args
@@ -25,7 +24,7 @@ module Asciidoctor
           if FormattingSnifferPattern.match? string
             if (parsed = @parser.parse string)
               return @transform.apply parsed.content, [], inherited
-            else
+            elsif !@scratch
               logger.error %(failed to parse formatted text: #{string})
             end
           end

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

@@ -2,12 +2,13 @@
 
 module Asciidoctor::PDF::FormattedText
   class FragmentPositionRenderer
-    attr_reader :top, :right, :bottom, :left
+    attr_reader :top, :right, :bottom, :left, :page_number
 
     def render_behind fragment
       @top = fragment.top
       @right = (@left = fragment.left) + fragment.width
       @bottom = fragment.bottom
+      @page_number = fragment.document.page_number
     end
   end
 end

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

@@ -3,15 +3,9 @@
 module Asciidoctor::PDF::FormattedText
   module InlineImageArranger
     include ::Asciidoctor::PDF::Measurements
-    if defined? ::Asciidoctor::Logging
-      include ::Asciidoctor::Logging
-    else
-      include ::Asciidoctor::LoggingShim
-    end
+    include ::Asciidoctor::Logging
 
-    # NOTE we must use a visible char or else Prawn won't allocate space for the fragment
-    ImagePlaceholderChar = '.'
-    TemporaryPath = ::Asciidoctor::PDF::TemporaryPath
+    PlaceholderChar = ::Asciidoctor::Prawn::Extensions::PlaceholderChar
 
     def wrap fragments
       arrange_images fragments
@@ -113,11 +107,14 @@ module Asciidoctor::PDF::FormattedText
             end
           end
 
-          fragment[:text] = ImagePlaceholderChar
+          # NOTE we can't rely on the fragment width because the line wrap mechanism ignores it;
+          # it only considers the text (string) and character spacing, rebuilding the string several times
+          fragment[:text] = PlaceholderChar
+          fragment[:character_spacing] = image_w
           fragment[:image_width] = fragment[:width] = image_w
           fragment[:image_height] = image_h
         rescue
-          logger.warn %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! ? '; install prawn-gmagick gem to add support' : ''})
+          logger.warn %(could not embed image: #{image_path}; #{$!.message}#{::Prawn::Errors::UnsupportedImageType === $! ? '; install prawn-gmagick gem to add support' : ''}) unless scratch
           drop = true # delegate to cleanup logic in ensure block
         ensure
           # NOTE skip rendering image in scratch document or if image can't be loaded
@@ -126,8 +123,6 @@ module Asciidoctor::PDF::FormattedText
             fragment.delete :image_info
             # NOTE retain key to indicate we've visited fragment already
             fragment[:image_obj] = nil
-            # NOTE in main document, temporary image path is unlinked by renderer
-            image_path.unlink if TemporaryPath === image_path && image_path.exist?
           end
         end
       end

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

@@ -2,8 +2,6 @@
 
 module Asciidoctor::PDF::FormattedText
   module InlineImageRenderer
-    TemporaryPath = ::Asciidoctor::PDF::TemporaryPath
-
     module_function
 
     # Embeds the image object in this fragment into the document in place of the
@@ -36,6 +34,7 @@ module Asciidoctor::PDF::FormattedText
         pdf.float do
           image_obj.draw
           image_obj.document.warnings.each do |img_warning|
+            # NOTE shim logger can't be imported into a module, so use the one from the PDF document instead
             pdf.logger.warn %(problem encountered in image: #{data[:image_path]}; #{img_warning})
           end
         end
@@ -47,8 +46,6 @@ module Asciidoctor::PDF::FormattedText
 
       # prevent any text from being written
       fragment.conceal
-    ensure
-      data[:image_path].unlink if TemporaryPath === data[:image_path] && data[:image_path].exist?
     end
   end
 end

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

@@ -170,7 +170,7 @@ module Asciidoctor
                 when :img
                   attributes = node[:attributes]
                   fragment = {
-                    image_path: attributes[:tmp] == 'true' ? attributes[:src].extend(TemporaryPath) : attributes[:src],
+                    image_path: attributes[:src],
                     image_format: attributes[:format],
                     # a zero-width space in the text will cause the image to be duplicated
                     text: (attributes[:alt].delete ZeroWidthSpace),

data/lib/asciidoctor/pdf/theme_loader.rb

@@ -8,11 +8,7 @@ module Asciidoctor
   module PDF
     class ThemeLoader
       include ::Asciidoctor::PDF::Measurements
-      if defined? ::Asciidoctor::Logging
-        include ::Asciidoctor::Logging
-      else
-        include ::Asciidoctor::LoggingShim
-      end
+      include ::Asciidoctor::Logging
 
       DataDir = ::File.absolute_path %(#{__dir__}/../../../data)
       ThemesDir = ::File.join DataDir, 'themes'
@@ -80,6 +76,10 @@ module Asciidoctor
             theme_data.base_font_color ||= '000000'
             theme_data.code_font_family ||= (theme_data.literal_font_family || 'Courier')
             theme_data.conum_font_family ||= (theme_data.literal_font_family || 'Courier')
+            if (heading_font_family = theme_data.heading_font_family)
+              theme_data.abstract_title_font_family ||= heading_font_family
+              theme_data.sidebar_title_font_family ||= heading_font_family
+            end
           end
           theme_data.__dir__ = theme_dir
           theme_data
@@ -91,7 +91,7 @@ module Asciidoctor
         data = data.each_line.map {|line|
           line.sub(HexColorEntryRx) { %(#{(m = $~)[:k]}: #{m[:h] || (m[:k].end_with? 'color') ? "'#{m[:v]}'" : m[:v]}) }
         }.join unless (::File.dirname filename) == ThemesDir
-        yaml_data = ::SafeYAML.load data
+        yaml_data = ::SafeYAML.load data, filename
         if ::Hash === yaml_data && (yaml_data.key? 'extends')
           if (extends = yaml_data.delete 'extends')
             [*extends].each do |extend_path|
@@ -127,16 +127,17 @@ module Asciidoctor
             process_entry %(#{key}_#{subkey}), subval, data if subkey == 'catalog' || subkey == 'fallbacks'
           end if ::Hash === val
         elsif key == 'font_catalog'
-          data[key] = ::Hash === val ? val.reduce({}) do |accum, (name, styles)| # rubocop:disable Style/EachWithObject
+          data[key] = ::Hash === val ? (val.reduce (val.delete 'merge') ? data[key] || {} : {} do |accum, (name, styles)| # rubocop:disable Style/EachWithObject
+            styles = %w(normal bold italic bold_italic).map {|style| [style, styles] }.to_h if ::String === styles
             accum[name] = styles.reduce({}) do |subaccum, (style, path)| # rubocop:disable Style/EachWithObject
               if (path.start_with? 'GEM_FONTS_DIR') && (sep = path[13])
                 path = %(#{FontsDir}#{sep}#{path.slice 14, path.length})
               end
-              subaccum[style] = expand_vars path, data
+              subaccum[style == 'regular' ? 'normal' : style] = expand_vars path, data
               subaccum
             end if ::Hash === styles
             accum
-          end : {}
+          end) : {}
         elsif key == 'font_fallbacks'
           data[key] = ::Array === val ? val.map {|name| expand_vars name.to_s, data } : []
         elsif key.start_with? 'admonition_icon_'

data/lib/asciidoctor/pdf/version.rb

@@ -2,7 +2,7 @@
 
 module Asciidoctor
   module PDF
-    VERSION = '1.5.0.rc.2'
+    VERSION = '1.5.0.rc.3'
   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.rc.2
+  version: 1.5.0.rc.3
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -191,34 +191,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.0
-- !ruby/object:Gem::Dependency
-  name: deep-cover-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -253,42 +225,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.14.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -336,6 +280,7 @@ files:
 - bin/asciidoctor-pdf-optimize
 - data/fonts/ABOUT-mplus1mn-subset
 - data/fonts/ABOUT-mplus1p-subset
+- data/fonts/ABOUT-notoemoji-subset
 - data/fonts/ABOUT-notoserif-subset
 - data/fonts/LICENSE-mplus
 - data/fonts/LICENSE-notoserif
@@ -348,6 +293,7 @@ files:
 - data/fonts/mplus1mn-regular-ascii-conums.ttf
 - data/fonts/mplus1mn-regular-subset.ttf
 - data/fonts/mplus1p-regular-fallback.ttf
+- data/fonts/notoemoji-subset.ttf
 - data/fonts/notoserif-bold-subset.ttf
 - data/fonts/notoserif-bold_italic-subset.ttf
 - data/fonts/notoserif-italic-subset.ttf
@@ -373,6 +319,7 @@ files:
 - lib/asciidoctor/pdf/ext/asciidoctor/section.rb
 - lib/asciidoctor/pdf/ext/core.rb
 - lib/asciidoctor/pdf/ext/core/array.rb
+- lib/asciidoctor/pdf/ext/core/file.rb
 - lib/asciidoctor/pdf/ext/core/hash.rb
 - lib/asciidoctor/pdf/ext/core/numeric.rb
 - lib/asciidoctor/pdf/ext/core/object.rb
@@ -419,7 +366,6 @@ files:
 - lib/asciidoctor/pdf/pdfmark.rb
 - lib/asciidoctor/pdf/roman_numeral.rb
 - lib/asciidoctor/pdf/sanitizer.rb
-- lib/asciidoctor/pdf/temporary_path.rb
 - lib/asciidoctor/pdf/text_transformer.rb
 - lib/asciidoctor/pdf/theme_loader.rb
 - lib/asciidoctor/pdf/version.rb
@@ -446,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to PDF using Asciidoctor and Prawn