motion-kramdown 0.6.0 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9577c71875ad433ef83f571aabd8d174ecc7f3e
-  data.tar.gz: c62c562508e488a2acdccc73b11103f5819e790f
+SHA256:
+  metadata.gz: 60142424142433a2b5ffdb6d598820aa55a3cb3e1f1f75aa5a9ce177b6ba41ba
+  data.tar.gz: 6c7371fbba67b2996585abbcdc1957d8e4600c3507055d58833265a17522ddb4
 SHA512:
-  metadata.gz: cc144943f6ef46416d7f5aa286966f0dbbb055a3a1d7c937e8c9f4a6cfa726abdf77add761eb9a05cb5256e42970d4df3ec299373add3de0e701fabc009162ce
-  data.tar.gz: 1b081491e595b664f22f060a0bb44da88874629b8d8f2a973de5548befc5ed5387553c59f0e0d9e011e5169b2f079b27aed697a139a640dc01742f6f43204c65
+  metadata.gz: fb1786361e980d753ac54bc88cbc206361f8d7486886bdd6f14fbb54eb04029ea9bf64fcce02328eb978490e5aba81957df6d3387d5259e72bdc6aec2bcf8537
+  data.tar.gz: d0c0d4212fda52d3e3faa7c8a98ddfda404894977d81375f41223bbe38324b313d4a6f88c6f769eda652f48135a2c25ccb51d68d5a24175a170b5444dc9618cf

data/README.md

@@ -1,10 +1,13 @@
 # motion-kramdown
 
 [![Gem Version](https://badge.fury.io/rb/motion-kramdown.svg)](http://badge.fury.io/rb/motion-kramdown)
+[![Build Status](https://travis-ci.org/digitalmoksha/motion-kramdown.svg?branch=master)](https://travis-ci.org/digitalmoksha/motion-kramdown)
+[![Platform](https://img.shields.io/badge/platform-macos%20|%20ios-lightgrey.svg)](https://shields.io/)
+[![Language](https://img.shields.io/badge/language-RubyMotion-red.svg)](http://www.rubymotion.com)
 
 [kramdown](https://github.com/gettalong/kramdown) Markdown parser, for use with RubyMotion on iOS and OS X.
 
-Currently implements: _kramdown_ 1.6
+Currently implements: _kramdown_ 1.16.2
 
 ## Introduction
 
@@ -83,4 +86,5 @@ All credit for _kramdown_ belongs to Thomas Leitner.  _motion-kramdown_ is a sim
 
 _motion-kramdown_ is released under the MIT license (see the **COPYING** file) and therefore can easily be used in commercial projects.
 
-However, if you use _motion-kramdown_ in a commercial setting, please consider **contributing back any changes** for the benefit of the community and/or **making a donation** (see the links in the sidebar on the [kramdown homepage](http://kramdown.gettalong.org/).
+However, if you use _motion-kramdown_ in a commercial setting, please consider **contributing back any changes** for the benefit of the community and/or
+[**becoming a patron**](https://www.patreon.com/gettalong) - thanks!

data/lib/kramdown.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/converter.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 'kramdown/utils'
+require 'kramdown/utils'
 
 module Kramdown
 
@@ -26,17 +26,19 @@ module Kramdown
     # RM autoload :Toc, 'kramdown/converter/toc'
     # RM autoload :RemoveHtmlTags, 'kramdown/converter/remove_html_tags'
     # RM autoload :Pdf, 'kramdown/converter/pdf'
+    # RM autoload :HashAST, 'kramdown/converter/hash_ast'
+    # RM autoload :Man, 'kramdown/converter/man'
 
     extend ::Kramdown::Utils::Configurable
 
     configurable(:syntax_highlighter)
 
-    # RM ["Coderay", "Rouge"].each do |klass_name|
+    # RM ["Minted", "Coderay", "Rouge"].each do |klass_name|
     # RM   kn_down = klass_name.downcase.intern
     # RM   add_syntax_highlighter(kn_down) do |converter, text, lang, type, opts|
     # RM     require "kramdown/converter/syntax_highlighter/#{kn_down}"
     # RM     klass = ::Kramdown::Utils.deep_const_get("::Kramdown::Converter::SyntaxHighlighter::#{klass_name}")
-    # RM     if klass::AVAILABLE
+    # RM.    if !klass.const_defined?(:AVAILABLE) || klass::AVAILABLE
     # RM       add_syntax_highlighter(kn_down, klass)
     # RM     else
     # RM       add_syntax_highlighter(kn_down) {|*args| nil}
@@ -44,18 +46,15 @@ module Kramdown
     # RM     syntax_highlighter(kn_down).call(converter, text, lang, type, opts)
     # RM   end
     # RM end
-    # RM 
+    # RM
     # RM configurable(:math_engine)
-    # RM 
-    # RM require 'kramdown/converter/math_engine/mathjax'
-    # RM add_math_engine(:mathjax, ::Kramdown::Converter::MathEngine::Mathjax)
-    # RM 
-    # RM ["Ritex", "Itex2MML"].each do |klass_name|
+    # RM
+    # RM ['Mathjax', "MathjaxNode", "SsKaTeX", "Ritex", "Itex2MML"].each do |klass_name|
     # RM   kn_down = klass_name.downcase.intern
     # RM   add_math_engine(kn_down) do |converter, el, opts|
     # RM     require "kramdown/converter/math_engine/#{kn_down}"
     # RM     klass = ::Kramdown::Utils.deep_const_get("::Kramdown::Converter::MathEngine::#{klass_name}")
-    # RM     if klass::AVAILABLE
+    # RM     if !klass.const_defined?(:AVAILABLE) || klass::AVAILABLE
     # RM       add_math_engine(kn_down, klass)
     # RM     else
     # RM       add_math_engine(kn_down) {|*args| nil}

data/lib/kramdown/converter/base.rb

@@ -1,15 +1,15 @@
 # -*- 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 'erb'
-# RM require 'kramdown/utils'
-# RM require 'kramdown/document'
+require 'erb'
+require 'kramdown/utils'
+require 'kramdown/document'
 
 module Kramdown
 
@@ -67,7 +67,7 @@ module Kramdown
         false
       end
 
-      # Returns whether the template should be applied ater the conversion of the tree.
+      # Returns whether the template should be applied after the conversion of the tree.
       #
       # Defaults to true.
       def apply_template_after?
@@ -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+\b/
-          attr['class'].scan(/\blanguage-(\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+\b/, '').strip if lang
+        attr['class'] = attr['class'].sub(/\blanguage-\S+/, '').strip if lang
         attr.delete('class') if lang && attr['class'].empty?
         lang
       end
@@ -231,10 +231,7 @@ module Kramdown
       # ID.
       def generate_id(str)
         str = ::Kramdown::Utils::Unidecoder.decode(str) if @options[:transliterated_header_ids]
-        gen_id = str.gsub(/^[^a-zA-Z]+/, '')
-        gen_id.tr!('^a-zA-Z0-9 -', '')
-        gen_id.tr!(' ', '-')
-        gen_id.downcase!
+        gen_id = basic_generate_id(str)
         gen_id = 'section' if gen_id.length == 0
         @used_ids ||= {}
         if @used_ids.has_key?(gen_id)
@@ -245,6 +242,16 @@ module Kramdown
         @options[:auto_id_prefix] + gen_id
       end
 
+      # The basic version of the ID generator, without any special provisions for empty or unique
+      # IDs.
+      def basic_generate_id(str)
+        gen_id = str.gsub(/^[^a-zA-Z]+/, '')
+        gen_id.tr!('^a-zA-Z0-9 -', '')
+        gen_id.tr!(' ', '-')
+        gen_id.downcase!
+        gen_id
+      end
+
       SMART_QUOTE_INDICES = {:lsquo => 0, :rsquo => 1, :ldquo => 2, :rdquo => 3} # :nodoc:
 
       # Return the entity that represents the given smart_quote element.

data/lib/kramdown/converter/hash_ast.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2016 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown which is licensed under the MIT.
+#++
+#
+
+require 'kramdown/parser'
+require 'kramdown/converter'
+require 'kramdown/utils'
+
+module Kramdown
+
+  module Converter
+
+    # Converts a Kramdown::Document to a nested hash for further processing or debug output.
+    class HashAST < Base
+
+      def convert(el)
+        hash = {:type => el.type}
+        hash[:attr] = el.attr unless el.attr.empty?
+        hash[:value] = el.value unless el.value.nil?
+        hash[:options] = el.options unless el.options.empty?
+        unless el.children.empty?
+          hash[:children] = []
+          el.children.each {|child| hash[:children] << convert(child)}
+        end
+        hash
+      end
+
+    end
+
+    HashAst = HashAST
+
+  end
+end

data/lib/kramdown/converter/html.rb

@@ -1,15 +1,15 @@
 # -*- 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 'kramdown/parser'
-# RM require 'kramdown/converter'
-# RM require 'kramdown/utils'
+require 'kramdown/parser'
+require 'kramdown/converter'
+require 'kramdown/utils'
 
 module Kramdown
 
@@ -92,10 +92,11 @@ module Kramdown
       def convert_codeblock(el, indent)
         attr = el.attr.dup
         lang = extract_code_language!(attr)
-        highlighted_code = highlight_code(el.value, lang, :block)
+        hl_opts = {}
+        highlighted_code = highlight_code(el.value, el.options[:lang] || lang, :block, hl_opts)
 
         if highlighted_code
-          add_syntax_highlighter_to_class_attr(attr)
+          add_syntax_highlighter_to_class_attr(attr, lang || hl_opts[:default_lang])
           "#{' '*indent}<div#{html_attributes(attr)}>#{highlighted_code}#{' '*indent}</div>\n"
         else
           result = escape_html(el.value)
@@ -164,7 +165,14 @@ module Kramdown
       alias :convert_dd :convert_li
 
       def convert_dt(el, indent)
-        format_as_block_html(el.type, el.attr, inner(el, indent), indent)
+        attr = el.attr.dup
+        @stack.last.options[:ial][:refs].each do |ref|
+          if ref =~ /\Aauto_ids(?:-([\w-]+))?/
+            attr['id'] = ($1 ? $1 : '') << basic_generate_id(el.options[:raw_text])
+            break
+          end
+        end if !attr['id'] && @stack.last.options[:ial] && @stack.last.options[:ial][:refs]
+        format_as_block_html(el.type, attr, inner(el, indent), indent)
       end
 
       def convert_html_element(el, indent)
@@ -235,14 +243,7 @@ module Kramdown
       end
 
       def convert_a(el, indent)
-        res = inner(el, indent)
-        attr = el.attr.dup
-        if attr['href'].start_with?('mailto:')
-          mail_addr = attr['href'][7..-1]
-          attr['href'] = obfuscate('mailto') << ":" << obfuscate(mail_addr)
-          res = obfuscate(res) if res == mail_addr
-        end
-        format_as_span_html(el.type, attr, res)
+        format_as_span_html(el.type, el.attr, inner(el, indent))
       end
 
       def convert_img(el, indent)
@@ -252,9 +253,10 @@ module Kramdown
       def convert_codespan(el, indent)
         attr = el.attr.dup
         lang = extract_code_language(attr)
-        result = highlight_code(el.value, lang, :span)
+        hl_opts = {}
+        result = highlight_code(el.value, lang, :span, hl_opts)
         if result
-          add_syntax_highlighter_to_class_attr(attr)
+          add_syntax_highlighter_to_class_attr(attr, hl_opts[:default_lang])
         else
           result = escape_html(el.value)
         end
@@ -303,7 +305,11 @@ module Kramdown
         :raquo => [::Kramdown::Utils::Entities.entity('raquo')]
       } # :nodoc:
       def convert_typographic_sym(el, indent)
-        TYPOGRAPHIC_SYMS[el.value].map {|e| entity_to_str(e)}.join('')
+        if (result = @options[:typographic_symbols][el.value])
+          escape_html(result, :text)
+        else
+          TYPOGRAPHIC_SYMS[el.value].map {|e| entity_to_str(e)}.join('')
+        end
       end
 
       def convert_smart_quote(el, indent)
@@ -313,10 +319,14 @@ module Kramdown
       def convert_math(el, indent)
         if (result = format_math(el, :indent => indent))
           result
-        elsif el.options[:category] == :block
-          format_as_block_html('pre', el.attr, "$$\n#{el.value}\n$$", indent)
         else
-          format_as_span_html('span', el.attr, "$#{el.value}$")
+          attr = el.attr.dup
+          (attr['class'] = (attr['class'] || '') << " kdmath").lstrip!
+          if el.options[:category] == :block
+            format_as_block_html('div', attr, "$$\n#{el.value}\n$$", indent)
+          else
+            format_as_span_html('span', attr, "$#{el.value}$")
+          end
         end
       end
 
@@ -330,7 +340,7 @@ module Kramdown
       def convert_root(el, indent)
         result = inner(el, indent)
         if @footnote_location
-          result.sub!(/#{@footnote_location}/, footnote_content)
+          result.sub!(/#{@footnote_location}/, footnote_content.gsub(/\\/, "\\\\\\\\"))
         else
           result << footnote_content
         end
@@ -341,7 +351,7 @@ module Kramdown
                  else
                    ''
                  end
-          result.sub!(/#{@toc_code.last}/, text)
+          result.sub!(/#{@toc_code.last}/, text.gsub(/\\/, "\\\\\\\\"))
         end
         result
       end
@@ -362,9 +372,11 @@ module Kramdown
         "#{' '*indent}<#{name}#{html_attributes(attr)}>\n#{body}#{' '*indent}</#{name}>\n"
       end
 
-      # Add the syntax highlighter name to the 'class' attribute of the given attribute hash.
-      def add_syntax_highlighter_to_class_attr(attr)
+      # Add the syntax highlighter name to the 'class' attribute of the given attribute hash. And
+      # overwrites or add a "language-LANG" part using the +lang+ parameter if +lang+ is not nil.
+      def add_syntax_highlighter_to_class_attr(attr, lang = nil)
         (attr['class'] = (attr['class'] || '') + " highlighter-#{@options[:syntax_highlighter]}").lstrip!
+        attr['class'].sub!(/\blanguage-\S+|(^)/) { "language-#{lang}#{$1 ? ' ' : ''}" } if lang
       end
 
       # Generate and return an element tree for the table of contents.
@@ -378,7 +390,7 @@ module Kramdown
           a = Element.new(:a, nil)
           a.attr['href'] = "##{id}"
           a.attr['id'] = "#{sections.attr['id']}-#{id}"
-          a.children.concat(remove_footnotes(Marshal.load(Marshal.dump(children))))
+          a.children.concat(fix_for_toc_entry(Marshal.load(Marshal.dump(children))))
           li.children.last.children << a
           li.children << Element.new(type)
 
@@ -405,6 +417,21 @@ module Kramdown
         sections
       end
 
+      # Fixes the elements for use in a TOC entry.
+      def fix_for_toc_entry(elements)
+        remove_footnotes(elements)
+        unwrap_links(elements)
+        elements
+      end
+
+      # Remove all link elements by unwrapping them.
+      def unwrap_links(elements)
+        elements.map! do |c|
+          unwrap_links(c.children)
+          c.type == :a ? c.children : c
+        end.flatten!
+      end
+
       # Remove all footnotes from the given elements.
       def remove_footnotes(elements)
         elements.delete_if do |c|
@@ -419,7 +446,7 @@ module Kramdown
         text.each_byte do |b|
           result << (b > 128 ? b.chr : "&#%03d;" % b)
         end
-        result.force_encoding(text.encoding) if result.respond_to?(:force_encoding)
+        result.force_encoding(text.encoding)
         result
       end
 
@@ -430,28 +457,33 @@ module Kramdown
         ol = Element.new(:ol)
         ol.attr['start'] = @footnote_start if @footnote_start != 1
         i = 0
+        backlink_text = escape_html(@options[:footnote_backlink], :text)
         while i < @footnotes.length
           name, data, _, repeat = *@footnotes[i]
           li = Element.new(:li, nil, {'id' => "fn:#{name}"})
           li.children = Marshal.load(Marshal.dump(data.children))
-          
-          #------------------------------------------------------------------------------
-          # RM Crash due to an object being autoreleased one too many times in RubyMotion.
-          # pre-initializing `para` before it's assigned in the `if` statement seems to 
-          # fix it.
-          para = nil
 
-          if li.children.last.type == :p
-            para = li.children.last
+          para = nil
+          if li.children.last.type == :p || @options[:footnote_backlink_inline]
+            parent = li
+            while !parent.children.empty? && ![:p, :header].include?(parent.children.last.type)
+              parent = parent.children.last
+            end
+            para = parent.children.last
             insert_space = true
-          else
+          end
+
+          unless para
             li.children << (para = Element.new(:p))
             insert_space = false
           end
 
-          para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [insert_space ? ' ' : '', name, "&#8617;"])
-          (1..repeat).each do |index|
-            para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [" ", "#{name}:#{index}", "&#8617;<sup>#{index+1}</sup>"])
+          unless @options[:footnote_backlink].empty?
+            nbsp = entity_to_str(ENTITY_NBSP)
+            para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [insert_space ? nbsp : '', name, backlink_text])
+            (1..repeat).each do |index|
+              para.children << Element.new(:raw, FOOTNOTE_BACKLINK_FMT % [nbsp, "#{name}:#{index}", "#{backlink_text}<sup>#{index+1}</sup>"])
+            end
           end
 
           ol.children << Element.new(:raw, convert(li, 4))

data/lib/kramdown/converter/kramdown.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 'kramdown/converter'
-# RM require 'kramdown/utils'
+require 'kramdown/converter'
+require 'kramdown/utils'
 
 module Kramdown
 
@@ -31,7 +31,7 @@ module Kramdown
 
       def convert(el, opts = {:indent => 0})
         res = send("convert_#{el.type}", el, opts)
-        if ![:html_element, :li, :dd, :td].include?(el.type) && (ial = ial_for_element(el))
+        if ![:html_element, :li, :dt, :dd, :td].include?(el.type) && (ial = ial_for_element(el))
           res << ial
           res << "\n\n" if Element.category(el) == :block
         elsif [:ul, :dl, :ol, :codeblock].include?(el.type) && opts[:next] &&
@@ -174,7 +174,11 @@ module Kramdown
       end
 
       def convert_dt(el, opts)
-        inner(el, opts) << "\n"
+        result = ''
+        if ial = ial_for_element(el)
+          result << ial << " "
+        end
+        result << inner(el, opts) << "\n"
       end
 
       HTML_TAGS_WITH_BODY=['div', 'script', 'iframe', 'textarea']
@@ -288,14 +292,15 @@ module Kramdown
 
       def convert_img(el, opts)
         alt_text = el.attr['alt'].to_s.gsub(ESCAPED_CHAR_RE) { $1 ? "\\#{$1}" : $2 }
-        if el.attr['src'].empty?
+        src = el.attr['src'].to_s
+        if src.empty?
           "![#{alt_text}]()"
         else
           title = parse_title(el.attr['title'])
-          link = if el.attr['src'].count("()") > 0
-                   "<#{el.attr['src']}>"
+          link = if src.count("()") > 0
+                   "<#{src}>"
                  else
-                   el.attr['src']
+                   src
                  end
           "![#{alt_text}](#{link}#{title})"
         end
@@ -402,7 +407,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}"
@@ -414,6 +419,10 @@ module Kramdown
           (el.options[:ial] && (el.options[:ial][:refs] || []).include?('toc'))  # RM can't use rescue nil
         res = "footnotes" << (res.strip.empty? ? '' : " #{res}") if (el.type == :ul || el.type == :ol) &&
           (el.options[:ial] && (el.options[:ial][:refs] || []).include?('footnotes')) # RM can't use rescue nil
+        if el.type == :dl && el.options[:ial] && el.options[:ial][:refs]
+          auto_ids = el.options[:ial][:refs].select {|ref| ref =~ /\Aauto_ids/}.join(" ")
+          res = auto_ids << (res.strip.empty? ? '' : " #{res}") unless auto_ids.empty?
+        end
         res.strip.empty? ? nil : "{:#{res}}"
       end