asciidoctor 2.0.15 → 2.0.16

data/lib/asciidoctor/syntax_highlighter.rb

@@ -99,9 +99,10 @@ module SyntaxHighlighter
     raise ::NotImplementedError, %(#{SyntaxHighlighter} subclass #{self.class} must implement the ##{__method__} method since #write_stylesheet? returns true)
   end
 
-  private_class_method def self.included into
+  def self.included into
     into.extend Config
-  end || :included
+  end
+  private_class_method :included # use separate declaration for Ruby 2.0.x
 
   module Config
     # Public: Statically register the current class in the registry for the specified names.
@@ -152,7 +153,7 @@ module SyntaxHighlighter
     end
 
     private
-    
+
     def registry
       raise ::NotImplementedError, %(#{Factory} subclass #{self.class} must implement the ##{__method__} method)
     end
@@ -166,19 +167,17 @@ module SyntaxHighlighter
     end
 
     private
-    
-    def registry
-      @registry
-    end
+
+    attr_reader :registry
   end
 
   module DefaultFactory
     include Factory
 
-    private
-
     @@registry = {}
 
+    private
+
     def registry
       @@registry
     end
@@ -216,8 +215,6 @@ module SyntaxHighlighter
         'rouge' => %(#{__dir__}/syntax_highlighter/rouge),
       }
 
-      private
-
       @@mutex = ::Mutex.new
     end
   end

data/lib/asciidoctor/syntax_highlighter/coderay.rb

@@ -78,7 +78,8 @@ class SyntaxHighlighter::CodeRayAdapter < SyntaxHighlighter::Base
   end
 
   extend Styles # exports static methods
-  include Loader, Styles # adds methods to instance
+  include Styles # adds methods to instance
+  include Loader # adds methods to instance
 
   CodeCellStartTagCs = '<td class="code"><pre>'
 

data/lib/asciidoctor/syntax_highlighter/highlightjs.rb

@@ -9,7 +9,7 @@ class SyntaxHighlighter::HighlightJsAdapter < SyntaxHighlighter::Base
   end
 
   def format node, lang, opts
-    super node, lang, (opts.merge transform: proc {|_, code| code['class'] = %(language-#{lang || 'none'} hljs) } )
+    super node, lang, (opts.merge transform: proc {|_, code| code['class'] = %(language-#{lang || 'none'} hljs) })
   end
 
   def docinfo? location

data/lib/asciidoctor/syntax_highlighter/pygments.rb

@@ -129,7 +129,8 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
   end
 
   extend Styles # exports static methods
-  include Loader, Styles # adds methods to instance
+  include Styles # adds methods to instance
+  include Loader # adds methods to instance
 
   CodeCellStartTagCs = '<td class="code">'
   LinenoColumnStartTagsCs = '<td class="linenos"><div class="linenodiv"><pre>'

data/lib/asciidoctor/syntax_highlighter/rouge.rb

@@ -133,7 +133,8 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
   end
 
   extend Styles # exports static methods
-  include Loader, Styles # adds methods to instance
+  include Styles # adds methods to instance
+  include Loader # adds methods to instance
 
   CodeCellStartTagCs = '<td class="code">'
 

data/lib/asciidoctor/table.rb

@@ -259,7 +259,8 @@ class Table::Cell < AbstractBlock
         cell_style = attributes['style'] || cell_style unless in_header_row
         update_attributes attributes
       end
-      if cell_style == :asciidoc
+      case cell_style
+      when :asciidoc
         asciidoc = true
         inner_document_cursor = opts[:cursor]
         if (cell_text = cell_text.rstrip).start_with? LF
@@ -270,7 +271,7 @@ class Table::Cell < AbstractBlock
         else
           cell_text = cell_text.lstrip
         end
-      elsif cell_style == :literal
+      when :literal
         literal = true
         cell_text = cell_text.rstrip
         # QUESTION should we use same logic as :asciidoc cell? strip leading space if text doesn't start with newline?
@@ -357,14 +358,10 @@ class Table::Cell < AbstractBlock
     apply_subs @text, @subs
   end
 
-  # Public: Set the String text.
+  # Public: Set the String text for this cell.
   #
   # This method shouldn't be used for cells that have the AsciiDoc style.
-  #
-  # Returns the new String text assigned to this Cell
-  def text= val
-    @text = val
-  end
+  attr_writer :text
 
   # Public: Handles the body data (tbody, tfoot), applying styles and partitioning into paragraphs
   #
@@ -406,7 +403,7 @@ class Table::Cell < AbstractBlock
   end
 
   def to_s
-    "#{super.to_s} - [text: #@text, colspan: #{@colspan || 1}, rowspan: #{@rowspan || 1}, attributes: #@attributes]"
+    %(#{super} - [text: #{@text}, colspan: #{@colspan || 1}, rowspan: #{@rowspan || 1}, attributes: #{@attributes}])
   end
 end
 
@@ -534,12 +531,13 @@ class Table::ParserContext
   #
   # returns true if the buffer has unclosed quotes, false if it doesn't or it
   # isn't quoted data
-  def buffer_has_unclosed_quotes? append = nil
-    if (record = append ? (@buffer + append).strip : @buffer.strip) == '"'
+  def buffer_has_unclosed_quotes? append = nil, q = '"'
+    if (record = append ? (@buffer + append).strip : @buffer.strip) == q
       true
-    elsif record.start_with? '"'
-      if ((trailing_quote = record.end_with? '"') && (record.end_with? '""')) || (record.start_with? '""')
-        ((record = record.gsub '""', '').start_with? '"') && !(record.end_with? '"')
+    elsif record.start_with? q
+      qq = q + q
+      if ((trailing_quote = record.end_with? q) && (record.end_with? qq)) || (record.start_with? qq)
+        ((record = record.gsub qq, '').start_with? q) && !(record.end_with? q)
       else
         !trailing_quote
       end
@@ -632,20 +630,20 @@ class Table::ParserContext
       @buffer = ''
       cellspec = nil
       repeat = 1
-      if @format == 'csv' && !cell_text.empty? && cell_text.include?('"')
+      if @format == 'csv' && !cell_text.empty? && (cell_text.include? (q = '"'))
         # this may not be perfect logic, but it hits the 99%
-        if cell_text.start_with?('"') && cell_text.end_with?('"')
+        if (cell_text.start_with? q) && (cell_text.end_with? q)
           # unquote
           if (cell_text = cell_text.slice(1, cell_text.length - 2))
             # trim whitespace and collapse escaped quotes
-            cell_text = cell_text.strip.squeeze('"')
+            cell_text = cell_text.strip.squeeze q
           else
             logger.error message_with_context 'unclosed quote in CSV data; setting cell to empty', source_location: @reader.cursor_at_prev_line
             cell_text = ''
           end
         else
           # collapse escaped quotes
-          cell_text = cell_text.squeeze('"')
+          cell_text = cell_text.squeeze q
         end
       end
     end
@@ -664,7 +662,7 @@ class Table::ParserContext
         # QUESTION is this right for cells that span columns?
         unless (column = @table.columns[@current_row.size])
           logger.error message_with_context 'dropping cell because it exceeds specified number of columns', source_location: @reader.cursor_before_mark
-          return
+          return nil
         end
       end
 

data/lib/asciidoctor/timings.rb

@@ -49,9 +49,9 @@ module Asciidoctor
 
     def print_report to = $stdout, subject = nil
       to.puts %(Input file: #{subject}) if subject
-      to.puts %(  Time to read and parse source: #{'%05.5f' % read_parse.to_f})
-      to.puts %(  Time to convert document: #{'%05.5f' % convert.to_f})
-      to.puts %(  Total time (read, parse and convert): #{'%05.5f' % read_parse_convert.to_f})
+      to.puts %(  Time to read and parse source: #{sprintf '%05.5f', read_parse.to_f})
+      to.puts %(  Time to convert document: #{sprintf '%05.5f', convert.to_f})
+      to.puts %(  Total time (read, parse and convert): #{sprintf '%05.5f', read_parse_convert.to_f})
     end
 
     private

data/lib/asciidoctor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Asciidoctor
-  VERSION = '2.0.15'
+  VERSION = '2.0.16'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.15
-.\"      Date: 2021-04-27
+.\" Generator: Asciidoctor 2.0.16
+.\"      Date: 2021-08-03
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.15
+.\"    Source: Asciidoctor 2.0.16
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2021-04-27" "Asciidoctor 2.0.15" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2021-08-03" "Asciidoctor 2.0.16" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -109,11 +109,10 @@ This name is also used to build the full path to the custom converter templates.
 If a template engine is not specified, it will be auto\-detected based on the file extension of the custom converter templates found.
 .RE
 .sp
-\fB\-e, \-\-eruby\fP
+\fB\-e, \-\-embedded\fP
 .RS 4
-Specifies the eRuby implementation to use for executing the custom converter templates written in ERB.
-Supported values are \fIerb\fP and \fIerubis\fP.
-Defaults to \fIerb\fP.
+Output an embeddable document, which excludes the header, the footer, and everything outside the body of the document.
+This option is useful for producing documents that can be inserted into an external template.
 .RE
 .sp
 \fB\-I, \-\-load\-path\fP=\fIDIRECTORY\fP
@@ -257,7 +256,7 @@ Refer to the \fBAsciidoctor\fP issue tracker at \c
 .URL "http://discuss.asciidoctor.org" "" ""
 .SH "COPYING"
 .sp
-Copyright (C) 2012\-2021 Dan Allen, Ryan Waldron, and the Asciidoctor Project.
+Copyright (C) 2012\-present Dan Allen, Ryan Waldron, and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 .SH "AUTHORS"
 .sp

data/man/asciidoctor.adoc

@@ -1,7 +1,7 @@
 = asciidoctor(1)
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
-:release-version: 2.0.15
+:release-version: 2.0.16
 :man manual: Asciidoctor Manual
 :man source: Asciidoctor {release-version}
 :page-layout: base
@@ -22,6 +22,7 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
 == OPTIONS
 
+// tag::options[]
 === Security Settings
 
 *-B, --base-dir*=_DIR_::
@@ -79,10 +80,9 @@ This option may be specified more than once.
   This name is also used to build the full path to the custom converter templates.
   If a template engine is not specified, it will be auto-detected based on the file extension of the custom converter templates found.
 
-*-e, --eruby*::
-  Specifies the eRuby implementation to use for executing the custom converter templates written in ERB.
-  Supported values are _erb_ and _erubis_.
-  Defaults to _erb_.
+*-e, --embedded*::
+  Output an embeddable document, which excludes the header, the footer, and everything outside the body of the document.
+  This option is useful for producing documents that can be inserted into an external template.
 
 *-I, --load-path*=_DIRECTORY_::
   Add the specified directory to the load path, so that _-r_ can load extensions from outside the default Ruby load path.
@@ -155,6 +155,7 @@ Matching templates found in subsequent directories override ones previously disc
   Print program version number.
 +
 *-v* can also be used if no source files are specified.
+// end::options[]
 
 == ENVIRONMENT
 
@@ -192,5 +193,5 @@ Refer to the *Asciidoctor* issue tracker at https://github.com/asciidoctor/ascii
 
 == COPYING
 
-Copyright \(C) 2012-2021 Dan Allen, Ryan Waldron, and the Asciidoctor Project.
+Copyright \(C) 2012-present Dan Allen, Ryan Waldron, and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Dan Allen
@@ -13,36 +13,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: asciimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: coderay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -105,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.0
+        version: 5.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.0
+        version: 5.14.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -141,34 +113,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 12.3.0
-- !ruby/object:Gem::Dependency
-  name: rouge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.26.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.26.0
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -244,8 +188,10 @@ files:
 - data/locale/attributes-sr.adoc
 - data/locale/attributes-sr_Latn.adoc
 - data/locale/attributes-sv.adoc
+- data/locale/attributes-th.adoc
 - data/locale/attributes-tr.adoc
 - data/locale/attributes-uk.adoc
+- data/locale/attributes-vi.adoc
 - data/locale/attributes-zh_CN.adoc
 - data/locale/attributes-zh_TW.adoc
 - data/locale/attributes.adoc
@@ -325,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain