asciidoctor 2.0.16 → 2.0.18

data/lib/asciidoctor/parser.rb

@@ -89,10 +89,10 @@ class Parser
   #
   # returns the Document object
   def self.parse(reader, document, options = {})
-    block_attributes = parse_document_header(reader, document)
+    block_attributes = parse_document_header(reader, document, (header_only = options[:header_only]))
 
     # NOTE don't use a postfix conditional here as it's known to confuse JRuby in certain circumstances
-    unless options[:header_only]
+    unless header_only
       while reader.has_more_lines?
         new_section, block_attributes = next_section(reader, document, block_attributes)
         if new_section
@@ -117,7 +117,7 @@ class Parser
   # which are automatically removed by the reader.
   #
   # returns the Hash of orphan block attributes captured above the header
-  def self.parse_document_header(reader, document)
+  def self.parse_document_header(reader, document, header_only = false)
     # capture lines of block-level metadata and plow away comment lines that precede first block
     block_attrs = reader.skip_blank_lines ? (parse_block_metadata_lines reader, document) : {}
     doc_attrs = document.attributes
@@ -125,6 +125,7 @@ class Parser
     # special case, block title is not allowed above document title,
     # carry attributes over to the document body
     if (implicit_doctitle = is_next_line_doctitle? reader, block_attrs, doc_attrs['leveloffset']) && block_attrs['title']
+      doc_attrs['authorcount'] = 0
       return document.finalize_header block_attrs, false
     end
 
@@ -168,7 +169,7 @@ class Parser
       end
       block_attrs.clear
       (modified_attrs = document.instance_variable_get :@attributes_modified).delete 'doctitle'
-      parse_header_metadata reader, document
+      parse_header_metadata reader, document, nil
       if modified_attrs.include? 'doctitle'
         if (val = doc_attrs['doctitle']).nil_or_empty? || val == doctitle_attr_val
           doc_attrs['doctitle'] = doctitle_attr_val
@@ -179,10 +180,19 @@ class Parser
         modified_attrs << 'doctitle'
       end
       document.register :refs, [doc_id, document] if doc_id
+    elsif (author = doc_attrs['author'])
+      author_metadata = process_authors author, true, false
+      author_metadata.delete 'authorinitials' if doc_attrs['authorinitials']
+      doc_attrs.update author_metadata
+    elsif (author = doc_attrs['authors'])
+      author_metadata = process_authors author, true
+      doc_attrs.update author_metadata
+    else
+      doc_attrs['authorcount'] = 0
     end
 
     # parse title and consume name section of manpage document
-    parse_manpage_header reader, document, block_attrs if document.doctype == 'manpage'
+    parse_manpage_header reader, document, block_attrs, header_only if document.doctype == 'manpage'
 
     # NOTE block_attrs are the block-level attributes (not document attributes) that
     # precede the first line of content (document title, first section or first block)
@@ -192,7 +202,7 @@ class Parser
   # Public: Parses the manpage header of the AsciiDoc source read from the Reader
   #
   # returns Nothing
-  def self.parse_manpage_header(reader, document, block_attributes)
+  def self.parse_manpage_header(reader, document, block_attributes, header_only = false)
     if ManpageTitleVolnumRx =~ (doc_attrs = document.attributes)['doctitle']
       doc_attrs['manvolnum'] = manvolnum = $2
       doc_attrs['mantitle'] = (((mantitle = $1).include? ATTR_REF_HEAD) ? (document.sub_attributes mantitle) : mantitle).downcase
@@ -209,6 +219,8 @@ class Parser
         doc_attrs['docname'] = manname
         doc_attrs['outfilesuffix'] = %(.#{manvolnum})
       end
+    elsif header_only
+      # done
     else
       reader.skip_blank_lines
       reader.save
@@ -452,7 +464,7 @@ class Parser
     end
 
     # The attributes returned here are orphaned attributes that fall at the end
-    # of a section that need to get transfered to the next section
+    # of a section that need to get transferred to the next section
     # see "trailing block attributes transfer to the following section" in
     # test/attributes_test.rb for an example
     [section == parent ? nil : section, attributes.merge]
@@ -647,7 +659,7 @@ class Parser
                 if (default_attrs = ext_config[:default_attrs])
                   attributes.update(default_attrs) {|_, old_v| old_v }
                 end
-                if (block = extension.process_method[parent, target, attributes])
+                if (block = extension.process_method[parent, target, attributes]) && block != parent
                   attributes.replace block.attributes
                   break
                 else
@@ -1038,12 +1050,12 @@ class Parser
     if (extension = options[:extension])
       # QUESTION do we want to delete the style?
       attributes.delete('style')
-      if (block = extension.process_method[parent, block_reader || (Reader.new lines), attributes.merge])
+      if (block = extension.process_method[parent, block_reader || (Reader.new lines), attributes.merge]) && block != parent
         attributes.replace block.attributes
-        # FIXME if the content model is set to compound, but we only have simple in this context, then
-        # forcefully set the content_model to simple to prevent parsing blocks from children
-        # TODO document this behavior!!
-        if block.content_model == :compound && !(lines = block.lines).empty?
+        # NOTE an extension can change the content model from :simple to :compound. It's up to the extension
+        # to decide which one to use. The extension can consult the cloaked-context attribute to determine
+        # if the input is a paragraph or delimited block.
+        if block.content_model == :compound && Block === block && !(lines = block.lines).empty?
           content_model = :compound
           block_reader = Reader.new lines
         end
@@ -1510,7 +1522,7 @@ class Parser
             break
           end
         else # only dlist in need of item text, so slurp it up!
-          # pop the blank line so it's not interpretted as a list continuation
+          # pop the blank line so it's not interpreted as a list continuation
           buffer.pop unless within_nested_list
           buffer << this_line
           has_text = true
@@ -1769,38 +1781,31 @@ class Parser
   #  parse_header_metadata(Reader.new data, nil, normalize: true)
   #  # => { 'author' => 'Author Name', 'firstname' => 'Author', 'lastname' => 'Name', 'email' => 'author@example.org',
   #  #       'revnumber' => '1.0', 'revdate' => '2012-12-21', 'revremark' => 'Coincide w/ end of world.' }
-  def self.parse_header_metadata(reader, document = nil)
+  def self.parse_header_metadata reader, document = nil, retrieve = true
     doc_attrs = document && document.attributes
     # NOTE this will discard any comment lines, but not skip blank lines
     process_attribute_entries reader, document
 
-    metadata, implicit_author, implicit_authorinitials = implicit_authors = {}, nil, nil
-
     if reader.has_more_lines? && !reader.next_line_empty?
-      unless (author_metadata = process_authors reader.read_line).empty?
-        if document
-          # apply header subs and assign to document
-          author_metadata.each do |key, val|
-            # NOTE the attributes substitution only applies for the email record
-            doc_attrs[key] = ::String === val ? (document.apply_header_subs val) : val unless doc_attrs.key? key
-          end
-
-          implicit_author = doc_attrs['author']
-          implicit_authorinitials = doc_attrs['authorinitials']
-          implicit_authors = doc_attrs['authors']
+      authorcount = (implicit_author_metadata = process_authors reader.read_line).delete 'authorcount'
+      if document && (doc_attrs['authorcount'] = authorcount) > 0
+        implicit_author_metadata.each do |key, val|
+          # apply header subs and assign to document; attributes substitution only relevant for email
+          doc_attrs[key] = document.apply_header_subs val unless doc_attrs.key? key
         end
-
-        metadata = author_metadata
+        implicit_author = doc_attrs['author']
+        implicit_authorinitials = doc_attrs['authorinitials']
+        implicit_authors = doc_attrs['authors']
       end
+      implicit_author_metadata['authorcount'] = authorcount
 
       # NOTE this will discard any comment lines, but not skip blank lines
       process_attribute_entries reader, document
 
-      rev_metadata = {}
-
       if reader.has_more_lines? && !reader.next_line_empty?
         rev_line = reader.read_line
-        if (match = RevisionInfoLineRx.match(rev_line))
+        if (match = RevisionInfoLineRx.match rev_line)
+          rev_metadata = {}
           rev_metadata['revnumber'] = match[1].rstrip if match[1]
           unless (component = match[2].strip).empty?
             # version must begin with 'v' if date is absent
@@ -1811,31 +1816,24 @@ class Parser
             end
           end
           rev_metadata['revremark'] = match[3].rstrip if match[3]
+          if document && !rev_metadata.empty?
+            # apply header subs and assign to document
+            rev_metadata.each do |key, val|
+              doc_attrs[key] = document.apply_header_subs val unless doc_attrs.key? key
+            end
+          end
         else
           # throw it back
           reader.unshift_line rev_line
         end
       end
 
-      unless rev_metadata.empty?
-        if document
-          # apply header subs and assign to document
-          rev_metadata.each do |key, val|
-            unless doc_attrs.key? key
-              doc_attrs[key] = document.apply_header_subs val
-            end
-          end
-        end
-
-        metadata.update rev_metadata
-      end
-
       # NOTE this will discard any comment lines, but not skip blank lines
       process_attribute_entries reader, document
 
       reader.skip_blank_lines
     else
-      author_metadata = {}
+      implicit_author_metadata = {}
     end
 
     # process author attribute entries that override (or stand in for) the implicit author line
@@ -1852,7 +1850,7 @@ class Parser
         while doc_attrs.key? author_key
           # only use indexed author attribute if value is different
           # leaves corner case if line matches with underscores converted to spaces; use double space to force
-          if (author_override = doc_attrs[author_key]) == author_metadata[author_key]
+          if (author_override = doc_attrs[author_key]) == implicit_author_metadata[author_key]
             authors << nil
             sparse = true
           else
@@ -1866,20 +1864,24 @@ class Parser
           authors.each_with_index do |author, idx|
             next if author
             authors[idx] = [
-              author_metadata[%(firstname_#{name_idx = idx + 1})],
-              author_metadata[%(middlename_#{name_idx})],
-              author_metadata[%(lastname_#{name_idx})]
+              implicit_author_metadata[%(firstname_#{name_idx = idx + 1})],
+              implicit_author_metadata[%(middlename_#{name_idx})],
+              implicit_author_metadata[%(lastname_#{name_idx})]
             ].compact.map {|it| it.tr ' ', '_' }.join ' '
           end if sparse
           # process as names only
           author_metadata = process_authors authors, true, false
         else
-          author_metadata = {}
+          author_metadata = { 'authorcount' => 0 }
         end
       end
 
-      if author_metadata.empty?
-        metadata['authorcount'] ||= (doc_attrs['authorcount'] = 0)
+      if author_metadata['authorcount'] == 0
+        if authorcount
+          author_metadata = nil
+        else
+          doc_attrs['authorcount'] = 0
+        end
       else
         doc_attrs.update author_metadata
 
@@ -1890,7 +1892,7 @@ class Parser
       end
     end
 
-    metadata
+    implicit_author_metadata.merge rev_metadata.to_h, author_metadata.to_h if retrieve
   end
 
   # Internal: Parse the author line into a Hash of author metadata

data/lib/asciidoctor/reader.rb

@@ -690,7 +690,7 @@ class PreprocessorReader < Reader
       # only process lines in AsciiDoc files
       if (@process_lines = file.end_with?(*ASCIIDOC_EXTENSIONS.keys))
         # NOTE registering the include with a nil value tracks it while not making it visible to interdocument xrefs
-        @includes[path.slice 0, (path.rindex '.')] = attributes['partial-option'] ? nil : true
+        @includes[path.slice 0, (path.rindex '.')] ||= attributes['partial-option'] ? nil : true
       end
     else
       @dir = '.'
@@ -698,7 +698,7 @@ class PreprocessorReader < Reader
       @process_lines = true
       if (@path = path)
         # NOTE registering the include with a nil value tracks it while not making it visible to interdocument xrefs
-        @includes[Helpers.rootname path] = attributes['partial-option'] ? nil : true
+        @includes[Helpers.rootname path] ||= attributes['partial-option'] ? nil : true
       else
         @path = '<stdin>'
       end
@@ -949,7 +949,7 @@ class PreprocessorReader < Reader
         if no_target
           # the text in brackets must match a conditional expression
           if text && EvalExpressionRx =~ text.strip
-            # NOTE assignments must happen before call to resolve_expr_val for compatiblity with Opal
+            # NOTE assignments must happen before call to resolve_expr_val for compatibility with Opal
             lhs = $1
             # regex enforces a restricted set of math-related operations (==, !=, <=, >=, <, >)
             op = $2
@@ -1035,7 +1035,7 @@ class PreprocessorReader < Reader
     # however, be friendly and at least make it a link to the source document
     elsif doc.safe >= SafeMode::SECURE
       # FIXME we don't want to use a link macro if we are in a verbatim context
-      replace_next_line %(link:#{expanded_target}[])
+      replace_next_line %(link:#{expanded_target}[role=include])
     elsif @maxdepth
       if @include_stack.size >= @maxdepth[:curr]
         logger.error message_with_context %(maximum include depth of #{@maxdepth[:rel]} exceeded), source_location: cursor
@@ -1125,7 +1125,7 @@ class PreprocessorReader < Reader
           push_include inc_lines, inc_path, relpath, inc_offset, parsed_attrs
         end
       elsif inc_tags
-        inc_lines, inc_offset, inc_lineno, tag_stack, tags_used, active_tag = [], nil, 0, [], ::Set.new, nil
+        inc_lines, inc_offset, inc_lineno, tag_stack, tags_selected, active_tag = [], nil, 0, [], ::Set.new, nil
         if inc_tags.key? '**'
           select = base_select = inc_tags.delete '**'
           if inc_tags.key? '*'
@@ -1164,9 +1164,9 @@ class PreprocessorReader < Reader
                     end
                   end
                 elsif inc_tags.key? this_tag
-                  tags_used << this_tag
+                  tags_selected << this_tag if (select = inc_tags[this_tag])
                   # QUESTION should we prevent tag from being selected when enclosing tag is excluded?
-                  tag_stack << [(active_tag = this_tag), (select = inc_tags[this_tag]), inc_lineno]
+                  tag_stack << [(active_tag = this_tag), select, inc_lineno]
                 elsif !wildcard.nil?
                   select = active_tag && !select ? false : wildcard
                   tag_stack << [(active_tag = this_tag), select, inc_lineno]
@@ -1187,7 +1187,7 @@ class PreprocessorReader < Reader
             logger.warn message_with_context %(detected unclosed tag '#{tag_name}' starting at line #{tag_lineno} of include #{target_type}: #{inc_path}), source_location: cursor, include_location: (create_include_cursor inc_path, expanded_target, tag_lineno)
           end
         end
-        unless (missing_tags = inc_tags.keys - tags_used.to_a).empty?
+        unless (missing_tags = inc_tags.keep_if {|_, v| v }.keys - tags_selected.to_a).empty?
           logger.warn message_with_context %(tag#{missing_tags.size > 1 ? 's' : ''} '#{missing_tags.join ', '}' not found in include #{target_type}: #{inc_path}), source_location: cursor
         end
         shift
@@ -1232,7 +1232,7 @@ class PreprocessorReader < Reader
   def resolve_include_path target, attrlist, attributes
     doc = @document
     if (Helpers.uriish? target) || (::String === @dir ? nil : (target = %(#{@dir}/#{target})))
-      return replace_next_line %(link:#{target}[#{attrlist}]) unless doc.attr? 'allow-uri-read'
+      return replace_next_line %(link:#{target}[role=include]) unless doc.attr? 'allow-uri-read'
       if doc.attr? 'cache-uri'
         # caching requires the open-uri-cached gem to be installed
         # processing will be automatically aborted if these libraries can't be opened
@@ -1280,27 +1280,22 @@ class PreprocessorReader < Reader
 
   # Private: Ignore front-matter, commonly used in static site generators
   def skip_front_matter! data, increment_linenos = true
-    front_matter = nil
-    if data[0] == '---'
-      original_data = data.drop 0
-      data.shift
-      front_matter = []
+    return unless (delim = data[0]) == '---'
+    original_data = data.drop 0
+    data.shift
+    front_matter = []
+    @lineno += 1 if increment_linenos
+    until (eof = data.empty?) || data[0] == delim
+      front_matter << data.shift
       @lineno += 1 if increment_linenos
-      while !data.empty? && data[0] != '---'
-        front_matter << data.shift
-        @lineno += 1 if increment_linenos
-      end
-
-      if data.empty?
-        data.unshift(*original_data)
-        @lineno = 0 if increment_linenos
-        front_matter = nil
-      else
-        data.shift
-        @lineno += 1 if increment_linenos
-      end
     end
-
+    if eof
+      data.unshift(*original_data)
+      @lineno -= original_data.size if increment_linenos
+      return
+    end
+    data.shift
+    @lineno += 1 if increment_linenos
     front_matter
   end
 

data/lib/asciidoctor/rx.rb

@@ -407,7 +407,7 @@ module Asciidoctor
   #   gist::123456[]
   #
   #--
-  # NOTE we've relaxed the match for target to accomodate the short format (e.g., name::[attrlist])
+  # NOTE we've relaxed the match for target to accommodate the short format (e.g., name::[attrlist])
   CustomBlockMacroRx = /^(#{CG_WORD}[#{CC_WORD}-]*)::(|\S|\S#{CC_ANY}*?\S)\[(#{CC_ANY}+)?\]$/
 
   # Matches an image, video or audio block macro.
@@ -716,7 +716,11 @@ module Asciidoctor
   #
   #   not c:/sample.adoc or c:\sample.adoc
   #
-  UriSniffRx = %r(^#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2})
+  if RUBY_ENGINE == 'opal'
+    UriSniffRx = %r(^#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2})
+  else
+    UriSniffRx = %r(\A#{CG_ALPHA}[#{CC_ALNUM}.+-]+:/{0,2})
+  end
 
   # Detects XML tags
   XmlSanitizeRx = /<[^>]+>/

data/lib/asciidoctor/section.rb

@@ -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

data/lib/asciidoctor/substitutors.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Asciidoctor
 # Public: Methods to perform substitutions on lines of AsciiDoc text. This module
-# is intented to be mixed-in to Section and Block to provide operations for performing
+# is intended to be mixed-in to Section and Block to provide operations for performing
 # the necessary substitutions.
 module Substitutors
   SpecialCharsRx = /[<&>]/
@@ -940,7 +940,7 @@ module Substitutors
   # process_callouts - a Boolean flag indicating whether callout marks should be located and substituted
   #
   # Returns the highlighted source code, if a syntax highlighter is defined on the document, otherwise the source with
-  # verbatim substituions applied
+  # verbatim substitutions applied
   def highlight_source source, process_callouts
     # NOTE the call to highlight? is a defensive check since, normally, we wouldn't arrive here unless it returns true
     return sub_source source, process_callouts unless (syntax_hl = @document.syntax_highlighter) && syntax_hl.highlight?
@@ -1010,7 +1010,7 @@ module Substitutors
 
   # Public: Extract the passthrough text from the document for reinsertion after processing.
   #
-  # text - The String from which to extract passthrough fragements
+  # text - The String from which to extract passthrough fragments
   #
   # Returns the String text with passthrough regions substituted with placeholders
   def extract_passthroughs text
@@ -1217,7 +1217,7 @@ module Substitutors
       end
     end
     return unless candidates
-    # weed out invalid options and remove duplicates (order is preserved; first occurence wins)
+    # weed out invalid options and remove duplicates (order is preserved; first occurrence wins)
     resolved = candidates & SUB_OPTIONS[type]
     unless (candidates - resolved).empty?
       invalid = candidates - resolved

data/lib/asciidoctor/syntax_highlighter/highlightjs.rb

@@ -25,7 +25,7 @@ class SyntaxHighlighter::HighlightJsAdapter < SyntaxHighlighter::Base
 #{(doc.attr? 'highlightjs-languages') ? ((doc.attr 'highlightjs-languages').split ',').map {|lang| %[<script src="#{base_url}/languages/#{lang.lstrip}.min.js"></script>\n] }.join : ''}<script>
 if (!hljs.initHighlighting.called) {
   hljs.initHighlighting.called = true
-  ;[].slice.call(document.querySelectorAll('pre.highlight > code')).forEach(function (el) { hljs.highlightBlock(el) })
+  ;[].slice.call(document.querySelectorAll('pre.highlight > code[data-lang]')).forEach(function (el) { hljs.highlightBlock(el) })
 }
 </script>)
     end

data/lib/asciidoctor/syntax_highlighter/pygments.rb

@@ -36,7 +36,13 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
         node.sub_source source, false # handles nil response from ::Pygments::Lexer#highlight
       end
     elsif (highlighted = lexer.highlight source, options: highlight_opts)
-      highlighted = highlighted.gsub StyledLinenoSpanTagRx, LinenoSpanTagCs if linenos && noclasses
+      if linenos
+        if noclasses
+          highlighted = highlighted.gsub StyledLinenoSpanTagRx, LinenoSpanTagCs
+        elsif highlighted.include? LegacyLinenoSpanStartTagCs
+          highlighted = highlighted.gsub LegacyLinenoSpanTagRx, LinenoSpanTagCs
+        end
+      end
       highlighted.sub WrapperTagRx, '\1'
     else
       node.sub_source source, false # handles nil response from ::Pygments::Lexer#highlight
@@ -114,6 +120,7 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
     end
     @@stylesheet_cache = ::Hash.new do |cache, key|
       if (stylesheet = ::Pygments.css BASE_SELECTOR, classprefix: TOKEN_CLASS_PREFIX, style: key)
+        stylesheet = stylesheet.slice (stylesheet.index BASE_SELECTOR), stylesheet.length unless stylesheet.start_with? BASE_SELECTOR
         @@stylesheet_cache = cache.merge key => stylesheet
         stylesheet
       end
@@ -122,7 +129,6 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
     DEFAULT_STYLE = 'default'
     BASE_SELECTOR = 'pre.pygments'
     TOKEN_CLASS_PREFIX = 'tok-'
-
     BaseStyleRx = /^#{BASE_SELECTOR.gsub '.', '\\.'} +\{([^}]+?)\}/
 
     private_constant :BASE_SELECTOR, :TOKEN_CLASS_PREFIX, :BaseStyleRx
@@ -133,8 +139,10 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
   include Loader # adds methods to instance
 
   CodeCellStartTagCs = '<td class="code">'
+  LegacyLinenoSpanStartTagCs = '<span class="lineno">'
+  LegacyLinenoSpanTagRx = %r(#{LegacyLinenoSpanStartTagCs}( *\d+) ?</span>)
   LinenoColumnStartTagsCs = '<td class="linenos"><div class="linenodiv"><pre>'
-  LinenoSpanTagCs = '<span class="lineno">\1 </span>'
+  LinenoSpanTagCs = '<span class="linenos">\1</span>'
   PreTagCs = '<pre>\1</pre>'
   StyledLinenoColumnStartTagsRx = /<td><div class="linenodiv" style="[^"]+?"><pre style="[^"]+?">/
   StyledLinenoSpanTagRx = %r((?<=^|<span></span>)<span style="[^"]+">( *\d+) ?</span>)
@@ -144,6 +152,6 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
   # NOTE initial <span></span> preserves leading blank lines
   WrapperTagRx = %r(<div class="#{WRAPPER_CLASS}"><pre\b[^>]*?>(.*)</pre></div>\n*)m
 
-  private_constant :CodeCellStartTagCs, :LinenoColumnStartTagsCs, :LinenoSpanTagCs, :PreTagCs, :StyledLinenoColumnStartTagsRx, :StyledLinenoSpanTagRx, :WrapperTagRx, :WRAPPER_CLASS
+  private_constant :CodeCellStartTagCs, :LegacyLinenoSpanStartTagCs, :LegacyLinenoSpanTagRx, :LinenoColumnStartTagsCs, :LinenoSpanTagCs, :PreTagCs, :StyledLinenoColumnStartTagsRx, :StyledLinenoSpanTagRx, :WrapperTagRx, :WRAPPER_CLASS
 end
 end

data/lib/asciidoctor/table.rb

@@ -411,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

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
-.\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.16
-.\"      Date: 2021-08-03
+.\"    Author: Dan Allen, Sarah White
+.\" Generator: Asciidoctor 2.0.17
+.\"      Date: 2022-01-05
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.16
+.\"    Source: Asciidoctor 2.0.17
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2021-08-03" "Asciidoctor 2.0.16" "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
@@ -171,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
@@ -206,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
@@ -238,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
-.URL "https://github.com/asciidoctor/asciidoctor" "" ""
-.sp
-\fBGitHub organization:\fP \c
-.URL "https://github.com/asciidoctor" "" ""
+\fBProject documentation:\fP \c
+.URL "https://docs.asciidoctor.org" "" ""
 .sp
-\fBDiscussion list / forum:\fP \c
-.URL "http://discuss.asciidoctor.org" "" ""
-.SH "COPYING"
+\fBCommunity chat:\fP \c
+.URL "https://chat.asciidoctor.org" "" ""
 .sp
-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
-Dan Allen
+\fBSource repository:\fP \c
+.URL "https://github.com/asciidoctor/asciidoctor" "" ""
 .sp
-Sarah White
+\fBMailing list archive:\fP \c
+.URL "https://discuss.asciidoctor.org" "" ""
+.SH "COPYING"
 .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.