asciidoctor 2.0.15 → 2.0.17

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
 
@@ -414,7 +411,7 @@ end
 # class are primarily responsible for tracking the buffer of a cell as the parser
 # moves through the lines of the table using tail recursion. When a cell boundary
 # is located, the previous cell is closed, an instance of Table::Cell is
-# instantiated, the row is closed if the cell satisifies the column count and,
+# instantiated, the row is closed if the cell satisfies the column count and,
 # finally, a new buffer is allocated to track the next cell.
 class Table::ParserContext
   include Logging
@@ -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.17'
 end

data/lib/asciidoctor.rb

@@ -53,12 +53,12 @@ module Asciidoctor
   module SafeMode
     # A safe mode level that disables any of the security features enforced
     # by Asciidoctor (Ruby is still subject to its own restrictions).
-    UNSAFE = 0;
+    UNSAFE = 0
 
     # A safe mode level that closely parallels safe mode in AsciiDoc. This value
     # prevents access to files which reside outside of the parent directory of
     # the source file and disables any macro other than the include::[] directive.
-    SAFE = 1;
+    SAFE = 1
 
     # A safe mode level that disallows the document from setting attributes
     # that would affect the conversion of the document, in addition to all the
@@ -66,19 +66,19 @@ module Asciidoctor
     # changing the backend or source-highlighter using an attribute defined
     # in the source document header. This is the most fundamental level of
     # security for server deployments (hence the name).
-    SERVER = 10;
+    SERVER = 10
 
     # A safe mode level that disallows the document from attempting to read
     # files from the file system and including the contents of them into the
     # document, in additional to all the security features of SafeMode::SERVER.
     # For instance, this level disallows use of the include::[] directive and the
     # embedding of binary content (data uri), stylesheets and JavaScripts
-    # referenced by the document.(Asciidoctor and trusted extensions may still
+    # referenced by the document. (Asciidoctor and trusted extensions may still
     # be allowed to embed trusted content into the document).
     #
     # Since Asciidoctor is aiming for wide adoption, this level is the default
     # and is recommended for server deployments.
-    SECURE = 20;
+    SECURE = 20
 
     # A planned safe mode level that disallows the use of passthrough macros and
     # prevents the document from setting any known attributes, in addition to all
@@ -86,9 +86,9 @@ module Asciidoctor
     #
     # Please note that this level is not currently implemented (and therefore not
     # enforced)!
-    #PARANOID = 100;
+    #PARANOID = 100
 
-    @names_by_value = {}.tap {|accum| (constants false).each {|sym| accum[const_get sym, false] = sym.to_s.downcase } }
+    @names_by_value = (constants false).map {|sym| [(const_get sym), sym.to_s.downcase] }.sort {|(a), (b)| a <=> b }.to_h
 
     def self.value_for_name name
       const_get name.upcase, false

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
+.\"    Author: Dan Allen, Sarah White
+.\" Generator: Asciidoctor 2.0.17
+.\"      Date: 2022-01-05
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.15
+.\"    Source: Asciidoctor 2.0.17
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2021-04-27" "Asciidoctor 2.0.15" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2022-01-05" "Asciidoctor 2.0.17" "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
@@ -172,8 +171,8 @@ Matching templates found in subsequent directories override ones previously disc
 .sp
 \fB\-\-failure\-level\fP=\fILEVEL\fP
 .RS 4
-The minimum logging level that triggers a non\-zero exit code (failure).
-If this option is not set (default: FATAL), the program exits with exit code zero even if warnings or errors have been logged.
+Set the minimum logging level (default: FATAL) that yields a non\-zero exit code (i.e., failure).
+If this option is not set, the program exits with a zero exit code even if warnings or errors have been logged.
 .RE
 .sp
 \fB\-q, \-\-quiet\fP
@@ -207,6 +206,7 @@ Print timings report to stderr (time to read, parse, and convert).
 Print a help message.
 Show the command usage if \fITOPIC\fP is not specified or recognized.
 Dump the Asciidoctor man page (in troff/groff format) if \fITOPIC\fP is \fImanpage\fP.
+Print an AsciiDoc syntax crib sheet (in AsciiDoc) if \fITOPIC\fP is \fIsyntax\fP.
 .RE
 .sp
 \fB\-V, \-\-version\fP
@@ -239,30 +239,28 @@ Refer to the \fBAsciidoctor\fP issue tracker at \c
 .URL "https://github.com/asciidoctor/asciidoctor/issues?q=is%3Aopen" "" "."
 .SH "AUTHORS"
 .sp
-\fBAsciidoctor\fP was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld, and other contributors.
+\fBAsciidoctor\fP is led and maintained by Dan Allen and Sarah White and has received contributions from many individuals in the Asciidoctor community.
+The project was started in 2012 by Ryan Waldron based on a prototype written by Nick Hengeveld for the Git website.
+Jason Porter wrote the first implementation of the CLI interface provided by this command.
 .sp
-\fBAsciiDoc\fP was written by Stuart Rackham and has received contributions from many other individuals.
+\fBAsciiDoc.py\fP was created by Stuart Rackham and has received contributions from many individuals in the AsciiDoc.py community.
 .SH "RESOURCES"
 .sp
-\fBProject web site:\fP \c
+\fBProject website:\fP \c
 .URL "https://asciidoctor.org" "" ""
 .sp
-\fBGit source repository on GitHub:\fP \c
+\fBProject documentation:\fP \c
+.URL "https://docs.asciidoctor.org" "" ""
+.sp
+\fBSource repository:\fP \c
 .URL "https://github.com/asciidoctor/asciidoctor" "" ""
 .sp
-\fBGitHub organization:\fP \c
-.URL "https://github.com/asciidoctor" "" ""
+\fBCommunity chat:\fP \c
+.URL "https://asciidoctor.zulipchat.com" "" ""
 .sp
-\fBDiscussion list / forum:\fP \c
-.URL "http://discuss.asciidoctor.org" "" ""
+\fBDiscussion list:\fP \c
+.URL "https://discuss.asciidoctor.org" "" ""
 .SH "COPYING"
 .sp
-Copyright (C) 2012\-2021 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
-Dan Allen
-.sp
-Sarah White
-.sp
-Ryan Waldron
+Copyright (C) 2012\-present Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
+Use of this software is granted under the terms of the MIT License.

data/man/asciidoctor.adoc

@@ -1,27 +1,28 @@
 = asciidoctor(1)
-Dan Allen; Sarah White; Ryan Waldron
+Dan Allen; Sarah White
 :doctype: manpage
-:release-version: 2.0.15
+:release-version: 2.0.17
 :man manual: Asciidoctor Manual
 :man source: Asciidoctor {release-version}
-:page-layout: base
+ifdef::backend-manpage[:!author:]
 
-== NAME
+== Name
 
 asciidoctor - converts AsciiDoc source files to HTML, DocBook, and other formats
 
-== SYNOPSIS
+== Synopsis
 
 *asciidoctor* [_OPTION_]... _FILE_...
 
-== DESCRIPTION
+== Description
 
 The asciidoctor(1) command converts the AsciiDoc source file(s) _FILE_ to HTML5, DocBook 5, man(ual) page, and other custom output formats.
 
 If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
-== OPTIONS
+== 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.
@@ -126,8 +126,8 @@ Matching templates found in subsequent directories override ones previously disc
 === Processing Information
 
 *--failure-level*=_LEVEL_::
-  The minimum logging level that triggers a non-zero exit code (failure).
-  If this option is not set (default: FATAL), the program exits with exit code zero even if warnings or errors have been logged.
+  Set the minimum logging level (default: FATAL) that yields a non-zero exit code (i.e., failure).
+  If this option is not set, the program exits with a zero exit code even if warnings or errors have been logged.
 
 *-q, --quiet*::
   Silence application log messages and script warnings.
@@ -150,19 +150,21 @@ Matching templates found in subsequent directories override ones previously disc
   Print a help message.
   Show the command usage if _TOPIC_ is not specified or recognized.
   Dump the Asciidoctor man page (in troff/groff format) if _TOPIC_ is _manpage_.
+  Print an AsciiDoc syntax crib sheet (in AsciiDoc) if _TOPIC_ is _syntax_.
 
 *-V, --version*::
   Print program version number.
 +
 *-v* can also be used if no source files are specified.
+// end::options[]
 
-== ENVIRONMENT
+== Environment
 
 *Asciidoctor* honors the *SOURCE_DATE_EPOCH* environment variable.
 If this variable is assigned an integer value, that value is used as the epoch of all input documents and as the local date and time.
 See https://reproducible-builds.org/specs/source-date-epoch/ for more information about this environment variable.
 
-== EXIT STATUS
+== Exit Status
 
 *0*::
   Success.
@@ -170,27 +172,31 @@ See https://reproducible-builds.org/specs/source-date-epoch/ for more informatio
 *1*::
   Failure (syntax or usage error; configuration error; document processing failure; unexpected error).
 
-== BUGS
+== Bugs
 
 Refer to the *Asciidoctor* issue tracker at https://github.com/asciidoctor/asciidoctor/issues?q=is%3Aopen.
 
-== AUTHORS
+== Authors
+
+*Asciidoctor* is led and maintained by Dan Allen and Sarah White and has received contributions from many individuals in the Asciidoctor community.
+The project was started in 2012 by Ryan Waldron based on a prototype written by Nick Hengeveld for the Git website.
+Jason Porter wrote the first implementation of the CLI interface provided by this command.
 
-*Asciidoctor* was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld, and other contributors.
+*AsciiDoc.py* was created by Stuart Rackham and has received contributions from many individuals in the AsciiDoc.py community.
 
-*AsciiDoc* was written by Stuart Rackham and has received contributions from many other individuals.
+== Resources
 
-== RESOURCES
+*Project website:* https://asciidoctor.org
 
-*Project web site:* https://asciidoctor.org
+*Project documentation:* https://docs.asciidoctor.org
 
-*Git source repository on GitHub:* https://github.com/asciidoctor/asciidoctor
+*Source repository:* https://github.com/asciidoctor/asciidoctor
 
-*GitHub organization:* https://github.com/asciidoctor
+*Community chat:* https://asciidoctor.zulipchat.com
 
-*Discussion list / forum:* http://discuss.asciidoctor.org
+*Discussion list:* https://discuss.asciidoctor.org
 
-== COPYING
+== Copying
 
-Copyright \(C) 2012-2021 Dan Allen, Ryan Waldron, and the Asciidoctor Project.
-Free use of this software is granted under the terms of the MIT License.
+Copyright \(C) 2012-present Dan Allen, Sarah White, Ryan Waldron, and the individual contributors to Asciidoctor.
+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.17
 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: 2022-01-06 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
@@ -307,7 +253,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/asciidoctor/asciidoctor/issues
-  changelog_uri: https://github.com/asciidoctor/asciidoctor/blob/master/CHANGELOG.adoc
+  changelog_uri: https://github.com/asciidoctor/asciidoctor/blob/HEAD/CHANGELOG.adoc
   mailing_list_uri: http://discuss.asciidoctor.org
   source_code_uri: https://github.com/asciidoctor/asciidoctor
 post_install_message: 
@@ -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.32
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain