asciidoctor 1.5.8 → 2.0.17

data/lib/asciidoctor/section.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 module Asciidoctor
 # Public: Methods for managing sections of AsciiDoc content in a document.
 # The section responds as an Array of content blocks by delegating
@@ -64,6 +64,13 @@ class Section < AbstractBlock
     Section.generate_id title, @document
   end
 
+  # Public: Check whether this Section has any child Section objects.
+  #
+  # Returns A [Boolean] to indicate whether this Section has child Section objects
+  def sections?
+    @next_section_index > 0
+  end
+
   # Public: Get the section number for the current Section
   #
   # The section number is a dot-separated String that uniquely describes the position of this
@@ -111,14 +118,7 @@ class Section < AbstractBlock
   # Returns the section number as a String
   def sectnum(delimiter = '.', append = nil)
     append ||= (append == false ? '' : delimiter)
-    if @level == 1
-      %(#{@numeral}#{append})
-    elsif @level > 1
-      Section === @parent ? %(#{@parent.sectnum(delimiter, delimiter)}#{@numeral}#{append}) : %(#{@numeral}#{append})
-    else # @level == 0
-      # NOTE coerce @numeral to int just in case not set; can happen if section nesting is out of sequence
-      %(#{Helpers.int_to_roman @numeral.to_i}#{append})
-    end
+    @level > 1 && Section === @parent ? %(#{@parent.sectnum(delimiter, delimiter)}#{@numeral}#{append}) : %(#{@numeral}#{append})
   end
 
   # (see AbstractBlock#xreftext)
@@ -130,9 +130,9 @@ class Section < AbstractBlock
         case xrefstyle
         when 'full'
           if (type = @sectname) == 'chapter' || type == 'appendix'
-            quoted_title = sprintf sub_quotes('_%s_'), title
+            quoted_title = sub_placeholder (sub_quotes '_%s_'), title
           else
-            quoted_title = sprintf sub_quotes(@document.compat_mode ? %q(``%s'') : '"`%s`"'), title
+            quoted_title = sub_placeholder (sub_quotes @document.compat_mode ? %q(``%s'') : '"`%s`"'), title
           end
           if (signifier = @document.attributes[%(#{type}-refsig)])
             %(#{signifier} #{sectnum '.', ','} #{quoted_title})
@@ -146,10 +146,10 @@ class Section < AbstractBlock
             sectnum '.', ''
           end
         else # 'basic'
-          (type = @sectname) == 'chapter' || type == 'appendix' ? (sprintf sub_quotes('_%s_'), title) : title
+          (type = @sectname) == 'chapter' || type == 'appendix' ? (sub_placeholder (sub_quotes '_%s_'), title) : title
         end
       else # apply basic styling
-        (type = @sectname) == 'chapter' || type == 'appendix' ? (sprintf sub_quotes('_%s_'), title) : title
+        (type = @sectname) == 'chapter' || type == 'appendix' ? (sub_placeholder (sub_quotes '_%s_'), title) : title
       end
     else
       title
@@ -215,9 +215,10 @@ class Section < AbstractBlock
       # ensure id doesn't begin with idseparator if idprefix is empty (assuming idseparator is not empty)
       gen_id = gen_id.slice 1, gen_id.length if pre.empty? && (gen_id.start_with? sep)
     end
-    if document.catalog[:ids].key? gen_id
-      ids, cnt = document.catalog[:ids], Compliance.unique_id_start_index
-      cnt += 1 while ids.key?(candidate_id = %(#{gen_id}#{sep}#{cnt}))
+    if document.catalog[:refs].key? gen_id
+      ids = document.catalog[:refs]
+      cnt = Compliance.unique_id_start_index
+      cnt += 1 while ids[candidate_id = %(#{gen_id}#{sep}#{cnt})]
       candidate_id
     else
       gen_id

data/lib/asciidoctor/stylesheets.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 module Asciidoctor
 # A utility class for working with the built-in stylesheets.
 #--
@@ -6,9 +6,7 @@ module Asciidoctor
 # QUESTION create method for user stylesheet?
 class Stylesheets
   DEFAULT_STYLESHEET_NAME = 'asciidoctor.css'
-  DEFAULT_PYGMENTS_STYLE = 'default'
-  STYLESHEETS_DATA_PATH = ::File.join DATA_PATH, 'stylesheets'
-  PygmentsBgColorRx = /^\.pygments +\{ *background: *([^;]+);/
+  STYLESHEETS_DIR = ::File.join DATA_DIR, 'stylesheets'
 
   @__instance__ = new
 
@@ -24,9 +22,12 @@ class Stylesheets
   #
   # returns the [String] Asciidoctor stylesheet data
   def primary_stylesheet_data
-    @primary_stylesheet_data ||= ::IO.read(::File.join(STYLESHEETS_DATA_PATH, 'asciidoctor-default.css')).rstrip
+    @primary_stylesheet_data ||= (::File.read (::File.join STYLESHEETS_DIR, 'asciidoctor-default.css'), mode: FILE_READ_MODE).rstrip
   end
 
+  # Deprecated: Generate code to embed the primary stylesheet
+  #
+  # Returns the [String] primary stylesheet data wrapped in a <style> tag
   def embed_primary_stylesheet
     %(<style>
 #{primary_stylesheet_data}
@@ -34,24 +35,23 @@ class Stylesheets
   end
 
   def write_primary_stylesheet target_dir = '.'
-    ::IO.write(::File.join(target_dir, primary_stylesheet_name), primary_stylesheet_data)
+    ::File.write (::File.join target_dir, primary_stylesheet_name), primary_stylesheet_data, mode: FILE_WRITE_MODE
   end
 
   def coderay_stylesheet_name
-    'coderay-asciidoctor.css'
+    (SyntaxHighlighter.for 'coderay').stylesheet_basename
   end
 
   # Public: Read the contents of the default CodeRay stylesheet
   #
   # returns the [String] CodeRay stylesheet data
   def coderay_stylesheet_data
-    # NOTE use the following lines to load a built-in theme instead
-    # unless load_coderay.nil?
-    #   ::CodeRay::Encoders[:html]::CSS.new(:default).stylesheet
-    # end
-    @coderay_stylesheet_data ||= ::IO.read(::File.join(STYLESHEETS_DATA_PATH, 'coderay-asciidoctor.css')).rstrip
+    (SyntaxHighlighter.for 'coderay').read_stylesheet
   end
 
+  # Deprecated: Generate code to embed the CodeRay stylesheet
+  #
+  # Returns the [String] CodeRay stylesheet data wrapped in a <style> tag
   def embed_coderay_stylesheet
     %(<style>
 #{coderay_stylesheet_data}
@@ -59,33 +59,23 @@ class Stylesheets
   end
 
   def write_coderay_stylesheet target_dir = '.'
-    ::IO.write(::File.join(target_dir, coderay_stylesheet_name), coderay_stylesheet_data)
+    ::File.write (::File.join target_dir, coderay_stylesheet_name), coderay_stylesheet_data, mode: FILE_WRITE_MODE
   end
 
   def pygments_stylesheet_name style = nil
-    %(pygments-#{style || DEFAULT_PYGMENTS_STYLE}.css)
-  end
-
-  def pygments_background style = nil
-    if load_pygments && PygmentsBgColorRx =~ (::Pygments.css '.pygments', :style => style || DEFAULT_PYGMENTS_STYLE)
-      $1
-    end
+    (SyntaxHighlighter.for 'pygments').stylesheet_basename style
   end
 
   # Public: Generate the Pygments stylesheet with the specified style.
   #
   # returns the [String] Pygments stylesheet data
   def pygments_stylesheet_data style = nil
-    if load_pygments
-      style ||= DEFAULT_PYGMENTS_STYLE
-      (@pygments_stylesheet_data ||= {})[style] ||=
-          ((::Pygments.css '.listingblock .pygments', :classprefix => 'tok-', :style => style) || '/* Failed to load Pygments CSS. */').
-          sub('.listingblock .pygments  {', '.listingblock .pygments, .listingblock .pygments code {')
-    else
-      '/* Pygments CSS disabled. Pygments is not available. */'
-    end
+    (SyntaxHighlighter.for 'pygments').read_stylesheet style
   end
 
+  # Deprecated: Generate code to embed the Pygments stylesheet
+  #
+  # Returns the [String] Pygments stylesheet data for the specified style wrapped in a <style> tag
   def embed_pygments_stylesheet style = nil
     %(<style>
 #{pygments_stylesheet_data style}
@@ -93,15 +83,7 @@ class Stylesheets
   end
 
   def write_pygments_stylesheet target_dir = '.', style = nil
-    ::IO.write(::File.join(target_dir, pygments_stylesheet_name(style)), pygments_stylesheet_data(style))
-  end
-
-  #def load_coderay
-  #  (defined? ::CodeRay) ? true : !(Helpers.require_library 'coderay', true, :ignore).nil?
-  #end
-
-  def load_pygments
-    (defined? ::Pygments) ? true : !(Helpers.require_library 'pygments', 'pygments.rb', :ignore).nil?
+    ::File.write (::File.join target_dir, (pygments_stylesheet_name style)), (pygments_stylesheet_data style), mode: FILE_WRITE_MODE
   end
 end
 end