asciidoctor 2.0.0.rc.2 → 2.0.0.rc.3

data/lib/asciidoctor/converter/template.rb

@@ -58,7 +58,7 @@ class Converter::TemplateConverter < Converter::Base
     @safe = opts[:safe]
     @active_engines = {}
     @engine = opts[:template_engine]
-    @engine_options = {}.tap {|accum| DEFAULT_ENGINE_OPTIONS.each {|engine, engine_opts| accum[engine] = engine_opts.dup } }
+    @engine_options = {}.tap {|accum| DEFAULT_ENGINE_OPTIONS.each {|engine, engine_opts| accum[engine] = engine_opts.merge } }
     if opts[:htmlsyntax] == 'html' # if not set, assume xml since this converter is also used for DocBook (which doesn't specify htmlsyntax)
       @engine_options[:haml][:format] = :html5
       @engine_options[:slim][:format] = :html
@@ -124,7 +124,7 @@ class Converter::TemplateConverter < Converter::Base
   #
   # Returns a [Hash] of Tilt template objects keyed by template name.
   def templates
-    @templates.dup
+    @templates.merge
   end
 
   # Public: Registers a Tilt template with this converter.

data/lib/asciidoctor/core_ext.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative 'core_ext/float/truncate'
+require_relative 'core_ext/hash/merge'
 require_relative 'core_ext/match_data/names' if RUBY_ENGINE == 'opal'
 require_relative 'core_ext/nil_or_empty'
 require_relative 'core_ext/regexp/is_match'

data/lib/asciidoctor/core_ext/hash/merge.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# NOTE remove once minimum required Ruby version is at least 2.6
+Hash.prepend(Module.new do
+  def merge *args
+    (len = args.length) < 1 ? super({}) : (len > 1 ? args.inject(self) {|acc, arg| acc.merge arg } : (super args[0]))
+  end
+end) if (Hash.instance_method :merge).arity == 1

data/lib/asciidoctor/document.rb

@@ -241,7 +241,7 @@ class Document < AbstractBlock
   #
   # data    - The AsciiDoc source data as a String or String Array. (default: nil)
   # options - A Hash of options to control processing (e.g., safe mode value (:safe), backend (:backend),
-  #           header/footer toggle (:header_footer), custom attributes (:attributes)). (default: {})
+  #           standalone enclosure (:standalone), custom attributes (:attributes)). (default: {})
   #
   # Duplication of the options Hash is handled in the enclosing API.
   #
@@ -257,10 +257,10 @@ class Document < AbstractBlock
       @parent_document = parent_doc
       options[:base_dir] ||= parent_doc.base_dir
       options[:catalog_assets] = true if parent_doc.options[:catalog_assets]
-      @catalog = parent_doc.catalog.dup.tap {|catalog| catalog[:footnotes] = [] }
+      @catalog = parent_doc.catalog.merge footnotes: []
       # QUESTION should we support setting attribute in parent document from nested document?
       # NOTE we must dup or else all the assignments to the overrides clobbers the real attributes
-      @attribute_overrides = attr_overrides = parent_doc.attributes.dup
+      @attribute_overrides = attr_overrides = parent_doc.attributes.merge
       parent_doctype = attr_overrides.delete 'doctype'
       attr_overrides.delete 'compat-mode'
       attr_overrides.delete 'toc'
@@ -284,7 +284,7 @@ class Document < AbstractBlock
         footnotes: [],
         links: [],
         images: [],
-        indexterms: [],
+        #indexterms: [],
         callouts: Callouts.new,
         includes: {},
       }
@@ -328,6 +328,7 @@ class Document < AbstractBlock
       @path_resolver = PathResolver.new
       initialize_extensions = (defined? ::Asciidoctor::Extensions) ? true : nil
       @extensions = nil # initialize furthur down if initialize_extensions is true
+      options[:standalone] = options[:header_footer] if (options.key? :header_footer) && !(options.key? :standalone)
     end
 
     @parsed = false
@@ -335,20 +336,20 @@ class Document < AbstractBlock
     @counters = {}
     @attributes_modified = ::Set.new
     @docinfo_processor_extensions = {}
-    header_footer = (options[:header_footer] ||= false)
+    standalone = options[:standalone]
     (@options = options).freeze
 
     attrs = @attributes
     #attrs['encoding'] = 'UTF-8'
     attrs['sectids'] = ''
     attrs['toc-placement'] = 'auto'
-    if header_footer
+    if standalone
       attrs['copycss'] = ''
-      # sync embedded attribute with :header_footer option value
+      # sync embedded attribute with :standalone option value
       attr_overrides['embedded'] = nil
     else
       attrs['notitle'] = ''
-      # sync embedded attribute with :header_footer option value
+      # sync embedded attribute with :standalone option value
       attr_overrides['embedded'] = ''
     end
     attrs['stylesheet'] = ''
@@ -606,7 +607,8 @@ class Document < AbstractBlock
     when :refs
       @catalog[:refs][value[0]] ||= (ref = value[1])
       ref
-    when :footnotes, :indexterms
+    #when :footnotes, :indexterms
+    when :footnotes
       @catalog[type] << value
     else
       @catalog[type] << (type == :images ? (ImageReference.new value[0], value[1]) : value) if @options[:catalog_assets]
@@ -723,6 +725,10 @@ class Document < AbstractBlock
   end
   alias name doctitle
 
+  def xreftext xrefstyle = nil
+    (val = reftext) && !val.empty? ? val : title
+  end
+
   # Public: Convenience method to retrieve the document attribute 'author'
   #
   # returns the full name of the author as a String
@@ -928,7 +934,13 @@ class Document < AbstractBlock
         end
       end
     else
-      transform = ((opts.key? :header_footer) ? opts[:header_footer] : @options[:header_footer]) ? 'document' : 'embedded'
+      if opts.key? :standalone
+        transform = opts[:standalone] ? 'document' : 'embedded'
+      elsif opts.key? :header_footer
+        transform = opts[:header_footer] ? 'document' : 'embedded'
+      else
+        transform = @options[:standalone] ? 'document' : 'embedded'
+      end
       output = @converter.convert self, transform
     end
 
@@ -1053,10 +1065,12 @@ class Document < AbstractBlock
 
     # TODO allow document to control whether extension docinfo is contributed
     if @extensions && (docinfo_processors? location)
-      (content ||= []).concat @docinfo_processor_extensions[location].map {|ext| ext.process_method[self] }.compact
+      ((content || []).concat @docinfo_processor_extensions[location].map {|ext| ext.process_method[self] }.compact).join LF
+    elsif content
+      content.join LF
+    else
+      ''
     end
-
-    content ? (content.join LF) : ''
   end
 
   def docinfo_processors?(location = :head)
@@ -1235,7 +1249,7 @@ class Document < AbstractBlock
       end
     end
 
-    @header_attributes = attrs.dup
+    @header_attributes = attrs.merge
   end
 
   # Internal: Assign the local and document datetime attributes, which includes localdate, localyear, localtime,

data/lib/asciidoctor/extensions.rb

@@ -201,7 +201,7 @@ module Extensions
     end
 
     def create_inline parent, context, text, opts = {}
-      Inline.new parent, context, text, opts
+      Inline.new parent, context, text, context == :quoted ? ({ type: :unquoted }.merge opts) : opts
     end
 
     # Public: Parses blocks in the content and attaches the block to the parent.
@@ -211,7 +211,7 @@ module Extensions
     # QUESTION is parse_content the right method name? should we wrap in open block automatically?
     def parse_content parent, content, attributes = nil
       reader = Reader === content ? content : (Reader.new content)
-      while ((block = Parser.next_block reader, parent, (attributes ? attributes.dup : {})) && parent << block) ||
+      while ((block = Parser.next_block reader, parent, (attributes ? attributes.merge : {})) && parent << block) ||
           reader.has_more_lines?
       end
       parent
@@ -225,7 +225,8 @@ module Extensions
       [:create_pass_block,    :create_block,  :pass],
       [:create_listing_block, :create_block,  :listing],
       [:create_literal_block, :create_block,  :literal],
-      [:create_anchor,        :create_inline, :anchor]
+      [:create_anchor,        :create_inline, :anchor],
+      [:create_inline_pass,   :create_inline, :quoted],
     ].each do |method_name, delegate_method_name, context|
       define_method method_name do |*args|
         args.unshift args.shift, context

data/lib/asciidoctor/inline.rb

@@ -3,7 +3,7 @@ module Asciidoctor
 # Public: Methods for managing inline elements in AsciiDoc block
 class Inline < AbstractNode
   # Public: Get the text of this inline element
-  attr_reader :text
+  attr_accessor :text
 
   # Public: Get the type (qualifier) of this inline element
   attr_reader :type
@@ -12,19 +12,12 @@ class Inline < AbstractNode
   attr_accessor :target
 
   def initialize(parent, context, text = nil, opts = {})
-    super(parent, context)
+    super(parent, context, opts)
     @node_name = %(inline_#{context})
-
     @text = text
-
     @id = opts[:id]
     @type = opts[:type]
     @target = opts[:target]
-
-    # value of attributes option for inline nodes may be nil
-    if (attrs = opts[:attributes])
-      @attributes = attrs.dup
-    end
   end
 
   def block?

data/lib/asciidoctor/parser.rb

@@ -346,7 +346,10 @@ class Parser
     while reader.has_more_lines?
       parse_block_metadata_lines reader, document, attributes
       if (next_level = is_next_line_section?(reader, attributes))
-        next_level += document.attr('leveloffset').to_i if document.attr?('leveloffset')
+        if document.attr? 'leveloffset'
+          next_level += (document.attr 'leveloffset').to_i
+          next_level = 0 if next_level < 0
+        end
         if next_level > current_level
           if expected_next_level
             unless next_level == expected_next_level || (expected_next_level_alt && next_level == expected_next_level_alt) || expected_next_level < 0
@@ -445,7 +448,7 @@ class Parser
     # of a section that need to get transfered to the next section
     # see "trailing block attributes transfer to the following section" in
     # test/attributes_test.rb for an example
-    [section != parent ? section : nil, attributes.dup]
+    [section != parent ? section : nil, attributes.merge]
   end
 
   # Public: Parse and return the next Block at the Reader's current location
@@ -579,14 +582,14 @@ class Parser
               end
               # style doesn't have special meaning for media macros
               attributes.delete 'style' if attributes.key? 'style'
-              if (target.include? ATTR_REF_HEAD) && (target = block.sub_attributes target, attribute_missing: 'drop-line').empty?
-                # retain as unparsed if attribute-missing is skip
-                if (doc_attrs['attribute-missing'] || Compliance.attribute_missing) == 'skip'
-                  return Block.new(parent, :paragraph, content_model: :simple, source: [this_line])
-                # otherwise, drop the line
-                else
+              if target.include? ATTR_REF_HEAD
+                if (expanded_target = block.sub_attributes target).empty? &&
+                    (doc_attrs['attribute-missing'] || Compliance.attribute_missing) == 'drop-line' &&
+                    (block.sub_attributes target + ' ', attribute_missing: 'drop-line', drop_line_severity: :ignore).empty?
                   attributes.clear
                   return
+                else
+                  target = expanded_target
                 end
               end
               if blk_ctx == :image
@@ -616,12 +619,16 @@ class Parser
               if report_unknown_block_macro
                 logger.debug message_with_context %(unknown name for block macro: #{$1}), source_location: reader.cursor_at_mark
               else
-                target = $2
                 content = $3
-                if (target.include? ATTR_REF_HEAD) && (target = parent.sub_attributes target).empty? &&
-                  (doc_attrs['attribute-missing'] || Compliance.attribute_missing) == 'drop-line'
-                  attributes.clear
-                  return
+                if (target = $2).include? ATTR_REF_HEAD
+                  if (expanded_target = parent.sub_attributes target).empty? &&
+                      (doc_attrs['attribute-missing'] || Compliance.attribute_missing) == 'drop-line' &&
+                      (parent.sub_attributes target + ' ', attribute_missing: 'drop-line', drop_line_severity: :ignore).empty?
+                    attributes.clear
+                    return
+                  else
+                    target = expanded_target
+                  end
                 end
                 if extension.config[:content_model] == :attributes
                   document.parse_attributes content, extension.config[:pos_attrs] || [], sub_input: true, into: attributes if content
@@ -903,7 +910,7 @@ class Parser
     end
     # FIXME remove the need for this update!
     block.attributes.update(attributes) unless attributes.empty?
-    block.lock_in_subs
+    block.commit_subs
 
     #if doc_attrs.key? :pending_attribute_entries
     #  doc_attrs.delete(:pending_attribute_entries).each do |entry|
@@ -1025,7 +1032,7 @@ 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.dup])
+      if (block = extension.process_method[parent, block_reader || (Reader.new lines), attributes.merge])
         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
@@ -1749,7 +1756,10 @@ class Parser
     else
       raise %(Unrecognized section at #{reader.cursor_at_prev_line})
     end
-    sect_level += document.attr('leveloffset').to_i if document.attr?('leveloffset')
+    if document.attr? 'leveloffset'
+      sect_level += (document.attr 'leveloffset').to_i
+      sect_level = 0 if sect_level < 0
+    end
     [sect_id, sect_reftext, sect_title, sect_level, atx]
   end
 
@@ -2448,7 +2458,7 @@ class Parser
         end
 
         if m[1]
-          1.upto(m[1].to_i) { specs << spec.dup }
+          1.upto(m[1].to_i) { specs << spec.merge }
         else
           specs << spec
         end

data/lib/asciidoctor/reader.rb

@@ -902,30 +902,28 @@ class PreprocessorReader < Reader
     # attributes are case insensitive
     target = target.downcase unless (no_target = target.empty?)
 
-    # must have a target before brackets if ifdef or ifndef
-    # must not have text between brackets if endif
-    # skip line if it doesn't meet this criteria
-    # QUESTION should we warn for these bogus declarations?
-    return false if (no_target && (keyword == 'ifdef' || keyword == 'ifndef')) || (text && keyword == 'endif')
-
     if keyword == 'endif'
-      if @conditional_stack.empty?
-        logger.error message_with_context %(unmatched macro: endif::#{target}[]), source_location: cursor
+      if text
+        logger.error message_with_context %(malformed preprocessor directive - text not permitted: endif::#{target}[#{text}]), source_location: cursor
+      elsif @conditional_stack.empty?
+        logger.error message_with_context %(unmatched preprocessor directive: endif::#{target}[]), source_location: cursor
       elsif no_target || target == (pair = @conditional_stack[-1])[:target]
         @conditional_stack.pop
         @skipping = @conditional_stack.empty? ? false : @conditional_stack[-1][:skipping]
       else
-        logger.error message_with_context %(mismatched macro: endif::#{target}[], expected endif::#{pair[:target]}[]), source_location: cursor
+        logger.error message_with_context %(mismatched preprocessor directive: endif::#{target}[], expected endif::#{pair[:target]}[]), source_location: cursor
       end
       return true
-    end
-
-    if @skipping
+    elsif @skipping
       skip = false
     else
       # QUESTION any way to wrap ifdef & ifndef logic up together?
       case keyword
       when 'ifdef'
+        if no_target
+          logger.error message_with_context %(malformed preprocessor directive - missing target: ifdef::[#{text}]), source_location: cursor
+          return true
+        end
         case delimiter
         when ','
           # skip if no attribute is defined
@@ -938,6 +936,10 @@ class PreprocessorReader < Reader
           skip = !@document.attributes.key?(target)
         end
       when 'ifndef'
+        if no_target
+          logger.error message_with_context %(malformed preprocessor directive - missing target: ifndef::[#{text}]), source_location: cursor
+          return true
+        end
         case delimiter
         when ','
           # skip if any attribute is defined
@@ -950,15 +952,19 @@ class PreprocessorReader < Reader
           skip = @document.attributes.key?(target)
         end
       when 'ifeval'
-        # the text in brackets must match an expression
-        # don't honor match if it doesn't meet this criteria
-        return false unless no_target && EvalExpressionRx =~ text.strip
-
-        lhs = resolve_expr_val $1
-        rhs = resolve_expr_val $3
-
-        # regex enforces a restricted set of math-related operations (==, !=, <=, >=, <, >)
-        skip = (lhs.send $2, rhs) ? false : true
+        if no_target
+          # the text in brackets must match a conditional expression
+          if text && EvalExpressionRx =~ text.strip
+            # regex enforces a restricted set of math-related operations (==, !=, <=, >=, <, >)
+            skip = ((resolve_expr_val $1).send $2, (resolve_expr_val $3)) ? false : true
+          else
+            logger.error message_with_context %(malformed preprocessor directive - #{text ? 'invalid expression' : 'missing expression'}: ifeval::[#{text}]), source_location: cursor
+            return true
+          end
+        else
+          logger.error message_with_context %(malformed preprocessor directive - target not permitted: ifeval::#{target}[#{text}]), source_location: cursor
+          return true
+        end
       end
     end
 
@@ -1008,12 +1014,20 @@ class PreprocessorReader < Reader
   def preprocess_include_directive target, attrlist
     doc = @document
     if ((expanded_target = target).include? ATTR_REF_HEAD) &&
-        (expanded_target = doc.sub_attributes target, attribute_missing: 'drop-line').empty?
-      shift
-      if (doc.attributes['attribute-missing'] || Compliance.attribute_missing) == 'skip'
-        unshift %(Unresolved directive in #{@path} - include::#{target}[#{attrlist}])
+        (expanded_target = doc.sub_attributes target, attribute_missing: ((attr_missing = doc.attributes['attribute-missing'] || Compliance.attribute_missing) == 'warn' ? 'drop-line' : attr_missing)).empty?
+      if attr_missing == 'drop-line' && (doc.sub_attributes target + ' ', attribute_missing: 'drop-line', drop_line_severity: :ignore).empty?
+        logger.info { message_with_context %(include dropped due to missing attribute: include::#{target}[#{attrlist}]), source_location: cursor }
+        shift
+        true
+      elsif (doc.parse_attributes attrlist, [], sub_input: true)['optional-option']
+        logger.info { message_with_context %(optional include dropped #{attr_missing == 'warn' && (doc.sub_attributes target + ' ', attribute_missing: 'drop-line', drop_line_severity: :ignore).empty? ? 'due to missing attribute' : 'because resolved target is blank'}: include::#{target}[#{attrlist}]), source_location: cursor }
+        shift
+        true
+      else
+        logger.warn message_with_context %(include dropped #{attr_missing == 'warn' && (doc.sub_attributes target + ' ', attribute_missing: 'drop-line', drop_line_severity: :ignore).empty? ? 'due to missing attribute' : 'because resolved target is blank'}: include::#{target}[#{attrlist}]), source_location: cursor
+        # QUESTION should this line include target or expanded_target (or escaped target?)
+        replace_next_line %(Unresolved directive in #{@path} - include::#{target}[#{attrlist}])
       end
-      true
     elsif include_processors? && (ext = @include_processor_extensions.find {|candidate| candidate.instance.handles? expanded_target })
       shift
       # FIXME parse attributes only if requested by extension
@@ -1222,6 +1236,7 @@ class PreprocessorReader < Reader
       inc_path = doc.normalize_system_path target, @dir, nil, target_name: 'include file'
       unless ::File.file? inc_path
         if attributes['optional-option']
+          logger.info { message_with_context %(optional include dropped because include file not found: #{inc_path}), source_location: cursor }
           shift
           return true
         else

data/lib/asciidoctor/section.rb

@@ -111,14 +111,7 @@ class Section < AbstractBlock
   # Returns the section number as a String
   def sectnum(delimiter = '.', append = nil)
     append ||= (append == false ? '' : delimiter)
-    if @level == 1
-      %(#{@numeral}#{append})
-    elsif @level > 1
-      Section === @parent ? %(#{@parent.sectnum(delimiter, delimiter)}#{@numeral}#{append}) : %(#{@numeral}#{append})
-    else # @level == 0
-      # NOTE coerce @numeral to int just in case not set; can happen if section nesting is out of sequence
-      %(#{Helpers.int_to_roman @numeral.to_i}#{append})
-    end
+    @level > 1 && Section === @parent ? %(#{@parent.sectnum(delimiter, delimiter)}#{@numeral}#{append}) : %(#{@numeral}#{append})
   end
 
   # (see AbstractBlock#xreftext)

data/lib/asciidoctor/substitutors.rb

@@ -395,9 +395,9 @@ module Substitutors
       when :none
         replacement
       when :bounding
-        %(#{m[1]}#{replacement}#{m[2]})
+        m[1] + replacement + m[2]
       else # :leading
-        %(#{m[1]}#{replacement})
+        m[1] + replacement
       end
     end
   end
@@ -416,7 +416,7 @@ module Substitutors
   # Returns the [String] text with the attribute references replaced with resolved values
   def sub_attributes text, opts = {}
     doc_attrs = @document.attributes
-    drop = drop_line = drop_empty_line = attribute_undefined = attribute_missing = nil
+    drop = drop_line = drop_line_severity = drop_empty_line = attribute_undefined = attribute_missing = nil
     text = text.gsub AttributeReferenceRx do
       # escaped attribute, return unescaped
       if $1 == RS || $4 == RS
@@ -426,7 +426,7 @@ module Substitutors
         when 'set'
           _, value = Parser.store_attribute args[0], args[1] || '', @document
           # NOTE since this is an assignment, only drop-line applies here (skip and drop imply the same result)
-          if value || (attribute_undefined ||= doc_attrs['attribute-undefined'] || Compliance.attribute_undefined) != 'drop-line'
+          if value || (attribute_undefined ||= (doc_attrs['attribute-undefined'] || Compliance.attribute_undefined)) != 'drop-line'
             drop = drop_empty_line = DEL
           else
             drop = drop_line = CAN
@@ -442,11 +442,15 @@ module Substitutors
       elsif (value = INTRINSIC_ATTRIBUTES[key])
         value
       else
-        case (attribute_missing ||= opts[:attribute_missing] || doc_attrs['attribute-missing'] || Compliance.attribute_missing)
+        case (attribute_missing ||= (opts[:attribute_missing] || doc_attrs['attribute-missing'] || Compliance.attribute_missing))
         when 'drop'
           drop = drop_empty_line = DEL
         when 'drop-line'
-          logger.warn %(dropping line containing reference to missing attribute: #{key})
+          if (drop_line_severity ||= (opts[:drop_line_severity] || :info)) == :info
+            logger.info { %(dropping line containing reference to missing attribute: #{key}) }
+          #elsif drop_line_severity == :warn
+          #  logger.warn %(dropping line containing reference to missing attribute: #{key})
+          end
           drop = drop_line = CAN
         when 'warn'
           logger.warn %(skipping reference to missing attribute: #{key})
@@ -460,7 +464,7 @@ module Substitutors
     if drop
       # drop lines from text
       if drop_empty_line
-        lines = (text.tr_s DEL, DEL).split LF, -1
+        lines = (text.squeeze DEL).split LF, -1
         if drop_line
           (lines.reject {|line| line == DEL || line == CAN || (line.start_with? CAN) || (line.include? CAN) }.join LF).delete DEL
         else
@@ -486,13 +490,54 @@ module Substitutors
   def sub_macros(text)
     #return text if text.nil_or_empty?
     # some look ahead assertions to cut unnecessary regex calls
-    found = {}
-    found_square_bracket = found[:square_bracket] = text.include? '['
+    found_square_bracket = text.include? '['
     found_colon = text.include? ':'
-    found_macroish = found[:macroish] = found_square_bracket && found_colon
+    found_macroish = found_square_bracket && found_colon
     found_macroish_short = found_macroish && (text.include? ':[')
     doc_attrs = (doc = @document).attributes
 
+    # TODO allow position of substitution to be controlled (before or after other macros)
+    # TODO this handling needs some cleanup
+    if (extensions = doc.extensions) && extensions.inline_macros? # && found_macroish
+      extensions.inline_macros.each do |extension|
+        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 = unescape_bracketed_text content
+            # QUESTION should we store the unparsed attrlist in the attrlist key?
+            if extconf[:content_model] == :attributes
+              parse_attributes content, extconf[:pos_attrs] || [], into: attributes
+            else
+              attributes['text'] = content
+            end
+          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)
+            end
+            replacement.convert
+          elsif replacement
+            logger.info %(expected substitution value for custom inline macro to be of type Inline; got #{replacement.class}: #{$&})
+            replacement
+          else
+            ''
+          end
+        end
+      end
+    end
+
     if doc_attrs.key? 'experimental'
       if found_macroish_short && ((text.include? 'kbd:') || (text.include? 'btn:'))
         text = text.gsub InlineKbdBtnMacroRx do
@@ -509,7 +554,7 @@ module Substitutors
               # NOTE handle special case where keys ends with delimiter (e.g., Ctrl++ or Ctrl,,)
               if keys.end_with? delim
                 keys = (keys.chop.split delim, -1).map {|key| key.strip }
-                keys[-1] = %(#{keys[-1]}#{delim})
+                keys[-1] += delim
               else
                 keys = keys.split(delim).map {|key| key.strip }
               end
@@ -557,39 +602,6 @@ module Substitutors
       end
     end
 
-    # FIXME this location is somewhat arbitrary, probably need to be able to control ordering
-    # TODO this handling needs some cleanup
-    if (extensions = doc.extensions) && extensions.inline_macros? # && found_macroish
-      extensions.inline_macros.each do |extension|
-        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.dup : {}
-          if content.nil_or_empty?
-            attributes['text'] = content if content && extconf[:content_model] != :attributes
-          else
-            content = unescape_bracketed_text content
-            # QUESTION should we store the unparsed attrlist in the attrlist key?
-            if extconf[:content_model] == :attributes
-              parse_attributes content, extconf[:pos_attrs] || [], into: attributes
-            else
-              attributes['text'] = content
-            end
-          end
-          # NOTE for convenience, map content (unparsed attrlist) to target when format is short
-          target ||= extconf[:format] == :short ? content : target
-          replacement = extension.process_method[self, target, attributes]
-          Inline === replacement ? replacement.convert : replacement
-        end
-      end
-    end
-
     if found_macroish && ((text.include? 'image:') || (text.include? 'icon:'))
       # image:filename.png[Alt Text]
       text = text.gsub InlineImageMacroRx do
@@ -625,7 +637,7 @@ module Substitutors
 
           # indexterm:[Tigers,Big cats]
           terms = split_simple_csv normalize_string $2, true
-          doc.register :indexterms, terms
+          #doc.register :indexterms, terms
           (Inline.new self, :indexterm, nil, attributes: { 'terms' => terms }).convert
         when 'indexterm2'
           # honor the escape
@@ -633,7 +645,7 @@ module Substitutors
 
           # indexterm2:[Tigers]
           term = normalize_string $2, true
-          doc.register :indexterms, [term]
+          #doc.register :indexterms, [term]
           (Inline.new self, :indexterm, term, type: :visible).convert
         else
           text = $3
@@ -661,12 +673,12 @@ module Substitutors
           if visible
             # ((Tigers))
             term = normalize_string text
-            doc.register :indexterms, [term]
+            #doc.register :indexterms, [term]
             subbed_term = (Inline.new self, :indexterm, term, type: :visible).convert
           else
             # (((Tigers,Big cats)))
             terms = split_simple_csv(normalize_string text)
-            doc.register :indexterms, terms
+            #doc.register :indexterms, terms
             subbed_term = (Inline.new self, :indexterm, nil, attributes: { 'terms' => terms }).convert
           end
           before ? %(#{before}#{subbed_term}#{after}) : subbed_term
@@ -771,15 +783,14 @@ module Substitutors
       end
     end
 
-    if found_macroish && ((text.include? 'link:') || (text.include? 'mailto:'))
+    if found_macroish && ((text.include? 'link:') || (text.include? 'ilto:'))
       # inline link macros, link:target[text]
       text = text.gsub InlineLinkMacroRx do
         # honor the escape
         if $&.start_with? RS
           next $&.slice 1, $&.length
         elsif (mailto = $1)
-          target = %(mailto:#{$2})
-          mailto_text = $2
+          target = 'mailto:' + (mailto_text = $2)
         else
           target = $2
         end
@@ -854,7 +865,7 @@ module Substitutors
         # honor the escape
         next $1 == RS ? ($&.slice 1, $&.length) : $& if $1
 
-        target = %(mailto:#{$&})
+        target = 'mailto:' + $&
         # QUESTION should this be registered as an e-mail address?
         doc.register(:links, target)
 
@@ -862,65 +873,11 @@ module Substitutors
       end
     end
 
-    if found_macroish && (text.include? 'tnote')
-      text = text.gsub InlineFootnoteMacroRx do
-        # honor the escape
-        next $&.slice 1, $&.length if $&.start_with? RS
-
-        # footnoteref
-        if $1
-          if $3
-            id, text = $3.split ',', 2
-            logger.warn %(found deprecated footnoteref macro: #{$&}; use footnote macro with target instead) unless doc.compat_mode
-          else
-            next $&
-          end
-        # footnote
-        else
-          id = $2
-          text = $3
-        end
-
-        if id
-          if text
-            # REVIEW it's a dirty job, but somebody's gotta do it
-            text = restore_passthroughs(sub_inline_xrefs(sub_inline_anchors(normalize_string text, true)))
-            index = doc.counter('footnote-number')
-            doc.register(:footnotes, Document::Footnote.new(index, id, text))
-            type, target = :ref, nil
-          else
-            if (footnote = doc.footnotes.find {|candidate| candidate.id == id })
-              index, text = footnote.index, footnote.text
-            else
-              logger.warn %(invalid footnote reference: #{id})
-              index, text = nil, id
-            end
-            type, target, id = :xref, id, nil
-          end
-        elsif text
-          # REVIEW it's a dirty job, but somebody's gotta do it
-          text = restore_passthroughs(sub_inline_xrefs(sub_inline_anchors(normalize_string text, true)))
-          index = doc.counter('footnote-number')
-          doc.register(:footnotes, Document::Footnote.new(index, id, text))
-          type = target = nil
-        else
-          next $&
-        end
-        Inline.new(self, :footnote, text, attributes: { 'index' => index }, id: id, target: target, type: type).convert
-      end
-    end
-
-    sub_inline_xrefs(sub_inline_anchors(text, found), found)
-  end
-
-  # Internal: Substitute normal and bibliographic anchors
-  def sub_inline_anchors(text, found = nil)
-    if @context == :list_item && @parent.style == 'bibliography'
+    if found_square_bracket && @context == :list_item && @parent.style == 'bibliography'
       text = text.sub(InlineBiblioAnchorRx) { (Inline.new self, :anchor, $2, type: :bibref, id: $1).convert }
     end
 
-    if ((!found || found[:square_bracket]) && text.include?('[[')) ||
-        ((!found || found[:macroish]) && text.include?('or:'))
+    if (found_square_bracket && text.include?('[[')) || (found_macroish && text.include?('or:'))
       text = text.gsub InlineAnchorRx do
         # honor the escape
         next $&.slice 1, $&.length if $1
@@ -938,17 +895,13 @@ module Substitutors
       end
     end
 
-    text
-  end
-
-  # Internal: Substitute cross reference links
-  def sub_inline_xrefs(content, found = nil)
-    if ((found ? found[:macroish] : (content.include? '[')) && (content.include? 'xref:')) || ((content.include? '&') && (content.include? 'lt;&'))
-      content = content.gsub InlineXrefMacroRx do
+    #if (text.include? ';&l') || (found_macroish && (text.include? 'xref:'))
+    if ((text.include? '&') && (text.include? ';&l')) || (found_macroish && (text.include? 'xref:'))
+      text = text.gsub InlineXrefMacroRx do
         # honor the escape
         next $&.slice 1, $&.length if $&.start_with? RS
 
-        attrs, doc = {}, @document
+        attrs = {}
         if (refid = $1)
           refid, text = refid.split ',', 2
           text = text.lstrip if text
@@ -994,14 +947,14 @@ module Substitutors
         # handles: #id
         if target
           refid = fragment
-          logger.debug %(possible invalid reference: #{refid}) if logger.debug? && !doc.catalog[:refs][refid]
+          logger.info %(possible invalid reference: #{refid}) if logger.info? && !doc.catalog[:refs][refid]
         elsif path
           # handles: path#, path#id, path.adoc#, path.adoc#id, or path.adoc (xref macro only)
           # the referenced path is the current document, or its contents have been included in the current document
           if src2src && (doc.attributes['docname'] == path || doc.catalog[:includes][path])
             if fragment
               refid, path, target = fragment, nil, %(##{fragment})
-              logger.debug %(possible invalid reference: #{refid}) if logger.debug? && !doc.catalog[:refs][refid]
+              logger.info %(possible invalid reference: #{refid}) if logger.info? && !doc.catalog[:refs][refid]
             else
               refid, path, target = nil, nil, '#'
             end
@@ -1016,7 +969,7 @@ module Substitutors
         # handles: id (in compat mode or when natural xrefs are disabled)
         elsif doc.compat_mode || !Compliance.natural_xrefs
           refid, target = fragment, %(##{fragment})
-          logger.debug %(possible invalid reference: #{refid}) if logger.debug? && doc.catalog[:refs][refid]
+          logger.info %(possible invalid reference: #{refid}) if logger.info? && doc.catalog[:refs][refid]
         # handles: id
         elsif doc.catalog[:refs][fragment]
           refid, target = fragment, %(##{fragment})
@@ -1026,14 +979,62 @@ module Substitutors
           fragment, target = refid, %(##{refid})
         else
           refid, target = fragment, %(##{fragment})
-          logger.debug %(possible invalid reference: #{refid}) if logger.debug?
+          logger.info %(possible invalid reference: #{refid}) if logger.info?
         end
-        attrs['path'], attrs['fragment'], attrs['refid'] = path, fragment, refid
+        attrs['path'] = path
+        attrs['fragment'] = fragment
+        attrs['refid'] = refid
         Inline.new(self, :anchor, text, type: :xref, target: target, attributes: attrs).convert
       end
     end
 
-    content
+    if found_macroish && (text.include? 'tnote')
+      text = text.gsub InlineFootnoteMacroRx do
+        # honor the escape
+        next $&.slice 1, $&.length if $&.start_with? RS
+
+        # footnoteref
+        if $1
+          if $3
+            id, text = $3.split ',', 2
+            logger.warn %(found deprecated footnoteref macro: #{$&}; use footnote macro with target instead) unless doc.compat_mode
+          else
+            next $&
+          end
+        # footnote
+        else
+          id = $2
+          text = $3
+        end
+
+        if id
+          if text
+            text = restore_passthroughs(normalize_string text, true)
+            index = doc.counter('footnote-number')
+            doc.register(:footnotes, Document::Footnote.new(index, id, text))
+            type, target = :ref, nil
+          else
+            if (footnote = doc.footnotes.find {|candidate| candidate.id == id })
+              index, text = footnote.index, footnote.text
+            else
+              logger.warn %(invalid footnote reference: #{id})
+              index, text = nil, id
+            end
+            type, target, id = :xref, id, nil
+          end
+        elsif text
+          text = restore_passthroughs(normalize_string text, true)
+          index = doc.counter('footnote-number')
+          doc.register(:footnotes, Document::Footnote.new(index, id, text))
+          type = target = nil
+        else
+          next $&
+        end
+        Inline.new(self, :footnote, text, attributes: { 'index' => index }, id: id, target: target, type: type).convert
+      end
+    end
+
+    text
   end
 
   # Public: Substitute callout source references
@@ -1473,7 +1474,7 @@ module Substitutors
   # Internal: Inserts text into a formatted text enclosure; used by xreftext
   alias sub_placeholder sprintf unless RUBY_ENGINE == 'opal'
 
-  # Internal: Lock-in the substitutions for this block
+  # Internal: Commit the requested substitutions to this block.
   #
   # Looks for an attribute named "subs". If present, resolves substitutions
   # from the value of that attribute and assigns them to the subs property on
@@ -1482,7 +1483,7 @@ module Substitutors
   # the content model of the block.
   #
   # Returns The Array of resolved substitutions now assigned to this block
-  def lock_in_subs
+  def commit_subs
     unless (default_subs = @default_subs)
       case @content_model
       when :simple