motion-kramdown 0.6.0 → 1.16.2

data/lib/kramdown/parser/kramdown/footnote.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/kramdown/extensions'
-# RM require 'kramdown/parser/kramdown/blank_line'
-# RM require 'kramdown/parser/kramdown/codeblock'
+require 'kramdown/parser/kramdown/extensions'
+require 'kramdown/parser/kramdown/blank_line'
+require 'kramdown/parser/kramdown/codeblock'
 
 module Kramdown
   module Parser
@@ -61,4 +61,3 @@ module Kramdown
     end
   end
 end
-

data/lib/kramdown/parser/kramdown/header.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/parser/kramdown/block_boundary'
+require 'kramdown/parser/kramdown/block_boundary'
 
 module Kramdown
   module Parser

data/lib/kramdown/parser/kramdown/horizontal_rule.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/parser/kramdown/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 'kramdown/parser/html'
+require 'kramdown/parser/html'
 
 module Kramdown
   module Parser
@@ -113,14 +113,15 @@ module Kramdown
           warning("Found invalidly used HTML closing tag for '#{@src[1]}' on line #{line}")
           add_text(result)
         elsif result = @src.scan(HTML_TAG_RE)
-          tag_name = @src[1].downcase
+          tag_name = @src[1]
+          tag_name.downcase! if HTML_ELEMENT[tag_name.downcase]
           if HTML_BLOCK_ELEMENTS.include?(tag_name)
             warning("Found block HTML tag '#{tag_name}' in span-level text on line #{line}")
             add_text(result)
             return
           end
 
-          attrs = parse_html_attributes(@src[2], line)
+          attrs = parse_html_attributes(@src[2], line, HTML_ELEMENT[tag_name])
           attrs.each {|name, value| value.gsub!(/\n+/, ' ')}
 
           do_parsing = (HTML_CONTENT_MODEL[tag_name] == :raw || @tree.options[:content_model] == :raw ? false : @options[:parse_span_html])
@@ -139,10 +140,9 @@ module Kramdown
           el = Element.new(:html_element, tag_name, attrs, :category => :span, :location => line,
                            :content_model => (do_parsing ? :span : :raw), :is_closed => !!@src[4])
           @tree.children << el
-          stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/i
-          if !@src[4] && HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
-            warning("The HTML tag '#{el.value}' on line #{line} cannot have any content - auto-closing it")
-          elsif !@src[4]
+          stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/
+          stop_re = Regexp.new(stop_re.source, Regexp::IGNORECASE) if HTML_ELEMENT[tag_name]
+          if !@src[4] && !HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
             if parse_spans(el, stop_re, (do_parsing ? nil : [:span_html]))
               @src.scan(stop_re)
             else

data/lib/kramdown/parser/kramdown/html_entity.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/parser/html'
+require 'kramdown/parser/html'
 
 module Kramdown
   module Parser

data/lib/kramdown/parser/kramdown/line_break.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/parser/kramdown/link.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/parser/kramdown/escaped_chars'
+require 'kramdown/parser/kramdown/escaped_chars'
 
 module Kramdown
   module Parser
@@ -18,10 +18,11 @@ module Kramdown
         id.gsub(/[\s]+/, ' ').downcase
       end
 
-      LINK_DEFINITION_START = /^#{OPT_SPACE}\[([^\n\]]+)\]:[ \t]*(?:<(.*?)>|([^'"\n]*?\S[^'"\n]*?))[ \t]*?(?:\n?[ \t]*?(["'])(.+?)\4[ \t]*?)?\n/
+      LINK_DEFINITION_START = /^#{OPT_SPACE}\[([^\n\]]+)\]:[ \t]*(?:<(.*?)>|([^\n]*?\S[^\n]*?))(?:(?:[ \t]*?\n|[ \t]+?)[ \t]*?(["'])(.+?)\4)?[ \t]*?\n/
 
       # Parse the link definition at the current location.
       def parse_link_definition
+        return false if @src[3].to_s =~ /[ \t]+["']/
         @src.pos += @src.matched_size
         link_id, link_url, link_title = normalize_link_id(@src[1]), @src[2] || @src[3], @src[5]
         warning("Duplicate link ID '#{link_id}' on line #{@src.current_line_number} - overwriting") if @link_defs[link_id]
@@ -76,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/parser/kramdown/list.rb

@@ -1,16 +1,16 @@
 # -*- 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/kramdown/blank_line'
-# RM require 'kramdown/parser/kramdown/eob'
-# RM require 'kramdown/parser/kramdown/horizontal_rule'
-# RM require 'kramdown/parser/kramdown/extensions'
+require 'kramdown/parser/kramdown/blank_line'
+require 'kramdown/parser/kramdown/eob'
+require 'kramdown/parser/kramdown/horizontal_rule'
+require 'kramdown/parser/kramdown/extensions'
 
 module Kramdown
   module Parser
@@ -39,7 +39,7 @@ module Kramdown
           end
           indentation += content[/^ */].length
         end
-        content = content.sub(/^\s*/, '')
+        content.sub!(/^\s*/, '')
 
         # [content, indentation, *PARSE_FIRST_LIST_LINE_REGEXP_CACHE[indentation]]  # RM use caching code below
 
@@ -90,7 +90,7 @@ module Kramdown
             list.children << item
 
             #------------------------------------------------------------------------------
-            # RM don't know why, but using the item.options[:ial] directly in the block 
+            # RM don't know why, but using the item.options[:ial] directly in the block
             # caused an object to be autoreleased one too many times in RubyMotion,
             # crashing the app. So use this workaround
             item_options = (item.options[:ial] ||= {}) # RM
@@ -107,10 +107,12 @@ module Kramdown
             item.value = [item.value]
           elsif (result = @src.scan(content_re)) || (!last_is_blank && (result = @src.scan(lazy_re)))
             result.sub!(/^(\t+)/) { " " * 4 * $1.length }
-            result.sub!(indent_re, '')
-            if !nested_list_found && result =~ LIST_START
+            indentation_found = result.sub!(indent_re, '')
+            if !nested_list_found && indentation_found && result =~ LIST_START
               item.value << ''
               nested_list_found = true
+            elsif nested_list_found && !indentation_found && result =~ LIST_START
+              result = " " * (indentation + 4) << result
             end
             item.value.last << result
             last_is_blank = false
@@ -189,6 +191,11 @@ module Kramdown
         deflist.options[:location] = para.options[:location] # take location from preceding para which is the first definition term
         para.children.first.value.split(/\n/).each do |term|
           el = Element.new(:dt, nil, nil, :location => @src.current_line_number)
+          term.sub!(self.class::LIST_ITEM_IAL) do
+            parse_attribute_list($1, el.options[:ial] ||= {})
+            ''
+          end
+          el.options[:raw_text] = term
           el.children << Element.new(:raw_text, term)
           deflist.children << el
         end
@@ -207,7 +214,7 @@ module Kramdown
             deflist.children << item
 
             #------------------------------------------------------------------------------
-            # RM don't know why, but using the item.options[:ial] directly in the block 
+            # RM don't know why, but using the item.options[:ial] directly in the block
             # caused an object to be autoreleased one too many times in RubyMotion,
             # crashing the app. So use this workaround
             item_options = (item.options[:ial] ||= {}) # RM

data/lib/kramdown/parser/kramdown/math.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/parser/kramdown/block_boundary'
+require 'kramdown/parser/kramdown/block_boundary'
 
 module Kramdown
   module Parser

data/lib/kramdown/parser/kramdown/paragraph.rb

@@ -1,17 +1,17 @@
 # -*- 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/kramdown/blank_line'
-# RM require 'kramdown/parser/kramdown/extensions'
-# RM require 'kramdown/parser/kramdown/eob'
-# RM require 'kramdown/parser/kramdown/list'
-# RM require 'kramdown/parser/kramdown/html'
+require 'kramdown/parser/kramdown/blank_line'
+require 'kramdown/parser/kramdown/extensions'
+require 'kramdown/parser/kramdown/eob'
+require 'kramdown/parser/kramdown/list'
+require 'kramdown/parser/kramdown/html'
 
 module Kramdown
   module Parser
@@ -32,14 +32,21 @@ module Kramdown
 
       # Parse the paragraph at the current location.
       def parse_paragraph
+        pos = @src.pos
         start_line_number = @src.current_line_number
         result = @src.scan(PARAGRAPH_MATCH)
-        while !@src.match?(self.class::PARAGRAPH_END)
+        while !@src.match?(paragraph_end)
           result << @src.scan(PARAGRAPH_MATCH)
         end
         result.rstrip!
         if @tree.children.last && @tree.children.last.type == :p
-          @tree.children.last.children.first.value << "\n" << result
+          last_item_in_para = @tree.children.last.children.last
+          if last_item_in_para && last_item_in_para.type == @text_type
+            joiner = (extract_string((pos - 3)...pos, @src) == "  \n" ? "  \n" : "\n")
+            last_item_in_para.value << joiner << result
+          else
+            add_text(result, @tree.children.last)
+          end
         else
           @tree.children << new_block_el(:p, nil, nil, :location => start_line_number)
           result.lstrip!
@@ -49,6 +56,10 @@ module Kramdown
       end
       define_parser(:paragraph, PARAGRAPH_START)
 
+      def paragraph_end
+        self.class::PARAGRAPH_END
+      end
+
     end
   end
 end

data/lib/kramdown/parser/kramdown/smart_quotes.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.
 #++
@@ -123,7 +123,7 @@ module Kramdown
 
       SQ_RULES = [
                   [/("|')(?=[_*]{1,2}\S)/, [:lquote1]],
-                  [/("|')(?=#{SQ_PUNCT}\B)/, [:rquote1]],
+                  [/("|')(?=#{SQ_PUNCT}(?!\.\.)\B)/, [:rquote1]],
                   # Special case for double sets of quotes, e.g.:
                   #   <p>He said, "'Quoted' words in a larger quote."</p>
                   [/(\s?)"'(?=\w)/, [1, :ldquo, :lsquo]],
@@ -136,7 +136,7 @@ module Kramdown
                   # Single/double closing quotes:
                   [/(#{SQ_CLOSE})('|")/, [1, :rquote2]],
                   # Special case for e.g. "<i>Custer</i>'s Last Stand."
-                  [/("|')(\s|s\b|$)/, [:rquote1, 2]],
+                  [/("|')(?=\s|s\b|$)/, [:rquote1]],
                   # Any remaining single quotes should be opening ones:
                   [/(.?)'/m, [1, :lsquo]],
                   [/(.?)"/m, [1, :ldquo]],

data/lib/kramdown/parser/kramdown/table.rb

@@ -1,21 +1,21 @@
 # -*- 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/kramdown/block_boundary'
+require 'kramdown/parser/kramdown/block_boundary'
 
 module Kramdown
   module Parser
     class Kramdown
 
-      TABLE_SEP_LINE = /^([+|: -]*?-[+|: -]*?)[ \t]*\n/
-      TABLE_HSEP_ALIGN = /[ ]?(:?)-+(:?)[ ]?/
-      TABLE_FSEP_LINE = /^[+|: =]*?=[+|: =]*?[ \t]*\n/
+      TABLE_SEP_LINE = /^([+|: \t-]*?-[+|: \t-]*?)[ \t]*\n/
+      TABLE_HSEP_ALIGN = /[ \t]?(:?)-+(:?)[ \t]?/
+      TABLE_FSEP_LINE = /^[+|: \t=]*?=[+|: \t=]*?[ \t]*\n/
       TABLE_ROW_LINE = /^(.*?)[ \t]*\n/
       TABLE_PIPE_CHECK = /(?:\||.*?[^\\\n]\|)/
       TABLE_LINE = /#{TABLE_PIPE_CHECK}.*?\n/
@@ -45,8 +45,10 @@ module Kramdown
 
         while !@src.eos?
           break if !@src.check(TABLE_LINE)
-          if @src.scan(TABLE_SEP_LINE) && !rows.empty?
-            if table.options[:alignment].empty? && !has_footer
+          if @src.scan(TABLE_SEP_LINE)
+            if rows.empty?
+              # nothing to do, ignoring multiple consecutive separator lines
+            elsif table.options[:alignment].empty? && !has_footer
               add_container.call(:thead, false)
               table.options[:alignment] = @src[1].scan(TABLE_HSEP_ALIGN).map do |left, right|
                 (left.empty? && right.empty? && :default) || (right.empty? && :left) || (left.empty? && :right) || :center
@@ -73,11 +75,7 @@ module Kramdown
 
                 root.children.each do |c|
                   if c.type == :raw_text
-                    # Only on Ruby 1.9: f, *l = c.value.split(/(?<!\\)\|/).map {|t| t.gsub(/\\\|/, '|')}
-                    f, *l = c.value.split(/\\\|/, -1).map {|t| t.split(/\|/, -1)}.inject([]) do |memo, t|
-                      memo.last << "|#{t.shift}" if memo.size > 0
-                      memo.concat(t)
-                    end
+                    f, *l = c.value.split(/(?<!\\)\|/, -1).map {|t| t.gsub(/\\\|/, '|')}
                     (cells.empty? ? cells : cells.last) << f
                     cells.concat(l)
                   else

data/lib/kramdown/parser/kramdown/typographic_symbol.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/parser/markdown.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/parser'
+require 'kramdown/parser'
 
 module Kramdown
 

data/lib/kramdown/utils.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.
 #++
@@ -21,6 +21,7 @@ module Kramdown
     # RM autoload :Unidecoder, 'kramdown/utils/unidecoder'
     # RM autoload :StringScanner, 'kramdown/utils/string_scanner'
     # RM autoload :Configurable, 'kramdown/utils/configurable'
+    # RM autoload :LRUCache, 'kramdown/utils/lru_cache'
 
     # Treat +name+ as if it were snake cased (e.g. snake_case) and camelize it (e.g. SnakeCase).
     def self.camelize(name)

data/lib/kramdown/utils/configurable.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.
 #++
@@ -29,7 +29,7 @@ module Kramdown
         singleton_class = (class << self; self; end)
         singleton_class.send(:define_method, :configurables) do
           @_configurables ||= Hash.new {|h, k| h[k] = {}}
-        end
+        end unless respond_to?(:configurables)
         singleton_class.send(:define_method, name) do |data|
           configurables[name][data]
         end