kramdown 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b045f72be4add1c589c1aa766c9e5645cbd8cae8
-  data.tar.gz: 8e957bbb6eb55cbbde3f8a6c12cf6105d9ba0732
+  metadata.gz: 2b6f2cf839ac06d2599c5b3b973045b114086f82
+  data.tar.gz: 0cf9626a31156f2e2c7d993041953ffa9c33f04e
 SHA512:
-  metadata.gz: f9e6675ca778e414d8add2d34d20f618c8b7181c273d2370329488533c451aa58dbd151d67cc0e5ececf852080f16782e342fd6a3f197389dcf43d9806fa31a8
-  data.tar.gz: 39db36de2b2b8c216111e31a091b3f8e4fc9ed2c8bd8cb12d0dc0e0a635f9281a919ff2df503cc0e4e770c1e3c3e9d0a95a5cf8cd5625aa3c8b490525ce51b72
+  metadata.gz: d62ca19bbaaa0a42dcd61042782f0e18a1591c136948e9495e8ec193f1f5ddac3ec1f2916196c8d2c1e094ad3a3057be2a8d660072bad4cbf98f1ad75e2e7048
+  data.tar.gz: fa8218c25f56a99b9f749cb6da57f44794394ce623a20ac8aa26a858cb8a08c26f1caac0dcabaf6367846980a81b47cd2158cbe84b79631c49c29a62885c80c1

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    781 Thomas Leitner <t_leitner@gmx.at>
+    789 Thomas Leitner <t_leitner@gmx.at>
       6 Gioele Barabucci <gioele@svario.it>
       4 Ted Pak <powerpak006@gmail.com>
       4 Arne Brasseur <arne@arnebrasseur.net>
@@ -9,6 +9,8 @@
       3 Brandur <brandur@mutelight.org>
       3 Ben Armston <ben.armston@googlemail.com>
       3 Alex Marandon <contact@alexmarandon.com>
+      2 Tom Thorogood <me+github@tomthorogood.co.uk>
+      2 Parker Moore <parkrmoore@gmail.com>
       2 Nathanael Jones <nathanael.jones@gmail.com>
       2 Max Meyer <dev@fedux.org>
       2 Jo Hund <jhund@clearcove.ca>
@@ -17,10 +19,10 @@
       1 utenmiki <utenmiki@gmail.com>
       1 Trevor Wennblom <trevor@well.com>
       1 tomykaira <tomykaira@gmail.com>
-      1 Tom Thorogood <me+github@tomthorogood.co.uk>
       1 Tim Blair <tim@bla.ir>
       1 Tim Besard <tim.besard@gmail.com>
       1 Tim Bates <tim@rumpuslabs.com>
+      1 Sun Yaozhu <yzyzsun@gmail.com>
       1 Simon Lydell <simon.lydell@gmail.com>
       1 Shusaku NAKAZATO <cu393uc@gmail.com>
       1 Sebastian Boehm <sebastian@sometimesfood.org>
@@ -38,5 +40,7 @@
       1 Jens Kraemer <jk@jkraemer.net>
       1 Hector Correa <hector@hectorcorrea.com>
       1 Floreal Morandat florealm@gmail.com <florealm@gmail.com>
+      1 Diego Galeota <diegobg123@gmail.com>
       1 Damien Pollet <damien.pollet@gmail.com>
+      1 Christopher Jefferson <caj21@st-andrews.ac.uk>
       1 Alex Tomlins <alex.tomlins@digital.cabinet-office.gov.uk>

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.10.0

data/doc/index.page

@@ -97,8 +97,8 @@ extensions that have been made popular by the [PHP Markdown Extra] package and [
 It is probably the fastest pure-Ruby Markdown converter available (September 2014), being about 3x
 faster than [Maruku] and about 4.5x faster than [BlueFeather].
 
-Version **1.9.0**{:itemprop="softwareVersion"} released on
-**2015-10-01**{:itemprop="datePublished"}, [more news](news.html)
+Version **1.10.0**{:itemprop="softwareVersion"} released on
+**2016-03-02**{:itemprop="datePublished"}, [more news](news.html)
 {: style="text-align: center; font-size: 80%"}
 
 </div>

data/doc/syntax.page

@@ -1136,9 +1136,9 @@ As the wording suggests, inline links provide all information inline in the text
 style links only provide the link text in the text flow and everything else is defined
 elsewhere. This also allows you to reuse link definitions.
 
-An inline style link can be created by surrounding the link text which must contain at least one
-character with square brackets, followed immediately by the link URL (and an optional title in
-single or double quotes preceded by at least one space) in normal parentheses. For example:
+An inline style link can be created by surrounding the link text with square brackets, followed
+immediately by the link URL (and an optional title in single or double quotes preceded by at least
+one space) in normal parentheses. For example:
 
     This is [a link](http://rubyforge.org) to a page.
     A [link](../test "local URI") can also have a title.
@@ -1150,6 +1150,8 @@ Notes:
   However, if you use square brackets within the link text, you have to either properly nest them or
   to escape them. It is not possible to create nested links!
 
+  The link text may also be omitted, e.g. for creating link anchors.
+
 * The link URL has to contain properly nested parentheses if no title is specified, or the link URL
   must be contained in angle brackets (incorrectly nested parentheses are allowed).
 
@@ -1222,9 +1224,8 @@ used on them to specify additional attributes for the links:
 
 Images can be specified via a syntax that is similar to the one used by links. The difference is
 that you have to use an exclamation mark before the first square bracket and that the link text of a
-normal link, which may also be the empty string in case of image links, becomes the alternative text
-of the image link. As with normal links, image links can be written inline or reference style. For
-example:
+normal link becomes the alternative text of the image link. As with normal links, image links can be
+written inline or reference style. For example:
 
     Here comes a ![smiley](../images/smiley.png)! And here
     ![too](../images/other.png 'Title text'). Or ![here].
@@ -1583,10 +1584,12 @@ ID name
 
 class names
 
-: A class name is defined by using a dot and then the class name. This is (almost, but not quite) a
-  short hand for the key-value pair `class="class-name"`. Almost because it actually means that the
-  class name should be appended to the current value of the `class` attribute. The following ALDs
-  are all equivalent:
+: A class name is defined by using a dot and then the class name which may contain any character
+  except whitespace, the dot character and the hash character.
+
+  This is (almost, but not quite) a short hand for the key-value pair `class="class-name"`. Almost
+  because it actually means that the class name should be appended to the current value of the
+  `class` attribute. The following ALDs are all equivalent:
 
       {:id: .cls1 .cls2}
       {:id: class="cls1" .cls2}

data/lib/kramdown/converter/base.rb

@@ -182,8 +182,8 @@ module Kramdown
 
       # Extract the code block/span language from the attributes.
       def extract_code_language(attr)
-        if attr['class'] && attr['class'] =~ /\blanguage-\w[\w-]*\b/
-          attr['class'].scan(/\blanguage-(\w[\w-]*)\b/).first.first
+        if attr['class'] && attr['class'] =~ /\blanguage-\S+/
+          attr['class'].scan(/\blanguage-(\S+)/).first.first
         end
       end
 
@@ -192,7 +192,7 @@ module Kramdown
       # *Warning*: This version will modify the given attributes if a language is present.
       def extract_code_language!(attr)
         lang = extract_code_language(attr)
-        attr['class'] = attr['class'].sub(/\blanguage-\w[\w-]*\b/, '').strip if lang
+        attr['class'] = attr['class'].sub(/\blanguage-\S+/, '').strip if lang
         attr.delete('class') if lang && attr['class'].empty?
         lang
       end

data/lib/kramdown/converter/html.rb

@@ -92,6 +92,7 @@ module Kramdown
       def convert_codeblock(el, indent)
         attr = el.attr.dup
         lang = extract_code_language!(attr)
+        lang = el.options[:lang] if el.options.has_key?(:lang)
         highlighted_code = highlight_code(el.value, lang, :block)
 
         if highlighted_code
@@ -112,7 +113,7 @@ module Kramdown
             end
           end
           code_attr = {}
-          code_attr['class'] = "language-#{lang}" if lang
+          code_attr['class'] = "language-#{lang.sub(/\?.*$/, '')}" if lang
           "#{' '*indent}<pre#{html_attributes(attr)}><code#{html_attributes(code_attr)}>#{result}\n</code></pre>\n"
         end
       end

data/lib/kramdown/converter/kramdown.rb

@@ -402,7 +402,7 @@ module Kramdown
           next if el.type == :header && k == 'id' && !v.strip.empty?
           if v.nil?
             ''
-          elsif k == 'class' && !v.empty?
+          elsif k == 'class' && !v.empty? && !v.index(/[\.#]/)
             " " + v.split(/\s+/).map {|w| ".#{w}"}.join(" ")
           elsif k == 'id' && !v.strip.empty?
             " ##{v}"

data/lib/kramdown/converter/math_engine/mathjaxnode.rb

@@ -9,19 +9,27 @@
 
 module Kramdown::Converter::MathEngine
 
-  # Uses the MathJax-node library for converting math formulas to MathML.
+  # Uses the mathjax-node library for converting math formulas to MathML.
   module MathjaxNode
 
     # MathjaxNode is available if this constant is +true+.
     AVAILABLE = RUBY_VERSION >= '1.9' && begin
-      npm = %x{npm --global --depth=1 list MathJax-node}
+      %x{node --version}[1..-2] >= '4.0'
+    rescue
+      begin
+        %x{nodejs --version}[1..-2] >= '4.0'
+      rescue
+        false
+      end
+    end && begin
+      npm = %x{npm --global --depth=1 list mathjax-node 2>&1}
 
-      unless /MathJax-node@/ === npm.lines.drop(1).join("\n")
-        npm = %x{npm --depth=1 list MathJax-node}
+      unless /mathjax-node@/ === npm.lines.drop(1).join("\n")
+        npm = %x{npm --depth=1 list mathjax-node 2>&1}
       end
 
-      T2MPATH = File.join(npm.lines.first.strip, "node_modules/MathJax-node/bin/tex2mml")
-      /MathJax-node@/ === npm.lines.drop(1).join("\n") && File.exist?(T2MPATH)
+      T2MPATH = File.join(npm.lines.first.strip, "node_modules/mathjax-node/bin/tex2mml")
+      /mathjax-node@/ === npm.lines.drop(1).join("\n") && File.exist?(T2MPATH)
     rescue
       false
     end

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

@@ -32,6 +32,9 @@ module Kramdown::Converter::SyntaxHighlighter
       else
         nil
       end
+    rescue
+      converter.warning("There was an error using CodeRay: #{$!.message}")
+      nil
     end
 
     def self.options(converter, type)

data/lib/kramdown/document.rb

@@ -29,7 +29,7 @@
 #
 #     Kramdown::Document.new(text).to_html
 #
-# For detailed information have a look at the Kramdown::Document class.
+# For detailed information have a look at the *\Kramdown::Document* class.
 #
 # == License
 #
@@ -100,13 +100,13 @@ module Kramdown
     # immediately available and the output can be generated.
     def initialize(source, options = {})
       @options = Options.merge(options).freeze
-      parser = (options[:input] || 'kramdown').to_s
+      parser = (@options[:input] || 'kramdown').to_s
       parser = parser[0..0].upcase + parser[1..-1]
       try_require('parser', parser)
       if Parser.const_defined?(parser)
         @root, @warnings = Parser.const_get(parser).parse(source, @options)
       else
-        raise Kramdown::Error.new("kramdown has no parser to handle the specified input format: #{options[:input]}")
+        raise Kramdown::Error.new("kramdown has no parser to handle the specified input format: #{@options[:input]}")
       end
     end
 

data/lib/kramdown/element.rb

@@ -98,6 +98,10 @@ module Kramdown
   #
   # The +value+ field has to contain the content of the code block.
   #
+  # The option :lang specifies a highlighting language with possible HTML style options (e.g.
+  # php?start_inline=1) and should be used instead of a possibly also available language embedded in
+  # a class name of the form 'language-LANG'.
+  #
   #
   # === :ul
   #

data/lib/kramdown/parser/gfm.rb

@@ -23,6 +23,10 @@ module Kramdown
           @block_parsers.delete(current)
           @block_parsers.insert(i, replacement)
         end
+
+        i = @span_parsers.index(:escaped_chars)
+        @span_parsers[i] = :escaped_chars_gfm if i
+        @span_parsers << :strikethrough_gfm
       end
 
       def parse
@@ -57,9 +61,32 @@ module Kramdown
       ATX_HEADER_START = /^\#{1,6}\s/
       define_parser(:atx_header_gfm, ATX_HEADER_START, nil, 'parse_atx_header')
 
-      FENCED_CODEBLOCK_MATCH = /^(([~`]){3,})\s*?(\w[\w-]*)?\s*?\n(.*?)^\1\2*\s*?\n/m
+      FENCED_CODEBLOCK_MATCH = /^(([~`]){3,})\s*?((\S+)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m
       define_parser(:codeblock_fenced_gfm, /^[~`]{3,}/, nil, 'parse_codeblock_fenced')
 
+      STRIKETHROUGH_DELIM = /~~/
+      STRIKETHROUGH_MATCH = /#{STRIKETHROUGH_DELIM}[^\s~](.*?)[^\s~]#{STRIKETHROUGH_DELIM}/m
+      define_parser(:strikethrough_gfm, STRIKETHROUGH_MATCH, '~~')
+
+      def parse_strikethrough_gfm
+        line_number = @src.current_line_number
+
+        @src.pos += @src.matched_size
+        el = Element.new(:html_element, 'del', {}, :category => :span, :line => line_number)
+        @tree.children << el
+
+        env = save_env
+        reset_env(:src => Kramdown::Utils::StringScanner.new(@src.matched[2..-3], line_number),
+                  :text_type => :text)
+        parse_spans(el)
+        restore_env(env)
+
+        el
+      end
+
+      ESCAPED_CHARS_GFM = /\\([\\.*_+`<>()\[\]{}#!:\|"'\$=\-~])/
+      define_parser(:escaped_chars_gfm, ESCAPED_CHARS_GFM, '\\\\', :parse_escaped_chars)
+
     end
   end
 end

data/lib/kramdown/parser/html.rb

@@ -53,7 +53,7 @@ module Kramdown
         # span HTML) and don't appear therefore!
         # 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 option q rb rbc rp rt rtc ruby samp select small span
+                              ins kbd label mark option q rb rbc rp rt rtc ruby samp select small span
                               strong sub sup 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
@@ -421,7 +421,7 @@ module Kramdown
             else
               set_basics(el, :codeblock)
               if el.children.size == 1 && el.children.first.value == 'code'
-                value = (el.children.first.attr['class'] || '').scan(/\blanguage-\w[\w-]*\b/).first
+                value = (el.children.first.attr['class'] || '').scan(/\blanguage-\S+/).first
                 el.attr['class'] = "#{value} #{el.attr['class']}".rstrip if value
               end
             end

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

@@ -16,7 +16,7 @@ module Kramdown
       elsif RUBY_VERSION < '1.9.0'
         ACHARS = '\w'
       else
-        ACHARS = '[[:alnum:]]'
+        ACHARS = '[[:alnum:]]_'
       end
       AUTOLINK_START_STR = "<((mailto|https?|ftps?):.+?|[-.#{ACHARS}]+@[-#{ACHARS}]+(?:\.[-#{ACHARS}]+)*\.[a-z]+)>"
       AUTOLINK_START = /#{AUTOLINK_START_STR}/u

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

@@ -32,16 +32,19 @@ module Kramdown
 
 
       FENCED_CODEBLOCK_START = /^~{3,}/
-      FENCED_CODEBLOCK_MATCH = /^((~){3,})\s*?(\w[\w-]*)?\s*?\n(.*?)^\1\2*\s*?\n/m
+      FENCED_CODEBLOCK_MATCH = /^((~){3,})\s*?((\S+?)(?:\?\S*)?)?\s*?\n(.*?)^\1\2*\s*?\n/m
 
       # Parse the fenced codeblock at the current location.
       def parse_codeblock_fenced
         if @src.check(self.class::FENCED_CODEBLOCK_MATCH)
           start_line_number = @src.current_line_number
           @src.pos += @src.matched_size
-          el = new_block_el(:codeblock, @src[4], nil, :location => start_line_number)
+          el = new_block_el(:codeblock, @src[5], nil, :location => start_line_number)
           lang = @src[3].to_s.strip
-          el.attr['class'] = "language-#{lang}" unless lang.empty?
+          unless lang.empty?
+            el.options[:lang] = lang
+            el.attr['class'] = "language-#{@src[4]}"
+          end
           @tree.children << el
           true
         else

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

@@ -128,8 +128,9 @@ module Kramdown
       ALD_ID_CHARS = /[\w-]/
       ALD_ANY_CHARS = /\\\}|[^\}]/
       ALD_ID_NAME = /\w#{ALD_ID_CHARS}*/
+      ALD_CLASS_NAME = /[^\s\.#]+/
       ALD_TYPE_KEY_VALUE_PAIR = /(#{ALD_ID_NAME})=("|')((?:\\\}|\\\2|[^\}\2])*?)\2/
-      ALD_TYPE_CLASS_NAME = /\.(-?#{ALD_ID_NAME})/
+      ALD_TYPE_CLASS_NAME = /\.(#{ALD_CLASS_NAME})/
       ALD_TYPE_ID_NAME = /#([A-Za-z][\w:-]*)/
       ALD_TYPE_ID_OR_CLASS = /#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME}/
       ALD_TYPE_ID_OR_CLASS_MULTI = /((?:#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME})+)/

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

@@ -77,7 +77,7 @@ module Kramdown
           count = count + (@src[1] ? -1 : 1)
           count - el.children.select {|c| c.type == :img}.size == 0
         end
-        if !found || (link_type == :a && el.children.empty?)
+        unless found
           @src.revert_pos(saved_pos)
           add_text(result)
           return

data/lib/kramdown/version.rb

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

data/test/test_files.rb

@@ -64,6 +64,7 @@ class TestFiles < Minitest::Test
                           'test/testcases/span/math/mathjaxnode.html', # bc of tidy
                           'test/testcases/block/15_math/mathjax_preview.html', # bc of mathjax preview
                           'test/testcases/block/15_math/mathjax_preview_simple.html', # bc of mathjax preview
+                          'test/testcases/span/05_html/mark_element.html', # bc of tidy
                          ].compact
     EXCLUDE_HTML_TEXT_FILES = ['test/testcases/block/09_html/parse_as_span.htmlinput',
                                'test/testcases/block/09_html/parse_as_raw.htmlinput',
@@ -117,6 +118,7 @@ class TestFiles < Minitest::Test
                            'test/testcases/span/01_link/empty_title.text',
                            'test/testcases/span/04_footnote/markers.text', # bc of footnote in header
                            'test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.text',
+                           'test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.text',
                           ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_LATEX_FILES.any? {|f| text_file =~ /#{f}$/}
@@ -156,7 +158,7 @@ class TestFiles < Minitest::Test
                           ('test/testcases/block/04_header/with_auto_ids.text' if RUBY_VERSION <= '1.8.6'), # bc of dep stringex not working
                           ('test/testcases/span/03_codespan/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
                           ('test/testcases/span/03_codespan/rouge/disabled.text' if RUBY_VERSION < '2.0'), #bc of rouge
-                          ('test/testcases/block/06_codeblock/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
+                          'test/testcases/block/06_codeblock/rouge/simple.text',
                           'test/testcases/block/15_math/ritex.text', # bc of tidy
                           'test/testcases/span/math/ritex.text', # bc of tidy
                           'test/testcases/block/15_math/itex2mml.text', # bc of tidy
@@ -166,6 +168,7 @@ class TestFiles < Minitest::Test
                           'test/testcases/block/15_math/mathjaxnode_semantics.text', # bc of tidy
                           'test/testcases/span/math/mathjaxnode.text', # bc of tidy
                           'test/testcases/span/01_link/link_defs_with_ial.text', # bc of attribute ordering
+                          'test/testcases/span/05_html/mark_element.text', # bc of tidy
                          ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_TEXT_FILES.any? {|f| text_file =~ /#{f}$/}
@@ -215,6 +218,7 @@ class TestFiles < Minitest::Test
                              'test/testcases/block/15_math/mathjax_preview.html', # bc of mathjax preview
                              'test/testcases/block/15_math/mathjax_preview_simple.html', # bc of mathjax preview
                              'test/testcases/span/01_link/link_defs_with_ial.html', # bc of attribute ordering
+                             'test/testcases/span/05_html/mark_element.html', # bc of tidy
                             ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.{html,html.19}'].each do |html_file|
       next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}(\.19)?$/}

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

@@ -4,3 +4,7 @@
 <div class="highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;a&gt;</span>href<span class="nt">&lt;/a&gt;</span>
 </code></pre>
 </div>
+
+<div class="highlighter-rouge"><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>
+</code></pre>
+</div>

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

@@ -2,3 +2,8 @@
 ^
     <a>href</a>
 {: .language-html}
+
+
+~~~ php?start_inline=1
+$foo = new Bar;
+~~~

data/test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.html

@@ -0,0 +1,8 @@
+<pre><code class="language-asn.1">text
+</code></pre>
+
+<pre><code class="language-asn#w1">text
+</code></pre>
+
+<pre><code class="language-русский">text
+</code></pre>

data/test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.options

@@ -0,0 +1,2 @@
+:enable_coderay: false
+

data/test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.text

@@ -0,0 +1,11 @@
+~~~ asn.1
+text
+~~~
+
+~~~ asn#w1
+text
+~~~
+
+~~~ русский
+text
+~~~

data/test/testcases/span/01_link/empty.html

@@ -2,4 +2,4 @@
 
 <p>This is [][] empty.</p>
 
-<p>This is [](test.html) empty.</p>
+<p>This is <a href="test.html"></a> empty.</p>

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

@@ -0,0 +1,3 @@
+<p>Lorem ipsum.</p>
+
+<p><mark>Test</mark></p>

data/test/testcases/span/05_html/mark_element.text

@@ -0,0 +1,3 @@
+Lorem ipsum.
+
+<mark>Test</mark>

data/test/testcases/span/autolinks/url_links.html

@@ -1,6 +1,7 @@
 <p>This should be a <a href="http://www.example.com/">http://www.example.com/</a> link.
 This should be a <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;">&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;</a> link.
 As should <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;">&#106;&#111;&#104;&#110;&#046;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;</a> this.
+As should <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#106;&#111;&#104;&#110;&#095;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;">&#106;&#111;&#104;&#110;&#095;&#100;&#111;&#101;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;</a> this.
 As should <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#067;&#083;&#083;&#064;&#101;&#120;&#097;&#109;&#112;&#108;&#101;&#046;&#099;&#111;&#109;"><abbr title="Cascading">CSS</abbr>@example.com</a> this.
 Another ampersand <a href="http://www.example.com/?doit&amp;x=y">http://www.example.com/?doit&amp;x=y</a> link.
 More entities  <a href="http://www.example.com/?doit&amp;x=&quot;y&amp;z=y">http://www.example.com/?doit&amp;x=&quot;y&amp;z=y</a>.</p>

data/test/testcases/span/autolinks/url_links.text

@@ -1,6 +1,7 @@
 This should be a <http://www.example.com/> link.
 This should be a <mailto:john.doe@example.com> link.
 As should <john.doe@example.com> this.
+As should <john_doe@example.com> this.
 As should <CSS@example.com> this.
 Another ampersand <http://www.example.com/?doit&x=y> link.
 More entities  <http://www.example.com/?doit&amp;x=&quot;y&z=y>.

data/test/testcases_gfm/strikethrough.html

@@ -0,0 +1,27 @@
+<p><del>This is a test</del></p>
+
+<p>~<del>This is another test</del>~</p>
+
+<p><del>This is yet another test</del>~</p>
+
+<p>~~ This is a test of it NOT working ~~</p>
+
+<p>~~<br />
+This<br />
+is<br />
+a<br />
+<strong>multiline</strong><br />
+test<br />
+~~</p>
+
+<p>This is an <del><em>inline</em> <strong>strikethrough</strong></del> test</p>
+
+<p>This is an ~~escaped~~ strikethrough.</p>
+
+<p>This is a <del>strikethrough with a ~ in the middle</del></p>
+
+<p>I <del>don&#8217;t even</del>~ have an extra tilde.</p>
+
+<p>This should ~~not be struck.</p>
+
+<p>This <del>is a complex <em>strike</em> through *test ~~with nesting</del> involved* here~~.</p>

data/test/testcases_gfm/strikethrough.html.19

@@ -0,0 +1,27 @@
+<p><del>This is a test</del></p>
+
+<p>~<del>This is another test</del>~</p>
+
+<p><del>This is yet another test</del>~</p>
+
+<p>~~ This is a test of it NOT working ~~</p>
+
+<p>~~<br />
+This<br />
+is<br />
+a<br />
+<strong>multiline</strong><br />
+test<br />
+~~</p>
+
+<p>This is an <del><em>inline</em> <strong>strikethrough</strong></del> test</p>
+
+<p>This is an ~~escaped~~ strikethrough.</p>
+
+<p>This is a <del>strikethrough with a ~ in the middle</del></p>
+
+<p>I <del>don’t even</del>~ have an extra tilde.</p>
+
+<p>This should ~~not be struck.</p>
+
+<p>This <del>is a complex <em>strike</em> through *test ~~with nesting</del> involved* here~~.</p>

data/test/testcases_gfm/strikethrough.text

@@ -0,0 +1,27 @@
+~~This is a test~~
+
+~~~This is another test~~~
+
+~~This is yet another test~~~
+
+~~ This is a test of it NOT working ~~
+
+~~
+This
+is
+a
+**multiline**
+test
+~~
+
+This is an ~~_inline_ **strikethrough**~~ test
+
+This is an \~~escaped~~ strikethrough.
+
+This is a ~~strikethrough with a ~ in the middle~~
+
+I ~~don't even~~~ have an extra tilde.
+
+This should ~~not be struck.
+
+This ~~is a complex *strike* through *test ~~with nesting~~ involved* here~~.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -318,6 +318,9 @@ files:
 - test/testcases/block/06_codeblock/with_lang_in_fenced_block.html
 - test/testcases/block/06_codeblock/with_lang_in_fenced_block.options
 - test/testcases/block/06_codeblock/with_lang_in_fenced_block.text
+- test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.html
+- test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.options
+- test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.text
 - test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.html
 - test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.options
 - test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.text
@@ -600,6 +603,8 @@ files:
 - test/testcases/span/05_html/invalid.text
 - test/testcases/span/05_html/link_with_mailto.html
 - test/testcases/span/05_html/link_with_mailto.text
+- test/testcases/span/05_html/mark_element.html
+- test/testcases/span/05_html/mark_element.text
 - test/testcases/span/05_html/markdown_attr.html
 - test/testcases/span/05_html/markdown_attr.text
 - test/testcases/span/05_html/normal.html
@@ -673,6 +678,9 @@ files:
 - test/testcases_gfm/hard_line_breaks_off.html
 - test/testcases_gfm/hard_line_breaks_off.options
 - test/testcases_gfm/hard_line_breaks_off.text
+- test/testcases_gfm/strikethrough.html
+- test/testcases_gfm/strikethrough.html.19
+- test/testcases_gfm/strikethrough.text
 - test/testcases_gfm/two_para_hard_line_breaks.html
 - test/testcases_gfm/two_para_hard_line_breaks.text
 homepage: http://kramdown.gettalong.org
@@ -697,7 +705,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: kramdown is a fast, pure-Ruby Markdown-superset converter.