asciidoctor 2.0.22 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8bf90148c22e9396333d1062352368ea297bd1a63d03c0166e0dde81677989
-  data.tar.gz: a9c48ed8d9827acb0b9919b1f6909c1752cd62115b3e6e7e9b552d8a6d7930c6
+  metadata.gz: 3b1c9cee03ccdf7fcc1d1aee9e9d934863d55065c673781d6113d93627ba16de
+  data.tar.gz: 582869ca4932e3b58d9ed0c45a7bb2f555a660e0b691090858768f0353be036a
 SHA512:
-  metadata.gz: 84f45230cbd9b25b810ef9a369b2c2e769833517fda4197f55f52129b86c6c30b9c4f06d20df20e6abd552a3b12679c123641de35c8d29e6dd3d0d3b511b8185
-  data.tar.gz: 0cf0028a60356d0966ff1637e130b285b73d769f7bcf426a31397f9eab8bbe91118d78fa27c303684f0e624dd062980ec5602c931e65272382d079b086ea076f
+  metadata.gz: 0757a8709e9278d7f5a6eaf0fdfd55001a336f110cad837ebdb2bf2918c9288703d9f4073ebb7e88ffd76532f8472c250191c7a81a0a821f055ac55b4d5e5965
+  data.tar.gz: 2ff7be04f59f2431d5d0da01c5fe792d089f1a53c72f6a166c3e6dd274ff17eddebcc39c66d4479047885033da48798c125906d3c7453dd950d60751d04d271f

data/CHANGELOG.adoc

@@ -16,6 +16,30 @@ For an even more detailed look at what has changed, refer to the {url-repo}/comm
 This project utilizes semantic versioning.
 
 // tag::compact[]
+== 2.0.23 (2024-05-17) - @mojavelinux
+
+Compliance::
+
+  * Encode spaces in mailto links as %20, in accordance with RFC 3986, instead of + (#4576)
+
+Improvements::
+
+  * Log error when an incomplete row is detected at the end of a table (#4573)
+
+Bug Fixes::
+
+  * Don't leave behind empty line inside skipped preprocessor conditional (#4580)
+  * Don't duplicate block attribute line above detached block that breaks a dlist; fixes duplicate role on detached block (#4565)
+  * Don't crash when parsing xref shorthand if target starts with URL protocol and text is offset by space (#4570)
+  * Only drop current row if colspan of last cell exceeds specified number of columns (#4587)
+  * Drop last row if colspan of last cell in table exceeds specified number of columns (#4587)
+  * Preserve repeating spaces in verbatim content in manpage output (#3583)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.23[git tag] | {url-repo}/compare/v2.0.22\...v2.0.23[full diff]
+// end::compact[]
+
 == 2.0.22 (2024-03-08) - @mojavelinux
 
 Improvements::
@@ -29,7 +53,6 @@ Compliance::
 === Details
 
 {url-repo}/releases/tag/v2.0.22[git tag] | {url-repo}/compare/v2.0.21\...v2.0.22[full diff]
-// end::compact[]
 
 == 2.0.21 (2024-02-20) - @mojavelinux
 

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.22, 2024-03-08
+v2.0.23, 2024-05-17
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.22
+:release-version: 2.0.23
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.22, 2024-03-08
+v2.0.23, 2024-05-17
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.22
+:release-version: 2.0.23
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.22, 2024-03-08
+v2.0.23, 2024-05-17
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.22
+:release-version: 2.0.23
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-zh_CN.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.22, 2024-03-08
+v2.0.23, 2024-05-17
 // settings:
 :page-layout: base
 :idprefix:
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.22
+:release-version: 2.0.23
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.22, 2024-03-08
+v2.0.23, 2024-05-17
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.22
+:release-version: 2.0.23
 // URLs:
 :url-org: https://github.com/asciidoctor
 :url-repo: {url-org}/asciidoctor
@@ -130,7 +130,7 @@ If you're using AsciiDoc.py, see {url-docs}/asciidoctor/latest/migrate/asciidoc-
 
 Asciidoctor works on Linux, macOS and Windows and requires one of the following implementations of {url-ruby}[Ruby]:
 
-* CRuby (aka MRI) 2.3 - 3.2
+* CRuby (aka MRI) 2.3 - 3.3
 * JRuby 9.1 - 9.4
 * TruffleRuby (GraalVM)
 

data/lib/asciidoctor/converter/manpage.rb

@@ -699,7 +699,7 @@ allbox tab(:);'
   def manify str, opts = {}
     case opts.fetch :whitespace, :collapse
     when :preserve
-      str = str.gsub TAB, ET
+      str = (str.gsub TAB, ET).gsub(/(^)?  +/) { $1 ? $& : %(#{ESC_BS}&#{$&}) }
     when :normalize
       str = str.gsub WrappedIndentRx, LF
     else

data/lib/asciidoctor/helpers.rb

@@ -145,10 +145,13 @@ module Helpers
         })
       )
     end
+  elsif (CGI = ::CGI).respond_to? :escapeURIComponent
+    def encode_uri_component str
+      CGI.escapeURIComponent str
+    end
   else
-    CGI = ::CGI
     def encode_uri_component str
-      CGI.escape str
+      (CGI.escape str).gsub '+', '%20'
     end
   end
 

data/lib/asciidoctor/parser.rb

@@ -1476,6 +1476,7 @@ class Parser
           break
         end
         if interrupt
+          this_line = nil
           reader.unshift_lines block_attribute_lines
           break
         end
@@ -2413,6 +2414,7 @@ class Parser
       end
     end
 
+    parser_ctx.close_table
     table.assign_column_widths unless (table.attributes['colcount'] ||= table.columns.size) == 0 || explicit_colspecs
     table.has_header_option = true if implicit_header
     table.partition_header_footer attributes

data/lib/asciidoctor/reader.rb

@@ -820,6 +820,10 @@ class PreprocessorReader < Reader
     return line unless @process_lines
 
     if line.empty?
+      if @skipping
+        shift
+        return
+      end
       @look_ahead += 1
       return line
     end

data/lib/asciidoctor/rx.rb

@@ -519,7 +519,12 @@ module Asciidoctor
   #   "https://github.com[]"
   #   (https://github.com) <= parenthesis not included in autolink
   #
-  InlineLinkRx = %r((^|link:|#{CG_BLANK}|\\?&lt;()|[>\(\)\[\];"'])(\\?(?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)\[(|#{CC_ALL}*?[^\\])\]|\2([^\s]*?)&gt;|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))m
+  if RUBY_ENGINE == 'opal'
+    # NOTE In JavaScript, a back reference succeeds if not set; invert the logic to give it a match to refute
+    InlineLinkRx = %r((^|link:|#{CG_BLANK}|\\?&lt;(?=\\?(?:https?|file|ftp|irc)(:))|[>\(\)\[\];"'])(\\?(?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)\[(|#{CC_ALL}*?[^\\])\]|(?!\2)([^\s]+?)&gt;|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))
+  else
+    InlineLinkRx = %r((^|link:|#{CG_BLANK}|\\?&lt;()|[>\(\)\[\];"'])(\\?(?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)\[(|#{CC_ALL}*?[^\\])\]|\2([^\s]+?)&gt;|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))m
+  end
 
   # Match a link or e-mail inline macro.
   #

data/lib/asciidoctor/substitutors.rb

@@ -537,9 +537,8 @@ module Substitutors
           # honor the escapes
           next $&.slice 1, $&.length if $1.start_with? RS
           next %(#{$1}#{$&.slice $1.length + 1, $&.length}) if $3.start_with? RS
-          target = $3 + $6
-          next $& if target == $3
-          doc.register :links, target
+          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

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.22'
+  VERSION = '2.0.23'
 end

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White
-.\" Generator: Asciidoctor 2.0.21
+.\" Generator: Asciidoctor 2.0.22
 .\"      Date: 2018-03-20
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.22
+.\"    Source: Asciidoctor 2.0.23
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.22" "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

data/man/asciidoctor.adoc

@@ -1,7 +1,7 @@
 = asciidoctor(1)
 Dan Allen; Sarah White
 :doctype: manpage
-:release-version: 2.0.22
+: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.22
+  version: 2.0.23
 platform: ruby
 authors:
 - Dan Allen
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain