motion-kramdown 0.6.0 → 1.16.2

data/lib/kramdown/utils/entities.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2016 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,13 +1,13 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
-# RM require 'rexml/parsers/baseparser'
+require 'rexml/parsers/baseparser'
 
 module Kramdown
 

data/lib/kramdown/utils/lru_cache.rb

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+#
+#--
+# Copyright (C) 2014-2017 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+
+module Kramdown
+  module Utils
+
+    # A simple least recently used (LRU) cache.
+    #
+    # The cache relies on the fact that Ruby's Hash class maintains insertion order. So deleting
+    # and re-inserting a key-value pair on access moves the key to the last position. When an
+    # entry is added and the cache is full, the first entry is removed.
+    class LRUCache
+
+      # Creates a new LRUCache that can hold +size+ entries.
+      def initialize(size)
+        @size = size
+        @cache = {}
+      end
+
+      # Returns the stored value for +key+ or +nil+ if no value was stored under the key.
+      def [](key)
+        (val = @cache.delete(key)).nil? ? nil : @cache[key] = val
+      end
+
+      # Stores the +value+ under the +key+.
+      def []=(key, value)
+        @cache.delete(key)
+        @cache[key] = value
+        @cache.shift if @cache.length > @size
+      end
+
+    end
+
+  end
+end

data/lib/kramdown/utils/ordered_hash.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -11,76 +11,7 @@ module Kramdown
 
   module Utils
 
-    if RUBY_VERSION < '1.9'
-
-      # A partial hash implementation which preserves the insertion order of the keys.
-      #
-      # *Note* that this class is only used on Ruby 1.8 since the built-in Hash on Ruby 1.9
-      # automatically preserves the insertion order. However, to remain compatibility only the
-      # methods defined in this class may be used when working with OrderedHash on Ruby 1.9.
-      class OrderedHash
-
-        include Enumerable
-
-        # Initialize the OrderedHash object.
-        def initialize
-          @data =  {}
-          @order = []
-        end
-
-        # Iterate over the stored keys in insertion order.
-        def each
-          @order.each {|k| yield(k, @data[k])}
-        end
-
-        # Return the value for the +key+.
-        def [](key)
-          @data[key]
-        end
-
-        # Return +true+ if the hash contains the key.
-        def has_key?(key)
-          @data.has_key?(key)
-        end
-
-        # Set the value for the +key+ to +val+.
-        def []=(key, val)
-          @order << key if !@data.has_key?(key)
-          @data[key] = val
-        end
-
-        # Delete the +key+.
-        def delete(key)
-          @order.delete(key)
-          @data.delete(key)
-        end
-
-        def merge!(other)
-          other.each {|k,v| self[k] = v}
-          self
-        end
-
-        def dup #:nodoc:
-          new_object = super
-          new_object.instance_variable_set(:@data, @data.dup)
-          new_object.instance_variable_set(:@order, @order.dup)
-          new_object
-        end
-
-        def ==(other) #:nodoc:
-          return false unless other.kind_of?(self.class)
-          @data == other.instance_variable_get(:@data) && @order == other.instance_variable_get(:@order)
-        end
-
-        def inspect #:nodoc:
-          "{" + map {|k,v| "#{k.inspect}=>#{v.inspect}"}.join(" ") + "}"
-        end
-
-      end
-
-    else
-      OrderedHash = Hash
-    end
+    OrderedHash = Hash
 
   end
 

data/lib/kramdown/utils/string_scanner.rb

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

data/lib/kramdown/utils/unidecoder.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown which is licensed under the MIT.
 #++
@@ -19,7 +19,7 @@ module Kramdown
       # RM TODO path = $:.find {|dir| File.directory?(File.join(File.expand_path(dir), "stringex", "unidecoder_data"))}
       path = 'lib' # RM TODO
 
-      if RUBY_VERSION <= '1.8.6' || !path
+      if !path
         def self.decode(string)
           string
         end

data/lib/kramdown/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2015 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2016 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.6.0'
+  VERSION = '1.16.2'
 
 end

data/lib/rubymotion/require_override.rb

@@ -0,0 +1,9 @@
+module Kernel
+  # Since RubyMotion doesn't support `require` in the code, then let's
+  # noop it.  This allows us to keep the original kramdown require statements
+  # so that the source is more pure and easier to diff.
+  # This _should_ be safe...
+  def require(_name)
+    # noop
+  end
+end

data/lib/rubymotion/version.rb

@@ -1,6 +1,6 @@
 module MotionKramdown
 
   # The motion-kramdown version.
-  VERSION = '0.6.0'
+  VERSION = '1.16.2'
 
 end

data/spec/{helpers → motion-kramdown/_helpers}/option_file.rb

@@ -1,6 +1,6 @@
 #------------------------------------------------------------------------------
 def testcase_dir(dir = 'testcases')
-  File.join(File.dirname(__FILE__), '../../test', dir)
+  File.join(File.dirname(__FILE__), '../../../test', dir)
 end
 
 #------------------------------------------------------------------------------
@@ -18,7 +18,7 @@ def load_options(opts_file)
   options.tap do |o|
     o.keys.each { |k| o[(k.to_s[0] == ':' ? k[1..-1] : k).to_sym] = o.delete(k) }
   end
-  
+
   # YAML isn't hanldling integers correctly, is giving doubles instead
   options[:header_offset] = options[:header_offset].to_int  if options[:header_offset]
   options[:footnote_nr]   = options[:footnote_nr].to_int    if options[:footnote_nr]

data/spec/motion-kramdown/bench_mark.rb

@@ -0,0 +1,37 @@
+# runs          = 10
+# files         = ['mdsyntax.text', 'mdbasics.text']
+# benchmark_dir = File.join(File.dirname(__FILE__), '../../benchmark')
+#
+# puts
+# puts "Running tests on #{Time.now.strftime("%Y-%m-%d")} under #{RUBY_DESCRIPTION}"
+#
+# files.each do |file|
+#   data = File.read(File.join(benchmark_dir, file))
+#   puts
+#   puts "==> Test using file #{file} and #{runs} runs"
+#
+#   # results = Benchmark.bmbm do |b|
+#   results = Benchmark.bm do |b|
+#     b.report("kramdown #{Kramdown::VERSION}") { runs.times { Kramdown::Document.new(data).to_html } }
+#     # b.report(" hoedown 3.0.1") do
+#     #   runs.times do
+#     #     document = HoedownDocument.new
+#     #     document.initWithHtmlRendererWithFlags(FLAGS)
+#     #     html = document.renderMarkdownString(data)
+#     #   end
+#     # end
+#   end
+#
+#   # puts
+#   # puts "Real time of X divided by real time of kramdown"
+#   # kd = results.shift.real
+#   # %w[hoedown].each do |name|
+#   #   puts name.ljust(19) << (results.shift.real/kd).round(4).to_s
+#   # end
+# end
+#
+# describe "Benchmark Test" do
+#   it "benchmarks with mdsyntax.text and mdbasics.text" do
+#     expect(true).to eq true
+#   end
+# end

data/spec/{document_tree.rb → motion-kramdown/document_tree.rb}

@@ -15,16 +15,26 @@ describe "asserting that converters don't modify the document tree" do
     'test/testcases/block/15_math/ritex.text',                        # bc no math support yet
     'test/testcases/block/15_math/mathjax_preview.text',              # bc no math support yet
     'test/testcases/block/15_math/mathjax_preview_simple.text',       # bc no math support yet
+    'test/testcases/block/15_math/mathjaxnode_notexhints.text',       # bc no math support yet
+    'test/testcases/block/15_math/mathjaxnode_semantics.text',        # bc no math support yet
+    'test/testcases/block/15_math/mathjaxnode.text',                  # bc no math support yet
+    'test/testcases/block/15_math/mathjax_preview_as_code.text',      # bc no math support yet
+    'test/testcases/man/example.text',                                # bc no math support yet
+    'test/testcases/span/math/mathjaxnode.text',                      # bc no math support yet
     'test/testcases/span/math/normal.text',                           # bc no math support yet
     'test/testcases/span/math/ritex.text',                            # bc no math support yet
     'test/testcases/span/math/itex2mml.text',                         # bc no math support yet
+
+    'test/testcases/block/15_math/sskatex.text',                      # bc no math support yet
+    'test/testcases/span/math/sskatex.text',                          # bc no math support yet
+    'test/testcases/span/04_footnote/backlink_inline.text',           # bc no math support yet
   ].compact
 
   Dir["#{focus_files(testcase_dir)}.text"].each do |text_file|
     next if EXCLUDE_TREE_FILES.any? {|f| text_file =~ /#{f}$/}
     opts_file = text_file.sub(/\.text$/, '.options')
     options   = load_options(opts_file)
-    
+
     (Kramdown::Converter.constants(true).map {|c| c.to_sym} - [:Latex, :Base, :RemoveHtmlTags, :MathEngine, :SyntaxHighlighter]).each do |conv_class|
       next if conv_class == :Pdf && (RUBY_VERSION < '2.0' || EXCLUDE_PDF_MODIFY.any? {|f| text_file =~ /#{f}$/})
 

data/spec/{gfm_to_html.rb → motion-kramdown/gfm_to_html.rb}

@@ -1,20 +1,42 @@
 describe "gfm-to-html conversion" do
 
+  MATHJAX_NODE_AVAILABLE = begin
+                             require 'kramdown/converter/math_engine/mathjaxnode'
+                             Kramdown::Converter::MathEngine::MathjaxNode::AVAILABLE or
+                               warn("Skipping MathjaxNode tests as MathjaxNode is not available")
+                           end
+
+  KATEX_AVAILABLE = begin
+                      / class="katex"/ === Kramdown::Document.
+                        new('$$a$$', {:math_engine => :sskatex}).to_html or
+                        warn("Skipping SsKaTeX tests as SsKaTeX is not available.")
+                    rescue
+                      warn("Skipping SsKaTeX tests as default SsKaTeX config does not work.")
+                    end or warn("Run \"rake dev:test_sskatex_deps\" to see why.")
+
   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/03_paragraph/line_break_last_line.text',
    'test/testcases/block/04_header/atx_header.text',
    'test/testcases/block/04_header/setext_header.text',
+   'test/testcases/block/04_header/with_auto_ids.text', # bc of ID generation difference
+   'test/testcases/block/04_header/with_auto_id_prefix.text', # bc of ID generation difference
    '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/06_codeblock/highlighting-opts.text',   # bc no highlight support yet
+   'test/testcases/block/06_codeblock/highlighting.text',        # bc no highlight support yet
+   ('test/testcases/block/06_codeblock/rouge/simple.text' if RUBY_VERSION < '2.0'), #bc of rouge
+   ('test/testcases/block/06_codeblock/rouge/multiple.text' if RUBY_VERSION < '2.0'), #bc of rouge
    '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/lazy_and_nested.text', # bc of change in lazy line handling
    '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',
@@ -28,6 +50,7 @@ describe "gfm-to-html conversion" do
    'test/testcases/block/12_extension/comment.text',
    'test/testcases/block/12_extension/ignored.text',
    'test/testcases/block/12_extension/nomarkdown.text',
+   'test/testcases/block/12_extension/options3.text',            # bc no highlight support yet
    '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',
@@ -37,12 +60,29 @@ describe "gfm-to-html conversion" do
    'test/testcases/block/14_table/escaping.text',
    'test/testcases/block/14_table/simple.text',
    'test/testcases/block/15_math/normal.text',
+   'test/testcases/block/15_math/mathjaxnode_notexhints.text',
+   'test/testcases/block/15_math/mathjaxnode_semantics.text',
+   'test/testcases/block/15_math/mathjaxnode.text',
+   'test/testcases/block/15_math/gh_128.text',                   # bc no math support yet
+   'test/testcases/block/15_math/itex2mml.text',                 # bc no math support yet
+   'test/testcases/block/15_math/normal.text',                   # bc no math support yet
+   'test/testcases/block/15_math/ritex.text',                    # bc no math support yet
+   'test/testcases/block/15_math/mathjax_preview.text',          # bc no math support yet
+   'test/testcases/block/15_math/mathjax_preview_simple.text',   # bc no math support yet
+   'test/testcases/block/15_math/mathjax_preview_as_code.text',  # bc no math support yet
+   'test/testcases/block/16_toc/toc_with_footnotes.text',        # bc of ID generation difference
+
    '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/03_codespan/rouge/simple.text',    # bc no highlight support yet
+   'test/testcases/span/03_codespan/highlighting.text',          # bc no highlight support yet
+   'test/testcases/span/03_codespan/rouge/simple.text',
+   'test/testcases/span/03_codespan/rouge/multiple.text',
    'test/testcases/span/04_footnote/definitions.text',
    'test/testcases/span/04_footnote/markers.text',
    'test/testcases/span/05_html/across_lines.text',
@@ -53,28 +93,21 @@ describe "gfm-to-html conversion" do
    '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
-   
-   'test/testcases/block/04_header/with_auto_ids.text',          # bc no transliteration support yet
-   'test/testcases/block/06_codeblock/highlighting-opts.text',   # bc no highlight support yet
-   'test/testcases/block/06_codeblock/highlighting.text',        # bc no highlight support yet
-   'test/testcases/block/12_extension/options3.text',            # bc no highlight support yet
-   'test/testcases/block/15_math/gh_128.text',                   # bc no math support yet
-   'test/testcases/block/15_math/itex2mml.text',                 # bc no math support yet
-   'test/testcases/block/15_math/normal.text',                   # bc no math support yet
-   'test/testcases/block/15_math/ritex.text',                    # bc no math support yet
-   'test/testcases/block/15_math/mathjax_preview.text',          # bc no math support yet
-   'test/testcases/block/15_math/mathjax_preview_simple.text',   # bc no math support yet
    'test/testcases/span/math/itex2mml.text',                     # bc no math support yet
+   'test/testcases/span/math/mathjaxnode.text',                  # bc no math support yet
    'test/testcases/span/math/normal.text',                       # bc no math support yet
    'test/testcases/span/math/ritex.text',                        # bc no math support yet
-   'test/testcases/span/03_codespan/highlighting-rouge.text',    # bc no highlight support yet
-   'test/testcases/span/03_codespan/highlighting.text',          # bc no highlight support yet
+   '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_gfm/backticks_syntax.text',                   # bc no highlight support yet
+   'test/testcases_gfm/header_ids.text',                         # bc no math support yet
+
+   ('test/testcases/block/15_math/sskatex.text' unless KATEX_AVAILABLE),
+   ('test/testcases/span/math/sskatex.text' unless KATEX_AVAILABLE),
+
+   'test/testcases/span/04_footnote/backlink_inline.text',       # bc no math support yet
   ].compact
 
   ['testcases', 'testcases_gfm'].each do |item|

data/spec/{html_to_html.rb → motion-kramdown/html_to_html.rb}

@@ -5,23 +5,41 @@ describe "html-to-{html,kramdown} conversion" do
     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
-      '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/06_codeblock/whitespace.html',          # bc of span inside pre
+      'test/testcases/block/06_codeblock/rouge/simple.html',        # bc of double surrounding <div>
+      'test/testcases/block/06_codeblock/rouge/multiple.html',      # bc of double surrounding <div>
+      'test/testcases/block/09_html/simple.html',                   # bc of xml elements
+      'test/testcases/block/09_html/xml.html',                      # bc of tidy
       '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
       '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/block/15_math/mathjax_preview_as_code.html',  # bc no math support yet
       'test/testcases/block/15_math/gh_128.html',                   # bc no math support yet
       'test/testcases/block/15_math/normal.html',                   # bc no math support yet
+
+      'test/testcases/span/03_codespan/highlighting.html',          # bc of span elements inside code element
+      ('test/testcases/span/03_codespan/rouge/simple.html'    if RUBY_VERSION < '2.0'),
+      'test/testcases/span/05_html/mark_element.html',              # bc of tidy
+      'test/testcases/span/05_html/xml.html',                       # bc of tidy
+      'test/testcases/span/math/ritex.html',                        # bc of tidy
+      'test/testcases/span/math/itex2mml.html',                     # bc of tidy
       'test/testcases/span/math/normal.html',                       # bc no math support yet
+
+      'test/testcases/block/16_toc/toc_with_footnotes.html',       # bc of issue with nbsp
+      'test/testcases/block/12_extension/options.html',            # bc of issue with nbsp
+      'test/testcases/block/12_extension/options2.html',           # bc of issue with nbsp
+      'test/testcases/span/04_footnote/footnote_nr.html',          # bc of issue with nbsp
+      'test/testcases/span/04_footnote/inside_footnote.html',      # bc of issue with nbsp
+      'test/testcases/span/04_footnote/backlink_text.html',        # bc of issue with nbsp
+      'test/testcases/span/abbreviations/in_footnote.html',        # bc of issue with nbsp
+
+      'test/testcases/span/math/sskatex.html',                     # bc of tidy
+      'test/testcases/block/15_math/sskatex.html',                 # bc of tidy
+
+      'test/testcases/span/04_footnote/backlink_inline.html',      # bc no math support yet
     ].compact
 
     EXCLUDE_HTML_TEXT_FILES = ['test/testcases/block/09_html/parse_as_span.htmlinput',
@@ -41,7 +59,7 @@ describe "html-to-{html,kramdown} conversion" do
       end
 
       out_files.select {|f, _| File.exist?(f)}.each do |out_file, out_method|
-      
+
         it "#{short_name(html_file)} --> #{File.extname(out_file)}" do
           options   = load_options(opts_file)
           doc       = Kramdown::Document.new(File.read(html_file), options.merge(:input => 'html'))