kramdown 2.3.2 → 2.5.0

data/lib/kramdown/options.rb

@@ -39,7 +39,7 @@ module Kramdown
     ALLOWED_TYPES = [String, Integer, Float, Symbol, Boolean, Object]
 
     @options = {}
-    @cached_defaults = nil
+    @defaults = nil
 
     # Define a new option called +name+ (a Symbol) with the given +type+ (String, Integer, Float,
     # Symbol, Boolean, Object), default value +default+ and the description +desc+. If a block is
@@ -55,7 +55,7 @@ module Kramdown
       raise ArgumentError, "Invalid type for default value" if !(type === default) && !default.nil?
       raise ArgumentError, "Missing validator block" if type == Object && block.nil?
       @options[name] = Definition.new(name, type, default, desc, block)
-      @cached_defaults = nil
+      @defaults = nil
     end
 
     # Return all option definitions.
@@ -70,11 +70,12 @@ module Kramdown
 
     # Return a Hash with the default values for all options.
     def self.defaults
-      @cached_defaults ||= begin
-                             temp = {}
-                             @options.each {|_n, o| temp[o.name] = o.default }
-                             temp.freeze
-                           end
+      @defaults ||=
+        begin
+          temp = {}
+          @options.each {|_n, o| temp[o.name] = o.default }
+          temp.freeze
+        end
     end
 
     # Merge the #defaults Hash with the *parsed* options from the given Hash, i.e. only valid option
@@ -140,7 +141,7 @@ module Kramdown
     # Optionally, the array is checked for the correct size.
     def self.simple_array_validator(val, name, size = nil)
       if String === val
-        val = val.split(/,/)
+        val = val.split(",")
       elsif !(Array === val)
         raise Kramdown::Error, "Invalid type #{val.class} for option #{name}"
       end
@@ -235,6 +236,15 @@ module Kramdown
       Used by: HTML/Latex converter
     EOF
 
+    define(:header_links, Boolean, false, <<~EOF)
+      Adds anchor tags within headers that can be used to generate permalinks
+      when not using a table of contents.
+
+      The anchor tags are empty, but can be styled to your liking.
+
+      Default: false
+    EOF
+
     define(:transliterated_header_ids, Boolean, false, <<~EOF)
       Transliterate the header text before generating the ID
 
@@ -350,8 +360,8 @@ module Kramdown
       when String
         if val =~ /^(\d)\.\.(\d)$/
           val = Range.new($1.to_i, $2.to_i).to_a
-        elsif val =~ /^\d(?:,\d)*$/
-          val = val.split(/,/).map(&:to_i).uniq
+        elsif val.match?(/^\d(?:,\d)*$/)
+          val = val.split(",").map(&:to_i).uniq
         else
           raise Kramdown::Error, "Invalid syntax for option toc_levels"
         end
@@ -360,11 +370,11 @@ module Kramdown
           val = val.map(&:to_i).uniq
         end
       when Range
-        if val.eql?(TOC_LEVELS_RANGE)
-          val = TOC_LEVELS_ARRAY
-        else
-          val = val.map(&:to_i).uniq
-        end
+        val = if val.eql?(TOC_LEVELS_RANGE)
+                TOC_LEVELS_ARRAY
+              else
+                val.map(&:to_i).uniq
+              end
       else
         raise Kramdown::Error, "Invalid type #{val.class} for option toc_levels"
       end
@@ -586,6 +596,24 @@ module Kramdown
       Used by: HTML
     EOF
 
+    define(:footnote_link_text, String, '%s', <<~EOF) do |val|
+      The text used for the footnote number in a footnote link
+
+      This option can be used to add additional text to the footnote
+      link. It should be a format string, and is passed the footnote
+      number as the only argument to the format string.
+      e.g. "[footnote %s]" would display as "[footnote 1]".
+
+      Default: '%s'
+      Used by: HTML
+    EOF
+      if !val.include?('%s')
+        raise Kramdown::Error, "option footnote_link_text needs to contain a '%s'"
+      end
+      val
+    end
+
+
     define(:remove_line_breaks_for_cjk, Boolean, false, <<~EOF)
       Specifies whether line breaks should be removed between CJK characters
 
@@ -605,6 +633,13 @@ module Kramdown
       simple_array_validator(val, :forbidden_inline_options)
     end
 
+    define(:list_indent, Integer, 2, <<~EOF)
+      Sets the number of spaces to use for list indentation
+
+      Default: 2
+      Used by: Kramdown converter
+    EOF
+
   end
 
 end

data/lib/kramdown/parser/base.rb

@@ -54,6 +54,12 @@ module Kramdown
         @options = Kramdown::Options.merge(options)
         @root = Element.new(:root, nil, nil, encoding: (source.encoding rescue nil), location: 1,
                             options: {}, abbrev_defs: {}, abbrev_attr: {})
+
+        @root.options[:abbrev_defs].default_proc = @root.options[:abbrev_attr].default_proc =
+          lambda do |h, k|
+            k_mod = k.gsub(/[\s\p{Z}]+/, " ")
+            k != k_mod ? h[k_mod] : nil
+          end
         @warnings = []
         @text_type = :text
       end

data/lib/kramdown/parser/html.rb

@@ -24,15 +24,16 @@ module Kramdown
       # Contains all constants that are used when parsing.
       module Constants
 
-        #:stopdoc:
+        # :stopdoc:
         # The following regexps are based on the ones used by REXML, with some slight modifications.
         HTML_DOCTYPE_RE = /<!DOCTYPE.*?>/im
         HTML_COMMENT_RE = /<!--(.*?)-->/m
         HTML_INSTRUCTION_RE = /<\?(.*?)\?>/m
+        HTML_CDATA_RE = /<!\[CDATA\[(.*?)\]\]>/m
         HTML_ATTRIBUTE_RE = /\s*(#{REXML::Parsers::BaseParser::UNAME_STR})(?:\s*=\s*(?:(\p{Word}+)|("|')(.*?)\3))?/m
         HTML_TAG_RE = /<((?>#{REXML::Parsers::BaseParser::UNAME_STR}))\s*((?>\s+#{REXML::Parsers::BaseParser::UNAME_STR}(?:\s*=\s*(?:\p{Word}+|("|').*?\3))?)*)\s*(\/)?>/m
         HTML_TAG_CLOSE_RE = /<\/(#{REXML::Parsers::BaseParser::UNAME_STR})\s*>/m
-        HTML_ENTITY_RE = /&([\w:][\-\w\.:]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
+        HTML_ENTITY_RE = /&([\w:][\w.:-]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
 
         HTML_CONTENT_MODEL_BLOCK = %w[address applet article aside blockquote body
                                       dd details div dl fieldset figure figcaption
@@ -55,7 +56,7 @@ module Kramdown
         # script, textarea
         HTML_SPAN_ELEMENTS = %w[a abbr acronym b big bdo br button cite code del dfn em i img input
                                 ins kbd label mark option q rb rbc rp rt rtc ruby samp select small
-                                span strong sub sup tt u var]
+                                span strong sub sup time tt u var]
         HTML_BLOCK_ELEMENTS = %w[address article aside applet body blockquote caption col colgroup
                                  dd div dl dt fieldset figcaption footer form h1 h2 h3 h4 h5 h6
                                  header hgroup hr html head iframe legend menu li main map nav ol
@@ -136,7 +137,7 @@ module Kramdown
           end
         end
 
-        HTML_RAW_START = /(?=<(#{REXML::Parsers::BaseParser::UNAME_STR}|\/|!--|\?))/ # :nodoc:
+        HTML_RAW_START = /(?=<(#{REXML::Parsers::BaseParser::UNAME_STR}|\/|!--|\?|!\[CDATA\[))/ # :nodoc:
 
         # Parse raw HTML from the current source position, storing the found elements in +el+.
         # Parsing continues until one of the following criteria are fulfilled:
@@ -160,6 +161,8 @@ module Kramdown
                 @tree.children << Element.new(:xml_comment, result, nil, category: :block, location: line)
               elsif (result = @src.scan(HTML_INSTRUCTION_RE))
                 @tree.children << Element.new(:xml_pi, result, nil, category: :block, location: line)
+              elsif @src.scan(HTML_CDATA_RE)
+                @tree.children << Element.new(:text, @src[1], nil, cdata: true, location: line)
               elsif @src.scan(HTML_TAG_RE)
                 if method(:handle_html_start_tag).arity.abs >= 1
                   handle_html_start_tag(line, &block)
@@ -239,6 +242,7 @@ module Kramdown
             el.options.replace(category: (HTML_CONTENT_MODEL[ptype] == :span ? :span : :block))
             return
           when :html_element
+            # do nothing
           when :root
             el.children.map! do |c|
               if c.type == :text
@@ -296,7 +300,7 @@ module Kramdown
             if (tmp = src.scan_until(/(?=#{HTML_ENTITY_RE})/o))
               result << Element.new(:text, tmp)
               src.scan(HTML_ENTITY_RE)
-              val = src[1] || (src[2]&.to_i) || src[3].hex
+              val = src[1] || src[2]&.to_i || src[3].hex
               result << if %w[lsquo rsquo ldquo rdquo].include?(val)
                           Element.new(:smart_quote, val.intern)
                         elsif %w[mdash ndash hellip laquo raquo].include?(val)
@@ -361,8 +365,8 @@ module Kramdown
           el.children = el.children.reject do |c|
             i += 1
             c.type == :text && c.value.strip.empty? &&
-              (i == 0 || i == el.children.length - 1 || ((el.children[i - 1]).block? &&
-                                                         (el.children[i + 1]).block?))
+              (i == 0 || i == el.children.length - 1 || (el.children[i - 1].block? &&
+                                                         el.children[i + 1].block?))
           end
         end
 
@@ -420,15 +424,16 @@ module Kramdown
           result = process_text(raw, true)
           begin
             str = result.inject(+'') do |mem, c|
-              if c.type == :text
+              case c.type
+              when :text
                 mem << c.value
-              elsif c.type == :entity
+              when :entity
                 mem << if [60, 62, 34, 38].include?(c.value.code_point)
                          c.value.code_point.chr
                        else
                          c.value.char
                        end
-              elsif c.type == :smart_quote || c.type == :typographic_sym
+              when :smart_quote, :typographic_sym
                 mem << entity(c.value.to_s).char
               else
                 raise "Bug - please report"
@@ -518,7 +523,7 @@ module Kramdown
           nr_cells = 0
           check_nr_cells = lambda do |t|
             if t.value == 'tr'
-              count = t.children.select {|cc| cc.value == 'th' || cc.value == 'td' }.length
+              count = t.children.count {|cc| cc.value == 'th' || cc.value == 'td' }
               if count != nr_cells
                 if nr_cells == 0
                   nr_cells = count
@@ -532,7 +537,7 @@ module Kramdown
             end
           end
           check_nr_cells.call(el)
-          return false if nr_cells == -1
+          return false if nr_cells == -1 || nr_cells == 0
 
           alignment = nil
           check_alignment = proc do |t|
@@ -551,7 +556,9 @@ module Kramdown
           check_alignment.call(el)
 
           check_rows = lambda do |t, type|
-            t.children.all? {|r| (r.value == 'tr' || r.type == :text) && r.children.all? {|c| c.value == type || c.type == :text }}
+            t.children.all? do |r|
+              (r.value == 'tr' || r.type == :text) && r.children.all? {|c| c.value == type || c.type == :text }
+            end
           end
           check_rows.call(el, 'td') ||
             (el.children.all? do |t|
@@ -561,10 +568,10 @@ module Kramdown
         end
 
         def convert_script(el)
-          if !is_math_tag?(el)
-            process_html_element(el)
-          else
+          if is_math_tag?(el)
             handle_math_tag(el)
+          else
+            process_html_element(el)
           end
         end
 
@@ -573,7 +580,7 @@ module Kramdown
         end
 
         def handle_math_tag(el)
-          set_basics(el, :math, category: (el.attr['type'] =~ /mode=display/ ? :block : :span))
+          set_basics(el, :math, category: (el.attr['type'].include?("mode=display") ? :block : :span))
           el.value = el.children.shift.value.sub(/\A(?:%\s*)?<!\[CDATA\[\n?(.*?)(?:\s%)?\]\]>\z/m, '\1')
           el.attr.delete('type')
         end
@@ -612,4 +619,3 @@ module Kramdown
   end
 
 end
-

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

@@ -42,12 +42,14 @@ module Kramdown
         return if @root.options[:abbrev_defs].empty?
         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 = [Regexp.union(*sorted_abbrevs.map do |k|
+            /#{Regexp.escape(k).gsub(/\\\s/, "[\\s\\p{Z}]+").force_encoding(Encoding::UTF_8)}/
+          end)]
           regexps << /(?=(?:\W|^)#{regexps.first}(?!\w))/ # regexp should only match on word boundaries
         end
         el.children.map! do |child|
           if child.type == :text && el.options[:content_model] != :raw
-            if child.value =~ regexps.first
+            if child.value.match?(regexps.first)
               result = []
               strscan = Kramdown::Utils::StringScanner.new(child.value, child.options[:location])
               text_lineno = strscan.current_line_number

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

@@ -43,7 +43,7 @@ module Kramdown
           end
           @tree.children << Element.new(:codespan, text, nil, {
                                           codespan_delimiter: result,
-                                          location: start_line_number
+                                          location: start_line_number,
                                         })
 
         else

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

@@ -22,12 +22,13 @@ module Kramdown
         element = (result.length == 2 ? :strong : :em)
         type = result[0..0]
 
-        if (type == '_' && @src.pre_match =~ /[[:alpha:]]-?[[:alpha:]]*\z/) || @src.check(/\s/) ||
+        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
 
+        warnings_pos = @warnings.size
         sub_parse = lambda do |delim, elem|
           el = Element.new(elem, nil, nil, location: start_line_number)
           stop_re = /#{Regexp.escape(delim)}/
@@ -46,9 +47,13 @@ module Kramdown
           found, el, stop_re = sub_parse.call(type, :em)
         end
         if found
+          # Useful for implementing underlines.
+          el.options[:char] = type
+
           @src.scan(stop_re)
           @tree.children << el
         else
+          @warnings.slice!(0...warnings_pos)
           @src.revert_pos(saved_pos)
           @src.pos += result.length
           add_text(result)

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

@@ -11,7 +11,7 @@ module Kramdown
   module Parser
     class Kramdown
 
-      ESCAPED_CHARS = /\\([\\.*_+`<>()\[\]{}#!:|"'\$=-])/
+      ESCAPED_CHARS = /\\([\\.*_+`<>()\[\]{}#!:|"'$=-])/
 
       # Parse the backslash-escaped character at the current location.
       def parse_escaped_chars

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

@@ -85,11 +85,11 @@ module Kramdown
           end
         end
 
-        if !handle_extension(ext, opts, body, type, start_line_number)
+        if handle_extension(ext, opts, body, type, start_line_number)
+          true
+        else
           error_block.call("Invalid extension with name '#{ext}' specified on line " \
                            "#{start_line_number} - ignoring it")
-        else
-          true
         end
       end
 
@@ -137,10 +137,10 @@ module Kramdown
       end
 
       ALD_ID_CHARS = /[\w-]/
-      ALD_ANY_CHARS = /\\\}|[^\}]/
+      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_CLASS_NAME = /[^\s.#]+/
+      ALD_TYPE_KEY_VALUE_PAIR = /(#{ALD_ID_NAME})=("|')((?:\\\}|\\\2|[^}\2])*?)\2/
       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}/

data/lib/kramdown/parser/kramdown/html.rb

@@ -14,6 +14,7 @@ module Kramdown
     class Kramdown
 
       include Kramdown::Parser::Html::Parser
+      include Kramdown::Utils::Html
 
       # Mapping of markdown attribute value to content model. I.e. :raw when "0", :default when "1"
       # (use default content model for the HTML element), :span when "span", :block when block and
@@ -42,11 +43,12 @@ module Kramdown
         el.options[:is_closed] = closed
 
         if !closed && handle_body
-          if content_model == :block
+          case content_model
+          when :block
             unless parse_blocks(el)
               warning("Found no end tag for '#{el.value}' (line #{el.options[:location]}) - auto-closing it")
             end
-          elsif content_model == :span
+          when :span
             curpos = @src.pos
             if @src.scan_until(/(?=<\/#{el.value}\s*>)/mi)
               add_text(extract_string(curpos...@src.pos, @src), el)
@@ -57,7 +59,7 @@ module Kramdown
               warning("Found no end tag for '#{el.value}' (line #{el.options[:location]}) - auto-closing it")
             end
           else
-            parse_raw_html(el, &method(:handle_kramdown_html_tag))
+            parse_raw_html(el) {|iel, ic, ih| handle_kramdown_html_tag(iel, ic, ih) }
           end
           unless @tree.type == :html_element && @tree.options[:content_model] == :raw
             @src.scan(TRAILING_WHITESPACE)
@@ -74,35 +76,35 @@ module Kramdown
           @tree.children << Element.new(:xml_comment, result, nil, category: :block, location: line)
           @src.scan(TRAILING_WHITESPACE)
           true
-        else
-          if @src.check(/^#{OPT_SPACE}#{HTML_TAG_RE}/o) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
+        elsif @src.check(/^#{OPT_SPACE}#{HTML_TAG_RE}/o) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
+          @src.pos += @src.matched_size
+          handle_html_start_tag(line) {|iel, ic, ih| handle_kramdown_html_tag(iel, ic, ih) }
+          Kramdown::Parser::Html::ElementConverter.convert(@root, @tree.children.last) if @options[:html_to_native]
+          true
+        elsif @src.check(/^#{OPT_SPACE}#{HTML_TAG_CLOSE_RE}/o) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
+          name = @src[1].downcase
+
+          if @tree.type == :html_element && @tree.value == name
             @src.pos += @src.matched_size
-            handle_html_start_tag(line, &method(:handle_kramdown_html_tag))
-            Kramdown::Parser::Html::ElementConverter.convert(@root, @tree.children.last) if @options[:html_to_native]
-            true
-          elsif @src.check(/^#{OPT_SPACE}#{HTML_TAG_CLOSE_RE}/o) && !HTML_SPAN_ELEMENTS.include?(@src[1].downcase)
-            name = @src[1].downcase
-
-            if @tree.type == :html_element && @tree.value == name
-              @src.pos += @src.matched_size
-              throw :stop_block_parsing, :found
-            else
-              false
-            end
+            throw :stop_block_parsing, :found
           else
             false
           end
+        else
+          false
         end
       end
       define_parser(:block_html, HTML_BLOCK_START)
 
-      HTML_SPAN_START = /<(#{REXML::Parsers::BaseParser::UNAME_STR}|!--|\/)/
+      HTML_SPAN_START = /<(#{REXML::Parsers::BaseParser::UNAME_STR}|!--|\/|!\[CDATA\[)/
 
       # Parse the HTML at the current position as span-level HTML.
       def parse_span_html
         line = @src.current_line_number
         if (result = @src.scan(HTML_COMMENT_RE))
           @tree.children << Element.new(:xml_comment, result, nil, category: :span, location: line)
+        elsif @src.scan(HTML_CDATA_RE)
+          add_text(escape_html(@src[1]))
         elsif (result = @src.scan(HTML_TAG_CLOSE_RE))
           warning("Found invalidly used HTML closing tag for '#{@src[1]}' on line #{line}")
           add_text(result)
@@ -124,20 +126,21 @@ module Kramdown
                          @options[:parse_span_html]
                        end
           if (val = HTML_MARKDOWN_ATTR_MAP[attrs.delete('markdown')])
-            if val == :block
+            case val
+            when :block
               warning("Cannot use block-level parsing in span-level HTML tag (line #{line}) " \
                       "- using default mode")
-            elsif val == :span
+            when :span
               do_parsing = true
-            elsif val == :default
+            when :default
               do_parsing = HTML_CONTENT_MODEL[tag_name] != :raw
-            elsif val == :raw
+            when :raw
               do_parsing = false
             end
           end
 
           el = Element.new(:html_element, tag_name, attrs, category: :span, location: line,
-                           content_model: (do_parsing ? :span : :raw), is_closed: !!@src[4])
+                           content_model: (do_parsing ? :span : :raw), is_closed: !@src[4].nil?)
           @tree.children << el
           stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/
           stop_re = Regexp.new(stop_re.source, Regexp::IGNORECASE) if HTML_ELEMENT[tag_name]

data/lib/kramdown/parser/kramdown/html_entity.rb

@@ -18,7 +18,7 @@ module Kramdown
         start_line_number = @src.current_line_number
         @src.pos += @src.matched_size
         begin
-          value = ::Kramdown::Utils::Entities.entity(@src[1] || (@src[2]&.to_i) || @src[3].hex)
+          value = ::Kramdown::Utils::Entities.entity(@src[1] || @src[2]&.to_i || @src[3].hex)
           @tree.children << Element.new(:entity, value,
                                         nil, original: @src.matched, location: start_line_number)
         rescue ::Kramdown::Error

data/lib/kramdown/parser/kramdown/link.rb

@@ -15,14 +15,14 @@ module Kramdown
 
       # Normalize the link identifier.
       def normalize_link_id(id)
-        id.gsub(/[\s]+/, ' ').downcase
+        id.gsub(/\s+/, ' ').downcase
       end
 
       LINK_DEFINITION_START = /^#{OPT_SPACE}\[([^\n\]]+)\]:[ \t]*(?:<(.*?)>|([^\n]*?\S[^\n]*?))(?:(?:[ \t]*?\n|[ \t]+?)[ \t]*?(["'])(.+?)\4)?[ \t]*?\n/
 
       # Parse the link definition at the current location.
       def parse_link_definition
-        return false if @src[3].to_s =~ /[ \t]+["']/
+        return false if @src[3].to_s.match?(/[ \t]+["']/)
         @src.pos += @src.matched_size
         link_id, link_url, link_title = normalize_link_id(@src[1]), @src[2] || @src[3], @src[5]
         if @link_defs[link_id]
@@ -64,7 +64,7 @@ module Kramdown
         cur_pos = @src.pos
         saved_pos = @src.save_pos
 
-        link_type = (result =~ /^!/ ? :img : :a)
+        link_type = (result.match?(/^!/) ? :img : :a)
 
         # no nested links allowed
         if link_type == :a && (@tree.type == :img || @tree.type == :a ||
@@ -77,7 +77,7 @@ module Kramdown
         count = 1
         found = parse_spans(el, LINK_BRACKET_STOP_RE) do
           count += (@src[1] ? -1 : 1)
-          count - el.children.select {|c| c.type == :img }.size == 0
+          count - el.children.count {|c| c.type == :img } == 0
         end
         unless found
           @src.revert_pos(saved_pos)

data/lib/kramdown/parser/kramdown/list.rb

@@ -30,10 +30,10 @@ module Kramdown
       # Used for parsing the first line of a list item or a definition, i.e. the line with list item
       # marker or the definition marker.
       def parse_first_list_line(indentation, content)
-        if content =~ self.class::LIST_ITEM_IAL_CHECK
+        if content.match?(self.class::LIST_ITEM_IAL_CHECK)
           indentation = 4
         else
-          while content =~ /^ *\t/
+          while content.match?(/^ *\t/)
             temp = content.scan(/^ */).first.length + indentation
             content.sub!(/^( *)(\t+)/) { $1 << " " * (4 - (temp % 4) + ($2.length - 1) * 4) }
           end
@@ -167,7 +167,7 @@ module Kramdown
         end
         # take location from preceding para which is the first definition term
         deflist.options[:location] = para.options[:location]
-        para.children.first.value.split(/\n/).each do |term|
+        para.children.first.value.split("\n").each do |term|
           el = Element.new(:dt, nil, nil, location: @src.current_line_number)
           term.sub!(self.class::LIST_ITEM_IAL) do
             parse_attribute_list($1, el.options[:ial] ||= {})
@@ -256,26 +256,27 @@ module Kramdown
       # precomputed patterns for indentations 1..4 and fallback expression
       # to compute pattern when indentation is outside the 1..4 range.
       def fetch_pattern(type, indentation)
-        if type == :ul
+        case type
+        when :ul
           case indentation
-          when 1 then %r/^( {0}[+*-])(#{PATTERN_TAIL})/o
-          when 2 then %r/^( {0,1}[+*-])(#{PATTERN_TAIL})/o
-          when 3 then %r/^( {0,2}[+*-])(#{PATTERN_TAIL})/o
-          else %r/^( {0,3}[+*-])(#{PATTERN_TAIL})/o
+          when 1 then /^( {0}[+*-])(#{PATTERN_TAIL})/o
+          when 2 then /^( {0,1}[+*-])(#{PATTERN_TAIL})/o
+          when 3 then /^( {0,2}[+*-])(#{PATTERN_TAIL})/o
+          else /^( {0,3}[+*-])(#{PATTERN_TAIL})/o
           end
-        elsif type == :ol
+        when :ol
           case indentation
-          when 1 then %r/^( {0}\d+\.)(#{PATTERN_TAIL})/o
-          when 2 then %r/^( {0,1}\d+\.)(#{PATTERN_TAIL})/o
-          when 3 then %r/^( {0,2}\d+\.)(#{PATTERN_TAIL})/o
-          else %r/^( {0,3}\d+\.)(#{PATTERN_TAIL})/o
+          when 1 then /^( {0}\d+\.)(#{PATTERN_TAIL})/o
+          when 2 then /^( {0,1}\d+\.)(#{PATTERN_TAIL})/o
+          when 3 then /^( {0,2}\d+\.)(#{PATTERN_TAIL})/o
+          else /^( {0,3}\d+\.)(#{PATTERN_TAIL})/o
           end
-        elsif type == :dl
+        when :dl
           case indentation
-          when 1 then %r/^( {0}:)(#{PATTERN_TAIL})/o
-          when 2 then %r/^( {0,1}:)(#{PATTERN_TAIL})/o
-          when 3 then %r/^( {0,2}:)(#{PATTERN_TAIL})/o
-          else %r/^( {0,3}:)(#{PATTERN_TAIL})/o
+          when 1 then /^( {0}:)(#{PATTERN_TAIL})/o
+          when 2 then /^( {0,1}:)(#{PATTERN_TAIL})/o
+          when 3 then /^( {0,2}:)(#{PATTERN_TAIL})/o
+          else /^( {0,3}:)(#{PATTERN_TAIL})/o
           end
         end
       end

data/lib/kramdown/parser/kramdown/smart_quotes.rb

@@ -119,7 +119,7 @@ module Kramdown
     class Kramdown
 
       SQ_PUNCT = '[!"#\$\%\'()*+,\-.\/:;<=>?\@\[\\\\\]\^_`{|}~]'
-      SQ_CLOSE = %![^\ \\\\\t\r\n\\[{(-]!
+      SQ_CLOSE = %![^ \\\\\t\r\n\\[{(-]!
 
       SQ_RULES = [
         [/("|')(?=[_*]{1,2}\S)/, [:lquote1]],

data/lib/kramdown/parser/kramdown.rb

@@ -80,7 +80,7 @@ module Kramdown
                           :smart_quotes, :inline_math, :span_extensions, :html_entity,
                           :typographic_syms, :line_break, :escaped_chars]
 
-        @span_pattern_cache ||= Hash.new { |h, k| h[k] = {} }
+        @span_pattern_cache ||= Hash.new {|h, k| h[k] = {} }
       end
       private_class_method(:new, :allocate)
 
@@ -166,16 +166,17 @@ module Kramdown
       def update_tree(element)
         last_blank = nil
         element.children.map! do |child|
-          if child.type == :raw_text
+          case child.type
+          when :raw_text
             last_blank = nil
             reset_env(src: ::Kramdown::Utils::StringScanner.new(child.value, element.options[:location]),
                       text_type: :text)
             parse_spans(child)
             child.children
-          elsif child.type == :eob
+          when :eob
             update_attr_with_ial(child.attr, child.options[:ial]) if child.options[:ial]
             []
-          elsif child.type == :blank
+          when :blank
             if last_blank
               last_blank.value << child.value
               []