asciidoctor 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c8776c68c1c086a0d17e7597f8e5cd2a4ef27a2b57545a0d82bb7520747c8d'
-  data.tar.gz: 6fa042782d5c3a6e446ce1b3b5a25557055d74248ca618f3bed651d5d6f7535e
+  metadata.gz: 07c1b7f136f76a2c716b27f41bc38e42e36c157d97ca50685c98e47be80d77df
+  data.tar.gz: f57b9e60b3d8547fdca2d2866758f046ddc5e7a439f0626fda3b7cd96c4a1148
 SHA512:
-  metadata.gz: 82e97c50b8ecc3cb09e2aa966e41acc3d714dd8fad4654ab68eadd5e339febdcd680fdb3fba77bb11583eb419120fb6429bcd9d21299ecb4e6f7ff102bda48d3
-  data.tar.gz: 2c96408f4c51935b2b9d413184358d58a55e528675442167a13e879d5a4506ab29fb628c65c63b616333d555f41a54d1da761889afbba64f563a623d3b2b4446
+  metadata.gz: be63260d2dfe6576b65e8e8b47e173107e046f83d4bbce38d27873a86e14fe6526bb3cda436034f80614946c9bddd3629156906bcc479252028860612fab18a0
+  data.tar.gz: f699eae9ef69ee56763c81b468245b33aa6edf9ba529ccb6e993ce0a888fcb47649f3779d1e1ebde7dea915ff9e9d55c5b0287c7d65e2bde24e2c5ceab0d3c09

data/.yardopts

@@ -0,0 +1,11 @@
+--charset UTF-8
+--readme README.adoc
+--hide-api private
+--plugin tomdoc
+--title "Asciidoctor API Documentation"
+--output-dir rdoc
+lib/**/*.rb
+-
+CHANGELOG.adoc
+CONTRIBUTING.adoc
+LICENSE

data/CHANGELOG.adoc

@@ -13,6 +13,21 @@ 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.1 (2019-03-25) - @mojavelinux
+
+Bug Fixes::
+
+  * convert titles of cataloged block and section nodes containing attribute references eagerly to resolve attributes while in scope (#3202)
+  * customize MathJax (using a postfilter hook) to apply displaymath formatting to AsciiMath block (#2498)
+  * fix misspelling of deprecated default_attrs DSL function (missing trailing "s")
+  * remove unused location property (attr_accessor :location) on DocinfoProcessor class
+  * look for deprecated extension option :pos_attrs if :positional_attrs option is missing (#3199)
+  * add detail to load error message if path differs from gem name (#1884)
+
+Build / Infrastructure::
+
+  * bundle .yardopts in RubyGem (#3193)
+
 == 2.0.0 (2019-03-22) - @mojavelinux
 
 Enhancements / Compliance::

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.0, 2019-03-22
+v2.0.1, 2019-03-25
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0
+:release-version: 2.0.1
 // 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.0, 2019-03-22
+v2.0.1, 2019-03-25
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0
+:release-version: 2.0.1
 // 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.0, 2019-03-22
+v2.0.1, 2019-03-25
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0
+:release-version: 2.0.1
 // 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.0, 2019-03-22
+v2.0.1, 2019-03-25
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0
+:release-version: 2.0.1
 // 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.0, 2019-03-22
+v2.0.1, 2019-03-25
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.0
+:release-version: 2.0.1
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/asciidoctor.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   rescue
     Dir['**/*']
   end
-  s.files = files.grep %r/^(?:(?:data|lib|man)\/.+|LICENSE|(?:CHANGELOG|README(?:-\w+)?)\.adoc|#{s.name}\.gemspec)$/
+  s.files = files.grep %r/^(?:(?:data|lib|man)\/.+|LICENSE|(?:CHANGELOG|README(?:-\w+)?)\.adoc|\.yardopts|#{s.name}\.gemspec)$/
   s.executables = (files.grep %r/^bin\//).map {|f| File.basename f }
   s.require_paths = ['lib']
   #s.test_files = files.grep %r/^(?:(?:features|test)\/.+)$/

data/lib/asciidoctor.rb

@@ -293,6 +293,8 @@ 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 }
+
   LAYOUT_BREAK_CHARS = {
     '\'' => :thematic_break,
     '<'  => :page_break
@@ -1271,9 +1273,8 @@ module Asciidoctor
 
     if ::File === input
       options[:input_mtime] = input.mtime
-      # TODO cli checks if input path can be read and is file, but might want to add check to API too
-      input_path = ::File.absolute_path input.path
       # NOTE defer setting infile and indir until we get a better sense of their purpose
+      # TODO cli checks if input path can be read and is file, but might want to add check to API too
       attrs['docfile'] = input_path = ::File.absolute_path input.path
       attrs['docdir'] = ::File.dirname input_path
       attrs['docname'] = Helpers.basename input_path, (attrs['docfilesuffix'] = ::File.extname input_path)
@@ -1363,32 +1364,26 @@ module Asciidoctor
   # Returns the Document object if the converted String is written to a
   # file, otherwise the converted String
   def convert input, options = {}
-    options = options.merge
-    options.delete(:parse)
-    to_file = options.delete(:to_file)
-    to_dir = options.delete(:to_dir)
-    mkdirs = options.delete(:mkdirs) || false
+    (options = options.merge).delete :parse
+    to_dir = options.delete :to_dir
+    mkdirs = options.delete :mkdirs
 
-    case to_file
+    case (to_file = options.delete :to_file)
     when true, nil
-      write_to_same_dir = !to_dir && ::File === input
-      stream_output = false
-      write_to_target = to_dir
+      unless (write_to_target = to_dir)
+        sibling_path = ::File.absolute_path input.path if ::File === input
+      end
       to_file = nil
     when false
-      write_to_same_dir = false
-      stream_output = false
-      write_to_target = false
       to_file = nil
     when '/dev/null'
       return self.load input, options
     else
-      write_to_same_dir = false
-      write_to_target = (stream_output = to_file.respond_to? :write) ? false : (options[:to_file] = to_file)
+      options[:to_file] = write_to_target = to_file unless (stream_output = to_file.respond_to? :write)
     end
 
     unless options.key? :standalone
-      if write_to_same_dir || write_to_target
+      if sibling_path || write_to_target
         options[:standalone] = true
       elsif options.key? :header_footer
         options[:standalone] = options[:header_footer]
@@ -1396,9 +1391,8 @@ module Asciidoctor
     end
 
     # NOTE outfile may be controlled by document attributes, so resolve outfile after loading
-    if write_to_same_dir
-      input_path = ::File.absolute_path input.path
-      options[:to_dir] = (outdir = ::File.dirname input_path)
+    if sibling_path
+      options[:to_dir] = outdir = ::File.dirname sibling_path
     elsif write_to_target
       if to_dir
         if to_file
@@ -1415,11 +1409,9 @@ module Asciidoctor
     # NOTE :to_file option only passed if assigned an explicit path
     doc = self.load input, options
 
-    if write_to_same_dir # write to file in same directory
+    if sibling_path # write to file in same directory
       outfile = ::File.join outdir, %(#{doc.attributes['docname']}#{doc.outfilesuffix})
-      if outfile == input_path
-        raise ::IOError, %(input file and output file cannot be the same: #{outfile})
-      end
+      raise ::IOError, %(input file and output file cannot be the same: #{outfile}) if outfile == sibling_path
     elsif write_to_target # write to explicit file or directory
       working_dir = (options.key? :base_dir) ? (::File.expand_path options[:base_dir]) : ::Dir.pwd
       # QUESTION should the jail be the working_dir or doc.base_dir???
@@ -1447,15 +1439,18 @@ module Asciidoctor
         Helpers.mkdir_p outdir
       else
         # NOTE we intentionally refer to the directory as it was passed to the API
-        raise ::IOError, %(target directory does not exist: #{to_dir} (hint: set mkdirs option)) unless ::File.directory? outdir
+        raise ::IOError, %(target directory does not exist: #{to_dir} (hint: set :mkdirs option)) unless ::File.directory? outdir
       end
     else # write to stream
       outfile = to_file
       outdir = nil
     end
 
-    opts = outfile && !stream_output ? { 'outfile' => outfile, 'outdir' => outdir } : {}
-    output = doc.convert opts
+    if outfile && !stream_output
+      output = doc.convert 'outfile' => outfile, 'outdir' => outdir
+    else
+      output = doc.convert
+    end
 
     if outfile
       doc.write output, outfile
@@ -1477,7 +1472,7 @@ module Asciidoctor
           if mkdirs
             Helpers.mkdir_p stylesoutdir
           else
-            raise ::IOError, %(target stylesheet directory does not exist: #{stylesoutdir} (hint: set mkdirs option)) unless ::File.directory? stylesoutdir
+            raise ::IOError, %(target stylesheet directory does not exist: #{stylesoutdir} (hint: set :mkdirs option)) unless ::File.directory? stylesoutdir
           end
 
           if copy_asciidoctor_stylesheet

data/lib/asciidoctor/abstract_block.rb

@@ -375,13 +375,13 @@ class AbstractBlock < AbstractNode
   # 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: nil)
+  #         (default: @context)
   #
   # Returns nothing.
-  def assign_caption value = nil, key = nil
+  def assign_caption value = nil, key = @context
     unless @caption || !@title || (@caption = value || @document.attributes['caption'])
-      if (prefix = @document.attributes[%(#{key ||= @context}-caption)])
-        @caption = %(#{prefix} #{@numeral = @document.increment_and_store_counter "#{key}-number", self}. )
+      if (prefix = @document.attributes[%(#{key}-caption)])
+        @caption = %(#{prefix} #{@numeral = @document.increment_and_store_counter %[#{key}-number], self}. )
         nil
       end
     end

data/lib/asciidoctor/converter/html5.rb

@@ -252,18 +252,26 @@ class Converter::Html5Converter < Converter::Base
       # IMPORTANT inspect calls on delimiter arrays are intentional for JavaScript compat (emulates JSON.stringify)
       result << %(<script type="text/x-mathjax-config">
 MathJax.Hub.Config({
-messageStyle: "none",
-tex2jax: {
-  inlineMath: [#{INLINE_MATH_DELIMITERS[:latexmath].inspect}],
-  displayMath: [#{BLOCK_MATH_DELIMITERS[:latexmath].inspect}],
-  ignoreClass: "nostem|nolatexmath"
-},
-asciimath2jax: {
-  delimiters: [#{BLOCK_MATH_DELIMITERS[:asciimath].inspect}],
-  ignoreClass: "nostem|noasciimath"
-},
-TeX: {#{eqnums_opt}}
-});
+  messageStyle: "none",
+  tex2jax: {
+    inlineMath: [#{INLINE_MATH_DELIMITERS[:latexmath].inspect}],
+    displayMath: [#{BLOCK_MATH_DELIMITERS[:latexmath].inspect}],
+    ignoreClass: "nostem|nolatexmath"
+  },
+  asciimath2jax: {
+    delimiters: [#{BLOCK_MATH_DELIMITERS[:asciimath].inspect}],
+    ignoreClass: "nostem|noasciimath"
+  },
+  TeX: {#{eqnums_opt}}
+})
+MathJax.Hub.Register.StartupHook("AsciiMath Jax Ready", function () {
+  MathJax.InputJax.AsciiMath.postfilterHooks.Add(function (data, node) {
+    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains('stemblock')) {
+      data.math.root.display = "block"
+    }
+    return data
+  })
+})
 </script>
 <script src="#{cdn_base_url}/mathjax/#{MATHJAX_VERSION}/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>)
     end

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] || 'figure')
       end
       block
     end
@@ -319,7 +319,7 @@ module Extensions
       option :default_attrs, value
     end
     # NOTE default_attrs alias is deprecated
-    alias default_attr default_attributes
+    alias default_attrs default_attributes
 
     def resolve_attributes *args
       # NOTE assume true as default value; rewrap single-argument string or symbol
@@ -484,8 +484,6 @@ module Extensions
   # If a location is not specified, the DocinfoProcessor is assumed
   # to add content to the header.
   class DocinfoProcessor < Processor
-    attr_accessor :location
-
     def initialize config = {}
       super config
       @config[:location] ||= :head
@@ -584,10 +582,10 @@ module Extensions
     def resolve_attributes *args
       if args.size == 1 && !args[0]
         option :content_model, :text
-        return
+      else
+        super
+        option :content_model, :attributes
       end
-      super
-      option :content_model, :attributes
     end
     # NOTE resolves_attributes alias is deprecated
     alias resolves_attributes resolve_attributes

data/lib/asciidoctor/helpers.rb

@@ -23,22 +23,24 @@ module Helpers
   # Otherwise, nil is returned.
   def self.require_library name, gem_name = true, on_failure = :abort
     require name
-  rescue ::LoadError => e
+  rescue ::LoadError
     include Logging unless include? Logging
     if gem_name
       gem_name = name if gem_name == true
       case on_failure
       when :abort
-        raise ::LoadError, %(asciidoctor: FAILED: required gem '#{gem_name}' is not installed. Processing aborted.)
+        details = $!.path == gem_name ? '' : %[ (reason: #{$!.path ? %(cannot load '#{$!.path}') : $!.message})]
+        raise ::LoadError, %(asciidoctor: FAILED: required gem '#{gem_name}' is not available#{details}. Processing aborted.)
       when :warn
-        logger.warn %(optional gem '#{gem_name}' is not installed. Functionality disabled.)
+        details = $!.path == gem_name ? '' : %[ (reason: #{$!.path ? %(cannot load '#{$!.path}') : $!.message})]
+        logger.warn %(optional gem '#{gem_name}' is not available#{details}. Functionality disabled.)
       end
     else
       case on_failure
       when :abort
-        raise ::LoadError, %(asciidoctor: FAILED: #{e.message.chomp '.'}. Processing aborted.)
+        raise ::LoadError, %(asciidoctor: FAILED: #{$!.message.chomp '.'}. Processing aborted.)
       when :warn
-        logger.warn %(#{e.message.chomp '.'}. Functionality disabled.)
+        logger.warn %(#{$!.message.chomp '.'}. Functionality disabled.)
       end
     end
     nil

data/lib/asciidoctor/parser.rb

@@ -602,9 +602,9 @@ class Parser
                   # NOTE assume % units if not specified
                   attributes['scaledwidth'] = (TrailingDigitsRx.match? scaledwidth) ? %(#{scaledwidth}%) : scaledwidth
                 end
-                if attributes.key? 'title'
-                  block.title = attributes.delete 'title'
-                  block.assign_caption((attributes.delete 'caption'), 'figure')
+                if attributes['title']
+                  block.title = block_title = attributes.delete 'title'
+                  block.assign_caption (attributes.delete 'caption'), 'figure'
                 end
               end
               attributes['target'] = target
@@ -632,12 +632,12 @@ class Parser
                     target = expanded_target
                   end
                 end
-                if extension.config[:content_model] == :attributes
-                  document.parse_attributes content, extension.config[:positional_attrs] || [], sub_input: true, into: attributes if content
+                if (ext_config = extension.config)[:content_model] == :attributes
+                  document.parse_attributes content, ext_config[:positional_attrs] || ext_config[:pos_attrs] || [], sub_input: true, into: attributes if content
                 else
                   attributes['text'] = content || ''
                 end
-                if (default_attrs = extension.config[:default_attrs])
+                if (default_attrs = ext_config[:default_attrs])
                   attributes.update(default_attrs) {|_, old_v| old_v }
                 end
                 if (block = extension.process_method[parent, target, attributes])
@@ -680,10 +680,10 @@ class Parser
       elsif (style == 'float' || style == 'discrete') && (Compliance.underline_style_section_titles ?
           (is_section_title? this_line, reader.peek_line) : !indented && (atx_section_title? this_line))
         reader.unshift_line this_line
-        float_id, float_reftext, float_title, float_level = parse_section_title reader, document, attributes['id']
+        float_id, float_reftext, block_title, float_level = parse_section_title reader, document, attributes['id']
         attributes['reftext'] = float_reftext if float_reftext
         block = Block.new(parent, :floating_title, content_model: :empty)
-        block.title = float_title
+        block.title = block_title
         attributes.delete 'title'
         block.id = float_id || ((doc_attrs.key? 'sectids') ? (Section.generate_id block.title, document) : nil)
         block.level = float_level
@@ -871,11 +871,11 @@ class Parser
         return
       else
         if block_extensions && (extension = extensions.registered_for_block? block_context, cloaked_context)
-          unless (content_model = extension.config[:content_model]) == :skip
-            unless (positional_attrs = extension.config[:positional_attrs] || []).empty?
+          unless (content_model = (ext_config = extension.config)[:content_model]) == :skip
+            unless (positional_attrs = ext_config[:positional_attrs] || ext_config[:pos_attrs]).nil_or_empty?
               AttributeList.rekey(attributes, [nil] + positional_attrs)
             end
-            if (default_attrs = extension.config[:default_attrs])
+            if (default_attrs = ext_config[:default_attrs])
               default_attrs.each {|k, v| attributes[k] ||= v }
             end
             # QUESTION should we clone the extension for each cloaked context and set in config?
@@ -894,12 +894,19 @@ class Parser
 
     # FIXME we've got to clean this up, it's horrible!
     block.source_location = reader.cursor_at_mark if document.sourcemap
-    # FIXME title should be assigned when block is constructed
-    block.title = attributes.delete 'title' if attributes.key? 'title'
+    # 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
+      end
+    end
     # TODO eventually remove the style attribute from the attributes hash
     #block.style = attributes.delete 'style'
     block.style = attributes['style']
     if (block_id = block.id || (block.id = attributes['id']))
+      # convert title to resolve attributes while in scope
+      block.title if block_title ? (block_title.include? ATTR_REF_HEAD) : block.title?
       unless document.register :refs, [block_id, block]
         logger.warn message_with_context %(id assigned to block already in use: #{block_id}), source_location: reader.cursor_at_mark
       end
@@ -1044,13 +1051,6 @@ class Parser
       block = Block.new(parent, block_context, content_model: content_model, source: lines, attributes: attributes)
     end
 
-    # QUESTION should we have an explicit map or can we rely on check for *-caption attribute?
-    if (attributes.key? 'title') && block.context != :admonition &&
-        (parent.document.attributes.key? %(#{block.context}-caption))
-      block.title = attributes.delete 'title'
-      block.assign_caption(attributes.delete 'caption')
-    end
-
     # reader is confined within boundaries of a delimited block, so look for
     # blocks until there are no more lines
     parse_blocks block_reader, block if content_model == :compound
@@ -1521,7 +1521,7 @@ class Parser
             end
           end
         else
-          has_text = true if !this_line.empty?
+          has_text = true unless this_line.empty?
           if nested_list_type = (within_nested_list ? [:dlist] : NESTABLE_LIST_CONTEXTS).find {|ctx| ListRxMap[ctx] =~ this_line }
             within_nested_list = true
             if nested_list_type == :dlist && $3.nil_or_empty?
@@ -1612,7 +1612,9 @@ class Parser
     end
 
     # generate an ID if one was not embedded or specified as anchor above section title
-    if (id = section.id || (section.id = (document.attributes.key? 'sectids') ? (Section.generate_id section.title, document) : nil))
+    if (id = section.id || (section.id = (document.attributes.key? 'sectids') ? (generated_id = Section.generate_id section.title, document) : nil))
+      # convert title to resolve attributes while in scope
+      section.title if sect_title.include? ATTR_REF_HEAD unless generated_id
       unless document.register :refs, [id, section]
         logger.warn message_with_context %(id assigned to section already in use: #{id}), source_location: (reader.cursor_at_line reader.lineno - (sect_atx ? 1 : 2))
       end
@@ -2268,10 +2270,6 @@ class Parser
   # returns an instance of Asciidoctor::Table parsed from the provided reader
   def self.parse_table(table_reader, parent, attributes)
     table = Table.new(parent, attributes)
-    if attributes.key? 'title'
-      table.title = attributes.delete 'title'
-      table.assign_caption(attributes.delete 'caption')
-    end
 
     if (attributes.key? 'cols') && !(colspecs = parse_colspecs attributes['cols']).empty?
       table.create_columns colspecs

data/lib/asciidoctor/substitutors.rb

@@ -309,26 +309,27 @@ module Substitutors
         text = text.gsub extension.instance.regexp do
           # honor the escape
           next $&.slice 1, $&.length if $&.start_with? RS
-          extconf = extension.config
           if $~.names.empty?
             target, content = $1, $2
           else
             target, content = ($~[:target] rescue nil), ($~[:content] rescue nil)
           end
-          attributes = (attributes = extconf[:default_attrs]) ? attributes.merge : {}
-          if content.nil_or_empty?
-            attributes['text'] = content if content && extconf[:content_model] != :attributes
-          else
-            content = normalize_text content, true, true
-            # QUESTION should we store the unparsed attrlist in the attrlist key?
-            if extconf[:content_model] == :attributes
-              parse_attributes content, extconf[:positional_attrs] || [], into: attributes
+          attributes = (default_attrs = (ext_config = extension.config)[:default_attrs]) ? default_attrs.merge : {}
+          if content
+            if content.empty?
+              attributes['text'] = content unless ext_config[:content_model] == :attributes
             else
-              attributes['text'] = content
+              content = normalize_text content, true, true
+              # QUESTION should we store the unparsed attrlist in the attrlist key?
+              if ext_config[:content_model] == :attributes
+                parse_attributes content, ext_config[:positional_attrs] || ext_config[:pos_attrs] || [], into: attributes
+              else
+                attributes['text'] = content
+              end
             end
+            # NOTE for convenience, map content (unparsed attrlist) to target when format is short
+            target ||= ext_config[:format] == :short ? content : target
           end
-          # NOTE for convenience, map content (unparsed attrlist) to target when format is short
-          target ||= extconf[:format] == :short ? content : target
           if (Inline === (replacement = extension.process_method[self, target, attributes]))
             if (inline_subs = replacement.attributes.delete 'subs')
               replacement.text = apply_subs replacement.text, (expand_subs inline_subs)

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.0
-.\"      Date: 2019-03-22
+.\" Generator: Asciidoctor 2.0.1
+.\"      Date: 2019-03-25
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.0
+.\"    Source: Asciidoctor 2.0.1
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-03-22" "Asciidoctor 2.0.0" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2019-03-25" "Asciidoctor 2.0.1" "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.0
+:man source: Asciidoctor 2.0.1
 :page-layout: base
 
 == NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -206,6 +206,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - CHANGELOG.adoc
 - LICENSE
 - README-de.adoc