asciidoctor 2.0.15 → 2.0.16

data/lib/asciidoctor/path_resolver.rb

@@ -109,7 +109,7 @@ class PathResolver
   SLASH = '/'
   BACKSLASH = '\\'
   DOUBLE_SLASH = '//'
-  WindowsRootRx = /^(?:[a-zA-Z]:)?[\\\/]/
+  WindowsRootRx = %r(^(?:[a-zA-Z]:)?[\\/])
 
   attr_accessor :file_separator
   attr_accessor :working_dir
@@ -290,8 +290,8 @@ class PathResolver
       # ex. ./sample/path
       elsif posix_path.start_with? DOT_SLASH
         root = DOT_SLASH
-      # else ex. sample/path
       end
+      # otherwise ex. sample/path
     elsif root? posix_path
       # ex. //sample/path
       if unc? posix_path
@@ -306,8 +306,8 @@ class PathResolver
     # ex. ./sample/path
     elsif posix_path.start_with? DOT_SLASH
       root = DOT_SLASH
-    # else ex. sample/path
     end
+    # otherwise ex. sample/path
 
     path_segments = (root ? (posix_path.slice root.length, posix_path.length) : posix_path).split SLASH
     # strip out all dot entries

data/lib/asciidoctor/reader.rb

@@ -59,8 +59,7 @@ class Reader
       end
       @lineno = cursor.lineno || 1
     end
-    @lines = prepare_lines data, opts
-    @source_lines = @lines.drop 0
+    @lines = (@source_lines = prepare_lines data, opts).reverse
     @mark = nil
     @look_ahead = 0
     @process_lines = true
@@ -127,7 +126,7 @@ class Reader
   # Returns nothing if there is no more data.
   def peek_line direct = false
     if direct || @look_ahead > 0
-      @unescape_next_line ? ((line = @lines[0]).slice 1, line.length) : @lines[0]
+      @unescape_next_line ? ((line = @lines[-1]).slice 1, line.length) : @lines[-1]
     elsif @lines.empty?
       @look_ahead = 0
       nil
@@ -135,7 +134,7 @@ class Reader
       # FIXME the problem with this approach is that we aren't
       # retaining the modified line (hence the @unescape_next_line tweak)
       # perhaps we need a stack of proxied lines
-      (line = process_line @lines[0]) ? line : peek_line
+      (process_line @lines[-1]) || peek_line
     end
   end
 
@@ -192,9 +191,7 @@ class Reader
   def read_lines
     lines = []
     # has_more_lines? triggers preprocessor
-    while has_more_lines?
-      lines << shift
-    end
+    lines << shift while has_more_lines?
     lines
   end
   alias readlines read_lines
@@ -241,7 +238,6 @@ class Reader
   # Returns nothing.
   def unshift_lines lines_to_restore
     unshift_all lines_to_restore
-    nil
   end
   alias restore_lines unshift_lines
 
@@ -334,7 +330,7 @@ class Reader
     comment_lines = []
     # optimized code for shortest execution path
     while (next_line = peek_line) && !next_line.empty?
-      if (next_line.start_with? '//')
+      if next_line.start_with? '//'
         comment_lines << shift
       else
         break
@@ -407,34 +403,22 @@ class Reader
       break_on_list_continuation = options[:break_on_list_continuation]
     end
     skip_comments = options[:skip_line_comments]
-    complete = line_read = line_restored = nil
+    line_read = line_restored = nil
     shift if options[:skip_first_line]
-    while !complete && (line = read_line)
-      complete = while true
-        break true if terminator && line == terminator
-        # QUESTION: can we get away with line.empty? here?
-        break true if break_on_blank_lines && line.empty?
-        if break_on_list_continuation && line_read && line == LIST_CONTINUATION
-          options[:preserve_last_line] = true
-          break true
-        end
-        break true if block_given? && (yield line)
-        break false
-      end
-      if complete
-        if options[:read_last_line]
-          result << line
-          line_read = true
-        end
+    while (line = read_line)
+      if terminator ? line == terminator : ((break_on_blank_lines && line.empty?) ||
+          (break_on_list_continuation && line_read && line == LIST_CONTINUATION && (options[:preserve_last_line] = true)) ||
+          (block_given? && (yield line)))
+        result << line if options[:read_last_line]
         if options[:preserve_last_line]
           unshift line
           line_restored = true
         end
-      else
-        unless skip_comments && (line.start_with? '//') && !(line.start_with? '///')
-          result << line
-          line_read = true
-        end
+        break
+      end
+      unless skip_comments && (line.start_with? '//') && !(line.start_with? '///')
+        result << line
+        line_read = true
       end
     end
     if restore_process_lines
@@ -459,21 +443,37 @@ class Reader
   def shift
     @lineno += 1
     @look_ahead -= 1 unless @look_ahead == 0
-    @lines.shift
+    @lines.pop
   end
 
   # Internal: Restore the line to the stack and decrement the lineno
   def unshift line
     @lineno -= 1
     @look_ahead += 1
-    @lines.unshift line
+    @lines.push line
+    nil
   end
 
-  # Internal: Restore the lines to the stack and decrement the lineno
-  def unshift_all lines
-    @lineno -= lines.size
-    @look_ahead += lines.size
-    @lines.unshift(*lines)
+  if ::RUBY_ENGINE == 'jruby'
+    # Internal: Restore the lines to the stack and decrement the lineno
+    def unshift_all lines_to_restore
+      @lineno -= lines_to_restore.size
+      @look_ahead += lines_to_restore.size
+      if lines_to_restore.respond_to? :reverse
+        @lines.push(*lines_to_restore.reverse)
+      else
+        lines_to_restore.reverse_each {|it| @lines.push it }
+      end
+      nil
+    end
+  else
+    # Internal: Restore the lines to the stack and decrement the lineno
+    def unshift_all lines_to_restore
+      @lineno -= lines_to_restore.size
+      @look_ahead += lines_to_restore.size
+      @lines.push(*lines_to_restore.reverse)
+      nil
+    end
   end
 
   def cursor
@@ -516,12 +516,12 @@ class Reader
   #
   # Returns A copy of the String Array of lines remaining in this Reader
   def lines
-    @lines.drop 0
+    @lines.reverse
   end
 
   # Public: Get a copy of the remaining lines managed by this Reader joined as a String
   def string
-    @lines.join LF
+    @lines.reverse.join LF
   end
 
   # Public: Get the source lines for this Reader joined as a String
@@ -576,8 +576,7 @@ class Reader
   # Returns A String Array of source lines. If the source data is an Array, this method returns a copy.
   def prepare_lines data, opts = {}
     if (normalize = opts[:normalize])
-      trim_end = normalize == :chomp ? false : true
-      ::Array === data ? (Helpers.prepare_source_array data, trim_end) : (Helpers.prepare_source_string data, trim_end)
+      ::Array === data ? (Helpers.prepare_source_array data, normalize != :chomp) : (Helpers.prepare_source_string data, normalize != :chomp)
     elsif ::Array === data
       data.drop 0
     elsif data
@@ -725,16 +724,11 @@ class PreprocessorReader < Reader
     else
       # FIXME we eventually want to handle leveloffset without affecting the lines
       if attributes.key? 'leveloffset'
-        @lines.unshift ''
-        @lines.unshift %(:leveloffset: #{attributes['leveloffset']})
-        @lines << ''
-        if (old_leveloffset = @document.attr 'leveloffset')
-          @lines << %(:leveloffset: #{old_leveloffset})
-        else
-          @lines << ':leveloffset!:'
-        end
-        # compensate for these extra lines
+        @lines = [((leveloffset = @document.attr 'leveloffset') ? %(:leveloffset: #{leveloffset}) : ':leveloffset!:'), ''] + @lines.reverse + ['', %(:leveloffset: #{attributes['leveloffset']})]
+        # compensate for these extra lines at the top
         @lineno -= 2
+      else
+        @lines.reverse!
       end
 
       # FIXME kind of a hack
@@ -804,10 +798,8 @@ class PreprocessorReader < Reader
     result = super
 
     # QUESTION should this work for AsciiDoc table cell content? Currently it does not.
-    if @document && @document.attributes['skip-front-matter']
-      if (front_matter = skip_front_matter! result)
-        @document.attributes['front-matter'] = front_matter.join LF
-      end
+    if @document && @document.attributes['skip-front-matter'] && (front_matter = skip_front_matter! result)
+      @document.attributes['front-matter'] = front_matter.join LF
     end
 
     if opts.fetch :condense, true
@@ -957,11 +949,12 @@ class PreprocessorReader < Reader
         if no_target
           # the text in brackets must match a conditional expression
           if text && EvalExpressionRx =~ text.strip
+            # NOTE assignments must happen before call to resolve_expr_val for compatiblity with Opal
             lhs = $1
+            # regex enforces a restricted set of math-related operations (==, !=, <=, >=, <, >)
             op = $2
             rhs = $3
-            # regex enforces a restricted set of math-related operations (==, !=, <=, >=, <, >)
-            skip = ((resolve_expr_val lhs).send op, (resolve_expr_val rhs)) ? false : true
+            skip = ((resolve_expr_val lhs).send op, (resolve_expr_val rhs)) ? false : true rescue true
           else
             logger.error message_with_context %(malformed preprocessor directive - #{text ? 'invalid expression' : 'missing expression'}: ifeval::[#{text}]), source_location: cursor
             return true
@@ -1051,10 +1044,11 @@ class PreprocessorReader < Reader
 
       parsed_attrs = doc.parse_attributes attrlist, [], sub_input: true
       inc_path, target_type, relpath = resolve_include_path expanded_target, attrlist, parsed_attrs
-      if target_type == :file
+      case target_type
+      when :file
         reader = ::File.method :open
         read_mode = FILE_READ_MODE
-      elsif target_type == :uri
+      when :uri
         reader = ::OpenURI.method :open_uri
         read_mode = URI_READ_MODE
       else
@@ -1075,7 +1069,7 @@ class PreprocessorReader < Reader
           (split_delimited_value parsed_attrs['lines']).each do |linedef|
             if linedef.include? '..'
               from, _, to = linedef.partition '..'
-              inc_linenos += (to.empty? || (to = to.to_i) < 0) ? [from.to_i, 1.0/0.0] : (from.to_i..to).to_a
+              inc_linenos += (to.empty? || (to = to.to_i) < 0) ? [from.to_i, ::Float::INFINITY] : (from.to_i..to).to_a
             else
               inc_linenos << linedef.to_i
             end
@@ -1133,16 +1127,21 @@ class PreprocessorReader < Reader
       elsif inc_tags
         inc_lines, inc_offset, inc_lineno, tag_stack, tags_used, active_tag = [], nil, 0, [], ::Set.new, nil
         if inc_tags.key? '**'
+          select = base_select = inc_tags.delete '**'
           if inc_tags.key? '*'
-            select = base_select = inc_tags.delete '**'
             wildcard = inc_tags.delete '*'
-          else
-            select = base_select = wildcard = inc_tags.delete '**'
+          elsif !select && inc_tags.values.first == false
+            wildcard = true
           end
         elsif inc_tags.key? '*'
-          select = base_select = !(wildcard = inc_tags.delete '*')
+          if inc_tags.keys.first == '*'
+            select = base_select = !(wildcard = inc_tags.delete '*')
+          else
+            select = base_select = false
+            wildcard = inc_tags.delete '*'
+          end
         else
-          select = base_select = false
+          select = base_select = !(inc_tags.value? true)
         end
         begin
           reader.call inc_path, read_mode do |f|
@@ -1193,7 +1192,7 @@ class PreprocessorReader < Reader
         end
         shift
         if inc_offset
-          parsed_attrs['partial-option'] = '' unless base_select && wildcard && inc_tags.empty?
+          parsed_attrs['partial-option'] = '' unless base_select && wildcard != false && inc_tags.empty?
           # FIXME not accounting for skipped lines in reader line numbering
           push_include inc_lines, inc_path, relpath, inc_offset, parsed_attrs
         end
@@ -1264,7 +1263,7 @@ class PreprocessorReader < Reader
   end
 
   def pop_include
-    if @include_stack.size > 0
+    unless @include_stack.empty?
       @lines, @file, @dir, @path, @lineno, @maxdepth, @process_lines = @include_stack.pop
       # FIXME kind of a hack
       #Document::AttributeEntry.new('infile', @file).save_to_next_block @document

data/lib/asciidoctor/rx.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Asciidoctor
   # A collection of regular expression constants used by the parser. (For speed, these are not defined in the Rx module,
   # but rather directly in the Asciidoctor module).
@@ -469,7 +470,7 @@ module Asciidoctor
   #   footnoteref:[id,text] (legacy)
   #   footnoteref:[id] (legacy)
   #
-  InlineFootnoteMacroRx = /\\?footnote(?:(ref):|:([#{CC_WORD}-]+)?)\[(?:|(#{CC_ALL}*?[^\\]))\](?!<\/a>)/m
+  InlineFootnoteMacroRx = %r(\\?footnote(?:(ref):|:([#{CC_WORD}-]+)?)\[(?:|(#{CC_ALL}*?[^\\]))\](?!</a>))m
 
   # Matches an image or icon inline macro.
   #

data/lib/asciidoctor/substitutors.rb

@@ -330,13 +330,13 @@ module Substitutors
             # NOTE for convenience, map content (unparsed attrlist) to target when format is short
             target ||= ext_config[:format] == :short ? content : target
           end
-          if (Inline === (replacement = extension.process_method[self, target, attributes]))
+          if Inline === (replacement = extension.process_method[self, target, attributes])
             if (inline_subs = replacement.attributes.delete 'subs') && (inline_subs = expand_subs inline_subs, 'custom inline macro')
               replacement.text = apply_subs replacement.text, inline_subs
             end
             replacement.convert
           elsif replacement
-            logger.info %(expected substitution value for custom inline macro to be of type Inline; got #{replacement.class}: #{match})
+            logger.info { %(expected substitution value for custom inline macro to be of type Inline; got #{replacement.class}: #{match}) }
             replacement
           else
             ''
@@ -445,23 +445,16 @@ module Substitutors
           # indexterm:[Tigers,Big cats]
           if (attrlist = normalize_text $2, true, true).include? '='
             if (primary = (attrs = (AttributeList.new attrlist, self).parse)[1])
-              attrs['terms'] = terms = [primary]
-              if (secondary = attrs[2])
-                terms << secondary
-                if (tertiary = attrs[3])
-                  terms << tertiary
-                end
-              end
+              attrs['terms'] = [primary]
               if (see_also = attrs['see-also'])
                 attrs['see-also'] = (see_also.include? ',') ? (see_also.split ',').map {|it| it.lstrip } : [see_also]
               end
             else
-              attrs = { 'terms' => (terms = attrlist) }
+              attrs = { 'terms' => attrlist }
             end
           else
-            attrs = { 'terms' => (terms = split_simple_csv attrlist) }
+            attrs = { 'terms' => (split_simple_csv attrlist) }
           end
-          #doc.register :indexterms, terms
           (Inline.new self, :indexterm, nil, attributes: attrs).convert
         when 'indexterm2'
           # honor the escape
@@ -474,34 +467,33 @@ module Substitutors
               attrs['see-also'] = (see_also.include? ',') ? (see_also.split ',').map {|it| it.lstrip } : [see_also]
             end
           end
-          #doc.register :indexterms, [term]
           (Inline.new self, :indexterm, term, attributes: attrs, type: :visible).convert
         else
-          text = $3
+          encl_text = $3
           # honor the escape
           if $&.start_with? RS
             # escape concealed index term, but process nested flow index term
-            if (text.start_with? '(') && (text.end_with? ')')
-              text = text.slice 1, text.length - 2
+            if (encl_text.start_with? '(') && (encl_text.end_with? ')')
+              encl_text = encl_text.slice 1, encl_text.length - 2
               visible, before, after = true, '(', ')'
             else
               next $&.slice 1, $&.length
             end
           else
             visible = true
-            if text.start_with? '('
-              if text.end_with? ')'
-                text, visible = (text.slice 1, text.length - 2), false
+            if encl_text.start_with? '('
+              if encl_text.end_with? ')'
+                encl_text, visible = (encl_text.slice 1, encl_text.length - 2), false
               else
-                text, before, after = (text.slice 1, text.length), '(', ''
+                encl_text, before, after = (encl_text.slice 1, encl_text.length), '(', ''
               end
-            elsif text.end_with? ')'
-              text, before, after = text.chop, '', ')'
+            elsif encl_text.end_with? ')'
+              encl_text, before, after = encl_text.chop, '', ')'
             end
           end
           if visible
             # ((Tigers))
-            if (term = normalize_text text, true).include? ';&'
+            if (term = normalize_text encl_text, true).include? ';&'
               if term.include? ' &gt;&gt; '
                 term, _, see = term.partition ' &gt;&gt; '
                 attrs = { 'see' => see }
@@ -510,12 +502,11 @@ module Substitutors
                 attrs = { 'see-also' => see_also }
               end
             end
-            #doc.register :indexterms, [term]
             subbed_term = (Inline.new self, :indexterm, term, attributes: attrs, type: :visible).convert
           else
             # (((Tigers,Big cats)))
             attrs = {}
-            if (terms = normalize_text text, true).include? ';&'
+            if (terms = normalize_text encl_text, true).include? ';&'
               if terms.include? ' &gt;&gt; '
                 terms, _, see = terms.partition ' &gt;&gt; '
                 attrs['see'] = see
@@ -524,8 +515,7 @@ module Substitutors
                 attrs['see-also'] = see_also
               end
             end
-            attrs['terms'] = terms = split_simple_csv terms
-            #doc.register :indexterms, terms
+            attrs['terms'] = split_simple_csv terms
             subbed_term = (Inline.new self, :indexterm, nil, attributes: attrs).convert
           end
           before ? %(#{before}#{subbed_term}#{after}) : subbed_term
@@ -545,7 +535,7 @@ module Substitutors
         # NOTE if $4 is set, we're looking at a formal macro (e.g., https://example.org[])
         if $4
           prefix = '' if prefix == 'link:'
-          text = $4
+          link_text = nil if (link_text = $4).empty?
         else
           # invalid macro syntax (link: prefix w/o trailing square brackets or enclosed in double quotes)
           # FIXME we probably shouldn't even get here when the link: prefix is present; the regex is doing too much
@@ -553,7 +543,6 @@ module Substitutors
           when 'link:', ?", ?'
             next $&
           end
-          text = ''
           case $3
           when ')', '?', '!'
             target = target.chop
@@ -593,27 +582,37 @@ module Substitutors
         end
 
         attrs, link_opts = nil, { type: :link }
-        unless text.empty?
-          text = text.gsub ESC_R_SB, R_SB if text.include? R_SB
-          if !doc.compat_mode && (text.include? '=')
-            # NOTE if an equals sign (=) is present, extract attributes from text
-            text, attrs = extract_attributes_from_text text, ''
+
+        if link_text
+          new_link_text = link_text = link_text.gsub ESC_R_SB, R_SB if link_text.include? R_SB
+          if !doc.compat_mode && (link_text.include? '=')
+            # NOTE if an equals sign (=) is present, extract attributes from link text
+            link_text, attrs = extract_attributes_from_text link_text, ''
+            new_link_text = link_text
             link_opts[:id] = attrs['id']
           end
 
-          if text.end_with? '^'
-            text = text.chop
+          if link_text.end_with? '^'
+            new_link_text = link_text = link_text.chop
             if attrs
               attrs['window'] ||= '_blank'
             else
               attrs = { 'window' => '_blank' }
             end
           end
-        end
 
-        if text.empty?
+          if new_link_text && new_link_text.empty?
+            # NOTE it's not possible for the URI scheme to be bare in this case
+            link_text = (doc_attrs.key? 'hide-uri-scheme') ? (target.sub UriSniffRx, '') : target
+            bare = true
+          end
+        else
           # NOTE it's not possible for the URI scheme to be bare in this case
-          text = (doc_attrs.key? 'hide-uri-scheme') ? (target.sub UriSniffRx, '') : target
+          link_text = (doc_attrs.key? 'hide-uri-scheme') ? (target.sub UriSniffRx, '') : target
+          bare = true
+        end
+
+        if bare
           if attrs
             attrs['role'] = (attrs.key? 'role') ? %(bare #{attrs['role']}) : 'bare'
           else
@@ -623,7 +622,7 @@ module Substitutors
 
         doc.register :links, (link_opts[:target] = target)
         link_opts[:attributes] = attrs if attrs
-        %(#{prefix}#{(Inline.new self, :anchor, text, link_opts).convert}#{suffix})
+        %(#{prefix}#{(Inline.new self, :anchor, link_text, link_opts).convert}#{suffix})
       end
     end
 
@@ -639,12 +638,12 @@ module Substitutors
           target = $2
         end
         attrs, link_opts = nil, { type: :link }
-        unless (text = $3).empty?
-          text = text.gsub ESC_R_SB, R_SB if text.include? R_SB
+        unless (link_text = $3).empty?
+          link_text = link_text.gsub ESC_R_SB, R_SB if link_text.include? R_SB
           if mailto
-            if !doc.compat_mode && (text.include? ',')
-              # NOTE if a comma (,) is present, extract attributes from text
-              text, attrs = extract_attributes_from_text text, ''
+            if !doc.compat_mode && (link_text.include? ',')
+              # NOTE if a comma (,) is present, extract attributes from link text
+              link_text, attrs = extract_attributes_from_text link_text, ''
               link_opts[:id] = attrs['id']
               if attrs.key? 2
                 if attrs.key? 3
@@ -654,14 +653,14 @@ module Substitutors
                 end
               end
             end
-          elsif !doc.compat_mode && (text.include? '=')
-            # NOTE if an equals sign (=) is present, extract attributes from text
-            text, attrs = extract_attributes_from_text text, ''
+          elsif !doc.compat_mode && (link_text.include? '=')
+            # NOTE if an equals sign (=) is present, extract attributes from link text
+            link_text, attrs = extract_attributes_from_text link_text, ''
             link_opts[:id] = attrs['id']
           end
 
-          if text.end_with? '^'
-            text = text.chop
+          if link_text.end_with? '^'
+            link_text = link_text.chop
             if attrs
               attrs['window'] ||= '_blank'
             else
@@ -670,17 +669,17 @@ module Substitutors
           end
         end
 
-        if text.empty?
+        if link_text.empty?
           # mailto is a special case, already processed
           if mailto
-            text = mailto_text
+            link_text = mailto_text
           else
             if doc_attrs.key? 'hide-uri-scheme'
-              if (text = target.sub UriSniffRx, '').empty?
-                text = target
+              if (link_text = target.sub UriSniffRx, '').empty?
+                link_text = target
               end
             else
-              text = target
+              link_text = target
             end
             if attrs
               attrs['role'] = (attrs.key? 'role') ? %(bare #{attrs['role']}) : 'bare'
@@ -693,7 +692,7 @@ module Substitutors
         # QUESTION should a mailto be registered as an e-mail address?
         doc.register :links, (link_opts[:target] = target)
         link_opts[:attributes] = attrs if attrs
-        Inline.new(self, :anchor, text, link_opts).convert
+        Inline.new(self, :anchor, link_text, link_opts).convert
       end
     end
 
@@ -740,15 +739,17 @@ module Substitutors
 
         attrs = {}
         if (refid = $1)
-          refid, text = refid.split ',', 2
-          text = text.lstrip if text
+          if refid.include? ','
+            refid, _, link_text = refid.partition ','
+            link_text = nil if (link_text = link_text.lstrip).empty?
+          end
         else
           macro = true
           refid = $2
-          if (text = $3)
-            text = text.gsub ESC_R_SB, R_SB if text.include? R_SB
-            # NOTE if an equals sign (=) is present, extract attributes from text
-            text, attrs = extract_attributes_from_text text if !doc.compat_mode && (text.include? '=')
+          if (link_text = $3)
+            link_text = link_text.gsub ESC_R_SB, R_SB if link_text.include? R_SB
+            # NOTE if an equals sign (=) is present, extract attributes from link text
+            link_text, attrs = extract_attributes_from_text link_text if !doc.compat_mode && (link_text.include? '=')
           end
         end
 
@@ -827,7 +828,7 @@ module Substitutors
         attrs['path'] = path
         attrs['fragment'] = fragment
         attrs['refid'] = refid
-        Inline.new(self, :anchor, text, type: :xref, target: target, attributes: attrs).convert
+        Inline.new(self, :anchor, link_text, type: :xref, target: target, attributes: attrs).convert
       end
     end
 
@@ -839,7 +840,7 @@ module Substitutors
         # footnoteref
         if $1
           if $3
-            id, text = $3.split ',', 2
+            id, content = $3.split ',', 2
             logger.warn %(found deprecated footnoteref macro: #{$&}; use footnote macro with target instead) unless doc.compat_mode
           else
             next $&
@@ -847,31 +848,31 @@ module Substitutors
         # footnote
         else
           id = $2
-          text = $3
+          content = $3
         end
 
         if id
           if (footnote = doc.footnotes.find {|candidate| candidate.id == id })
-            index, text = footnote.index, footnote.text
+            index, content = footnote.index, footnote.text
             type, target, id = :xref, id, nil
-          elsif text
-            text = restore_passthroughs(normalize_text text, true, true)
+          elsif content
+            content = restore_passthroughs(normalize_text content, true, true)
             index = doc.counter('footnote-number')
-            doc.register(:footnotes, Document::Footnote.new(index, id, text))
+            doc.register(:footnotes, Document::Footnote.new(index, id, content))
             type, target = :ref, nil
           else
             logger.warn %(invalid footnote reference: #{id})
-            type, target, text, id = :xref, id, id, nil
+            type, target, content, id = :xref, id, id, nil
           end
-        elsif text
-          text = restore_passthroughs(normalize_text text, true, true)
+        elsif content
+          content = restore_passthroughs(normalize_text content, true, true)
           index = doc.counter('footnote-number')
-          doc.register(:footnotes, Document::Footnote.new(index, id, text))
+          doc.register(:footnotes, Document::Footnote.new(index, id, content))
           type = target = nil
         else
           next $&
         end
-        Inline.new(self, :footnote, text, attributes: { 'index' => index }, id: id, target: target, type: type).convert
+        Inline.new(self, :footnote, content, attributes: { 'index' => index }, id: id, target: target, type: type).convert
       end
     end
 
@@ -948,8 +949,9 @@ module Substitutors
 
     doc_attrs = @document.attributes
     syntax_hl_name = syntax_hl.name
-    if (linenums_mode = (attr? 'linenums') ? (doc_attrs[%(#{syntax_hl_name}-linenums-mode)] || :table).to_sym : nil)
-      start_line_number = 1 if (start_line_number = (attr 'start', 1).to_i) < 1
+    if (linenums_mode = (attr? 'linenums') ? (doc_attrs[%(#{syntax_hl_name}-linenums-mode)] || :table).to_sym : nil) &&
+        (start_line_number = (attr 'start', 1).to_i) < 1
+      start_line_number = 1
     end
     highlight_lines = resolve_lines_to_highlight source, (attr 'highlight'), start_line_number if attr? 'highlight'
 
@@ -986,7 +988,7 @@ module Substitutors
         negate = true
       end
       if (delim = (entry.include? '..') ? '..' : ((entry.include? '-') ? '-' : nil))
-        from, delim, to = entry.partition delim
+        from, _, to = entry.partition delim
         to = (source.count LF) + 1 if to.empty? || (to = to.to_i) < 0
         if negate
           lines -= (from.to_i..to).to_a
@@ -1241,9 +1243,10 @@ module Substitutors
   #
   # Returns a Symbol Array of substitutions to pass to apply_subs or nil if no substitutions were resolved.
   def expand_subs subs, subject = nil
-    if ::Symbol === subs
+    case subs
+    when ::Symbol
       subs == :none ? nil : SUB_GROUPS[subs] || [subs]
-    elsif ::Array === subs
+    when ::Array
       expanded_subs = []
       subs.each do |key|
         unless key == :none
@@ -1481,26 +1484,21 @@ module Substitutors
     if (str = str.strip).empty?
       {}
     elsif (str.start_with? '.', '#') && Compliance.shorthand_property_syntax
-      segments = str.split '#', 2
-
-      if segments.size > 1
-        id, *more_roles = segments[1].split('.')
+      before, _, after = str.partition '#'
+      attrs = {}
+      if after.empty?
+        attrs['role'] = (before.tr '.', ' ').lstrip if before.length > 1
       else
-        more_roles = []
-      end
-
-      roles = segments[0].empty? ? [] : segments[0].split('.')
-      if roles.size > 1
-        roles.shift
-      end
-
-      if more_roles.size > 0
-        roles.concat more_roles
+        id, _, roles = after.partition '.'
+        attrs['id'] = id unless id.empty?
+        if roles.empty?
+          attrs['role'] = (before.tr '.', ' ').lstrip if before.length > 1
+        elsif before.length > 1
+          attrs['role'] = ((before + '.' + roles).tr '.', ' ').lstrip
+        else
+          attrs['role'] = roles.tr '.', ' '
+        end
       end
-
-      attrs = {}
-      attrs['id'] = id if id
-      attrs['role'] = roles.join ' ' unless roles.empty?
       attrs
     else
       { 'role' => str }
@@ -1534,7 +1532,7 @@ module Substitutors
         case c
         when ','
           if quote_open
-            accum = accum + c
+            accum += c
           else
             values << accum.strip
             accum = ''
@@ -1542,7 +1540,7 @@ module Substitutors
         when '"'
           quote_open = !quote_open
         else
-          accum = accum + c
+          accum += c
         end
       end
       values << accum.strip