asciidoctor-pdf 1.5.0.alpha.17 → 1.5.0.beta.1

data/lib/asciidoctor-pdf/asciidoctor_ext/abstract_block.rb

@@ -0,0 +1,5 @@
+class Asciidoctor::AbstractBlock
+  def sections?
+    !sections.empty?
+  end unless method_defined? :sections?
+end

data/lib/asciidoctor-pdf/asciidoctor_ext/document.rb

@@ -0,0 +1,3 @@
+class Asciidoctor::Document
+  alias catalog references unless method_defined? :catalog
+end

data/lib/asciidoctor-pdf/asciidoctor_ext/image.rb

@@ -3,13 +3,13 @@ module Image
   DataUriRx = /^data:image\/(?<fmt>png|jpe?g|gif|pdf|bmp|tiff);base64,(?<data>.*)$/
 
   class << self
-    def format path, node = nil
-      (node && (node.attr 'format', nil, false)) || (::File.extname path).downcase[1..-1]
+    def format path, attributes = nil
+      (attributes && attributes['format']) || ((ext = ::File.extname path).downcase.slice 1, ext.length)
     end
   end
 
   def format
-    (attr 'format', nil, false) || ::File.extname(inline? ? target : (attr 'target')).downcase[1..-1]
+    (attr 'format', nil, false) || ((ext = ::File.extname(inline? ? target : (attr 'target'))).downcase.slice 1, ext.length)
   end
 
   def target_and_format
@@ -17,7 +17,7 @@ module Image
     if (image_path.start_with? 'data:') && (m = DataUriRx.match image_path)
       [(m[:data].extend ::Base64), m[:fmt]]
     else
-      [image_path, (attr 'format', nil, false) || (::File.extname image_path).downcase[1..-1]]
+      [image_path, (attr 'format', nil, false) || ((ext = ::File.extname image_path).downcase.slice 1, ext.length)]
     end
   end
 end

data/lib/asciidoctor-pdf/asciidoctor_ext/logging_shim.rb

@@ -1,11 +1,17 @@
 module Asciidoctor
   class StubLogger
     class << self
-      def warn message
+      def info message = nil
+        # ignore since this isn't a real logger
+      end
+
+      def warn message = nil
+        message = block_given? ? yield : message unless message
         ::Kernel.warn %(asciidoctor: WARNING: #{message})
       end
 
-      def error message
+      def error message = nil
+        message = block_given? ? yield : message unless message
         ::Kernel.warn %(asciidoctor: ERROR: #{message})
       end
     end

data/lib/asciidoctor-pdf/asciidoctor_ext/section.rb

@@ -1,17 +1,25 @@
 class Asciidoctor::Section
   def numbered_title opts = {}
     unless (@cached_numbered_title ||= nil)
-      if (slevel = (@level == 0 && @special ? 1 : @level)) == 0
-        @is_numbered = false
-        @cached_numbered_title = @cached_formal_numbered_title = title
-      elsif @numbered && !@caption && slevel <= (@document.attr 'sectnumlevels', 3).to_i
+      slevel = @level == 0 && @special ? 1 : @level
+      if @numbered && !@caption && slevel <= (@document.attr 'sectnumlevels', 3).to_i
         @is_numbered = true
-        @cached_numbered_title = %(#{sectnum} #{title})
-        @cached_formal_numbered_title = if slevel == 1 && @document.doctype == 'book'
-          %(#{@document.attr 'chapter-label', 'Chapter'} #{@cached_numbered_title}).lstrip
+        @cached_formal_numbered_title = if @document.doctype == 'book'
+          if slevel == 0
+            @cached_numbered_title = %(#{sectnum nil, ':'} #{title})
+            %(#{@document.attr 'part-signifier', 'Part'} #{@cached_numbered_title}).lstrip
+          elsif slevel == 1
+            @cached_numbered_title = %(#{sectnum} #{title})
+            %(#{@document.attr 'chapter-signifier', (@document.attr 'chapter-label', 'Chapter')} #{@cached_numbered_title}).lstrip
+          else
+            @cached_numbered_title = %(#{sectnum} #{title})
+          end
         else
-          @cached_numbered_title
+          @cached_numbered_title = %(#{sectnum} #{title})
         end
+      elsif slevel == 0
+        @is_numbered = false
+        @cached_numbered_title = @cached_formal_numbered_title = title
       else
         @is_numbered = false
         @cached_numbered_title = @cached_formal_numbered_title = captioned_title

data/lib/asciidoctor-pdf/asciidoctor_ext.rb

@@ -1,4 +1,6 @@
-# NOTE these are all candidates for inclusion in Asciidoctor core
+# NOTE these are either candidates for inclusion in Asciidoctor core or backports
+require_relative 'asciidoctor_ext/abstract_block'
+require_relative 'asciidoctor_ext/document'
 require_relative 'asciidoctor_ext/section'
 require_relative 'asciidoctor_ext/list'
 require_relative 'asciidoctor_ext/list_item'