asciidoctor-pdf 1.5.0.alpha.17 → 1.5.0.alpha.18

data/lib/asciidoctor-pdf/core_ext.rb

@@ -2,3 +2,4 @@ require_relative 'core_ext/object'
 require_relative 'core_ext/array'
 require_relative 'core_ext/numeric'
 require_relative 'core_ext/string'
+require_relative 'core_ext/regexp'

data/lib/asciidoctor-pdf/core_ext/regexp.rb

@@ -0,0 +1,3 @@
+class Regexp
+  alias match? === unless Regexp.method_defined? :match?
+end

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

@@ -19,7 +19,7 @@ class Formatter
   def format string, *args
     options = args[0] || {}
     string = string.tr_s(WHITESPACE, ' ') if options[:normalize]
-    return [text: string] unless string.match(FormattingSnifferPattern)
+    return [text: string] unless FormattingSnifferPattern.match? string
     if (parsed = @parser.parse(string))
       @transform.apply(parsed.content)
     else
@@ -27,6 +27,13 @@ class Formatter
       [text: string]
     end
   end
+
+  # The original purpose of this method is to split paragraphs, but our formatter only works on paragraphs that have
+  # been presplit. Therefore, we just need to wrap the fragments in a single-element array (representing a single
+  # paragraph) and return them.
+  def array_paragraphs fragments
+    [fragments]
+  end
 end
 end
 end

data/lib/asciidoctor-pdf/index_catalog.rb

@@ -1,5 +1,6 @@
 module Asciidoctor; module PDF
   class IndexCatalog
+    include Sanitizer
     LeadingAlphaRx = /^\p{Alpha}/
 
     attr_accessor :start_page_number
@@ -8,6 +9,11 @@ module Asciidoctor; module PDF
       @categories = {}
       @start_page_number = 1
       @dests = {}
+      @sequence = 0
+    end
+
+    def next_anchor_name
+      %(__indexterm-#{@sequence += 1})
     end
 
     def store_term names, dest = nil
@@ -22,7 +28,7 @@ module Asciidoctor; module PDF
 
     def store_primary_term name, dest = nil
       store_dest dest if dest
-      (init_category name.chr.upcase).store_term name, dest
+      (init_category uppercase_mb name.chr).store_term name, dest
     end
 
     def store_secondary_term primary_name, secondary_name, dest = nil
@@ -36,8 +42,8 @@ module Asciidoctor; module PDF
     end
 
     def init_category name
-      name = '@' unless LeadingAlphaRx =~ name
-      @categories[name] ||= (IndexTermCategory.new name)
+      name = '@' unless LeadingAlphaRx.match? name
+      @categories[name] ||= IndexTermCategory.new name
     end
 
     def find_category name

data/lib/asciidoctor-pdf/measurements.rb

@@ -48,7 +48,7 @@ module Asciidoctor; module PDF
 
     # Resolve measurement values in the string to PDF points.
     def resolve_measurement_values str
-      if MeasurementValueHintRx =~ str
+      if MeasurementValueHintRx.match? str
         str.gsub(InsetMeasurementValueRx) { to_pt $1.to_f, $2 }
       else
         str

data/lib/asciidoctor-pdf/prawn_ext/extensions.rb

@@ -357,11 +357,19 @@ module Extensions
     end
   end
 
-  # Performs the same work as text except that the first_line_opts
-  # are applied to the first line of text renderered. It's necessary
-  # to use low-level APIs in this method so that we only style the
-  # first line and not the remaining lines (which is the default
-  # behavior in Prawn).
+  # 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]
+    end
+    result
+  end
+
+  # Performs the same work as Prawn::Text.text except that the first_line_opts are applied to the first line of text
+  # renderered. It's necessary to use low-level APIs in this method so we only style the first line and not the
+  # remaining lines (which is the default behavior in Prawn).
   def text_with_formatted_first_line string, first_line_opts, opts
     color = opts.delete :color
     fragments = parse_text string, opts
@@ -378,17 +386,27 @@ module Extensions
     first_line_opts = opts.merge(first_line_opts).merge single_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
-    remaining_fragments = box.render dry_run: true
+    if (text_indent = opts.delete :indent_paragraphs)
+      remaining_fragments = indent text_indent do
+        box.render dry_run: true
+      end
+    else
+      remaining_fragments = box.render dry_run: true
+    end
     # NOTE color must be applied per-fragment
     if first_line_color
       fragments.each {|fragment| fragment[:color] ||= first_line_color}
     end
-    fill_formatted_text_box fragments, first_line_opts
+    if text_indent
+      indent text_indent do
+        fill_formatted_text_box fragments, first_line_opts
+      end
+    else
+      fill_formatted_text_box fragments, first_line_opts
+    end
     unless remaining_fragments.empty?
       # NOTE color must be applied per-fragment
-      if color
-        remaining_fragments.each {|fragment| fragment[:color] ||= color }
-      end
+      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

data/lib/asciidoctor-pdf/roman_numeral.rb

@@ -73,6 +73,14 @@ class RomanNumeral
     @integer_value
   end
 
+  def odd?
+    to_i.odd?
+  end
+
+  def even?
+    to_i.even?
+  end
+
   def next
     RomanNumeral.new @integer_value + 1, @letter_case
   end
@@ -86,6 +94,10 @@ class RomanNumeral
     RomanNumeral.new @integer_value - 1, @letter_case
   end
 
+  def empty?
+    false
+  end
+
   def self.int_to_roman value
     result = []
     BaseDigits.keys.reverse_each do |ival|

data/lib/asciidoctor-pdf/theme_loader.rb

@@ -70,15 +70,27 @@ class ThemeLoader
       theme_data = load_base_theme
     end
 
-    theme_file == BaseThemePath ? theme_data : (load_file theme_file, theme_data)
+    theme_file == BaseThemePath ? theme_data : (load_file theme_file, theme_data, theme_path)
   end
 
-  def self.load_file filename, theme_data = nil
-    raw_data = (::File.read filename, encoding: ::Encoding::UTF_8).each_line.map {|l| l.sub HexColorEntryRx, '\k<k>: \'\k<v>\'' }.join
-    self.new.load((::SafeYAML.load raw_data), theme_data)
+  def self.load_file filename, theme_data = nil, theme_path = nil
+    yaml_data = ::SafeYAML.load (::File.read filename, encoding: ::Encoding::UTF_8).each_line.map {|l| l.sub HexColorEntryRx, '\k<k>: \'\k<v>\'' }.join
+    if ::Hash === yaml_data && (extend_files = yaml_data.delete 'extends')
+      [*extend_files].each do |extend_file|
+        if extend_file == 'default'
+          extend_file = resolve_theme_file extend_file, (extend_theme_path = ThemesDir)
+        elsif extend_file.start_with? './'
+          extend_file = resolve_theme_file extend_file, (extend_theme_path = (::File.dirname ::File.absolute_path filename))
+        else
+          extend_file = resolve_theme_file extend_file, (extend_theme_path = theme_path)
+        end
+        theme_data = load_file extend_file, theme_data, extend_theme_path
+      end
+    end
+    self.new.load yaml_data, theme_data, theme_path
   end
 
-  def load hash, theme_data = nil
+  def load hash, theme_data = nil, theme_path = nil
     theme_data ||= ::OpenStruct.new
     return theme_data unless ::Hash === hash
     base_code_font_family = theme_data.delete 'code_font_family'

data/lib/asciidoctor-pdf/version.rb

@@ -1,6 +1,6 @@
 module Asciidoctor
 module PDF
-  VERSION = '1.5.0.alpha.17'
+  VERSION = '1.5.0.alpha.18'
 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.alpha.17
+  version: 1.5.0.alpha.18
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -199,6 +199,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: An extension for Asciidoctor that converts AsciiDoc documents to PDF
   using the Prawn PDF library.
 email: dan@opendevise.com
@@ -230,6 +244,8 @@ files:
 - docs/theming-guide.adoc
 - lib/asciidoctor-pdf.rb
 - lib/asciidoctor-pdf/asciidoctor_ext.rb
+- lib/asciidoctor-pdf/asciidoctor_ext/abstract_block.rb
+- lib/asciidoctor-pdf/asciidoctor_ext/document.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/image.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/list.rb
 - lib/asciidoctor-pdf/asciidoctor_ext/list_item.rb
@@ -242,6 +258,7 @@ files:
 - lib/asciidoctor-pdf/core_ext/object.rb
 - lib/asciidoctor-pdf/core_ext/ostruct.rb
 - lib/asciidoctor-pdf/core_ext/quantifiable_stdout.rb
+- lib/asciidoctor-pdf/core_ext/regexp.rb
 - lib/asciidoctor-pdf/core_ext/string.rb
 - lib/asciidoctor-pdf/formatted_text.rb
 - lib/asciidoctor-pdf/formatted_text/formatter.rb