asciidoctor 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c1b7f136f76a2c716b27f41bc38e42e36c157d97ca50685c98e47be80d77df
-  data.tar.gz: f57b9e60b3d8547fdca2d2866758f046ddc5e7a439f0626fda3b7cd96c4a1148
+  metadata.gz: b2de6beb8308df8a84bde4b59be99d0d9d41474735279c6aaf6e6e76821d4bb6
+  data.tar.gz: 709d4f1eb62a388ef5e1e5c7991c024c126112894d842185f7ae2fdc8fbe924d
 SHA512:
-  metadata.gz: be63260d2dfe6576b65e8e8b47e173107e046f83d4bbce38d27873a86e14fe6526bb3cda436034f80614946c9bddd3629156906bcc479252028860612fab18a0
-  data.tar.gz: f699eae9ef69ee56763c81b468245b33aa6edf9ba529ccb6e993ce0a888fcb47649f3779d1e1ebde7dea915ff9e9d55c5b0287c7d65e2bde24e2c5ceab0d3c09
+  metadata.gz: 5bac9d6c955c94dc8425ad7dc54706e3988e516cd156554d11ed1e1a85f4a8d77087bd2fbb407a630c547446dfbb6324c4a1babd226c144eee8df0c9ddd52e60
+  data.tar.gz: 7405db9ddcd871c6615862dc7bf0af440acca9b4120accdbd05493735b8de8c012a163dbaf731c074c8cfcc21c496d40e610e4aaaeb55aeba6613ef1941f06c6

data/CHANGELOG.adoc

@@ -13,6 +13,13 @@ endif::[]
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.0.2 (2019-03-26) - @mojavelinux
+
+Bug Fixes::
+
+  * apply verbatim substitutions to literal paragraphs attached to list item (#3205)
+  * implement #lines and #source methods on Table::Cell based on cell text (#3207)
+
 == 2.0.1 (2019-03-25) - @mojavelinux
 
 Bug Fixes::

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.1, 2019-03-25
+v2.0.2, 2019-03-26
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.1
+:release-version: 2.0.2
 // 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]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.1, 2019-03-25
+v2.0.2, 2019-03-26
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.1
+:release-version: 2.0.2
 // 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]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.1, 2019-03-25
+v2.0.2, 2019-03-26
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.1
+:release-version: 2.0.2
 // 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]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.1, 2019-03-25
+v2.0.2, 2019-03-26
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.1
+:release-version: 2.0.2
 // 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]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.1, 2019-03-25
+v2.0.2, 2019-03-26
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.1
+:release-version: 2.0.2
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/data/reference/syntax.adoc

@@ -37,10 +37,10 @@ TIP: Convert this document using the `asciidoctor` command to see the output pro
 .Constrained (applied at word boundaries)
 *strong importance* (aka bold)
 _stress emphasis_ (aka italic)
-`literal text` (aka monospaced)
+`monospaced` (aka typewriter text)
 "`double`" and '`single`' typographic quotes
 +passthrough text+ (substitutions disabled)
-`+literal passthrough text+` (literal text with substitutions disabled)
+`+literal text+` (monospaced with substitutions disabled)
 
 .Unconstrained (applied anywhere)
 **C**reate+**R**ead+**U**pdate+**D**elete

data/lib/asciidoctor.rb

@@ -293,7 +293,7 @@ module Asciidoctor
   DELIMITED_BLOCK_HEADS = {}.tap {|accum| DELIMITED_BLOCKS.each_key {|k| accum[k.slice 0, 2] = true } }
   DELIMITED_BLOCK_TAILS = {}.tap {|accum| DELIMITED_BLOCKS.each_key {|k| accum[k] = k[k.length - 1] if k.length == 4 } }
 
-  CAPTIONABLE_BLOCKS = { example: true, listing: true, table: true }
+  CAPTION_ATTR_NAMES = { example: 'example-caption', image: 'figure-caption', listing: 'listing-caption', table: 'table-caption' }
 
   LAYOUT_BREAK_CHARS = {
     '\'' => :thematic_break,

data/lib/asciidoctor/abstract_block.rb

@@ -32,9 +32,6 @@ class AbstractBlock < AbstractNode
   # Public: Substitutions to be applied to content in this block.
   attr_reader :subs
 
-  # Internal: Set the default subs applied to this block; used during block creation
-  attr_writer :default_subs
-
   def initialize parent, context, opts = {}
     super
     @content_model = :compound
@@ -126,7 +123,7 @@ class AbstractBlock < AbstractNode
   #
   # Returns A Boolean indicating whether this Block has block content
   def blocks?
-    !@blocks.empty?
+    @blocks.empty? ? false : true
   end
 
   # Public: Check whether this block has any child Section objects.
@@ -342,13 +339,13 @@ class AbstractBlock < AbstractNode
       case xrefstyle
       when 'full'
         quoted_title = sub_placeholder (sub_quotes @document.compat_mode ? %q(``%s'') : '"`%s`"'), title
-        if @numeral && (prefix = @document.attributes[@context == :image ? 'figure-caption' : %(#{@context}-caption)])
+        if @numeral && (caption_attr_name = CAPTION_ATTR_NAMES[@context]) && (prefix = @document.attributes[caption_attr_name])
           %(#{prefix} #{@numeral}, #{quoted_title})
         else
           %(#{@caption.chomp '. '}, #{quoted_title})
         end
       when 'short'
-        if @numeral && (prefix = @document.attributes[@context == :image ? 'figure-caption' : %(#{@context}-caption)])
+        if @numeral && (caption_attr_name = CAPTION_ATTR_NAMES[@context]) && (prefix = @document.attributes[caption_attr_name])
           %(#{prefix} #{@numeral})
         else
           @caption.chomp '. '
@@ -372,16 +369,17 @@ class AbstractBlock < AbstractNode
   # The parts of a complete caption are: <prefix> <number>. <title>
   # This partial caption represents the part the precedes the title.
   #
-  # value - The explicit String caption to assign to this block (default: nil).
-  # key   - The String prefix for the caption and counter attribute names.
-  #         If not provided, the name of the context for this block is used.
-  #         (default: @context)
+  # value           - The explicit String caption to assign to this block (default: nil).
+  # caption_context - The Symbol context to use when resolving caption-related attributes.
+  #                   If not provided, the name of the context for this block is used.
+  #                   (default: @context)
   #
   # Returns nothing.
-  def assign_caption value = nil, key = @context
+  def assign_caption value = nil, caption_context = @context
     unless @caption || !@title || (@caption = value || @document.attributes['caption'])
-      if (prefix = @document.attributes[%(#{key}-caption)])
-        @caption = %(#{prefix} #{@numeral = @document.increment_and_store_counter %[#{key}-number], self}. )
+      if (attr_name = CAPTION_ATTR_NAMES[caption_context]) && (prefix = @document.attributes[attr_name])
+        counter_name = caption_context == :image ? 'figure-number' : %(#{caption_context}-number)
+        @caption = %(#{prefix} #{@numeral = @document.increment_and_store_counter counter_name, self}. )
         nil
       end
     end

data/lib/asciidoctor/converter/template.rb

@@ -71,7 +71,7 @@ class Converter::TemplateConverter < Converter::Base
     end
     case opts[:template_cache]
     when true
-      logger.warn 'gem \'concurrent-ruby\' is not installed. This gem is recommended when using the built-in template cache.' unless defined? ::Concurrent::Hash
+      logger.warn 'optional gem \'concurrent-ruby\' is not available. This gem is recommended when using the default template cache.' unless defined? ::Concurrent::Hash
       @caches = self.class.caches
     when ::Hash
       @caches = opts[:template_cache]

data/lib/asciidoctor/extensions.rb

@@ -197,7 +197,7 @@ module Extensions
       block = create_block parent, :image, nil, attrs, opts
       if title
         block.title = title
-        block.assign_caption (attrs.delete 'caption'), (opts[:caption_context] || 'figure')
+        block.assign_caption (attrs.delete 'caption'), (opts[:caption_context] || :image)
       end
       block
     end

data/lib/asciidoctor/helpers.rb

@@ -9,7 +9,7 @@ module Helpers
   # passes a message to Kernel#raise if on_failure is :abort or Kernel#warn if
   # on_failure is :warn to communicate to the user that processing is being
   # aborted or functionality is disabled, respectively. If a gem_name is
-  # specified, the message communicates that a required gem is not installed.
+  # specified, the message communicates that a required gem is not available.
   #
   # name       - the String name of the library to require.
   # gem_name   - a Boolean that indicates whether this library is provided by a RubyGem,

data/lib/asciidoctor/list.rb

@@ -66,7 +66,7 @@ class ListItem < AbstractBlock
   # Public: A convenience method that checks whether the text of this list item
   # is not blank (i.e., not nil or empty string).
   def text?
-    !@text.nil_or_empty?
+    @text.nil_or_empty? ? false : true
   end
 
   # Public: Get the String text of this ListItem with substitutions applied.
@@ -103,27 +103,11 @@ class ListItem < AbstractBlock
     !simple?
   end
 
-  # Internal: Fold the first paragraph block into the text
-  #
-  # Here are the rules for when a folding occurs:
-  #
-  # Given: this list item has at least one block
-  # When: the first block is a paragraph that's not connected by a list continuation
-  # Or: the first block is an indented paragraph that's adjacent (wrapped line)
-  # Or: the first block is an indented paragraph that's not connected by a list continuation
-  # Then: then drop the first block and fold it's content (buffer) into the list text
+  # Internal: Fold the adjacent paragraph block into the list item text
   #
   # Returns nothing
-  def fold_first(continuation_connects_first_block = false, content_adjacent = false)
-    if (first_block = @blocks[0])
-      if first_block.context == :literal
-        if (content_adjacent || !continuation_connects_first_block) # && first_block.attributes['listparagraph-option']
-          @text = @text.nil_or_empty? ? @blocks.shift.source : %(#{@text}#{LF}#{@blocks.shift.source})
-        end
-      elsif first_block.context == :paragraph && !continuation_connects_first_block
-        @text = @text.nil_or_empty? ? @blocks.shift.source : %(#{@text}#{LF}#{@blocks.shift.source})
-      end
-    end
+  def fold_first
+    @text = @text.nil_or_empty? ? @blocks.shift.source : %(#{@text}#{LF}#{@blocks.shift.source})
     nil
   end
 

data/lib/asciidoctor/parser.rb

@@ -469,7 +469,8 @@ class Parser
   # attributes - A Hash of attributes that will become the attributes
   #              associated with the parsed Block (default: {}).
   # options    - An options Hash to control parsing (default: {}):
-  #              * :text indicates that the parser is only looking for text content
+  #              * :text_only indicates that the parser is only looking for text content
+  #              * :list_type indicates this block will be attached to a list item in a list of the specified type
   #
   # Returns a Block object built from the parsed content of the processed
   # lines, or nothing if no block is found.
@@ -480,15 +481,15 @@ class Parser
     # check for option to find list item text only
     # if skipped a line, assume a list continuation was
     # used and block content is acceptable
-    if (text_only = options[:text]) && skipped > 0
-      options.delete :text
+    if (text_only = options[:text_only]) && skipped > 0
+      options.delete :text_only
       text_only = nil
     end
 
     document = parent.document
 
     if options.fetch :parse_metadata, true
-      # read lines until there are no more metadata lines to read
+      # read lines until there are no more metadata lines to read; note that :text_only option impacts parsing rules
       while parse_block_metadata_line reader, document, attributes, options
         # discard the line just processed
         reader.shift
@@ -604,7 +605,7 @@ class Parser
                 end
                 if attributes['title']
                   block.title = block_title = attributes.delete 'title'
-                  block.assign_caption (attributes.delete 'caption'), 'figure'
+                  block.assign_caption (attributes.delete 'caption')
                 end
               end
               attributes['target'] = target
@@ -722,17 +723,17 @@ class Parser
       # a literal paragraph: contiguous lines starting with at least one whitespace character
       # NOTE style can only be nil or "normal" at this point
       if indented && !style
-        lines = read_paragraph_lines reader, (list_item = options[:list_item]) && skipped == 0, skip_line_comments: text_only
+        lines = read_paragraph_lines reader, (content_adjacent = skipped == 0 ? options[:list_type] : nil), skip_line_comments: text_only
         adjust_indentation! lines
-        block = Block.new(parent, :literal, content_model: :verbatim, source: lines, attributes: attributes)
-        if list_item
-          # a literal gets special meaning inside of a description list
-          block.set_option 'listparagraph'
-          block.default_subs = []
+        if text_only || content_adjacent == :dlist
+          # this block gets folded into the list item text
+          block = Block.new(parent, :paragraph, content_model: :simple, source: lines, attributes: attributes)
+        else
+          block = Block.new(parent, :literal, content_model: :verbatim, source: lines, attributes: attributes)
         end
       # a normal paragraph: contiguous non-blank/non-continuation lines (left-indented or normal style)
       else
-        lines = read_paragraph_lines reader, skipped == 0 && options[:list_item], skip_line_comments: true
+        lines = read_paragraph_lines reader, skipped == 0 && options[:list_type], skip_line_comments: true
         # NOTE don't check indented here since it's extremely rare
         #if text_only || indented
         if text_only
@@ -897,8 +898,8 @@ class Parser
     # FIXME title and caption should be assigned when block is constructed (though we need to handle all cases)
     if attributes['title']
       block.title = block_title = attributes.delete 'title'
-      if CAPTIONABLE_BLOCKS[block_context = block.context] && document.attributes[%(#{block.context}-caption)]
-        block.assign_caption (attributes.delete 'caption'), block_context
+      if (caption_attr_name = CAPTION_ATTR_NAMES[block.context]) && document.attributes[caption_attr_name]
+        block.assign_caption (attributes.delete 'caption')
       end
     end
     # TODO eventually remove the style attribute from the attributes hash
@@ -1333,31 +1334,25 @@ class Parser
       comment_lines = list_item_reader.skip_line_comments
       if (subsequent_line = list_item_reader.peek_line)
         list_item_reader.unshift_lines comment_lines unless comment_lines.empty?
-        if (continuation_connects_first_block = subsequent_line.empty?)
-          content_adjacent = false
-        else
+        unless subsequent_line.empty?
           content_adjacent = true
           # treat lines as paragraph text if continuation does not connect first block (i.e., has_text = nil)
           has_text = nil unless dlist
         end
-      else
-        # NOTE we have no use for any trailing comment lines we might have found
-        continuation_connects_first_block = false
-        content_adjacent = false
       end
 
       # reader is confined to boundaries of list, which means only blocks will be found (no sections)
-      if (block = next_block(list_item_reader, list_item, {}, text: !has_text, list_item: true))
+      if (block = next_block(list_item_reader, list_item, {}, text_only: has_text ? nil : true, list_type: list_type))
         list_item.blocks << block
       end
 
       while list_item_reader.has_more_lines?
-        if (block = next_block(list_item_reader, list_item, {}, list_item: true))
+        if (block = next_block(list_item_reader, list_item, {}, list_type: list_type))
           list_item.blocks << block
         end
       end
 
-      list_item.fold_first(continuation_connects_first_block, content_adjacent)
+      list_item.fold_first if content_adjacent && (first_block = list_item.blocks[0]) && first_block.context == :paragraph
     end
 
     dlist ? [[list_term], (list_item.text? || list_item.blocks? ? list_item : nil)] : list_item
@@ -1537,19 +1532,19 @@ class Parser
 
     reader.unshift_line this_line if this_line
 
-    if detached_continuation
-      buffer.delete_at detached_continuation
-    end
-
-    # strip trailing blank lines to prevent empty blocks
-    buffer.pop while !buffer.empty? && buffer[-1].empty?
+    buffer.delete_at detached_continuation if detached_continuation
 
-    # We do need to replace the optional trailing continuation
-    # a blank line would have served the same purpose in the document
-    buffer.pop if !buffer.empty? && buffer[-1] == LIST_CONTINUATION
-
-    #warn "BUFFER[#{list_type},#{sibling_trait}]>#{buffer.join LF}<BUFFER"
-    #warn "BUFFER[#{list_type},#{sibling_trait}]>#{buffer.inspect}<BUFFER"
+    until buffer.empty?
+      # strip trailing blank lines to prevent empty blocks
+      if (last_line = buffer[-1]).empty?
+        buffer.pop
+      else
+        # drop optional trailing continuation
+        # (a blank line would have served the same purpose in the document)
+        buffer.pop if last_line == LIST_CONTINUATION
+        break
+      end
+    end
 
     buffer
   end
@@ -1987,7 +1982,7 @@ class Parser
   # document   - the current Document
   # attributes - a Hash of attributes in which any metadata found will be stored (default: {})
   # options    - a Hash of options to control processing: (default: {})
-  #              *  :text indicates that parser is only looking for text content
+  #              *  :text_only indicates that parser is only looking for text content
   #                   and thus the block title should not be captured
   #
   # returns the Hash of attributes including any metadata found
@@ -2016,13 +2011,13 @@ class Parser
   # document   - the current Document
   # attributes - a Hash of attributes in which any metadata found will be stored
   # options    - a Hash of options to control processing: (default: {})
-  #              *  :text indicates the parser is only looking for text content,
+  #              *  :text_only indicates the parser is only looking for text content,
   #                   thus neither a block title or attribute entry should be captured
   #
   # returns true if the line contains metadata, otherwise falsy
   def self.parse_block_metadata_line reader, document, attributes, options = {}
     if (next_line = reader.peek_line) &&
-        (options[:text] ? (next_line.start_with? '[', '/') : (normal = next_line.start_with? '[', '.', '/', ':'))
+        (options[:text_only] ? (next_line.start_with? '[', '/') : (normal = next_line.start_with? '[', '.', '/', ':'))
       if next_line.start_with? '['
         if next_line.start_with? '[['
           if (next_line.end_with? ']]') && BlockAnchorRx =~ next_line

data/lib/asciidoctor/table.rb

@@ -358,6 +358,14 @@ class Table::Cell < AbstractBlock
     end
   end
 
+  def lines
+    @text.split LF
+  end
+
+  def source
+    @text
+  end
+
   # Public: Get the source file where this block started
   def file
     @source_location && @source_location.file

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.1
-.\"      Date: 2019-03-25
+.\" Generator: Asciidoctor 2.0.2
+.\"      Date: 2019-03-26
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.1
+.\"    Source: Asciidoctor 2.0.2
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-03-25" "Asciidoctor 2.0.1" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2019-03-26" "Asciidoctor 2.0.2" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 2.0.1
+:man source: Asciidoctor 2.0.2
 :page-layout: base
 
 == NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath