kramdown 1.4.2 → 1.5.0

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

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2014 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
+
+module Kramdown::Converter::SyntaxHighlighter
+
+  # Uses Rouge which is CSS-compatible to Pygments to highlight code blocks and code spans.
+  module Rouge
+
+    begin
+      require 'rouge'
+
+      # Highlighting via Rouge is available if this constant is +true+.
+      AVAILABLE = true
+    rescue LoadError, SyntaxError
+      AVAILABLE = false  # :nodoc:
+    end
+
+    def self.call(converter, text, lang, type, _unused_opts)
+      opts = converter.options[:syntax_highlighter_opts].dup
+      lexer = ::Rouge::Lexer.find_fancy(lang || opts[:default_lang], text)
+      return nil unless lexer
+
+      opts[:wrap] = false if type == :span
+
+      formatter = ::Rouge::Formatters::HTML.new(opts)
+      formatter.format(lexer.lex(text))
+    end
+
+  end
+
+end

data/lib/kramdown/element.rb

@@ -116,7 +116,7 @@ module Kramdown
   #
   # === :li
   #
-  # [Category] None
+  # [Category] Block-level element
   # [Usage context] Inside :ol and :ul elements
   # [Content model] Block-level elements
   #
@@ -137,7 +137,7 @@ module Kramdown
   #
   # === :dt
   #
-  # [Category] None
+  # [Category] Block-level element
   # [Usage context] Before :dt or :dd elements inside a :dl elment
   # [Content model] Span-level elements
   #
@@ -146,7 +146,7 @@ module Kramdown
   #
   # === :dd
   #
-  # [Category] None
+  # [Category] Block-level element
   # [Usage context] After :dt or :dd elements inside a :dl elment
   # [Content model] Block-level elements
   #
@@ -214,7 +214,7 @@ module Kramdown
   #
   # === :td
   #
-  # [Category] None
+  # [Category] Block-level element
   # [Usage context] Inside :tr elements
   # [Content model] As child of :thead/:tr span-level elements, as child of :tbody/:tr and
   #                 :tfoot/:tr block-level elements
@@ -498,7 +498,7 @@ module Kramdown
     end
 
     CATEGORY = {} # :nodoc:
-    [:blank, :p, :header, :blockquote, :codeblock, :ul, :ol, :dl, :table, :hr].each {|b| CATEGORY[b] = :block}
+    [:blank, :p, :header, :blockquote, :codeblock, :ul, :ol, :li, :dl, :dt, :dd, :table, :td, :hr].each {|b| CATEGORY[b] = :block}
     [:text, :a, :br, :img, :codespan, :footnote, :em, :strong, :entity, :typographic_sym,
      :smart_quote, :abbreviation].each {|b| CATEGORY[b] = :span}
 

data/lib/kramdown/options.rb

@@ -101,9 +101,7 @@ module Kramdown
                elsif @options[name].type == Float
                  Float(data) rescue raise Kramdown::Error, "Invalid float value for option '#{name}': '#{data}'"
                elsif @options[name].type == Symbol
-                 data.strip!
-                 data = data[1..-1] if data[0] == ?:
-                 (data.empty? || data == 'nil' ? nil : data.to_sym)
+                 str_to_sym(data)
                elsif @options[name].type == Boolean
                  data.downcase.strip != 'false' && !data.empty?
                end
@@ -112,6 +110,17 @@ module Kramdown
       data
     end
 
+    # Converts the given String +data+ into a Symbol or +nil+ with the
+    # following provisions:
+    #
+    # - A leading colon is stripped from the string.
+    # - An empty value or a value equal to "nil" results in +nil+.
+    def self.str_to_sym(data)
+      data = data.strip
+      data = data[1..-1] if data[0] == ?:
+      (data.empty? || data == 'nil' ? nil : data.to_sym)
+    end
+
     # ----------------------------
     # :section: Option Validators
     #
@@ -137,6 +146,23 @@ module Kramdown
       val
     end
 
+    # Ensures that the option value +val+ for the option called +name+ is a valid hash. The
+    # parameter +val+ can be
+    #
+    # - a hash in YAML format
+    # - or a Ruby Hash object.
+    def self.simple_hash_validator(val, name)
+      if String === val
+        begin
+          val = YAML.load(val)
+        rescue RuntimeError, ArgumentError, SyntaxError
+          raise Kramdown::Error, "Invalid YAML value for option #{name}"
+        end
+      end
+      raise Kramdown::Error, "Invalid type #{val.class} for option #{name}" if !(Hash === val)
+      val
+    end
+
     # ----------------------------
     # :section: Option Definitions
     #
@@ -269,14 +295,7 @@ hash has to follow the above guidelines.
 Default: {}
 Used by: kramdown parser
 EOF
-      if String === val
-        begin
-          val = YAML.load(val)
-        rescue RuntimeError, ArgumentError, SyntaxError
-          raise Kramdown::Error, "Invalid YAML value for option link_defs"
-        end
-      end
-      raise Kramdown::Error, "Invalid type #{val.class} for option #{name}" if !(Hash === val)
+      val = simple_hash_validator(val, :link_defs)
       val.each do |k,v|
         if !(Array === v) || v.size > 2 || v.size < 1
           raise Kramdown::Error, "Invalid structure for hash value of option #{name}"
@@ -494,6 +513,72 @@ Default: true
 Used by: GFM parser
 EOF
 
+    define(:syntax_highlighter, Symbol, :coderay, <<EOF)
+Set the syntax highlighter
+
+Specifies the syntax highlighter that should be used for highlighting
+code blocks and spans. If this option is set to +nil+, no syntax
+highlighting is done.
+
+Options for the syntax highlighter can be set with the
+syntax_highlighter_opts configuration option.
+
+Default: coderay
+Used by: HTML converter
+EOF
+
+    define(:syntax_highlighter_opts, Object, {}, <<EOF) do |val|
+Set the syntax highlighter options
+
+Specifies options for the syntax highlighter set via the
+syntax_highlighter configuration option.
+
+The value needs to be a hash with key-value pairs that are understood by
+the used syntax highlighter.
+
+Default: {}
+Used by: HTML converter
+EOF
+      val = simple_hash_validator(val, :syntax_highlighter_opts)
+      val.keys.each do |k|
+        val[k.kind_of?(String) ? str_to_sym(k) : k] = val.delete(k)
+      end
+      val
+    end
+
+    define(:math_engine, Symbol, :mathjax, <<EOF)
+Set the math engine
+
+Specifies the math engine that should be used for converting math
+blocks/spans. If this option is set to +nil+, no math engine is used and
+the math blocks/spans are output as is.
+
+Options for the selected math engine can be set with the
+math_engine_opts configuration option.
+
+Default: mathjax
+Used by: HTML converter
+EOF
+
+    define(:math_engine_opts, Object, {}, <<EOF) do |val|
+Set the math engine options
+
+Specifies options for the math engine set via the math_engine
+configuration option.
+
+The value needs to be a hash with key-value pairs that are understood by
+the used math engine.
+
+Default: {}
+Used by: HTML converter
+EOF
+      val = simple_hash_validator(val, :math_engine_opts)
+      val.keys.each do |k|
+        val[k.kind_of?(String) ? str_to_sym(k) : k] = val.delete(k)
+      end
+      val
+    end
+
   end
 
 end

data/lib/kramdown/parser/gfm.rb

@@ -26,10 +26,13 @@ module Kramdown
         element.children.map! do |child|
           if child.type == :text && child.value =~ /\n/
             children = []
-            lines = child.value.split(/\n(?=.)/)
+            lines = child.value.split(/\n/, -1)
+            omit_trailing_br = (Kramdown::Element.category(element) == :block && element.children[-1] == child &&
+                                lines[-1].empty?)
             lines.each_with_index do |line, index|
               children << Element.new(:text, (index > 0 ? "\n#{line}" : line))
-              children << Element.new(:br) if index < lines.size - 1
+              children << Element.new(:br) if index < lines.size - 2 ||
+                (index == lines.size - 2 && !omit_trailing_br)
             end
             children
           elsif child.type == :html_element

data/lib/kramdown/parser/html.rb

@@ -33,7 +33,7 @@ module Kramdown
         HTML_TAG_CLOSE_RE = /<\/(#{REXML::Parsers::BaseParser::UNAME_STR})\s*>/m
         HTML_ENTITY_RE = /&([\w:][\-\w\.:]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
 
-        HTML_CONTENT_MODEL_BLOCK = %w{address applet article aside button blockquote body
+        HTML_CONTENT_MODEL_BLOCK = %w{address applet article aside blockquote body
              dd details div dl fieldset figure figcaption footer form header hgroup iframe li map menu nav
               noscript object section summary td}
         HTML_CONTENT_MODEL_SPAN  = %w{a abbr acronym b bdo big button cite caption del dfn dt em
@@ -54,7 +54,7 @@ module Kramdown
         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
                               strong sub sup tt u var}
-        HTML_BLOCK_ELEMENTS = %w{address article aside applet body button blockquote caption col colgroup dd div dl dt fieldset
+        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 map nav ol optgroup p pre section summary table tbody td th thead tfoot tr ul}
         HTML_ELEMENTS_WITHOUT_BODY = %w{area base br col command embed hr img input keygen link meta param source track wbr}
@@ -403,6 +403,7 @@ module Kramdown
           else
             if el.value == 'code'
               set_basics(el, :codespan)
+              el.attr['class'].gsub!(/\s+\bhighlighter-\w+\b|\bhighlighter-\w+\b\s*/, '') if el.attr['class']
             else
               set_basics(el, :codeblock)
               if el.children.size == 1 && el.children.first.value == 'code'

data/lib/kramdown/utils.rb

@@ -20,6 +20,7 @@ module Kramdown
     autoload :OrderedHash, 'kramdown/utils/ordered_hash'
     autoload :Unidecoder, 'kramdown/utils/unidecoder'
     autoload :StringScanner, 'kramdown/utils/string_scanner'
+    autoload :Configurable, 'kramdown/utils/configurable'
 
     # Treat +name+ as if it were snake cased (e.g. snake_case) and camelize it (e.g. SnakeCase).
     def self.camelize(name)
@@ -35,6 +36,23 @@ module Kramdown
       name
     end
 
+    if RUBY_VERSION < '2.0'
+
+      # Resolve the recursive constant +str+.
+      def self.deep_const_get(str)
+        names = str.split(/::/)
+        names.shift if names.first.empty?
+        names.inject(::Object) {|mod, s| mod.const_get(s)}
+      end
+
+    else
+
+      def self.deep_const_get(str)
+        ::Object.const_get(str)
+      end
+
+    end
+
   end
 
 end

data/lib/kramdown/utils/configurable.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2014 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
+
+module Kramdown
+  module Utils
+
+    # Methods for registering configurable extensions.
+    module Configurable
+
+      # Create a new configurable extension called +name+.
+      #
+      # Three methods will be defined on the calling object which allow to use this configurable
+      # extension:
+      #
+      # configurables:: Returns a hash of hashes that is used to store all configurables of the
+      #                 object.
+      #
+      # <name>(ext_name):: Return the configured extension +ext_name+.
+      #
+      # add_<name>(ext_name, data=nil, &block):: Define an extension +ext_name+ by specifying either
+      #                                          the data as argument or by using a block.
+      def configurable(name)
+        singleton_class = (class << self; self; end)
+        singleton_class.send(:define_method, :configurables) do
+          @_configurables ||= Hash.new {|h, k| h[k] = {}}
+        end
+        singleton_class.send(:define_method, name) do |data|
+          configurables[name][data]
+        end
+        singleton_class.send(:define_method, "add_#{name}".intern) do |data, *args, &block|
+          configurables[name][data] = args.first || block
+        end
+      end
+
+    end
+
+  end
+end

data/lib/kramdown/version.rb

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

data/man/man1/kramdown.1

@@ -392,6 +392,68 @@ Default: true
 Used by: GFM parser
 
 
+.TP
+.B \-\-syntax-highlighter ARG
+
+Set the syntax highlighter
+
+Specifies the syntax highlighter that should be used for highlighting
+code blocks and spans. If this option is set to +nil+, no syntax
+highlighting is done.
+
+Options for the syntax highlighter can be set with the
+syntax_highlighter_opts configuration option.
+
+Default: coderay
+Used by: HTML converter
+
+
+.TP
+.B \-\-syntax-highlighter-opts ARG
+
+Set the syntax highlighter options
+
+Specifies options for the syntax highlighter set via the
+syntax_highlighter configuration option.
+
+The value needs to be a hash with key-value pairs that are understood by
+the used syntax highlighter.
+
+Default: {}
+Used by: HTML converter
+
+
+.TP
+.B \-\-math-engine ARG
+
+Set the math engine
+
+Specifies the math engine that should be used for converting math
+blocks/spans. If this option is set to +nil+, no math engine is used and
+the math blocks/spans are output as is.
+
+Options for the selected math engine can be set with the
+math_engine_opts configuration option.
+
+Default: mathjax
+Used by: HTML converter
+
+
+.TP
+.B \-\-math-engine-opts ARG
+
+Set the math engine options
+
+Specifies options for the math engine set via the math_engine
+configuration option.
+
+The value needs to be a hash with key-value pairs that are understood by
+the used math engine.
+
+Default: {}
+Used by: HTML converter
+
+
 .SH EXIT STATUS
 The exit status is 0 if no error happened. Otherwise it is 1.
 .SH SEE ALSO

data/test/test_files.rb

@@ -17,6 +17,9 @@ Encoding.default_external = 'utf-8' if RUBY_VERSION >= '1.9'
 class TestFiles < Minitest::Test
 
   EXCLUDE_KD_FILES = [('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/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
+                      ('test/testcases/block/06_codeblock/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
+
                      ].compact
 
   # Generate test methods for kramdown-to-xxx conversion
@@ -48,6 +51,12 @@ class TestFiles < Minitest::Test
                           'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
                           'test/testcases/block/04_header/with_auto_ids.html', # bc of auto_ids=true option
                           'test/testcases/block/04_header/header_type_offset.html', # bc of header_offset option
+                          'test/testcases/block/06_codeblock/highlighting-rouge.html', # bc of double surrounding <div>
+                          ('test/testcases/span/03_codespan/highlighting-rouge.html' if RUBY_VERSION < '2.0'),
+                          'test/testcases/block/15_math/ritex.html', # bc of tidy
+                          '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
                          ]
     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)?$/}
@@ -122,6 +131,12 @@ class TestFiles < Minitest::Test
                           'test/testcases/span/extension/comment.text',      # bc of comment text modifications (can this be avoided?)
                           'test/testcases/block/04_header/header_type_offset.text', # bc of header_offset being applied twice
                           ('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/highlighting-rouge.text' if RUBY_VERSION < '2.0'),
+                          ('test/testcases/block/06_codeblock/highlighting-rouge.text' if RUBY_VERSION < '2.0'), #bc of rouge
+                          '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
+                          'test/testcases/span/math/itex2mml.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}$/}
@@ -150,12 +165,18 @@ class TestFiles < Minitest::Test
                              'test/testcases/block/09_html/markdown_attr.html',   # bc of markdown attr
                              'test/testcases/block/09_html/html_to_native/table_simple.html', # bc of invalidly converted simple table
                              'test/testcases/block/06_codeblock/whitespace.html', # bc of entity to char conversion
+                             'test/testcases/block/06_codeblock/highlighting-rouge.html', # bc of double surrounding <div>
                              'test/testcases/block/11_ial/simple.html',           # bc of change of ordering of attributes in header
                              'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
                              'test/testcases/block/04_header/with_auto_ids.html', # bc of auto_ids=true option
                              'test/testcases/block/04_header/header_type_offset.html', # bc of header_offset option
                              'test/testcases/block/16_toc/toc_exclude.html',      # bc of different attribute ordering
                              'test/testcases/span/autolinks/url_links.html',      # bc of quot entity being converted to char
+                             ('test/testcases/span/03_codespan/highlighting-rouge.html' if RUBY_VERSION < '2.0'),
+                             'test/testcases/block/15_math/ritex.html', # bc of tidy
+                             '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
                             ]
     Dir[File.dirname(__FILE__) + '/testcases/**/*.{html,html.19}'].each do |html_file|
       next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}(\.19)?$/}
@@ -173,61 +194,64 @@ class TestFiles < Minitest::Test
   end
 
   EXCLUDE_GFM_FILES = [
-    'test/testcases/block/03_paragraph/no_newline_at_end.text',
-    'test/testcases/block/03_paragraph/indented.text',
-    'test/testcases/block/03_paragraph/two_para.text',
-    'test/testcases/block/04_header/atx_header.text',
-    'test/testcases/block/04_header/setext_header.text',
-    'test/testcases/block/05_blockquote/indented.text',
-    'test/testcases/block/05_blockquote/lazy.text',
-    'test/testcases/block/05_blockquote/nested.text',
-    'test/testcases/block/05_blockquote/no_newline_at_end.text',
-    'test/testcases/block/06_codeblock/error.text',
-    'test/testcases/block/07_horizontal_rule/error.text',
-    'test/testcases/block/08_list/escaping.text',
-    'test/testcases/block/08_list/item_ial.text',
-    'test/testcases/block/08_list/lazy.text',
-    'test/testcases/block/08_list/list_and_others.text',
-    'test/testcases/block/08_list/other_first_element.text',
-    'test/testcases/block/08_list/simple_ul.text',
-    'test/testcases/block/08_list/special_cases.text',
-    'test/testcases/block/09_html/comment.text',
-    'test/testcases/block/09_html/html_to_native/code.text',
-    'test/testcases/block/09_html/html_to_native/emphasis.text',
-    'test/testcases/block/09_html/html_to_native/typography.text',
-    'test/testcases/block/09_html/parse_as_raw.text',
-    'test/testcases/block/09_html/simple.text',
-    'test/testcases/block/12_extension/comment.text',
-    'test/testcases/block/12_extension/ignored.text',
-    'test/testcases/block/12_extension/nomarkdown.text',
-    'test/testcases/block/13_definition_list/item_ial.text',
-    'test/testcases/block/13_definition_list/multiple_terms.text',
-    'test/testcases/block/13_definition_list/no_def_list.text',
-    'test/testcases/block/13_definition_list/simple.text',
-    'test/testcases/block/13_definition_list/with_blocks.text',
-    'test/testcases/block/14_table/errors.text',
-    'test/testcases/block/14_table/escaping.text',
-    'test/testcases/block/14_table/simple.text',
-    'test/testcases/block/15_math/normal.text',
-    'test/testcases/encoding.text',
-    'test/testcases/span/01_link/inline.text',
-    'test/testcases/span/01_link/link_defs.text',
-    'test/testcases/span/01_link/reference.text',
-    'test/testcases/span/02_emphasis/normal.text',
-    'test/testcases/span/03_codespan/normal.text',
-    'test/testcases/span/04_footnote/definitions.text',
-    'test/testcases/span/04_footnote/markers.text',
-    'test/testcases/span/05_html/across_lines.text',
-    'test/testcases/span/05_html/markdown_attr.text',
-    'test/testcases/span/05_html/normal.text',
-    'test/testcases/span/autolinks/url_links.text',
-    'test/testcases/span/extension/comment.text',
-    'test/testcases/span/ial/simple.text',
-    'test/testcases/span/line_breaks/normal.text',
-    'test/testcases/span/text_substitutions/entities_as_char.text',
-    'test/testcases/span/text_substitutions/entities.text',
-    'test/testcases/span/text_substitutions/typography.text'
-  ]
+                       'test/testcases/block/03_paragraph/no_newline_at_end.text',
+                       'test/testcases/block/03_paragraph/indented.text',
+                       'test/testcases/block/03_paragraph/two_para.text',
+                       'test/testcases/block/04_header/atx_header.text',
+                       'test/testcases/block/04_header/setext_header.text',
+                       'test/testcases/block/05_blockquote/indented.text',
+                       'test/testcases/block/05_blockquote/lazy.text',
+                       'test/testcases/block/05_blockquote/nested.text',
+                       'test/testcases/block/05_blockquote/no_newline_at_end.text',
+                       'test/testcases/block/06_codeblock/error.text',
+                       'test/testcases/block/07_horizontal_rule/error.text',
+                       'test/testcases/block/08_list/escaping.text',
+                       'test/testcases/block/08_list/item_ial.text',
+                       'test/testcases/block/08_list/lazy.text',
+                       'test/testcases/block/08_list/list_and_others.text',
+                       'test/testcases/block/08_list/other_first_element.text',
+                       'test/testcases/block/08_list/simple_ul.text',
+                       'test/testcases/block/08_list/special_cases.text',
+                       'test/testcases/block/09_html/comment.text',
+                       'test/testcases/block/09_html/html_to_native/code.text',
+                       'test/testcases/block/09_html/html_to_native/emphasis.text',
+                       'test/testcases/block/09_html/html_to_native/typography.text',
+                       'test/testcases/block/09_html/parse_as_raw.text',
+                       'test/testcases/block/09_html/simple.text',
+                       'test/testcases/block/12_extension/comment.text',
+                       'test/testcases/block/12_extension/ignored.text',
+                       'test/testcases/block/12_extension/nomarkdown.text',
+                       'test/testcases/block/13_definition_list/item_ial.text',
+                       'test/testcases/block/13_definition_list/multiple_terms.text',
+                       'test/testcases/block/13_definition_list/no_def_list.text',
+                       'test/testcases/block/13_definition_list/simple.text',
+                       'test/testcases/block/13_definition_list/with_blocks.text',
+                       'test/testcases/block/14_table/errors.text',
+                       'test/testcases/block/14_table/escaping.text',
+                       'test/testcases/block/14_table/simple.text',
+                       'test/testcases/block/15_math/normal.text',
+                       'test/testcases/encoding.text',
+                       'test/testcases/span/01_link/inline.text',
+                       'test/testcases/span/01_link/link_defs.text',
+                       'test/testcases/span/01_link/reference.text',
+                       'test/testcases/span/02_emphasis/normal.text',
+                       'test/testcases/span/03_codespan/normal.text',
+                       'test/testcases/span/04_footnote/definitions.text',
+                       'test/testcases/span/04_footnote/markers.text',
+                       'test/testcases/span/05_html/across_lines.text',
+                       'test/testcases/span/05_html/markdown_attr.text',
+                       'test/testcases/span/05_html/normal.text',
+                       'test/testcases/span/05_html/raw_span_elements.text',
+                       'test/testcases/span/autolinks/url_links.text',
+                       'test/testcases/span/extension/comment.text',
+                       'test/testcases/span/ial/simple.text',
+                       'test/testcases/span/line_breaks/normal.text',
+                       'test/testcases/span/text_substitutions/entities_as_char.text',
+                       'test/testcases/span/text_substitutions/entities.text',
+                       '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
+                      ]
 
   # Generate test methods for gfm-to-html conversion
   Dir[File.dirname(__FILE__) + '/{testcases,testcases_gfm}/**/*.text'].each do |text_file|
@@ -252,7 +276,7 @@ class TestFiles < Minitest::Test
   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]).each do |conv_class|
+    (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'
       define_method("test_whether_#{conv_class}_modifies_tree_with_file_#{text_file.tr('.', '_')}") do
         doc = Kramdown::Document.new(File.read(text_file), options)