kramdown 1.5.0 → 1.6.0

data/lib/kramdown/parser/kramdown/typographic_symbol.rb

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

data/lib/kramdown/parser/markdown.rb

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2014 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
-require 'kramdown/parser/kramdown'
+require 'kramdown/parser'
 
 module Kramdown
 

data/lib/kramdown/utils.rb

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

data/lib/kramdown/utils/configurable.rb

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

data/lib/kramdown/utils/entities.rb

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

data/lib/kramdown/utils/html.rb

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2014 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
+require 'rexml/parsers/baseparser'
+
 module Kramdown
 
   module Utils

data/lib/kramdown/utils/ordered_hash.rb

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

data/lib/kramdown/utils/string_scanner.rb

@@ -1,4 +1,12 @@
 # -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
+
 
 require 'strscan'
 

data/lib/kramdown/utils/unidecoder.rb

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

data/lib/kramdown/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2014 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -10,6 +10,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 
 end

data/man/man1/kramdown.1

@@ -1,4 +1,4 @@
-.TH "KRAMDOWN" 1 "June 2014"
+.TH "KRAMDOWN" 1 "February 2015"
 .SH NAME
 kramdown \- a fast, pure-Ruby Markdown-superset converter
 .SH SYNOPSIS

data/test/run_tests.rb

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

data/test/test_files.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2014 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -41,10 +41,10 @@ class TestFiles < Minitest::Test
     end
   end
 
-  # Generate test methods for html-to-html conversion
+  # Generate test methods for html-to-{html,kramdown} conversion
   `tidy -v 2>&1`
   if $?.exitstatus != 0
-    warn("Skipping html-to-html tests because tidy executable is missing")
+    warn("Skipping html-to-{html,kramdown} tests because tidy executable is missing")
   else
     EXCLUDE_HTML_FILES = ['test/testcases/block/06_codeblock/whitespace.html', # bc of span inside pre
                           'test/testcases/block/09_html/simple.html', # bc of xml elements
@@ -57,18 +57,34 @@ class TestFiles < Minitest::Test
                           'test/testcases/span/math/ritex.html', # bc of tidy
                           'test/testcases/block/15_math/itex2mml.html', # bc of tidy
                           'test/testcases/span/math/itex2mml.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
+                         ].compact
+    EXCLUDE_HTML_TEXT_FILES = ['test/testcases/block/09_html/parse_as_span.htmlinput',
+                               'test/testcases/block/09_html/parse_as_raw.htmlinput',
+                              ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.{html,html.19,htmlinput,htmlinput.19}'].each do |html_file|
       next if EXCLUDE_HTML_FILES.any? {|f| html_file =~ /#{f}(\.19)?$/}
       next if (RUBY_VERSION >= '1.9' && File.exist?(html_file + '.19')) ||
         (RUBY_VERSION < '1.9' && html_file =~ /\.19$/)
-      out_file = (html_file =~ /\.htmlinput(\.19)?$/ ? html_file.sub(/input(\.19)?$/, '') : html_file)
-      define_method('test_' + html_file.tr('.', '_') + "_to_html") do
-        opts_file = html_file.sub(/\.html(input)?(\.19)?$/, '.options')
-        opts_file = File.join(File.dirname(html_file), 'options') if !File.exist?(opts_file)
-        options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
-        doc = Kramdown::Document.new(File.read(html_file), options.merge(:input => 'html'))
-        assert_equal(tidy_output(File.read(out_file)), tidy_output(doc.to_html))
+
+      out_files = []
+      out_files << [(html_file =~ /\.htmlinput(\.19)?$/ ? html_file.sub(/input(\.19)?$/, '') : html_file), :to_html]
+      if html_file =~ /\.htmlinput(\.19)?$/ && !EXCLUDE_HTML_TEXT_FILES.any? {|f| html_file =~ /#{f}/}
+        out_files << [html_file.sub(/htmlinput(\.19)?$/, 'text'), :to_kramdown]
+      end
+      out_files.select {|f, _| File.exist?(f)}.each do |out_file, out_method|
+        define_method('test_' + html_file.tr('.', '_') + "_to_#{File.extname(out_file)}") do
+          opts_file = html_file.sub(/\.html(input)?(\.19)?$/, '.options')
+          opts_file = File.join(File.dirname(html_file), 'options') if !File.exist?(opts_file)
+          options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
+          doc = Kramdown::Document.new(File.read(html_file), options.merge(:input => 'html'))
+          if out_method == :to_html
+            assert_equal(tidy_output(File.read(out_file)), tidy_output(doc.send(out_method)))
+          else
+            assert_equal(File.read(out_file), doc.send(out_method))
+          end
+        end
       end
     end
   end
@@ -93,8 +109,9 @@ class TestFiles < Minitest::Test
   else
     EXCLUDE_LATEX_FILES = ['test/testcases/span/01_link/image_in_a.text', # bc of image link
                            'test/testcases/span/01_link/imagelinks.text', # bc of image links
+                           'test/testcases/span/01_link/empty_title.text',
                            'test/testcases/span/04_footnote/markers.text', # bc of footnote in header
-                          ]
+                          ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_LATEX_FILES.any? {|f| text_file =~ /#{f}$/}
       define_method('test_' + text_file.tr('.', '_') + "_to_latex_compilation") do
@@ -137,12 +154,14 @@ class TestFiles < Minitest::Test
                           'test/testcases/span/math/ritex.text', # bc of tidy
                           'test/testcases/block/15_math/itex2mml.text', # bc of tidy
                           'test/testcases/span/math/itex2mml.text', # bc of tidy
+                          'test/testcases/span/01_link/link_defs_with_ial.text', # bc of attribute ordering
                          ].compact
     Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
       next if EXCLUDE_TEXT_FILES.any? {|f| text_file =~ /#{f}$/}
+      html_file = text_file.sub(/\.text$/, '.html')
+      html_file += '.19' if RUBY_VERSION >= '1.9' && File.exist?(html_file + '.19')
+      next unless File.exist?(html_file)
       define_method('test_' + text_file.tr('.', '_') + "_to_kramdown_to_html") do
-        html_file = text_file.sub(/\.text$/, '.html')
-        html_file += '.19' if RUBY_VERSION >= '1.9' && File.exist?(html_file + '.19')
         opts_file = text_file.sub(/\.text$/, '.options')
         opts_file = File.join(File.dirname(text_file), 'options') if !File.exist?(opts_file)
         options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
@@ -177,7 +196,10 @@ class TestFiles < Minitest::Test
                              'test/testcases/span/math/ritex.html', # bc of tidy
                              'test/testcases/block/15_math/itex2mml.html', # bc of tidy
                              'test/testcases/span/math/itex2mml.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/01_link/link_defs_with_ial.html', # bc of attribute ordering
+                            ].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)?$/}
       next if (RUBY_VERSION >= '1.9' && File.exist?(html_file + '.19')) ||
@@ -251,7 +273,7 @@ class TestFiles < Minitest::Test
                        'test/testcases/span/text_substitutions/typography.text',
                        ('test/testcases/span/03_codespan/highlighting-rouge.text' if RUBY_VERSION < '2.0'),
                        ('test/testcases/block/06_codeblock/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
-                      ]
+                      ].compact
 
   # Generate test methods for gfm-to-html conversion
   Dir[File.dirname(__FILE__) + '/{testcases,testcases_gfm}/**/*.text'].each do |text_file|
@@ -261,6 +283,7 @@ class TestFiles < Minitest::Test
     html_file = [(".html.19" if RUBY_VERSION >= '1.9'), ".html"].compact.
       map {|ext| basename + ext }.
       detect {|file| File.exist?(file) }
+    next unless html_file
 
     define_method('test_gfm_' + text_file.tr('.', '_') + "_to_html") do
       opts_file = basename + '.options'
@@ -272,12 +295,20 @@ class TestFiles < Minitest::Test
   end
 
 
+  EXCLUDE_PDF_MODIFY = ['test/testcases/span/text_substitutions/entities.text',
+                        'test/testcases/span/text_substitutions/entities_numeric.text',
+                        'test/testcases/span/text_substitutions/entities_as_char.text',
+                        'test/testcases/span/text_substitutions/entities_as_input.text',
+                        'test/testcases/span/text_substitutions/entities_symbolic.text',
+                        'test/testcases/block/04_header/with_auto_ids.text',
+                       ].compact
+
   # Generate test methods for asserting that converters don't modify the document tree.
   Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
     opts_file = text_file.sub(/\.text$/, '.options')
     options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
     (Kramdown::Converter.constants.map {|c| c.to_sym} - [:Base, :RemoveHtmlTags, :MathEngine, :SyntaxHighlighter]).each do |conv_class|
-      next if conv_class == :Pdf && RUBY_VERSION < '1.9'
+      next if conv_class == :Pdf && (RUBY_VERSION < '2.0' || EXCLUDE_PDF_MODIFY.any? {|f| text_file =~ /#{f}$/})
       define_method("test_whether_#{conv_class}_modifies_tree_with_file_#{text_file.tr('.', '_')}") do
         doc = Kramdown::Document.new(File.read(text_file), options)
         options_before = Marshal.load(Marshal.dump(doc.options))

data/test/test_location.rb

@@ -1,4 +1,12 @@
 # -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
+
 
 require 'minitest/autorun'
 require 'kramdown'

data/test/test_string_scanner_kramdown.rb

@@ -1,4 +1,12 @@
 # -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
+
 
 require 'minitest/autorun'
 require 'kramdown/utils/string_scanner'

data/test/testcases/block/04_header/atx_header.html

@@ -30,7 +30,7 @@
 
 <h1>header</h1>
 
-<p># </p>
+<p>#</p>
 
 <p>#</p>
 

data/test/testcases/block/06_codeblock/highlighting-rouge.html

@@ -1,6 +1,6 @@
-<div class="highlighter-rouge"><pre><code class="highlight"><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span>
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">x</span> <span class="o">=</span> <span class="no">Class</span><span class="p">.</span><span class="nf">new</span>
 </code></pre>
 </div>
-<div class="highlighter-rouge"><pre><code class="highlight"><span class="nt">&lt;a&gt;</span>href<span class="nt">&lt;/a&gt;</span>
+<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>

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

@@ -0,0 +1,7 @@
+<p>Para</p>
+<div class="test">division</div>
+
+<blockquote>
+  <p>Quote</p>
+</blockquote>
+<div class="test">division</div>

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

@@ -0,0 +1,5 @@
+Para
+<div class="test">division</div>
+
+> Quote
+<div class="test">division</div>

data/test/testcases/block/11_ial/simple.html

@@ -1,4 +1,4 @@
-<p key1="val&quot;" key2="val'" class="other-class myclass class" id="other" key="val">Some paragraph.</p>
+<p key1="val&quot;" key2="val'" class="other-class myclass class -class" id="other" key="val">Some paragraph.</p>
 
 <p class="cls1 cls2" id="id">Some paragraph.</p>
 
@@ -20,6 +20,8 @@
 
 <p class="cls">Some paragraph here</p>
 
+<p class="cls1 cls2">Some paragraph here</p>
+
 <p class="cls">Paragraph</p>
 <p>Paragraph</p>
 

data/test/testcases/block/11_ial/simple.text

@@ -1,5 +1,5 @@
 Some paragraph.
-{:.class id key="val"}
+{:.class .-class id key="val"}
 
 Some paragraph.
 {:.cls1#id.cls2}
@@ -22,6 +22,10 @@ Some paragraph.
 {:.cls}
 Some paragraph here
 
+{:.cls1}
+{:.cls2}
+Some paragraph here
+
 Paragraph
 {:.cls}
 Paragraph

data/test/testcases/block/15_math/gh_128.html

@@ -1,2 +1,2 @@
 <script type="math/tex; mode=display">% <![CDATA[
- alert('a') alert('b<')  %]]></script>
+alert('a') alert('b<') %]]></script>

data/test/testcases/block/15_math/mathjax_preview.html

@@ -0,0 +1,4 @@
+<p>This is a <span class="MathJax_Preview">5 + 5</span><script type="math/tex">5 + 5</script> statement</p>
+
+<div class="MathJax_Preview">5 + 5</div>
+<script type="math/tex; mode=display">5 + 5</script>

data/test/testcases/block/15_math/mathjax_preview.options

@@ -0,0 +1,2 @@
+:math_engine_opts:
+  :preview: true

data/test/testcases/block/15_math/mathjax_preview.text

@@ -0,0 +1,5 @@
+This is a $$5 + 5$$ statement
+
+$$
+5 + 5
+$$

data/test/testcases/block/15_math/mathjax_preview_simple.html

@@ -0,0 +1,4 @@
+<p>This is a <span class="MathJax_Preview">math</span><script type="math/tex">5 + 5</script> statement</p>
+
+<div class="MathJax_Preview">math</div>
+<script type="math/tex; mode=display">5 + 5</script>

data/test/testcases/block/15_math/mathjax_preview_simple.options

@@ -0,0 +1,2 @@
+:math_engine_opts:
+  :preview: 'math'

data/test/testcases/block/15_math/mathjax_preview_simple.text

@@ -0,0 +1,5 @@
+This is a $$5 + 5$$ statement
+
+$$
+5 + 5
+$$

data/test/testcases/block/15_math/normal.html

@@ -1,5 +1,5 @@
 <p>This is a para.
-<script type="math/tex"> \text{LaTeX} \lambda_5 </script></p>
+<script type="math/tex">\text{LaTeX} \lambda_5</script></p>
 
 <script type="math/tex; mode=display">\lambda_5 = \alpha + 4</script>
 

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

@@ -1,19 +1,19 @@
 <h1 class="no_toc" id="contents">Contents</h1>
 
 <ul id="markdown-toc">
-  <li><a href="#header-level-1">Header level 1</a>    <ul>
-      <li><a href="#header-level-2">Header level 2</a>        <ul>
-          <li><a href="#header-level-3">Header level 3</a>            <ul>
-              <li><a href="#header-level-4">Header level 4</a></li>
+  <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>
+              <li><a href="#header-level-4" id="markdown-toc-header-level-4">Header level 4</a></li>
             </ul>
           </li>
         </ul>
       </li>
     </ul>
   </li>
-  <li><a href="#other-header-level-1">Other header level 1</a>    <ul>
-      <li><a href="#other-header-level-2">Other header level 2</a>        <ul>
-          <li><a href="#other-header-level-3">Other header level 3</a></li>
+  <li><a href="#other-header-level-1" id="markdown-toc-other-header-level-1">Other header level 1</a>    <ul>
+      <li><a href="#other-header-level-2" id="markdown-toc-other-header-level-2">Other header level 2</a>        <ul>
+          <li><a href="#other-header-level-3" id="markdown-toc-other-header-level-3">Other header level 3</a></li>
         </ul>
       </li>
     </ul>