radiant 0.9.1 → 1.0.0.rc1

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/html_entity.rb

@@ -29,7 +29,8 @@ module Kramdown
       # Parse the HTML entity at the current location.
       def parse_html_entity
         @src.pos += @src.matched_size
-        @tree.children << Element.new(:entity, @src[1] || (@src[2] && @src[2].to_i) || @src[3].hex)
+        @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity(@src[1] || (@src[2] && @src[2].to_i) || @src[3].hex),
+                                      nil, :original => @src.matched)
       end
       define_parser(:html_entity, Kramdown::Parser::Html::Constants::HTML_ENTITY_RE, '&')
 

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/link.rb

@@ -27,7 +27,7 @@ module Kramdown
       PUNCTUATION_CHARS = "_.:,;!?-"
       LINK_ID_CHARS = /[a-zA-Z0-9 #{PUNCTUATION_CHARS}]/
       LINK_ID_NON_CHARS = /[^a-zA-Z0-9 #{PUNCTUATION_CHARS}]/
-      LINK_DEFINITION_START = /^#{OPT_SPACE}\[(#{LINK_ID_CHARS}+)\]:[ \t]*(?:<(.*?)>|([^\s]+))[ \t]*?(?:\n?[ \t]*?(["'])(.+?)\4[ \t]*?)?\n/
+      LINK_DEFINITION_START = /^#{OPT_SPACE}\[(#{LINK_ID_CHARS}+)\]:[ \t]*(?:<(.*?)>|([^'"\n]*?\S[^'"\n]*?))[ \t]*?(?:\n?[ \t]*?(["'])(.+?)\4[ \t]*?)?\n/
 
       # Parse the link definition at the current location.
       def parse_link_definition
@@ -35,6 +35,7 @@ module Kramdown
         link_id, link_url, link_title = @src[1].downcase, @src[2] || @src[3], @src[5]
         warning("Duplicate link ID '#{link_id}' - overwriting") if @doc.parse_infos[:link_defs][link_id]
         @doc.parse_infos[:link_defs][link_id] = [link_url, link_title]
+        @tree.children << Element.new(:eob, :link_def)
         true
       end
       define_parser(:link_definition, LINK_DEFINITION_START)
@@ -43,15 +44,14 @@ module Kramdown
       # This helper methods adds the approriate attributes to the element +el+ of type +a+ or +img+
       # and the element itself to the <tt>@tree</tt>.
       def add_link(el, href, title, alt_text = nil)
-        el.options[:attr] ||= {}
-        el.options[:attr]['title'] = title if title
         if el.type == :a
-          el.options[:attr]['href'] = href
+          el.attr['href'] = href
         else
-          el.options[:attr]['src'] = href
-          el.options[:attr]['alt'] = alt_text
+          el.attr['src'] = href
+          el.attr['alt'] = alt_text
           el.children.clear
         end
+        el.attr['title'] = title if title
         @tree.children << el
       end
 
@@ -86,7 +86,7 @@ module Kramdown
           end
           count - el.children.select {|c| c.type == :img}.size == 0
         end
-        if !found || el.children.empty?
+        if !found || (link_type == :a && el.children.empty?)
           @src.pos = reset_pos
           add_text(result)
           return
@@ -98,7 +98,10 @@ module Kramdown
         # reference style link or no link url
         if @src.scan(LINK_INLINE_ID_RE) || !@src.check(/\(/)
           link_id = (@src[1] || conv_link_id).downcase
-          if @doc.parse_infos[:link_defs].has_key?(link_id)
+          if link_id.empty?
+            @src.pos = reset_pos
+            add_text(result)
+          elsif @doc.parse_infos[:link_defs].has_key?(link_id)
             add_link(el, @doc.parse_infos[:link_defs][link_id].first, @doc.parse_infos[:link_defs][link_id].last, alt_text)
           else
             warning("No link definition for link ID '#{link_id}' found")
@@ -117,7 +120,7 @@ module Kramdown
           end
         else
           link_url = ''
-          re = /\(|\)|\s/
+          re = /\(|\)|\s(?=['"])/
           nr_of_brackets = 0
           while temp = @src.scan_until(re)
             link_url += temp
@@ -131,7 +134,7 @@ module Kramdown
               break if nr_of_brackets == 0
             end
           end
-          link_url = link_url[1..-2]
+          link_url = link_url[1..-2].strip
 
           if nr_of_brackets == 0
             add_link(el, link_url, nil, alt_text)

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/list.rb

@@ -29,10 +29,12 @@ module Kramdown
   module Parser
     class Kramdown
 
+      LIST_ITEM_IAL = /^\s*(#{IAL_SPAN_START})?\s*\n/
+
       # Used for parsing the first line of a list item or a definition, i.e. the line with list item
       # marker or the definition marker.
       def parse_first_list_line(indentation, content)
-        if content =~ /^\s*\n/
+        if content =~ LIST_ITEM_IAL
           indentation = 4
         else
           while content =~ /^ *\t/
@@ -44,8 +46,9 @@ module Kramdown
         content.sub!(/^\s*/, '')
 
         indent_re = /^ {#{indentation}}/
-        content_re = /^(?:(?:\t| {4}){#{indentation / 4}} {#{indentation % 4}}|(?:\t| {4}){#{indentation / 4 + 1}}).*?\n/
-        [content, indentation, content_re, indent_re]
+        content_re = /^(?:(?:\t| {4}){#{indentation / 4}} {#{indentation % 4}}|(?:\t| {4}){#{indentation / 4 + 1}}).*\S.*\n/
+        lazy_re = /(?!^ {0,#{[indentation, 3].min}}(?:#{IAL_BLOCK}|#{LAZY_END_HTML_STOP}|#{LAZY_END_HTML_START})).*\S.*\n/
+        [content, indentation, content_re, lazy_re, indent_re]
       end
 
 
@@ -55,53 +58,47 @@ module Kramdown
 
       # Parse the ordered or unordered list at the current location.
       def parse_list
-        if @tree.children.last && @tree.children.last.type == :p # last element must not be a paragraph
-          return false
-        end
-
         type, list_start_re = (@src.check(LIST_START_UL) ? [:ul, LIST_START_UL] : [:ol, LIST_START_OL])
         list = new_block_el(type)
 
         item = nil
-        indent_re = nil
-        content_re = nil
+        content_re, lazy_re, indent_re = nil
         eob_found = false
         nested_list_found = false
+        last_is_blank = false
         while !@src.eos?
-          if @src.check(HR_START)
+          if last_is_blank && @src.check(HR_START)
+            break
+          elsif @src.scan(EOB_MARKER)
+            eob_found = true
             break
           elsif @src.scan(list_start_re)
             item = Element.new(:li)
-            item.value, indentation, content_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
+            item.value, indentation, content_re, lazy_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
             list.children << item
 
-            item.value.sub!(/^#{IAL_SPAN_START}/) do |match|
+            item.value.sub!(/^#{IAL_SPAN_START}\s*/) do |match|
               parse_attribute_list($~[1], item.options[:ial] ||= {})
               ''
             end
 
             list_start_re = (type == :ul ? /^( {0,#{[3, indentation - 1].min}}[+*-])([\t| ].*?\n)/ :
                              /^( {0,#{[3, indentation - 1].min}}\d+\.)([\t| ].*?\n)/)
-            nested_list_found = false
-          elsif result = @src.scan(content_re)
+            nested_list_found = (item.value =~ LIST_START)
+            last_is_blank = false
+          elsif (result = @src.scan(content_re)) || (!last_is_blank && (result = @src.scan(lazy_re)))
             result.sub!(/^(\t+)/) { " "*4*($1 ? $1.length : 0) }
             result.sub!(indent_re, '')
             if !nested_list_found && result =~ LIST_START
-              parse_blocks(item, item.value)
-              if item.children.length == 1 && item.children.first.type == :p
-                item.value = ''
-              else
-                item.children.clear
-              end
+              item.value << "^\n"
               nested_list_found = true
             end
             item.value << result
+            last_is_blank = false
           elsif result = @src.scan(BLANK_LINE)
             nested_list_found = true
+            last_is_blank = true
             item.value << result
-          elsif @src.scan(EOB_MARKER)
-            eob_found = true
-            break
           else
             break
           end
@@ -113,16 +110,21 @@ module Kramdown
         list.children.each do |it|
           temp = Element.new(:temp)
           parse_blocks(temp, it.value)
-          it.children += temp.children
+          it.children = temp.children
           it.value = nil
           next if it.children.size == 0
 
-          if it.children.first.type == :p && (it.children.length < 2 || it.children[1].type != :blank ||
-                                              (it == list.children.last && it.children.length == 2 && !eob_found)) &&
-              (list.children.last != it || list.children.size == 1 || list.children[0..-2].any? {|cit| cit.children.first.type != :p})
-            text = it.children.shift.children.first
-            text.value += "\n" if !it.children.empty? && it.children[0].type != :blank
-            it.children.unshift(text)
+          # Handle the case where an EOB marker is inserted by a block IAL for the first paragraph
+          it.children.delete_at(1) if it.children.first.type == :p &&
+            it.children.length >= 2 && it.children[1].type == :eob && it.children.first.options[:ial]
+
+          if it.children.first.type == :p &&
+              (it.children.length < 2 || it.children[1].type != :blank ||
+               (it == list.children.last && it.children.length == 2 && !eob_found)) &&
+              (list.children.last != it || list.children.size == 1 ||
+               list.children[0..-2].any? {|cit| cit.children.first.type != :p || cit.children.first.options[:transparent]})
+            it.children.first.children.first.value += "\n" if it.children.size > 1 && it.children[1].type != :blank
+            it.children.first.options[:transparent] = true
           end
 
           if it.children.last.type == :blank
@@ -163,26 +165,36 @@ module Kramdown
         end
 
         item = nil
-        indent_re = nil
-        content_re = nil
+        content_re, lazy_re, indent_re = nil
         def_start_re = DEFINITION_LIST_START
+        last_is_blank = false
         while !@src.eos?
           if @src.scan(def_start_re)
             item = Element.new(:dd)
             item.options[:first_as_para] = first_as_para
-            item.value, indentation, content_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
+            item.value, indentation, content_re, lazy_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
             deflist.children << item
 
+            item.value.sub!(/^#{IAL_SPAN_START}\s*/) do |match|
+              parse_attribute_list($~[1], item.options[:ial] ||= {})
+              ''
+            end
+
             def_start_re = /^( {0,#{[3, indentation - 1].min}}:)([\t| ].*?\n)/
             first_as_para = false
-          elsif result = @src.scan(content_re)
+            last_is_blank = false
+          elsif @src.check(EOB_MARKER)
+            break
+          elsif (result = @src.scan(content_re)) || (!last_is_blank && (result = @src.scan(lazy_re)))
             result.sub!(/^(\t+)/) { " "*4*($1 ? $1.length : 0) }
             result.sub!(indent_re, '')
             item.value << result
             first_as_para = false
+            last_is_blank = false
           elsif result = @src.scan(BLANK_LINE)
             first_as_para = true
             item.value << result
+            last_is_blank = true
           else
             break
           end
@@ -202,9 +214,8 @@ module Kramdown
             last = nil
           end
           if it.children.first.type == :p && !it.options.delete(:first_as_para)
-            text = it.children.shift.children.first
-            text.value += "\n" if !it.children.empty?
-            it.children.unshift(text)
+            it.children.first.children.first.value += "\n" if it.children.size > 1
+            it.children.first.options[:transparent] = true
           end
         end
 

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/math.rb

@@ -20,6 +20,8 @@
 #++
 #
 
+require 'kramdown/parser/kramdown/block_boundary'
+
 module Kramdown
   module Parser
     class Kramdown
@@ -28,13 +30,22 @@ module Kramdown
 
       # Parse the math block at the current location.
       def parse_block_math
-        if @src[1]
+        if !after_block_boundary?
+          return false
+        elsif @src[1]
           @src.scan(/^#{OPT_SPACE}\\/)
           return false
         end
+        orig_pos = @src.pos
         @src.pos += @src.matched_size
-        @tree.children << new_block_el(:math, @src[2], :category => :block)
-        true
+        data = @src[2]
+        if before_block_boundary?
+          @tree.children << new_block_el(:math, data)
+          true
+        else
+          @src.pos = orig_pos
+          false
+        end
       end
       define_parser(:block_math, BLOCK_MATH_START)
 
@@ -44,7 +55,7 @@ module Kramdown
       # Parse the inline math at the current location.
       def parse_inline_math
         @src.pos += @src.matched_size
-        @tree.children << Element.new(:math, @src[1], :category => :inline)
+        @tree.children << Element.new(:math, @src[1], nil, :category => :span)
       end
       define_parser(:inline_math, INLINE_MATH_START, '\$')
 

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/paragraph.rb

@@ -20,20 +20,31 @@
 #++
 #
 
+require 'kramdown/parser/kramdown/blank_line'
+require 'kramdown/parser/kramdown/attribute_list'
+require 'kramdown/parser/kramdown/eob'
+require 'kramdown/parser/kramdown/list'
+require 'kramdown/parser/kramdown/html'
+
 module Kramdown
   module Parser
     class Kramdown
 
+      LAZY_END_HTML_SPAN_ELEMENTS = HTML_SPAN_ELEMENTS + %w{script}
+      LAZY_END_HTML_START = /<(?>(?!(?:#{LAZY_END_HTML_SPAN_ELEMENTS.join('|')})\b)#{REXML::Parsers::BaseParser::UNAME_STR})\s*(?>\s+#{REXML::Parsers::BaseParser::UNAME_STR}\s*=\s*(["']).*?\1)*\s*\/?>/m
+      LAZY_END_HTML_STOP = /<\/(?!(?:#{LAZY_END_HTML_SPAN_ELEMENTS.join('|')})\b)#{REXML::Parsers::BaseParser::UNAME_STR}\s*>/m
+
       PARAGRAPH_START = /^#{OPT_SPACE}[^ \t].*?\n/
+      PARAGRAPH_MATCH = /(?:^.*\n)+?(?=#{BLANK_LINE}|#{IAL_BLOCK_START}|#{EOB_MARKER}|#{DEFINITION_LIST_START}|^#{OPT_SPACE}#{LAZY_END_HTML_STOP}|^#{OPT_SPACE}#{LAZY_END_HTML_START}|\Z)/
 
       # Parse the paragraph at the current location.
       def parse_paragraph
-        @src.pos += @src.matched_size
+        result = @src.scan(PARAGRAPH_MATCH)
         if @tree.children.last && @tree.children.last.type == :p
-          @tree.children.last.children.first.value << "\n" << @src.matched.chomp
+          @tree.children.last.children.first.value << "\n" << result.chomp
         else
           @tree.children << new_block_el(:p)
-          add_text(@src.matched.lstrip.chomp, @tree.children.last)
+          @tree.children.last.children << Element.new(@text_type, result.lstrip.chomp)
         end
         true
       end

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/table.rb

@@ -20,25 +20,26 @@
 #++
 #
 
-require 'kramdown/parser/kramdown/blank_line'
-require 'kramdown/parser/kramdown/eob'
-require 'kramdown/parser/kramdown/horizontal_rule'
+require 'kramdown/parser/kramdown/block_boundary'
 
 module Kramdown
   module Parser
     class Kramdown
 
-      TABLE_SEP_LINE = /^#{OPT_SPACE}(?:\||\+)([ ]?:?-[+|: -]*)[ \t]*\n/
+      TABLE_SEP_LINE = /^([+|: -]*?-[+|: -]*?)[ \t]*\n/
       TABLE_HSEP_ALIGN = /[ ]?(:?)-+(:?)[ ]?/
-      TABLE_FSEP_LINE = /^#{OPT_SPACE}(\||\+)[ ]?:?=[+|: =]*[ \t]*\n/
-      TABLE_ROW_LINE = /^#{OPT_SPACE}\|(.*?)[ \t]*\n/
-      TABLE_START = /^#{OPT_SPACE}\|(?:-|(?!=))/
+      TABLE_FSEP_LINE = /^[+|: =]*?=[+|: =]*?[ \t]*\n/
+      TABLE_ROW_LINE = /^(.*?)[ \t]*\n/
+      TABLE_LINE = /(?:\||.*?[^\\\n]\|).*?\n/
+      TABLE_START = /^#{OPT_SPACE}(?=\S)#{TABLE_LINE}/
 
       # Parse the table at the current location.
       def parse_table
-        orig_pos = @src.pos
-        table = new_block_el(:table, nil, :alignment => [])
+        return false if !after_block_boundary?
 
+        orig_pos = @src.pos
+        table = new_block_el(:table, nil, nil, :alignment => [])
+        leading_pipe = (@src.check(TABLE_LINE) =~ /^\s*\|/)
         @src.scan(TABLE_SEP_LINE)
 
         rows = []
@@ -54,6 +55,7 @@ module Kramdown
         end
 
         while !@src.eos?
+          break if !@src.check(TABLE_LINE)
           if @src.scan(TABLE_SEP_LINE) && !rows.empty?
             if table.options[:alignment].empty? && !has_footer
               add_container.call(:thead, false)
@@ -79,6 +81,7 @@ module Kramdown
                 i += 1
               end
             end
+            cells.shift if leading_pipe && cells.first.strip.empty?
             cells.pop if cells.last.strip.empty?
             cells.each do |cell_text|
               tcell = Element.new(:td)
@@ -92,6 +95,11 @@ module Kramdown
           end
         end
 
+        if !before_block_boundary?
+          @src.pos = orig_pos
+          return false
+        end
+
         add_container.call(has_footer ? :tfoot : :tbody, false) if !rows.empty?
 
         if !table.children.any? {|c| c.type == :tbody}

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/parser/kramdown/typographic_symbol.rb

@@ -38,11 +38,11 @@ module Kramdown
         if val.kind_of?(Symbol)
           @tree.children << Element.new(:typographic_sym, val)
         elsif @src.matched == '\\<<'
-          @tree.children << Element.new(:entity, 'lt')
-          @tree.children << Element.new(:entity, 'lt')
+          @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity('lt'))
+          @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity('lt'))
         else
-          @tree.children << Element.new(:entity, 'gt')
-          @tree.children << Element.new(:entity, 'gt')
+          @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity('gt'))
+          @tree.children << Element.new(:entity, ::Kramdown::Utils::Entities.entity('gt'))
         end
       end
       define_parser(:typographic_syms, TYPOGRAPHIC_SYMS_RE, '--|\\.\\.\\.|(?:\\\\| )?(?:<<|>>)')

data/vendor/extensions/markdown_filter/vendor/kramdown/lib/kramdown/utils.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
+#
+# This file is part of kramdown.
+#
+# kramdown is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+#
+
+module Kramdown
+
+  # == Utils Module
+  #
+  # This module contains utility class/modules/methods that can be used by both parsers and
+  # converters.
+  module Utils
+
+    autoload :Entities, 'kramdown/utils/entities'
+    autoload :HTML, 'kramdown/utils/html'
+    autoload :OrderedHash, 'kramdown/utils/ordered_hash'
+
+  end
+
+end