kramdown 0.14.2 → 2.3.0

data/lib/kramdown/parser/kramdown/block_boundary.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
@@ -32,8 +19,9 @@ module Kramdown
 
       # Return +true+ if we are after a block boundary.
       def after_block_boundary?
-        !@tree.children.last || @tree.children.last.type == :blank ||
-          (@tree.children.last.type == :eob && @tree.children.last.value.nil?) || @block_ial
+        last_child = @tree.children.last
+        !last_child || last_child.type == :blank ||
+          (last_child.type == :eob && last_child.value.nil?) || @block_ial
       end
 
       # Return +true+ if we are before a block boundary.

data/lib/kramdown/parser/kramdown/blockquote.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
@@ -32,20 +19,20 @@ module Kramdown
 
       # Parse the blockquote at the current location.
       def parse_blockquote
+        start_line_number = @src.current_line_number
         result = @src.scan(PARAGRAPH_MATCH)
-        while !@src.match?(self.class::LAZY_END)
+        until @src.match?(self.class::LAZY_END)
           result << @src.scan(PARAGRAPH_MATCH)
         end
         result.gsub!(BLOCKQUOTE_START, '')
 
-        el = new_block_el(:blockquote)
+        el = new_block_el(:blockquote, nil, nil, location: start_line_number)
         @tree.children << el
         parse_blocks(el, result)
         true
       end
       define_parser(:blockquote, BLOCKQUOTE_START)
 
-
     end
   end
 end

data/lib/kramdown/parser/kramdown/codeblock.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
@@ -30,29 +17,33 @@ module Kramdown
     class Kramdown
 
       CODEBLOCK_START = INDENT
-      CODEBLOCK_MATCH = /(?:#{BLANK_LINE}?(?:#{INDENT}[ \t]*\S.*\n)+(?:(?!#{BLANK_LINE} {0,3}\S|#{IAL_BLOCK_START}|#{EOB_MARKER}|^#{OPT_SPACE}#{LAZY_END_HTML_STOP}|^#{OPT_SPACE}#{LAZY_END_HTML_START})^[ \t]*\S.*\n)*)*/
+      CODEBLOCK_MATCH = /(?:#{BLANK_LINE}?(?:#{INDENT}[ \t]*\S.*\n)+(?:(?!#{IAL_BLOCK_START}|#{EOB_MARKER}|^#{OPT_SPACE}#{LAZY_END_HTML_STOP}|^#{OPT_SPACE}#{LAZY_END_HTML_START})^[ \t]*\S.*\n)*)*/
 
       # Parse the indented codeblock at the current location.
       def parse_codeblock
+        start_line_number = @src.current_line_number
         data = @src.scan(self.class::CODEBLOCK_MATCH)
         data.gsub!(/\n( {0,3}\S)/, ' \\1')
         data.gsub!(INDENT, '')
-        @tree.children << new_block_el(:codeblock, data)
+        @tree.children << new_block_el(:codeblock, data, nil, location: start_line_number)
         true
       end
       define_parser(:codeblock, CODEBLOCK_START)
 
-
       FENCED_CODEBLOCK_START = /^~{3,}/
-      FENCED_CODEBLOCK_MATCH = /^(~{3,})\s*?(\w+)?\s*?\n(.*?)^\1~*\s*?\n/m
+      FENCED_CODEBLOCK_MATCH = /^((~){3,})\s*?((\S+?)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m
 
       # Parse the fenced codeblock at the current location.
       def parse_codeblock_fenced
-        if @src.check(FENCED_CODEBLOCK_MATCH)
+        if @src.check(self.class::FENCED_CODEBLOCK_MATCH)
+          start_line_number = @src.current_line_number
           @src.pos += @src.matched_size
-          el = new_block_el(:codeblock, @src[3])
-          lang = @src[2].to_s.strip
-          el.attr['class'] = "language-#{lang}" unless lang.empty?
+          el = new_block_el(:codeblock, @src[5], nil, location: start_line_number, fenced: true)
+          lang = @src[3].to_s.strip
+          unless lang.empty?
+            el.options[:lang] = lang
+            el.attr['class'] = "language-#{@src[4]}"
+          end
           @tree.children << el
           true
         else

data/lib/kramdown/parser/kramdown/codespan.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
@@ -28,24 +15,35 @@ module Kramdown
 
       # Parse the codespan at the current scanner location.
       def parse_codespan
+        start_line_number = @src.current_line_number
         result = @src.scan(CODESPAN_DELIMITER)
         simple = (result.length == 1)
-        reset_pos = @src.pos
+        saved_pos = @src.save_pos
 
         if simple && @src.pre_match =~ /\s\Z/ && @src.match?(/\s/)
           add_text(result)
           return
         end
 
-        if text = @src.scan_until(/#{result}/)
-          text.sub!(/#{result}\Z/, '')
-          if !simple
+        # assign static regex to avoid allocating the same on every instance
+        # where +result+ equals a single-backtick. Interpolate otherwise.
+        if result == '`'
+          scan_pattern = /`/
+          str_sub_pattern = /`\Z/
+        else
+          scan_pattern = /#{result}/
+          str_sub_pattern = /#{result}\Z/
+        end
+
+        if (text = @src.scan_until(scan_pattern))
+          text.sub!(str_sub_pattern, '')
+          unless simple
             text = text[1..-1] if text[0..0] == ' '
             text = text[0..-2] if text[-1..-1] == ' '
           end
-          @tree.children << Element.new(:codespan, text)
+          @tree.children << Element.new(:codespan, text, nil, location: start_line_number)
         else
-          @src.pos = reset_pos
+          @src.revert_pos(saved_pos)
           add_text(result)
         end
       end

data/lib/kramdown/parser/kramdown/emphasis.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
@@ -28,38 +15,42 @@ module Kramdown
 
       # Parse the emphasis at the current location.
       def parse_emphasis
+        start_line_number = @src.current_line_number
+        saved_pos = @src.save_pos
+
         result = @src.scan(EMPHASIS_START)
         element = (result.length == 2 ? :strong : :em)
         type = result[0..0]
-        reset_pos = @src.pos
 
-        if (type == '_' && @src.pre_match =~ /[[:alpha:]]\z/ && @src.check(/[[:alpha:]]/)) || @src.check(/\s/) ||
-            @tree.type == element || @stack.any? {|el, _| el.type == element}
+        if (type == '_' && @src.pre_match =~ /[[:alpha:]]-?[[:alpha:]]*\z/) || @src.check(/\s/) ||
+            @tree.type == element || @stack.any? {|el, _| el.type == element }
           add_text(result)
           return
         end
 
         sub_parse = lambda do |delim, elem|
-          el = Element.new(elem)
+          el = Element.new(elem, nil, nil, location: start_line_number)
           stop_re = /#{Regexp.escape(delim)}/
           found = parse_spans(el, stop_re) do
             (@src.pre_match[-1, 1] !~ /\s/) &&
-              (elem != :em || !@src.match?(/#{Regexp.escape(delim*2)}(?!#{Regexp.escape(delim)})/)) &&
-              (type != '_' || !@src.match?(/#{Regexp.escape(delim)}[[:alpha:]]/)) && el.children.size > 0
+              (elem != :em || !@src.match?(/#{Regexp.escape(delim * 2)}(?!#{Regexp.escape(delim)})/)) &&
+              (type != '_' || !@src.match?(/#{Regexp.escape(delim)}[[:alnum:]]/)) && !el.children.empty?
           end
           [found, el, stop_re]
         end
 
         found, el, stop_re = sub_parse.call(result, element)
         if !found && element == :strong && @tree.type != :em
-          @src.pos = reset_pos - 1
+          @src.revert_pos(saved_pos)
+          @src.pos += 1
           found, el, stop_re = sub_parse.call(type, :em)
         end
         if found
           @src.scan(stop_re)
           @tree.children << el
         else
-          @src.pos = reset_pos
+          @src.revert_pos(saved_pos)
+          @src.pos += result.length
           add_text(result)
         end
       end

data/lib/kramdown/parser/kramdown/eob.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 

data/lib/kramdown/parser/kramdown/escaped_chars.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 

data/lib/kramdown/parser/kramdown/extensions.rb

@@ -1,22 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
-# This file is part of kramdown.
-#
-# kramdown is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
@@ -29,28 +16,33 @@ module Kramdown
       # Parse the string +str+ and extract all attributes and add all found attributes to the hash
       # +opts+.
       def parse_attribute_list(str, opts)
-        str.scan(ALD_TYPE_ANY).each do |key, sep, val, id_attr, class_attr, ref|
+        return if str.strip.empty? || str.strip == ':'
+        attrs = str.scan(ALD_TYPE_ANY)
+        attrs.each do |key, sep, val, ref, id_and_or_class, _, _|
           if ref
             (opts[:refs] ||= []) << ref
-          elsif class_attr
-            opts[IAL_CLASS_ATTR] = (opts[IAL_CLASS_ATTR] || '') << " #{class_attr}"
-            opts[IAL_CLASS_ATTR].lstrip!
-          elsif id_attr
-            opts['id'] = id_attr
+          elsif id_and_or_class
+            id_and_or_class.scan(ALD_TYPE_ID_OR_CLASS).each do |id_attr, class_attr|
+              if class_attr
+                opts[IAL_CLASS_ATTR] = "#{opts[IAL_CLASS_ATTR]} #{class_attr}".lstrip
+              else
+                opts['id'] = id_attr
+              end
+            end
           else
             val.gsub!(/\\(\}|#{sep})/, "\\1")
             opts[key] = val
           end
         end
+        warning("No or invalid attributes found in IAL/ALD content: #{str}") if attrs.empty?
       end
 
       # Update the +ial+ with the information from the inline attribute list +opts+.
       def update_ial_with_ial(ial, opts)
-        (ial[:refs] ||= []) << opts[:refs]
-        opts.each do |k,v|
+        (ial[:refs] ||= []).concat(opts[:refs]) if opts.key?(:refs)
+        opts.each do |k, v|
           if k == IAL_CLASS_ATTR
-            ial[k] = (ial[k] || '') << " #{v}"
-            ial[k].lstrip!
+            ial[k] = "#{ial[k]} #{v}".lstrip
           elsif k.kind_of?(String)
             ial[k] = v
           end
@@ -60,19 +52,21 @@ module Kramdown
       # Parse the generic extension at the current point. The parameter +type+ can either be :block
       # or :span depending whether we parse a block or span extension tag.
       def parse_extension_start_tag(type)
-        orig_pos = @src.pos
+        saved_pos = @src.save_pos
+        start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
 
         error_block = lambda do |msg|
           warning(msg)
-          @src.pos = orig_pos
+          @src.revert_pos(saved_pos)
           add_text(@src.getch) if type == :span
           false
         end
 
         if @src[4] || @src.matched == '{:/}'
           name = (@src[4] ? "for '#{@src[4]}' " : '')
-          return error_block.call("Invalid extension stop tag #{name}found - ignoring it")
+          return error_block.call("Invalid extension stop tag #{name} found on line " \
+                                  "#{start_line_number} - ignoring it")
         end
 
         ext = @src[1]
@@ -80,64 +74,79 @@ module Kramdown
         body = nil
         parse_attribute_list(@src[2] || '', opts)
 
-        if !@src[3]
+        unless @src[3]
           stop_re = (type == :block ? /#{EXT_BLOCK_STOP_STR % ext}/ : /#{EXT_STOP_STR % ext}/)
-          if result = @src.scan_until(stop_re)
+          if (result = @src.scan_until(stop_re))
             body = result.sub!(stop_re, '')
             body.chomp! if type == :block
           else
-            return error_block.call("No stop tag for extension '#{ext}' found - ignoring it")
+            return error_block.call("No stop tag for extension '#{ext}' found on line " \
+                                    "#{start_line_number} - ignoring it")
           end
         end
 
-        if !handle_extension(ext, opts, body, type)
-          error_block.call("Invalid extension with name '#{ext}' specified - ignoring it")
+        if !handle_extension(ext, opts, body, type, start_line_number)
+          error_block.call("Invalid extension with name '#{ext}' specified on line " \
+                           "#{start_line_number} - ignoring it")
         else
           true
         end
       end
 
-      def handle_extension(name, opts, body, type)
+      def handle_extension(name, opts, body, type, line_no = nil)
         case name
         when 'comment'
-          @tree.children << Element.new(:comment, body, nil, :category => type) if body.kind_of?(String)
+          if body.kind_of?(String)
+            @tree.children << Element.new(:comment, body, nil, category: type, location: line_no)
+          end
           true
         when 'nomarkdown'
-          @tree.children << Element.new(:raw, body, nil, :category => type, :type => opts['type'].to_s.split(/\s+/)) if body.kind_of?(String)
+          if body.kind_of?(String)
+            @tree.children << Element.new(:raw, body, nil, category: type,
+                                          location: line_no, type: opts['type'].to_s.split(/\s+/))
+          end
           true
         when 'options'
-          opts.select do |k,v|
+          opts.select do |k, v|
             k = k.to_sym
             if Kramdown::Options.defined?(k)
+              if @options[:forbidden_inline_options].include?(k) ||
+                  k == :forbidden_inline_options
+                warning("Option #{k} may not be set inline")
+                next false
+              end
+
               begin
                 val = Kramdown::Options.parse(k, v)
                 @options[k] = val
                 (@root.options[:options] ||= {})[k] = val
-              rescue
+              rescue StandardError
               end
               false
             else
               true
             end
-          end.each do |k,v|
+          end.each do |k, _v|
             warning("Unknown kramdown option '#{k}'")
           end
-          @tree.children << Element.new(:eob, :extension) if type == :block
+          @tree.children << new_block_el(:eob, :extension) if type == :block
           true
         else
           false
         end
       end
 
-
       ALD_ID_CHARS = /[\w-]/
       ALD_ANY_CHARS = /\\\}|[^\}]/
       ALD_ID_NAME = /\w#{ALD_ID_CHARS}*/
+      ALD_CLASS_NAME = /[^\s\.#]+/
       ALD_TYPE_KEY_VALUE_PAIR = /(#{ALD_ID_NAME})=("|')((?:\\\}|\\\2|[^\}\2])*?)\2/
-      ALD_TYPE_CLASS_NAME = /\.(#{ALD_ID_NAME})/
-      ALD_TYPE_ID_NAME = /#(\w[\w:-]*)/
+      ALD_TYPE_CLASS_NAME = /\.(#{ALD_CLASS_NAME})/
+      ALD_TYPE_ID_NAME = /#([A-Za-z][\w:-]*)/
+      ALD_TYPE_ID_OR_CLASS = /#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME}/
+      ALD_TYPE_ID_OR_CLASS_MULTI = /((?:#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME})+)/
       ALD_TYPE_REF = /(#{ALD_ID_NAME})/
-      ALD_TYPE_ANY = /(?:\A|\s)(?:#{ALD_TYPE_KEY_VALUE_PAIR}|#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME}|#{ALD_TYPE_REF})(?=\s|\Z)/
+      ALD_TYPE_ANY = /(?:\A|\s)(?:#{ALD_TYPE_KEY_VALUE_PAIR}|#{ALD_TYPE_REF}|#{ALD_TYPE_ID_OR_CLASS_MULTI})(?=\s|\Z)/
       ALD_START = /^#{OPT_SPACE}\{:(#{ALD_ID_NAME}):(#{ALD_ANY_CHARS}+)\}\s*?\n/
 
       EXT_STOP_STR = "\\{:/(%s)?\\}"
@@ -154,17 +163,19 @@ module Kramdown
       # location.
       def parse_block_extensions
         if @src.scan(ALD_START)
-          parse_attribute_list(@src[2], @alds[@src[1]] ||= Utils::OrderedHash.new)
-          @tree.children << Element.new(:eob, :ald)
+          parse_attribute_list(@src[2], @alds[@src[1]] ||= {})
+          @tree.children << new_block_el(:eob, :ald)
           true
         elsif @src.check(EXT_BLOCK_START)
           parse_extension_start_tag(:block)
         elsif @src.scan(IAL_BLOCK_START)
-          if @tree.children.last && @tree.children.last.type != :blank && @tree.children.last.type != :eob
-            parse_attribute_list(@src[1], @tree.children.last.options[:ial] ||= Utils::OrderedHash.new)
-            @tree.children << Element.new(:eob, :ial) unless @src.check(IAL_BLOCK_START)
+          if (last_child = @tree.children.last) && last_child.type != :blank &&
+              (last_child.type != :eob ||
+               [:link_def, :abbrev_def, :footnote_def].include?(last_child.value))
+            parse_attribute_list(@src[1], last_child.options[:ial] ||= {})
+            @tree.children << new_block_el(:eob, :ial) unless @src.check(IAL_BLOCK_START)
           else
-            parse_attribute_list(@src[1], @block_ial = Utils::OrderedHash.new)
+            parse_attribute_list(@src[1], @block_ial ||= {})
           end
           true
         else
@@ -173,7 +184,6 @@ module Kramdown
       end
       define_parser(:block_extensions, BLOCK_EXTENSIONS_START)
 
-
       EXT_SPAN_START = /#{EXT_START_STR}|#{EXT_STOP_STR % ALD_ID_NAME}/
       IAL_SPAN_START = /\{:(#{ALD_ANY_CHARS}+)\}/
       SPAN_EXTENSIONS_START = /\{:/
@@ -183,12 +193,12 @@ module Kramdown
         if @src.check(EXT_SPAN_START)
           parse_extension_start_tag(:span)
         elsif @src.check(IAL_SPAN_START)
-          if @tree.children.last && @tree.children.last.type != :text
+          if (last_child = @tree.children.last) && last_child.type != :text
             @src.pos += @src.matched_size
-            attr = Utils::OrderedHash.new
+            attr = {}
             parse_attribute_list(@src[1], attr)
-            update_ial_with_ial(@tree.children.last.options[:ial] ||= Utils::OrderedHash.new, attr)
-            update_attr_with_ial(@tree.children.last.attr, attr)
+            update_ial_with_ial(last_child.options[:ial] ||= {}, attr)
+            update_attr_with_ial(last_child.attr, attr)
           else
             warning("Found span IAL after text - ignoring it")
             add_text(@src.getch)