asciidoctor 2.0.18 → 2.0.23

data/lib/asciidoctor/substitutors.rb

@@ -445,7 +445,14 @@ module Substitutors
           # indexterm:[Tigers,Big cats]
           if (attrlist = normalize_text $2, true, true).include? '='
             if (primary = (attrs = (AttributeList.new attrlist, self).parse)[1])
-              attrs['terms'] = [primary]
+              terms = [primary]
+              if (secondary = attrs[2])
+                terms << secondary
+                if (tertiary = attrs[3])
+                  terms << tertiary
+                end
+              end
+              attrs['terms'] = terms
               if (see_also = attrs['see-also'])
                 attrs['see-also'] = (see_also.include? ',') ? (see_also.split ',').map {|it| it.lstrip } : [see_also]
               end
@@ -524,105 +531,100 @@ module Substitutors
     end
 
     if found_colon && (text.include? '://')
-      # inline urls, target[text] (optionally prefixed with link: and optionally surrounded by <>)
+      # inline urls, target[text] (optionally prefixed with link: or enclosed in <>)
       text = text.gsub InlineLinkRx do
-        if (target = $2).start_with? RS
-          # honor the escape
-          next %(#{$1}#{target.slice 1, target.length}#{$4})
-        end
-
-        prefix, suffix = $1, ''
-        # NOTE if $4 is set, we're looking at a formal macro (e.g., https://example.org[])
-        if $4
-          prefix = '' if prefix == 'link:'
-          link_text = nil if (link_text = $4).empty?
+        if $2 && !$5
+          # honor the escapes
+          next $&.slice 1, $&.length if $1.start_with? RS
+          next %(#{$1}#{$&.slice $1.length + 1, $&.length}) if $3.start_with? RS
+          next $& unless $6
+          doc.register :links, (target = $3 + $6)
+          link_text = (doc_attrs.key? 'hide-uri-scheme') ? (target.sub UriSniffRx, '') : target
+          (Inline.new self, :anchor, link_text, type: :link, target: target, attributes: { 'role' => 'bare' }).convert
         else
-          # invalid macro syntax (link: prefix w/o trailing square brackets or enclosed in double quotes)
-          # FIXME we probably shouldn't even get here when the link: prefix is present; the regex is doing too much
-          case prefix
-          when 'link:', ?", ?'
-            next $&
-          end
-          case $3
-          when ')', '?', '!'
-            target = target.chop
-            if (suffix = $3) == ')' && (target.end_with? '.', '?', '!')
-              suffix = target[-1] + suffix
-              target = target.chop
-            end
-            # NOTE handle case when modified target is a URI scheme (e.g., http://)
-            next $& if target.end_with? '://'
-          when ';'
-            if (prefix.start_with? '&lt;') && (target.end_with? '&gt;')
-              # move surrounding <> out of URL
-              prefix = prefix.slice 4, prefix.length
-              target = target.slice 0, target.length - 4
-            elsif (target = target.chop).end_with? ')'
-              # move trailing ); out of URL
-              target = target.chop
-              suffix = ');'
-            else
-              # move trailing ; out of URL
-              suffix = ';'
+          # honor the escape
+          next %(#{$1}#{$&.slice $1.length + 1, $&.length}) if $3.start_with? RS
+          prefix, target, suffix = $1, $3 + ($4 || $7), ''
+          # NOTE if $5 is set (the attrlist), we're looking at a formal macro (e.g., https://example.org[])
+          if $5
+            prefix = '' if prefix == 'link:'
+            link_text = nil if (link_text = $5).empty?
+          else
+            case prefix
+            # invalid macro syntax (link: prefix w/o trailing square brackets or URL enclosed in quotes)
+            # FIXME we probably shouldn't even get here when the link: prefix is present; the regex is doing too much
+            when 'link:', ?", ?'
+              next $&
             end
-            # NOTE handle case when modified target is a URI scheme (e.g., http://)
-            next $& if target.end_with? '://'
-          when ':'
-            if (target = target.chop).end_with? ')'
-              # move trailing ): out of URL
-              target = target.chop
-              suffix = '):'
-            else
-              # move trailing : out of URL
-              suffix = ':'
+            case $8
+            when ';'
+              if (target = target.chop).end_with? ')'
+                # move trailing ); out of URL
+                target = target.chop
+                suffix = ');'
+              else
+                # move trailing ; out of URL
+                suffix = ';'
+              end
+              # NOTE handle case when modified target is a bare URI scheme (e.g., http://)
+              next $& if target == $3
+            when ':'
+              if (target = target.chop).end_with? ')'
+                # move trailing ): out of URL
+                target = target.chop
+                suffix = '):'
+              else
+                # move trailing : out of URL
+                suffix = ':'
+              end
+              # NOTE handle case when modified target is a bare URI scheme (e.g., http://)
+              next $& if target == $3
             end
-            # NOTE handle case when modified target is a URI scheme (e.g., http://)
-            next $& if target.end_with? '://'
           end
-        end
 
-        attrs, link_opts = nil, { type: :link }
+          link_opts = { type: :link }
 
-        if link_text
-          new_link_text = link_text = link_text.gsub ESC_R_SB, R_SB if link_text.include? R_SB
-          if !doc.compat_mode && (link_text.include? '=')
-            # NOTE if an equals sign (=) is present, extract attributes from link text
-            link_text, attrs = extract_attributes_from_text link_text, ''
-            new_link_text = link_text
-            link_opts[:id] = attrs['id']
-          end
+          if link_text
+            new_link_text = link_text = link_text.gsub ESC_R_SB, R_SB if link_text.include? R_SB
+            if !doc.compat_mode && (link_text.include? '=')
+              # NOTE if an equals sign (=) is present, extract attributes from link text
+              link_text, attrs = extract_attributes_from_text link_text, ''
+              new_link_text = link_text
+              link_opts[:id] = attrs['id']
+            end
 
-          if link_text.end_with? '^'
-            new_link_text = link_text = link_text.chop
-            if attrs
-              attrs['window'] ||= '_blank'
-            else
-              attrs = { 'window' => '_blank' }
+            if link_text.end_with? '^'
+              new_link_text = link_text = link_text.chop
+              if attrs
+                attrs['window'] ||= '_blank'
+              else
+                attrs = { 'window' => '_blank' }
+              end
             end
-          end
 
-          if new_link_text && new_link_text.empty?
-            # NOTE it's not possible for the URI scheme to be bare in this case
+            if new_link_text && new_link_text.empty?
+              # NOTE the modified target will not be a bare URI scheme (e.g., http://) in this case
+              link_text = (doc_attrs.key? 'hide-uri-scheme') ? (target.sub UriSniffRx, '') : target
+              bare = true
+            end
+          else
+            # NOTE the modified target will not be a bare URI scheme (e.g., http://) in this case
             link_text = (doc_attrs.key? 'hide-uri-scheme') ? (target.sub UriSniffRx, '') : target
             bare = true
           end
-        else
-          # NOTE it's not possible for the URI scheme to be bare in this case
-          link_text = (doc_attrs.key? 'hide-uri-scheme') ? (target.sub UriSniffRx, '') : target
-          bare = true
-        end
 
-        if bare
-          if attrs
-            attrs['role'] = (attrs.key? 'role') ? %(bare #{attrs['role']}) : 'bare'
-          else
-            attrs = { 'role' => 'bare' }
+          if bare
+            if attrs
+              attrs['role'] = (attrs.key? 'role') ? %(bare #{attrs['role']}) : 'bare'
+            else
+              attrs = { 'role' => 'bare' }
+            end
           end
-        end
 
-        doc.register :links, (link_opts[:target] = target)
-        link_opts[:attributes] = attrs if attrs
-        %(#{prefix}#{(Inline.new self, :anchor, link_text, link_opts).convert}#{suffix})
+          doc.register :links, (link_opts[:target] = target)
+          link_opts[:attributes] = attrs if attrs
+          %(#{prefix}#{(Inline.new self, :anchor, link_text, link_opts).convert}#{suffix})
+        end
       end
     end
 
@@ -755,7 +757,7 @@ module Substitutors
 
         if doc.compat_mode
           fragment = refid
-        elsif (hash_idx = refid.index '#')
+        elsif (hash_idx = refid.index '#') && refid[hash_idx - 1] != '&'
           if hash_idx > 0
             if (fragment_len = refid.length - 1 - hash_idx) > 0
               path, fragment = (refid.slice 0, hash_idx), (refid.slice hash_idx + 1, fragment_len)
@@ -1027,11 +1029,17 @@ module Substitutors
             next %(#{$1}[#{attrlist}]#{RS * (escape_count - 1)}#{boundary}#{$5}#{boundary})
           elsif $1 == RS
             preceding = %([#{attrlist}])
-          else
-            if boundary == '++' && (attrlist.end_with? 'x-')
+          elsif boundary == '++'
+            if attrlist == 'x-'
+              old_behavior = true
+              attributes = {}
+            elsif attrlist.end_with? ' x-'
               old_behavior = true
-              attrlist = attrlist.slice 0, attrlist.length - 2
+              attributes = parse_quoted_text_attributes attrlist.slice 0, attrlist.length - 3
+            else
+              attributes = parse_quoted_text_attributes attrlist
             end
+          else
             attributes = parse_quoted_text_attributes attrlist
           end
         elsif (escape_count = $3.length) > 0
@@ -1066,41 +1074,43 @@ module Substitutors
     pass_inline_char1, pass_inline_char2, pass_inline_rx = InlinePassRx[compat_mode]
     text = text.gsub pass_inline_rx do
       preceding = $1
-      attrlist = $2
-      escape_mark = RS if (quoted_text = $3).start_with? RS
-      format_mark = $4
-      content = $5
+      attrlist = $4 || $3
+      escaped = true if $5
+      quoted_text = $6
+      format_mark = $7
+      content = $8
 
       if compat_mode
         old_behavior = true
-      elsif (old_behavior = attrlist && (attrlist.end_with? 'x-'))
-        attrlist = attrlist.slice 0, attrlist.length - 2
+      elsif attrlist && (attrlist == 'x-' || (attrlist.end_with? ' x-'))
+        old_behavior = old_behavior_forced = true
       end
 
       if attrlist
-        if format_mark == '`' && !old_behavior
-          next extract_inner_passthrough content, %(#{preceding}[#{attrlist}]#{escape_mark})
-        elsif escape_mark
+        if escaped
           # honor the escape of the formatting mark
           next %(#{preceding}[#{attrlist}]#{quoted_text.slice 1, quoted_text.length})
         elsif preceding == RS
           # honor the escape of the attributes
+          next %(#{preceding}[#{attrlist}]#{quoted_text}) if old_behavior_forced && format_mark == '`'
           preceding = %([#{attrlist}])
+        elsif old_behavior_forced
+          attributes = attrlist == 'x-' ? {} : (parse_quoted_text_attributes attrlist.slice 0, attrlist.length - 3)
         else
           attributes = parse_quoted_text_attributes attrlist
         end
-      elsif format_mark == '`' && !old_behavior
-        next extract_inner_passthrough content, %(#{preceding}#{escape_mark})
-      elsif escape_mark
+      elsif escaped
         # honor the escape of the formatting mark
         next %(#{preceding}#{quoted_text.slice 1, quoted_text.length})
+      elsif compat_mode && preceding == RS
+        next quoted_text
       end
 
       if compat_mode
         passthrus[passthru_key = passthrus.size] = { text: content, subs: BASIC_SUBS, attributes: attributes, type: :monospaced }
       elsif attributes
         if old_behavior
-          subs = (format_mark == '`' ? BASIC_SUBS : NORMAL_SUBS)
+          subs = format_mark == '`' ? BASIC_SUBS : NORMAL_SUBS
           passthrus[passthru_key = passthrus.size] = { text: content, subs: subs, attributes: attributes, type: :monospaced }
         else
           passthrus[passthru_key = passthrus.size] = { text: content, subs: BASIC_SUBS, attributes: attributes, type: :unquoted }
@@ -1399,20 +1409,6 @@ module Substitutors
     end.join LF)
   end
 
-  # Internal: Extract nested single-plus passthrough; otherwise return unprocessed
-  def extract_inner_passthrough text, pre
-    if (text.end_with? '+') && (text.start_with? '+', '\+') && SinglePlusInlinePassRx =~ text
-      if $1
-        %(#{pre}`+#{$2}+`)
-      else
-        @passthroughs[passthru_key = @passthroughs.size] = { text: $2, subs: BASIC_SUBS }
-        %(#{pre}`#{PASS_START}#{passthru_key}#{PASS_END}`)
-      end
-    else
-      %(#{pre}`#{text}`)
-    end
-  end
-
   # Internal: Convert a quoted text region
   #
   # match  - The MatchData for the quoted text region

data/lib/asciidoctor/table.rb

@@ -300,7 +300,7 @@ class Table::Cell < AbstractBlock
       # QUESTION is is faster to check for :: before splitting?
       inner_document_lines = cell_text.split LF, -1
       if (unprocessed_line1 = inner_document_lines[0]).include? '::'
-        preprocessed_lines = (PreprocessorReader.new @document, [unprocessed_line1]).readlines
+        preprocessed_lines = (PreprocessorReader.new @document, [unprocessed_line1], inner_document_cursor).readlines
         unless unprocessed_line1 == preprocessed_lines[0] && preprocessed_lines.size < 2
           inner_document_lines.shift
           inner_document_lines.unshift(*preprocessed_lines) unless preprocessed_lines.empty?
@@ -659,36 +659,43 @@ class Table::ParserContext
           end
         end
       else
-        # 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 nil
-        end
+        column = @table.columns[@current_row.size]
       end
 
-      cell = Table::Cell.new(column, cell_text, cellspec, cursor: @reader.cursor_before_mark)
+      cell = Table::Cell.new column, cell_text, cellspec, cursor: (cursor_before_mark = @reader.cursor_before_mark)
       @reader.mark
       unless !cell.rowspan || cell.rowspan == 1
         activate_rowspan(cell.rowspan, (cell.colspan || 1))
       end
       @column_visits += (cell.colspan || 1)
       @current_row << cell
-      # don't close the row if we're on the first line and the column count has not been set explicitly
-      # TODO perhaps the colcount/linenum logic should be in end_of_row? (or a should_end_row? method)
-      close_row if end_of_row? && (@colcount != -1 || @linenum > 0 || (eol && i == repeat))
+      if (row_status = end_of_row?) > -1 && (@colcount != -1 || @linenum > 0 || (eol && i == repeat))
+        if row_status > 0
+          logger.error message_with_context 'dropping cell because it exceeds specified number of columns', source_location: cursor_before_mark
+          close_row true
+        else
+          close_row
+        end
+      end
     end
     @cell_open = false
     nil
   end
 
+  def close_table
+    return if @column_visits == 0
+    logger.error message_with_context 'dropping cells from incomplete row detected end of table', source_location: @reader.cursor_before_mark
+    nil
+  end
+
   private
 
   # Internal: Close the row by adding it to the Table and resetting the row
   # Array and counter variables.
   #
   # returns nothing
-  def close_row
-    @table.rows.body << @current_row
+  def close_row drop = false
+    @table.rows.body << @current_row unless drop
     # don't have to account for active rowspans here
     # since we know this is first row
     @colcount = @column_visits if @colcount == -1
@@ -709,8 +716,10 @@ class Table::ParserContext
   end
 
   # Internal: Check whether we've met the number of effective columns for the current row.
+  #
+  # returns -1 if not at end of row, 0 if exactly at end of row, and 1 if overruns end of row
   def end_of_row?
-    @colcount == -1 || effective_column_visits == @colcount
+    @colcount == -1 ? 0 : effective_column_visits <=> @colcount
   end
 
   # Internal: Calculate the effective column visits, which consists of the number of

data/lib/asciidoctor/version.rb

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

data/lib/asciidoctor.rb

@@ -6,7 +6,6 @@ if RUBY_ENGINE == 'opal'
   # this require is satisfied by the Asciidoctor.js build; it augments the Ruby environment for Asciidoctor.js
   require 'asciidoctor/js'
 else
-  autoload :Base64, 'base64'
   require 'cgi/util'
   autoload :OpenURI, 'open-uri'
   autoload :Pathname, 'pathname'
@@ -209,13 +208,13 @@ module Asciidoctor
   BOM_BYTES_UTF_16BE = [0xfe, 0xff]
 
   # The mode to use when opening a file for reading
-  FILE_READ_MODE = RUBY_ENGINE_OPAL ? 'r' : 'rb:utf-8:utf-8'
+  FILE_READ_MODE = RUBY_ENGINE_OPAL ? 'r' : 'rb:UTF-8:UTF-8'
 
   # The mode to use when opening a URI for reading
   URI_READ_MODE = FILE_READ_MODE
 
   # The mode to use when opening a file for writing
-  FILE_WRITE_MODE = RUBY_ENGINE_OPAL ? 'w' : 'w:utf-8'
+  FILE_WRITE_MODE = RUBY_ENGINE_OPAL ? 'w' : 'wb:UTF-8'
 
   # The default document type
   # Can influence markup generated by the converters

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White
-.\" Generator: Asciidoctor 2.0.17
-.\"      Date: 2022-01-05
+.\" Generator: Asciidoctor 2.0.22
+.\"      Date: 2018-03-20
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.17
+.\"    Source: Asciidoctor 2.0.23
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2022-01-05" "Asciidoctor 2.0.17" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.23" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -67,10 +67,11 @@ If not set, the safe mode level defaults to \fIunsafe\fP when Asciidoctor is inv
 .RS 4
 Define, override, or unset a document attribute.
 Command\-line attributes take precedence over attributes defined in the source file unless either the name or value ends in \fI@\fP.
+No substitutions are applied to the value.
 .sp
 \fIATTRIBUTE\fP is normally formatted as a key\-value pair, in the form \fINAME=VALUE\fP.
 Alternate forms are \fINAME\fP (where the \fIVALUE\fP defaults to an empty string), \fINAME!\fP (unsets the \fINAME\fP attribute), and \fINAME=VALUE@\fP (or \fINAME@=VALUE\fP) (where \fIVALUE\fP does not override the \fINAME\fP attribute if it\(cqs already defined in the source document).
-Values containing spaces should be enclosed in quotes.
+A value containing spaces must be enclosed in quotes, in the form \fINAME="VALUE WITH SPACES"\fP.
 .sp
 This option may be specified more than once.
 .RE
@@ -263,4 +264,4 @@ Jason Porter wrote the first implementation of the CLI interface provided by thi
 .SH "COPYING"
 .sp
 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.
+Use of this software is granted under the terms of the MIT License.

data/man/asciidoctor.adoc

@@ -1,7 +1,7 @@
 = asciidoctor(1)
 Dan Allen; Sarah White
 :doctype: manpage
-:release-version: 2.0.17
+:release-version: 2.0.23
 :man manual: Asciidoctor Manual
 :man source: Asciidoctor {release-version}
 ifdef::backend-manpage[:!author:]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.23
 platform: ruby
 authors:
 - Dan Allen
@@ -63,42 +63,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.22.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - data/locale/attributes-sr.adoc
 - data/locale/attributes-sr_Latn.adoc
 - data/locale/attributes-sv.adoc
+- data/locale/attributes-sw.adoc
 - data/locale/attributes-th.adoc
 - data/locale/attributes-tr.adoc
 - data/locale/attributes-uk.adoc
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain