kramdown 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d90f86f716aa82f4766f16683887407deb66f637dd997f8b38114b8a48dfc34
-  data.tar.gz: e0de118de20cfdfc45027fccd10af6dfc71a109f62fc769b0de9540c7839b4ed
+  metadata.gz: eae4381ea8cc119f4cc1422de0b8c78baad5fc08b930111f66addb73776b7f81
+  data.tar.gz: 75c9f3f7a2385990fa9b490e073bd8d0f34efbb30e1f1b2fe80d4592c3668648
 SHA512:
-  metadata.gz: 0dd3de9b72e755fe43ed33adc136eaba941e4675d739fa318eedf7e0f63e6db37f92b3564e6ac897014269f1aff48c7e2ad3b70abae490ee92795e830c94d776
-  data.tar.gz: 3710cd52ea508e2ffca6fd6ab1c84efca4308f91540ceb7169fe5e78f09cd33161ad07b287ad716c5b95e295e61018f3957196d6cc597afa197a2d6641d9061f
+  metadata.gz: 64dfda6f14d6080a968682c5a5f0209a0455733ffbc8bfb7caf8519971cef64a553b4fcc0e18c63812dee4ed3e703dd512abd99cdf8714c9b921e9f93c618026
+  data.tar.gz: bcb900ad8208a1faf047c486015b8ff45fea819e5a45716f6a3a7c04a1958301e5a499bf6baa54988890425fa4fed79fe6c414c4a68493db8a82a5be887935aa

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    930 Thomas Leitner <t_leitner@gmx.at>
+    944 Thomas Leitner <t_leitner@gmx.at>
      18 Ashwin Maroli <ashmaroli@gmail.com>
       7 Christian Cornelssen <ccorn@1tein.de>
       6 Gioele Barabucci <gioele@svario.it>
@@ -13,6 +13,7 @@
       3 gettalong <t_leitner@gmx.at>
       3 Brandur <brandur@mutelight.org>
       3 Ben Armston <ben.armston@googlemail.com>
+      3 Ashwin Maroli <ashmaroli@users.noreply.github.com>
       3 Alex Marandon <contact@alexmarandon.com>
       2 Tom Thorogood <me+github@tomthorogood.co.uk>
       2 Parker Moore <parkrmoore@gmail.com>
@@ -40,6 +41,7 @@
       1 scherr <maximilianscherr@gmail.com>
       1 Postmodern <postmodern.mod3@gmail.com>
       1 Pete Michaud <michaudp@gmail.com>
+      1 Noah Doersing <doersino@gmail.com>
       1 myqlarson <myqlarson@gmail.com>
       1 milo.simpson <milo.simpson@bazaarvoice.com>
       1 Michal Till <michal.till@gmail.com>

data/README.md

@@ -7,8 +7,14 @@ requests it is now released under the MIT license and therefore can easily be us
 projects, too.
 
 However, if you use kramdown in a commercial setting, please consider **contributing back any
-changes** for the benefit of the community and/or
-[**becoming a patron**](https://www.patreon.com/gettalong) - thanks!
+changes** for the benefit of the community and/or [**becoming a
+sponsor**](https://github.com/sponsors/gettalong/) or [**a
+patron**](https://www.patreon.com/gettalong) - thanks!
+
+Sponsors:
+
+* **GROSSWEBER** provides <a href="http://grossweber.com/b/kramdown" target="_blank">software
+  development consulting and training services</a>.
 
 
 ## Introduction

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

data/lib/kramdown/converter/html.rb

@@ -49,15 +49,13 @@ module Kramdown
 
         # stash string representation of symbol to avoid allocations from multiple interpolations.
         @highlighter_class = " highlighter-#{options[:syntax_highlighter]}"
+        @dispatcher = Hash.new {|h, k| h[k] = :"convert_#{k}" }
       end
 
-      # The mapping of element type to conversion method.
-      DISPATCHER = Hash.new {|h, k| h[k] = "convert_#{k}" }
-
       # Dispatch the conversion of the element +el+ to a +convert_TYPE+ method using the +type+ of
       # the element.
       def convert(el, indent = -@indent)
-        send(DISPATCHER[el.type], el, indent)
+        send(@dispatcher[el.type], el, indent)
       end
 
       # Return the converted content of the children of +el+ as a string. The parameter +indent+ has
@@ -70,7 +68,7 @@ module Kramdown
         indent += @indent
         @stack.push(el)
         el.children.each do |inner_el|
-          result << send(DISPATCHER[inner_el.type], inner_el, indent)
+          result << send(@dispatcher[inner_el.type], inner_el, indent)
         end
         @stack.pop
         result
@@ -90,7 +88,7 @@ module Kramdown
           inner(el, indent)
         elsif el.children.size == 1 && el.children.first.type == :img &&
             el.children.first.options[:ial]&.[](:refs)&.include?('standalone')
-          convert_standalone_image(el.children.first, indent)
+          convert_standalone_image(el, indent)
         else
           format_as_block_html("p", el.attr, inner(el, indent), indent)
         end
@@ -99,12 +97,14 @@ module Kramdown
       # Helper method used by +convert_p+ to convert a paragraph that only contains a single :img
       # element.
       def convert_standalone_image(el, indent)
-        attr = el.attr.dup
-        figure_attr = {}
-        figure_attr['class'] = attr.delete('class') if attr.key?('class')
-        figure_attr['id'] = attr.delete('id') if attr.key?('id')
-        body = "#{' ' * (indent + @indent)}<img#{html_attributes(attr)} />\n" \
-          "#{' ' * (indent + @indent)}<figcaption>#{attr['alt']}</figcaption>\n"
+        figure_attr = el.attr.dup
+        image_attr = el.children.first.attr.dup
+
+        figure_attr['class'] = image_attr.delete('class') if image_attr.key?('class') and not figure_attr.key?('class')
+        figure_attr['id'] = image_attr.delete('id') if image_attr.key?('id') and not figure_attr.key?('id')
+
+        body = "#{' ' * (indent + @indent)}<img#{html_attributes(image_attr)} />\n" \
+          "#{' ' * (indent + @indent)}<figcaption>#{image_attr['alt']}</figcaption>\n"
         format_as_indented_block_html("figure", figure_attr, body, indent)
       end
 
@@ -160,10 +160,10 @@ module Kramdown
       private_constant :ZERO_TO_ONETWENTYEIGHT
 
       def convert_ul(el, indent)
-        if !@toc_code && (el.options[:ial][:refs].include?('toc') rescue nil)
+        if !@toc_code && el.options.dig(:ial, :refs)&.include?('toc')
           @toc_code = [el.type, el.attr, ZERO_TO_ONETWENTYEIGHT.map { rand(36).to_s(36) }.join]
           @toc_code.last
-        elsif !@footnote_location && el.options[:ial] && (el.options[:ial][:refs] || []).include?('footnotes')
+        elsif !@footnote_location && el.options.dig(:ial, :refs)&.include?('footnotes')
           @footnote_location = ZERO_TO_ONETWENTYEIGHT.map { rand(36).to_s(36) }.join
         else
           format_as_indented_block_html(el.type, el.attr, inner(el, indent), indent)
@@ -304,7 +304,7 @@ module Kramdown
           @footnotes_by_name[name] = @footnotes.last
         end
         "<sup id=\"fnref:#{name}#{repeat}\" role=\"doc-noteref\">" \
-          "<a href=\"#fn:#{name}\" class=\"footnote\">" \
+          "<a href=\"#fn:#{name}\" class=\"footnote\" rel=\"footnote\">" \
           "#{number}</a></sup>"
       end
 
@@ -415,7 +415,6 @@ module Kramdown
       def generate_toc_tree(toc, type, attr)
         sections = Element.new(type, nil, attr.dup)
         sections.attr['id'] ||= 'markdown-toc'
-        sections.attr['role'] ||= 'doc-toc'
         stack = []
         toc.each do |level, id, children|
           li = Element.new(:li, nil, nil, level: level)

data/lib/kramdown/converter/kramdown.rb

@@ -182,7 +182,7 @@ module Kramdown
         result << inner(el, opts) << "\n"
       end
 
-      HTML_TAGS_WITH_BODY = ['div', 'script', 'iframe', 'textarea']
+      HTML_TAGS_WITH_BODY = ['div', 'script', 'iframe', 'textarea', 'th', 'td']
 
       HTML_ELEMENT_TYPES = [:entity, :text, :html_element].freeze
       private_constant :HTML_ELEMENT_TYPES
@@ -426,9 +426,9 @@ module Kramdown
           end
         end.compact.join('')
         res = "toc" + (res.strip.empty? ? '' : " #{res}") if (el.type == :ul || el.type == :ol) &&
-          (el.options[:ial][:refs].include?('toc') rescue nil)
+          el.options.dig(:ial, :refs)&.include?('toc')
         res = "footnotes" + (res.strip.empty? ? '' : " #{res}") if (el.type == :ul || el.type == :ol) &&
-          (el.options[:ial][:refs].include?('footnotes') rescue nil)
+          el.options.dig(:ial, :refs)&.include?('footnotes')
         if el.type == :dl && el.options[:ial] && el.options[:ial][:refs]
           auto_ids = el.options[:ial][:refs].select {|ref| ref.start_with?('auto_ids') }.join(" ")
           res = auto_ids << (res.strip.empty? ? '' : " #{res}") unless auto_ids.empty?

data/lib/kramdown/converter/latex.rb

@@ -127,7 +127,7 @@ module Kramdown
       end
 
       def convert_ul(el, opts)
-        if !@data[:has_toc] && (el.options[:ial][:refs].include?('toc') rescue nil)
+        if !@data[:has_toc] && el.options.dig(:ial, :refs)&.include?('toc')
           @data[:has_toc] = true
           '\tableofcontents'
         else
@@ -517,7 +517,7 @@ module Kramdown
         8194 => ['\hskip .5em\relax'],
         8195 => ['\quad'],
       } # :nodoc:
-      ENTITY_CONV_TABLE.each_value {|v| v[0] = "{}#{v[0]}" }
+      ENTITY_CONV_TABLE.each_value {|v| v[0] = "#{v[0]}{}" }
 
       def entity_to_latex(entity)
         text, package = ENTITY_CONV_TABLE[entity.code_point]

data/lib/kramdown/converter/syntax_highlighter/rouge.rb

@@ -45,24 +45,32 @@ module Kramdown::Converter::SyntaxHighlighter
       cache = converter.data[:syntax_highlighter_rouge] = {}
 
       opts = converter.options[:syntax_highlighter_opts].dup
-      span_opts = (opts.delete(:span) || {}).dup
-      block_opts = (opts.delete(:block) || {}).dup
-      [span_opts, block_opts].each do |hash|
-        hash.keys.each do |k|
-          hash[k.kind_of?(String) ? Kramdown::Options.str_to_sym(k) : k] = hash.delete(k)
-        end
-      end
 
-      cache[:span] = opts.merge(span_opts).update(wrap: false)
+      span_opts = opts.delete(:span)&.dup || {}
+      block_opts = opts.delete(:block)&.dup || {}
+      normalize_keys(span_opts)
+      normalize_keys(block_opts)
+
+      cache[:span] = opts.merge(span_opts)
+      cache[:span][:wrap] = false
+
       cache[:block] = opts.merge(block_opts)
     end
 
+    def self.normalize_keys(hash)
+      return if hash.empty?
+
+      hash.keys.each do |k|
+        hash[k.kind_of?(String) ? Kramdown::Options.str_to_sym(k) : k] = hash.delete(k)
+      end
+    end
+
     def self.formatter_class(opts = {})
       case formatter = opts[:formatter]
       when Class
         formatter
       when /\A[[:upper:]][[:alnum:]_]*\z/
-        ::Rouge::Formatters.const_get(formatter)
+        ::Rouge::Formatters.const_get(formatter, false)
       else
         # Available in Rouge 2.0 or later
         ::Rouge::Formatters::HTMLLegacy

data/lib/kramdown/element.rb

@@ -14,6 +14,14 @@ module Kramdown
   # kramdown only uses this one class for representing all available elements in an element tree
   # (paragraphs, headers, emphasis, ...). The type of element can be set via the #type accessor.
   #
+  # The root of a kramdown element tree has to be an element of type :root. It needs to have certain
+  # option keys set so that conversions work correctly. If only a part of a tree should be
+  # converted, duplicate the root node and assign the #children appropriately, e.g:
+  #
+  #   root = doc.root
+  #   new_root = root.dup
+  #   new_root.children = [root.children[0]]  # assign new array with elements to convert
+  #
   # Following is a description of all supported element types.
   #
   # Note that the option :location may contain the start line number of an element in the source

data/lib/kramdown/options.rb

@@ -39,6 +39,7 @@ module Kramdown
     ALLOWED_TYPES = [String, Integer, Float, Symbol, Boolean, Object]
 
     @options = {}
+    @cached_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
@@ -54,6 +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
     end
 
     # Return all option definitions.
@@ -68,15 +70,17 @@ module Kramdown
 
     # Return a Hash with the default values for all options.
     def self.defaults
-      temp = {}
-      @options.each {|_n, o| temp[o.name] = o.default }
-      temp
+      @cached_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
     # names are considered and their value is run through the #parse method.
     def self.merge(hash)
-      temp = defaults
+      temp = defaults.dup
       hash.each do |k, v|
         k = k.to_sym
         temp[k] = @options.key?(k) ? parse(k, v) : v
@@ -589,6 +593,16 @@ module Kramdown
       Used by: HTML converter
     EOF
 
+    define(:forbidden_inline_options, Object, %w[template], <<~EOF) do |val|
+      Defines the options that may not be set using the {::options} extension
+
+      Default: template
+      Used by: HTML converter
+    EOF
+      val.map! {|item| item.kind_of?(String) ? str_to_sym(item) : item }
+      simple_array_validator(val, :forbidden_inline_options)
+    end
+
   end
 
 end

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

@@ -46,7 +46,7 @@ module Kramdown
           regexps << /(?=(?:\W|^)#{regexps.first}(?!\w))/ # regexp should only match on word boundaries
         end
         el.children.map! do |child|
-          if child.type == :text
+          if child.type == :text && el.options[:content_model] != :raw
             if child.value =~ regexps.first
               result = []
               strscan = Kramdown::Utils::StringScanner.new(child.value, child.options[:location])

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

@@ -20,7 +20,7 @@ module Kramdown
         simple = (result.length == 1)
         saved_pos = @src.save_pos
 
-        if simple && @src.pre_match =~ /\s\Z/ && @src.match?(/\s/)
+        if simple && @src.pre_match =~ /\s\Z|\A\Z/ && @src.match?(/\s/)
           add_text(result)
           return
         end

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

@@ -110,6 +110,12 @@ module Kramdown
           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

data/lib/kramdown/parser/kramdown/header.rb

@@ -8,6 +8,7 @@
 #
 
 require 'kramdown/parser/kramdown/block_boundary'
+require 'rexml/xmltokens'
 
 module Kramdown
   module Parser
@@ -40,7 +41,7 @@ module Kramdown
 
       protected
 
-      HEADER_ID = /[\t ]{#(?<id>[A-Za-z][\w:-]*)}\z/
+      HEADER_ID = /[\t ]{#(?<id>#{REXML::XMLTokens::NAME_START_CHAR}#{REXML::XMLTokens::NAME_CHAR}*)}\z/
 
       # Returns header text and optional ID.
       def parse_header_contents

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

@@ -65,7 +65,7 @@ module Kramdown
         end
       end
 
-      HTML_BLOCK_START = /^#{OPT_SPACE}<(#{REXML::Parsers::BaseParser::UNAME_STR}|\?|!--|\/)/
+      HTML_BLOCK_START = /^#{OPT_SPACE}<(#{REXML::Parsers::BaseParser::UNAME_STR}|!--|\/)/
 
       # Parse the HTML at the current position as block-level HTML.
       def parse_block_html
@@ -74,10 +74,6 @@ module Kramdown
           @tree.children << Element.new(:xml_comment, result, nil, category: :block, location: line)
           @src.scan(TRAILING_WHITESPACE)
           true
-        elsif (result = @src.scan(HTML_INSTRUCTION_RE))
-          @tree.children << Element.new(:xml_pi, 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)
             @src.pos += @src.matched_size
@@ -100,15 +96,13 @@ module Kramdown
       end
       define_parser(:block_html, HTML_BLOCK_START)
 
-      HTML_SPAN_START = /<(#{REXML::Parsers::BaseParser::UNAME_STR}|\?|!--|\/)/
+      HTML_SPAN_START = /<(#{REXML::Parsers::BaseParser::UNAME_STR}|!--|\/)/
 
       # 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 (result = @src.scan(HTML_INSTRUCTION_RE))
-          @tree.children << Element.new(:xml_pi, result, nil, category: :span, location: line)
         elsif (result = @src.scan(HTML_TAG_CLOSE_RE))
           warning("Found invalidly used HTML closing tag for '#{@src[1]}' on line #{line}")
           add_text(result)

data/lib/kramdown/utils/html.rb

@@ -42,6 +42,8 @@ module Kramdown
 
       # Return the HTML representation of the attributes +attr+.
       def html_attributes(attr)
+        return '' if attr.empty?
+
         attr.map do |k, v|
           v.nil? || (k == 'id' && v.strip.empty?) ? '' : " #{k}=\"#{escape_html(v.to_s, :attribute)}\""
         end.join('')

data/lib/kramdown/version.rb

@@ -10,6 +10,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '2.2.0'
+  VERSION = '2.3.1'
 
 end

data/man/man1/kramdown.1

@@ -118,6 +118,13 @@ This option can be used to set a prefix for footnote IDs\. This is useful when r
 Default: \[u2018]\[u2019] Used by: HTML
 .RE
 .TP
+\fB\-\-forbidden\-inline\-options\fP \fIARG\fP
+Defines the options that may not be set using the {::options} extension
+.RS
+.P
+Default: template Used by: HTML converter
+.RE
+.TP
 \fB\-\-header\-offset\fP \fIARG\fP
 Sets the output offset for headers
 .RS

data/test/test_files.rb

@@ -21,16 +21,20 @@ begin
   end
 
   # custom formatter for tests
-  class RougeHTMLFormatters < Kramdown::Converter::SyntaxHighlighter::Rouge.formatter_class
+  module Rouge
+    module Formatters
+      class RougeHTMLFormatters < Kramdown::Converter::SyntaxHighlighter::Rouge.formatter_class
 
-    tag 'rouge_html_formatters'
+        tag 'rouge_html_formatters'
 
-    def stream(tokens, &b)
-      yield %(<div class="custom-class">)
-      super
-      yield %(</div>)
-    end
+        def stream(tokens, &b)
+          yield %(<div class="custom-class">)
+          super
+          yield %(</div>)
+        end
 
+      end
+    end
   end
 rescue LoadError, SyntaxError, NameError
 end
@@ -180,6 +184,7 @@ class TestFiles < Minitest::Test
       'test/testcases/block/03_paragraph/standalone_image.text', # bc of standalone image
       'test/testcases/cjk-line-break.text',
       'test/testcases/block/09_html/standalone_image_in_div.html', # bc of standalone image
+      'test/testcases/span/abbreviations/abbrev_in_html.text', # bc of invalid abbr tag in SVG
     ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_TEXT_FILES.any? {|f| text_file =~ /#{f}$/ }
@@ -231,6 +236,7 @@ class TestFiles < Minitest::Test
       'test/testcases/block/15_math/gh_128.html', # bc of mathjax and HTML parser
       'test/testcases/span/04_footnote/backlink_inline.html', # bc of mathjax
       'test/testcases/block/09_html/standalone_image_in_div.html', # bc of standalone image
+      'test/testcases/block/09_html/processing_instruction.html', # bc of PI
     ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
       next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}$/ }

data/test/test_location.rb

@@ -18,7 +18,7 @@ describe 'location' do
   def check_element_for_location(element)
     if (match = /^line-(\d+)/.match(element.attr['class'] || ''))
       expected_line = match[1].to_i
-      element.options[:location].must_equal(expected_line)
+      assert_equal(expected_line, element.options[:location])
     end
     element.children.each do |child|
       check_element_for_location(child)
@@ -187,7 +187,7 @@ describe 'location' do
 *[duplicate]: The second definition
     )
     doc = Kramdown::Document.new(test_string.strip)
-    doc.warnings.must_equal ["Duplicate abbreviation ID 'duplicate' on line 4 - overwriting"]
+    assert_equal(["Duplicate abbreviation ID 'duplicate' on line 4 - overwriting"], doc.warnings)
   end
 
   it 'handles abbreviations' do

data/test/test_string_scanner_kramdown.rb

@@ -21,7 +21,7 @@ describe Kramdown::Utils::StringScanner do
     it "computes the correct current_line_number for example ##{i + 1}" do
       str_sc = Kramdown::Utils::StringScanner.new(test_string)
       scan_regexes.each {|scan_re| str_sc.scan_until(scan_re) }
-      str_sc.current_line_number.must_equal expect
+      assert_equal(expect, str_sc.current_line_number)
     end
   end
 end

data/test/testcases/block/03_paragraph/standalone_image.html

@@ -5,4 +5,9 @@
   <figcaption>standalone image</figcaption>
 </figure>
 
+<figure id="block-id" class="block-class" block-key="block-value">
+  <img src="some.jpg" alt="standalone image" id="id" class="class" key="value" />
+  <figcaption>standalone image</figcaption>
+</figure>
+
 <p>para</p>

data/test/testcases/block/03_paragraph/standalone_image.text

@@ -3,4 +3,7 @@ para
 
 ![standalone image](some.jpg){:#id .class key="value" standalone}
 
+![standalone image](some.jpg){:#id .class key="value" standalone}
+{:#block-id .block-class block-key="block-value"}
+
 para

data/test/testcases/block/06_codeblock/rouge/multiple.html

@@ -6,6 +6,6 @@
 </code></pre>
 </div></div></div>
 
-<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
+<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
 </code></pre>
 </div></div></div>

data/test/testcases/block/06_codeblock/rouge/simple.html

@@ -5,6 +5,6 @@
 </code></pre>
 </div></div>
 
-<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
+<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
 </code></pre>
 </div></div>

data/test/testcases/block/09_html/processing_instruction.html

@@ -1,13 +1,12 @@
-<?xml version="1.0"?>
+<p>&lt;?xml version=”1.0”?&gt;</p>
 
 <p>para</p>
 
-<?  test  ?>
-<p>para</p>
+<p>&lt;?  test  ?&gt; para</p>
 
 <p>other</p>
 
-<?
-multiline *text*
+<p>&lt;?
+multiline <em>text</em>
 is allowed
-?>
+?&gt;</p>

data/test/testcases/block/09_html/table.kramdown

@@ -0,0 +1,8 @@
+<table>
+<tr>
+<th>test</th>
+<th></th>
+<td></td>
+</tr>
+</table>
+

data/test/testcases/block/09_html/table.text

@@ -0,0 +1,7 @@
+<table>
+<tr>
+<th>test</th>
+<th></th>
+<td></td>
+</tr>
+</table>

data/test/testcases/block/12_extension/options.html

@@ -10,7 +10,7 @@ some <span>*para*</span>
   <p>some <span><em>para</em></span></p>
 </div>
 
-<p>Some text<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote">10</a></sup>.</p>
+<p>Some text<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote" rel="footnote">10</a></sup>.</p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol start="10">

data/test/testcases/block/12_extension/options.text

@@ -19,3 +19,5 @@ some <span>*para*</span>
 Some text[^ab].
 
 [^ab]: Some text.
+
+{::options template="/etc/passwd" /}

data/test/testcases/block/12_extension/options2.html

@@ -1,5 +1,5 @@
 
-<p>Some text<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote">1</a></sup>.</p>
+<p>Some text<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote" rel="footnote">1</a></sup>.</p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/block/14_table/table_with_footnote.html

@@ -1,7 +1,7 @@
 <table>
   <tbody>
     <tr>
-      <td>this is <sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote">1</a></sup></td>
+      <td>this is <sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">1</a></sup></td>
       <td>a table</td>
     </tr>
     <tr>

data/test/testcases/block/16_toc/toc_exclude.html

@@ -1,6 +1,6 @@
 <h1 class="no_toc" id="contents">Contents</h1>
 
-<ul id="markdown-toc" role="doc-toc">
+<ul id="markdown-toc">
   <li><a href="#header-level-1" id="markdown-toc-header-level-1">Header level 1</a>    <ul>
       <li><a href="#header-level-2" id="markdown-toc-header-level-2">Header level 2</a>        <ul>
           <li><a href="#header-level-3" id="markdown-toc-header-level-3">Header level 3</a>            <ul>

data/test/testcases/block/16_toc/toc_levels.html

@@ -1,4 +1,4 @@
-<ul id="markdown-toc" role="doc-toc">
+<ul id="markdown-toc">
   <li><a href="#header--level-2" id="markdown-toc-header--level-2">Header \` level 2</a>    <ul>
       <li><a href="#header-level-3" id="markdown-toc-header-level-3">Header level 3</a></li>
     </ul>

data/test/testcases/block/16_toc/toc_with_footnotes.html

@@ -1,8 +1,8 @@
-<ul id="markdown-toc" role="doc-toc">
+<ul id="markdown-toc">
   <li><a href="#header1-level-1" id="markdown-toc-header1-level-1">Header level 1</a></li>
 </ul>
 
-<h1 id="header1-level-1">Header<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote">1</a></sup> level 1</h1>
+<h1 id="header1-level-1">Header<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">1</a></sup> level 1</h1>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/block/16_toc/toc_with_links.html

@@ -2,7 +2,7 @@
 
 <h1 id="header-1"><a href="test.html">Header</a></h1>
 
-<ul id="markdown-toc" role="doc-toc">
+<ul id="markdown-toc">
   <li><a href="#header" id="markdown-toc-header">Header</a></li>
   <li><a href="#header-1" id="markdown-toc-header-1">Header</a></li>
 </ul>

data/test/testcases/span/03_codespan/normal.html

@@ -14,3 +14,7 @@ As `are` these!</p>
 <p>No <code>literal backtick</code>.</p>
 
 <p><code>something</code></p>
+
+<p>` `</p>
+
+<p>a ` `</p>

data/test/testcases/span/03_codespan/normal.text

@@ -14,3 +14,7 @@ As \`are\` these!
 No `` literal backtick``.
 
 `something`
+
+` `
+
+a ` `

data/test/testcases/span/04_footnote/backlink_inline.html

@@ -1,4 +1,4 @@
-<p>This is <sup id="fnref:paragraph" role="doc-noteref"><a href="#fn:paragraph" class="footnote">1</a></sup><sup id="fnref:header" role="doc-noteref"><a href="#fn:header" class="footnote">2</a></sup><sup id="fnref:blockquote" role="doc-noteref"><a href="#fn:blockquote" class="footnote">3</a></sup><sup id="fnref:codeblock" role="doc-noteref"><a href="#fn:codeblock" class="footnote">4</a></sup><sup id="fnref:list" role="doc-noteref"><a href="#fn:list" class="footnote">5</a></sup><sup id="fnref:table" role="doc-noteref"><a href="#fn:table" class="footnote">6</a></sup><sup id="fnref:hrule" role="doc-noteref"><a href="#fn:hrule" class="footnote">7</a></sup><sup id="fnref:mathblock" role="doc-noteref"><a href="#fn:mathblock" class="footnote">8</a></sup><sup id="fnref:html" role="doc-noteref"><a href="#fn:html" class="footnote">9</a></sup></p>
+<p>This is <sup id="fnref:paragraph" role="doc-noteref"><a href="#fn:paragraph" class="footnote" rel="footnote">1</a></sup><sup id="fnref:header" role="doc-noteref"><a href="#fn:header" class="footnote" rel="footnote">2</a></sup><sup id="fnref:blockquote" role="doc-noteref"><a href="#fn:blockquote" class="footnote" rel="footnote">3</a></sup><sup id="fnref:codeblock" role="doc-noteref"><a href="#fn:codeblock" class="footnote" rel="footnote">4</a></sup><sup id="fnref:list" role="doc-noteref"><a href="#fn:list" class="footnote" rel="footnote">5</a></sup><sup id="fnref:table" role="doc-noteref"><a href="#fn:table" class="footnote" rel="footnote">6</a></sup><sup id="fnref:hrule" role="doc-noteref"><a href="#fn:hrule" class="footnote" rel="footnote">7</a></sup><sup id="fnref:mathblock" role="doc-noteref"><a href="#fn:mathblock" class="footnote" rel="footnote">8</a></sup><sup id="fnref:html" role="doc-noteref"><a href="#fn:html" class="footnote" rel="footnote">9</a></sup></p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/span/04_footnote/backlink_text.html

@@ -1,4 +1,4 @@
-<p>Some footnote here<sup id="fnref:fn" role="doc-noteref"><a href="#fn:fn" class="footnote">1</a></sup></p>
+<p>Some footnote here<sup id="fnref:fn" role="doc-noteref"><a href="#fn:fn" class="footnote" rel="footnote">1</a></sup></p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/span/04_footnote/footnote_nr.html

@@ -1,4 +1,4 @@
-<p>This is a footnote<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote">35</a></sup>. And another<sup id="fnref:bc" role="doc-noteref"><a href="#fn:bc" class="footnote">36</a></sup>.</p>
+<p>This is a footnote<sup id="fnref:ab" role="doc-noteref"><a href="#fn:ab" class="footnote" rel="footnote">35</a></sup>. And another<sup id="fnref:bc" role="doc-noteref"><a href="#fn:bc" class="footnote" rel="footnote">36</a></sup>.</p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol start="35">

data/test/testcases/span/04_footnote/footnote_prefix.html

@@ -1,4 +1,4 @@
-<p>This is a<sup id="fnref:adf123-ab" role="doc-noteref"><a href="#fn:adf123-ab" class="footnote">1</a></sup> footnote<sup id="fnref:adf123-ab:1" role="doc-noteref"><a href="#fn:adf123-ab" class="footnote">1</a></sup>. And another<sup id="fnref:adf123-bc" role="doc-noteref"><a href="#fn:adf123-bc" class="footnote">2</a></sup>.</p>
+<p>This is a<sup id="fnref:adf123-ab" role="doc-noteref"><a href="#fn:adf123-ab" class="footnote" rel="footnote">1</a></sup> footnote<sup id="fnref:adf123-ab:1" role="doc-noteref"><a href="#fn:adf123-ab" class="footnote" rel="footnote">1</a></sup>. And another<sup id="fnref:adf123-bc" role="doc-noteref"><a href="#fn:adf123-bc" class="footnote" rel="footnote">2</a></sup>.</p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/span/04_footnote/inside_footnote.html

@@ -1,11 +1,11 @@
-<p>Lorem ipsum<sup id="fnref:first" role="doc-noteref"><a href="#fn:first" class="footnote">1</a></sup> dolor sit amet.</p>
+<p>Lorem ipsum<sup id="fnref:first" role="doc-noteref"><a href="#fn:first" class="footnote" rel="footnote">1</a></sup> dolor sit amet.</p>
 
-<p>Lorem ipsum<sup id="fnref:second" role="doc-noteref"><a href="#fn:second" class="footnote">2</a></sup> dolor sit amet.</p>
+<p>Lorem ipsum<sup id="fnref:second" role="doc-noteref"><a href="#fn:second" class="footnote" rel="footnote">2</a></sup> dolor sit amet.</p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>
     <li id="fn:first" role="doc-endnote">
-      <p>Consecutur adisping.<sup id="fnref:third" role="doc-noteref"><a href="#fn:third" class="footnote">3</a></sup> <a href="#fnref:first" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
+      <p>Consecutur adisping.<sup id="fnref:third" role="doc-noteref"><a href="#fn:third" class="footnote" rel="footnote">3</a></sup> <a href="#fnref:first" class="reversefootnote" role="doc-backlink">&#8617;</a></p>
     </li>
     <li id="fn:second" role="doc-endnote">
       <p>Sed ut perspiciatis unde omnis. <a href="#fnref:second" class="reversefootnote" role="doc-backlink">&#8617;</a></p>

data/test/testcases/span/04_footnote/markers.html

@@ -1,18 +1,18 @@
-<p>This is some *ref.<sup id="fnref:fn" role="doc-noteref"><a href="#fn:fn" class="footnote">1</a></sup></p>
+<p>This is some *ref.<sup id="fnref:fn" role="doc-noteref"><a href="#fn:fn" class="footnote" rel="footnote">1</a></sup></p>
 
 <blockquote>
-  <p>a blockquote <sup id="fnref:3" role="doc-noteref"><a href="#fn:3" class="footnote">2</a></sup></p>
+  <p>a blockquote <sup id="fnref:3" role="doc-noteref"><a href="#fn:3" class="footnote" rel="footnote">2</a></sup></p>
 </blockquote>
 
 <ul>
-  <li>and a list item <sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote">3</a></sup></li>
+  <li>and a list item <sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">3</a></sup></li>
 </ul>
 
-<h1>And a header<sup id="fnref:now" role="doc-noteref"><a href="#fn:now" class="footnote">4</a></sup></h1>
+<h1>And a header<sup id="fnref:now" role="doc-noteref"><a href="#fn:now" class="footnote" rel="footnote">4</a></sup></h1>
 
 <p>A marker without a definition [^without].</p>
 
-<p>A marker <sup id="fnref:empty" role="doc-noteref"><a href="#fn:empty" class="footnote">5</a></sup> used twice<sup id="fnref:fn:1" role="doc-noteref"><a href="#fn:fn" class="footnote">1</a></sup> and thrice<sup id="fnref:fn:2" role="doc-noteref"><a href="#fn:fn" class="footnote">1</a></sup>.</p>
+<p>A marker <sup id="fnref:empty" role="doc-noteref"><a href="#fn:empty" class="footnote" rel="footnote">5</a></sup> used twice<sup id="fnref:fn:1" role="doc-noteref"><a href="#fn:fn" class="footnote" rel="footnote">1</a></sup> and thrice<sup id="fnref:fn:2" role="doc-noteref"><a href="#fn:fn" class="footnote" rel="footnote">1</a></sup>.</p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/span/04_footnote/placement.html

@@ -6,6 +6,6 @@
   </ol>
 </div>
 
-<p>Some para with a<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote">1</a></sup> footnote.</p>
+<p>Some para with a<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">1</a></sup> footnote.</p>
 
 <p>And another para.</p>

data/test/testcases/span/04_footnote/regexp_problem.html

@@ -1,5 +1,5 @@
 <h1>Something</h1>
-<p>something<sup id="fnref:note1" role="doc-noteref"><a href="#fn:note1" class="footnote">1</a></sup>.</p>
+<p>something<sup id="fnref:note1" role="doc-noteref"><a href="#fn:note1" class="footnote" rel="footnote">1</a></sup>.</p>
 
 <h1>Footnotes</h1>
 

data/test/testcases/span/04_footnote/without_backlink.html

@@ -1,4 +1,4 @@
-<p>Some footnote here<sup id="fnref:fn" role="doc-noteref"><a href="#fn:fn" class="footnote">1</a></sup></p>
+<p>Some footnote here<sup id="fnref:fn" role="doc-noteref"><a href="#fn:fn" class="footnote" rel="footnote">1</a></sup></p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/span/05_html/normal.html

@@ -2,7 +2,7 @@
 
 <p><a href="test">title</a> is a title.</p>
 
-<p>This is <? a PI ?>.</p>
+<p>This is &lt;? a PI ?&gt;.</p>
 
 <p>This is <!-- a --> comment.</p>
 

data/test/testcases/span/abbreviations/abbrev_in_html.html

@@ -0,0 +1,9 @@
+<p>This is <em>some <abbr title="This Escapes SVG Text.">TEST</abbr></em> to check.</p>
+
+<svg width="100" height="30" viewBox="0 0 100 30" xmlns="http://www.w3.org/2000/svg">
+    <text x="20" y="20">This TEST fails.</text>
+</svg>
+<svg width="100" height="30" viewBox="0 0 100 30" xmlns="http://www.w3.org/2000/svg">
+    <text x="20" y="20">This <abbr title="This Escapes SVG Text.">TEST</abbr> fails.</text>
+</svg>
+

data/test/testcases/span/abbreviations/abbrev_in_html.text

@@ -0,0 +1,10 @@
+This is <em>some TEST</em> to check.
+
+<svg width="100" height="30" viewBox="0 0 100 30" xmlns="http://www.w3.org/2000/svg">
+    <text x="20" y="20">This TEST fails.</text>
+</svg>
+<svg width="100" height="30" viewBox="0 0 100 30" xmlns="http://www.w3.org/2000/svg">
+    <text x="20" y="20" markdown="span">This TEST fails.</text>
+</svg>
+
+*[TEST]: This Escapes SVG Text.

data/test/testcases/span/abbreviations/in_footnote.html

@@ -1,4 +1,4 @@
-<p>There is a <abbr title="Text File">TXT</abbr> file here. <sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote">1</a></sup></p>
+<p>There is a <abbr title="Text File">TXT</abbr> file here. <sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">1</a></sup></p>
 
 <div class="footnotes" role="doc-endnotes">
   <ol>

data/test/testcases/span/text_substitutions/entities.html

@@ -3,4 +3,4 @@ As well \& as this. Some ŗ other
 values may ¯ may also show but
 not st. like &amp;#xYZ;.</p>
 
-<p>This is BS&amp;T; done!</p>
+<p>This &lt;span&gt; is BS&amp;T; done!</p>

data/test/testcases/span/text_substitutions/entities.text

@@ -3,4 +3,4 @@ As well \& as this. Some ŗ other
 values may ¯ may also show but
 not st. like &#xYZ;.
 
-This is BS&T; done!
+This <span> is BS&T; done!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -42,16 +42,22 @@ dependencies:
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.26.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +372,8 @@ files:
 - test/testcases/block/09_html/simple.text
 - test/testcases/block/09_html/standalone_image_in_div.htmlinput
 - test/testcases/block/09_html/standalone_image_in_div.text
+- test/testcases/block/09_html/table.kramdown
+- test/testcases/block/09_html/table.text
 - test/testcases/block/09_html/textarea.html
 - test/testcases/block/09_html/textarea.text
 - test/testcases/block/09_html/xml.html
@@ -580,6 +588,8 @@ files:
 - test/testcases/span/abbreviations/abbrev.text
 - test/testcases/span/abbreviations/abbrev_defs.html
 - test/testcases/span/abbreviations/abbrev_defs.text
+- test/testcases/span/abbreviations/abbrev_in_html.html
+- test/testcases/span/abbreviations/abbrev_in_html.text
 - test/testcases/span/abbreviations/in_footnote.html
 - test/testcases/span/abbreviations/in_footnote.text
 - test/testcases/span/autolinks/url_links.html