kramdown 1.17.0 → 2.0.0.beta1

data/lib/kramdown/parser/kramdown.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -11,8 +11,8 @@ require 'strscan'
 require 'stringio'
 require 'kramdown/parser'
 
-#TODO: use [[:alpha:]] in all regexp to allow parsing of international values in 1.9.1
-#NOTE: use @src.pre_match only before other check/match?/... operations, otherwise the content is changed
+# TODO: use [[:alpha:]] in all regexp to allow parsing of international values in 1.9.1
+# NOTE: use @src.pre_match only before other check/match?/... operations, otherwise the content is changed
 
 module Kramdown
 
@@ -74,15 +74,14 @@ module Kramdown
 
         @block_parsers = [:blank_line, :codeblock, :codeblock_fenced, :blockquote, :atx_header,
                           :horizontal_rule, :list, :definition_list, :block_html, :setext_header,
-                          :block_math, :table, :footnote_definition, :link_definition, :abbrev_definition,
-                          :block_extensions, :eob_marker, :paragraph]
-        @span_parsers =  [:emphasis, :codespan, :autolink, :span_html, :footnote_marker, :link, :smart_quotes, :inline_math,
-                         :span_extensions, :html_entity, :typographic_syms, :line_break, :escaped_chars]
-
+                          :block_math, :table, :footnote_definition, :link_definition,
+                          :abbrev_definition, :block_extensions, :eob_marker, :paragraph]
+        @span_parsers =  [:emphasis, :codespan, :autolink, :span_html, :footnote_marker, :link,
+                          :smart_quotes, :inline_math, :span_extensions, :html_entity,
+                          :typographic_syms, :line_break, :escaped_chars]
       end
       private_class_method(:new, :allocate)
 
-
       # The source string provided on initialization is parsed into the @root element.
       def parse
         configure_parser
@@ -90,7 +89,7 @@ module Kramdown
         update_tree(@root)
         correct_abbreviations_attributes
         replace_abbreviations(@root)
-        @footnotes.each do |name,data|
+        @footnotes.each do |_name, data|
           update_tree(data[:content])
           replace_abbreviations(data[:content])
         end
@@ -101,9 +100,7 @@ module Kramdown
         end
       end
 
-      #######
       protected
-      #######
 
       # :doc:
       #
@@ -113,7 +110,7 @@ module Kramdown
       # The parameter +link_defs+ is a hash where the keys are possibly unnormalized link IDs and
       # the values are two element arrays consisting of the link target and a title (can be +nil+).
       def update_link_definitions(link_defs)
-        link_defs.each {|k,v| @link_defs[normalize_link_id(k)] = v}
+        link_defs.each {|k, v| @link_defs[normalize_link_id(k)] = v }
       end
 
       # Adapt the object to allow parsing like specified in the options.
@@ -131,7 +128,7 @@ module Kramdown
 
       # Create the needed span parser regexps.
       def span_parser_regexps(parsers = @span_parsers)
-        span_start = /#{parsers.map {|name| @parsers[name].span_start}.join('|')}/
+        span_start = /#{parsers.map {|name| @parsers[name].span_start }.join('|')}/
         [span_start, /(?=#{span_start})/]
       end
 
@@ -142,7 +139,7 @@ module Kramdown
         @src = (text.nil? ? @src : ::Kramdown::Utils::StringScanner.new(text, el.options[:location]))
 
         status = catch(:stop_block_parsing) do
-          while !@src.eos?
+          until @src.eos?
             @block_parsers.any? do |name|
               if @src.check(@parsers[name].start_re)
                 send(@parsers[name].method)
@@ -167,8 +164,8 @@ module Kramdown
         element.children.map! do |child|
           if child.type == :raw_text
             last_blank = nil
-            reset_env(:src => ::Kramdown::Utils::StringScanner.new(child.value, element.options[:location]),
-                      :text_type => :text)
+            reset_env(src: ::Kramdown::Utils::StringScanner.new(child.value, element.options[:location]),
+                      text_type: :text)
             parse_spans(child)
             child.children
           elsif child.type == :eob
@@ -212,12 +209,12 @@ module Kramdown
         span_start = @span_start
         span_start_re = @span_start_re
         span_start, span_start_re = span_parser_regexps(parsers) if parsers
-        parsers = parsers || @span_parsers
+        parsers ||= @span_parsers
 
         used_re = (stop_re.nil? ? span_start_re : /(?=#{Regexp.union(stop_re, span_start)})/)
         stop_re_found = false
         while !@src.eos? && !stop_re_found
-          if result = @src.scan_until(used_re)
+          if (result = @src.scan_until(used_re))
             add_text(result)
             if stop_re && @src.check(stop_re)
               stop_re_found = (block_given? ? yield : true)
@@ -245,7 +242,7 @@ module Kramdown
       # Reset the current parsing environment. The parameter +env+ can be used to set initial
       # values for one or more environment variables.
       def reset_env(opts = {})
-        opts = {:text_type => :raw_text, :stack => []}.merge(opts)
+        opts = {text_type: :raw_text, stack: []}.merge(opts)
         @src = opts[:src]
         @tree = opts[:tree]
         @block_ial = opts[:block_ial]
@@ -255,24 +252,23 @@ module Kramdown
 
       # Return the current parsing environment.
       def save_env
-        [@src, @tree, @block_ial, @stack,  @text_type]
+        [@src, @tree, @block_ial, @stack, @text_type]
       end
 
       # Restore the current parsing environment.
       def restore_env(env)
-        @src, @tree, @block_ial, @stack,  @text_type = *env
+        @src, @tree, @block_ial, @stack, @text_type = *env
       end
 
       # Update the given attributes hash +attr+ with the information from the inline attribute list
       # +ial+ and all referenced ALDs.
       def update_attr_with_ial(attr, ial)
-        ial[:refs].each do |ref|
-          update_attr_with_ial(attr, ref) if ref = @alds[ref]
-        end if ial[:refs]
-        ial.each do |k,v|
+        ial[:refs]&.each do |ref|
+          update_attr_with_ial(attr, ref) if (ref = @alds[ref])
+        end
+        ial.each do |k, v|
           if k == IAL_CLASS_ATTR
-            attr[k] = (attr[k] || '') << " #{v}"
-            attr[k].lstrip!
+            attr[k] = "#{attr[k]} #{v}".lstrip
           elsif k.kind_of?(String)
             attr[k] = v
           end
@@ -281,13 +277,13 @@ module Kramdown
 
       # Update the raw text for automatic ID generation.
       def update_raw_text(item)
-        raw_text = ''
+        raw_text = +''
 
         append_text = lambda do |child|
           if child.type == :text
             raw_text << child.value
           else
-            child.children.each {|c| append_text.call(c)}
+            child.children.each {|c| append_text.call(c) }
           end
         end
 
@@ -306,7 +302,7 @@ module Kramdown
         el
       end
 
-      @@parsers = {}
+      @parsers = {}
 
       # Struct class holding all the needed data for one block/span-level parser method.
       Data = Struct.new(:name, :start_re, :span_start, :method)
@@ -321,18 +317,18 @@ module Kramdown
       # to the registry. The method name is automatically derived from the +name+ or can explicitly
       # be set by using the +meth_name+ parameter.
       def self.define_parser(name, start_re, span_start = nil, meth_name = "parse_#{name}")
-        raise "A parser with the name #{name} already exists!" if @@parsers.has_key?(name)
-        @@parsers[name] = Data.new(name, start_re, span_start, meth_name)
+        raise "A parser with the name #{name} already exists!" if @parsers.key?(name)
+        @parsers[name] = Data.new(name, start_re, span_start, meth_name)
       end
 
       # Return the Data structure for the parser +name+.
       def self.parser(name = nil)
-        @@parsers[name]
+        @parsers[name]
       end
 
       # Return +true+ if there is a parser called +name+.
       def self.has_parser?(name)
-        @@parsers.has_key?(name)
+        @parsers.key?(name)
       end
 
       # Regexp for matching indentation (one tab or four spaces)

data/lib/kramdown/parser/kramdown/abbreviation.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -19,7 +19,10 @@ module Kramdown
         @src.pos += @src.matched_size
         abbrev_id, abbrev_text = @src[1], @src[2]
         abbrev_text.strip!
-        warning("Duplicate abbreviation ID '#{abbrev_id}' on line #{start_line_number} - overwriting") if @root.options[:abbrev_defs][abbrev_id]
+        if @root.options[:abbrev_defs][abbrev_id]
+          warning("Duplicate abbreviation ID '#{abbrev_id}' on line #{start_line_number} " \
+                  "- overwriting")
+        end
         @tree.children << new_block_el(:eob, :abbrev_def)
         @root.options[:abbrev_defs][abbrev_id] = abbrev_text
         @root.options[:abbrev_attr][abbrev_id] = @tree.children.last
@@ -37,9 +40,9 @@ module Kramdown
       # Replace the abbreviation text with elements.
       def replace_abbreviations(el, regexps = nil)
         return if @root.options[:abbrev_defs].empty?
-        if !regexps
-          sorted_abbrevs = @root.options[:abbrev_defs].keys.sort {|a,b| b.length <=> a.length}
-          regexps = [Regexp.union(*sorted_abbrevs.map {|k| /#{Regexp.escape(k)}/})]
+        unless regexps
+          sorted_abbrevs = @root.options[:abbrev_defs].keys.sort {|a, b| b.length <=> a.length }
+          regexps = [Regexp.union(*sorted_abbrevs.map {|k| /#{Regexp.escape(k)}/ })]
           regexps << /(?=(?:\W|^)#{regexps.first}(?!\w))/ # regexp should only match on word boundaries
         end
         el.children.map! do |child|
@@ -48,18 +51,18 @@ module Kramdown
               result = []
               strscan = Kramdown::Utils::StringScanner.new(child.value, child.options[:location])
               text_lineno = strscan.current_line_number
-              while temp = strscan.scan_until(regexps.last)
+              while (temp = strscan.scan_until(regexps.last))
                 abbr_lineno = strscan.current_line_number
                 abbr = strscan.scan(regexps.first) # begin of line case of abbr with \W char as first one
                 if abbr.nil?
                   temp << strscan.scan(/\W|^/)
                   abbr = strscan.scan(regexps.first)
                 end
-                result << Element.new(:text, temp, nil, :location => text_lineno)
-                result << Element.new(:abbreviation, abbr, nil, :location => abbr_lineno)
+                result << Element.new(:text, temp, nil, location: text_lineno)
+                result << Element.new(:abbreviation, abbr, nil, location: abbr_lineno)
                 text_lineno = strscan.current_line_number
               end
-              result << Element.new(:text, strscan.rest, nil, :location => text_lineno)
+              result << Element.new(:text, strscan.rest, nil, location: text_lineno)
             else
               child
             end

data/lib/kramdown/parser/kramdown/autolink.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -20,7 +20,7 @@ module Kramdown
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
         href = (@src[2].nil? ? "mailto:#{@src[1]}" : @src[1])
-        el = Element.new(:a, nil, {'href' => href}, :location => start_line_number)
+        el = Element.new(:a, nil, {'href' => href}, location: start_line_number)
         add_text(@src[1].sub(/^mailto:/, ''), el)
         @tree.children << el
       end

data/lib/kramdown/parser/kramdown/blank_line.rb

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++

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

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++

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

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -21,19 +21,18 @@ module Kramdown
       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, nil, nil, :location => start_line_number)
+        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,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -25,12 +25,11 @@ module Kramdown
         data = @src.scan(self.class::CODEBLOCK_MATCH)
         data.gsub!(/\n( {0,3}\S)/, ' \\1')
         data.gsub!(INDENT, '')
-        @tree.children << new_block_el(:codeblock, data, nil, :location => start_line_number)
+        @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*?((\S+?)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m
 
@@ -39,7 +38,7 @@ module Kramdown
         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[5], nil, :location => start_line_number, :fenced => true)
+          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

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

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -25,13 +25,13 @@ module Kramdown
           return
         end
 
-        if text = @src.scan_until(/#{result}/)
+        if (text = @src.scan_until(/#{result}/))
           text.sub!(/#{result}\Z/, '')
-          if !simple
+          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, nil, :location => start_line_number)
+          @tree.children << Element.new(:codespan, text, nil, location: start_line_number)
         else
           @src.revert_pos(saved_pos)
           add_text(result)

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

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -23,18 +23,18 @@ module Kramdown
         type = result[0..0]
 
         if (type == '_' && @src.pre_match =~ /[[:alpha:]-]\z/) || @src.check(/\s/) ||
-            @tree.type == element || @stack.any? {|el, _| el.type == element}
+            @tree.type == element || @stack.any? {|el, _| el.type == element }
           add_text(result)
           return
         end
 
         sub_parse = lambda do |delim, elem|
-          el = Element.new(elem, nil, nil, :location => start_line_number)
+          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)}[[:alnum:]]/)) && 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

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

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++

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

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++

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

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8; frozen_string_literal: true -*-
 #
 #--
-# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2019 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -24,8 +24,7 @@ module Kramdown
           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}"
-                opts[IAL_CLASS_ATTR].lstrip!
+                opts[IAL_CLASS_ATTR] = "#{opts[IAL_CLASS_ATTR]} #{class_attr}".lstrip
               else
                 opts['id'] = id_attr
               end
@@ -35,16 +34,15 @@ module Kramdown
             opts[key] = val
           end
         end
-        warning("No or invalid attributes found in IAL/ALD content: #{str}") if attrs.length == 0
+        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|
+        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
@@ -67,7 +65,8 @@ module Kramdown
 
         if @src[4] || @src.matched == '{:/}'
           name = (@src[4] ? "for '#{@src[4]}' " : '')
-          return error_block.call("Invalid extension stop tag #{name} found on line #{start_line_number} - ignoring it")
+          return error_block.call("Invalid extension stop tag #{name} found on line " \
+                                  "#{start_line_number} - ignoring it")
         end
 
         ext = @src[1]
@@ -75,18 +74,20 @@ 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 on line #{start_line_number} - 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, start_line_number)
-          error_block.call("Invalid extension with name '#{ext}' specified on line #{start_line_number} - ignoring it")
+          error_block.call("Invalid extension with name '#{ext}' specified on line " \
+                           "#{start_line_number} - ignoring it")
         else
           true
         end
@@ -95,26 +96,31 @@ module Kramdown
       def handle_extension(name, opts, body, type, line_no = nil)
         case name
         when 'comment'
-          @tree.children << Element.new(:comment, body, nil, :category => type, :location => line_no) 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, :location => line_no, :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)
               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 << new_block_el(:eob, :extension) if type == :block
@@ -124,7 +130,6 @@ module Kramdown
         end
       end
 
-
       ALD_ID_CHARS = /[\w-]/
       ALD_ANY_CHARS = /\\\}|[^\}]/
       ALD_ID_NAME = /\w#{ALD_ID_CHARS}*/
@@ -152,18 +157,19 @@ module Kramdown
       # location.
       def parse_block_extensions
         if @src.scan(ALD_START)
-          parse_attribute_list(@src[2], @alds[@src[1]] ||= Utils::OrderedHash.new)
+          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 || [:link_def, :abbrev_def, :footnote_def].include?(@tree.children.last.value))
-            parse_attribute_list(@src[1], @tree.children.last.options[:ial] ||= Utils::OrderedHash.new)
+              (@tree.children.last.type != :eob ||
+               [:link_def, :abbrev_def, :footnote_def].include?(@tree.children.last.value))
+            parse_attribute_list(@src[1], @tree.children.last.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
@@ -172,7 +178,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 = /\{:/
@@ -184,9 +189,9 @@ module Kramdown
         elsif @src.check(IAL_SPAN_START)
           if @tree.children.last && @tree.children.last.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_ial_with_ial(@tree.children.last.options[:ial] ||= {}, attr)
             update_attr_with_ial(@tree.children.last.attr, attr)
           else
             warning("Found span IAL after text - ignoring it")