radiant 0.9.0.rc2 → 0.9.1

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -20,18 +20,18 @@
 #++
 #
 
+require 'kramdown/parser/html'
+
 module Kramdown
   module Parser
     class Kramdown
 
-      HTML_ENTITY_RE = /&([\w:][\-\w\d\.:]*);|&#(\d+);|&\#x([0-9a-fA-F]+);/
-
       # 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)
       end
-      define_parser(:html_entity, HTML_ENTITY_RE, '&')
+      define_parser(:html_entity, Kramdown::Parser::Html::Constants::HTML_ENTITY_RE, '&')
 
     end
   end

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -91,7 +91,7 @@ module Kramdown
           add_text(result)
           return
         end
-        alt_text = extract_string(reset_pos...@src.pos)
+        alt_text = extract_string(reset_pos...@src.pos, @src)
         conv_link_id = alt_text.gsub(/(\s|\n)+/m, ' ').gsub(LINK_ID_NON_CHARS, '').downcase
         @src.scan(stop_re)
 

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -23,6 +23,7 @@
 require 'kramdown/parser/kramdown/blank_line'
 require 'kramdown/parser/kramdown/eob'
 require 'kramdown/parser/kramdown/horizontal_rule'
+require 'kramdown/parser/kramdown/attribute_list'
 
 module Kramdown
   module Parser
@@ -59,7 +60,7 @@ module Kramdown
         end
 
         type, list_start_re = (@src.check(LIST_START_UL) ? [:ul, LIST_START_UL] : [:ol, LIST_START_OL])
-        list = Element.new(type)
+        list = new_block_el(type)
 
         item = nil
         indent_re = nil
@@ -74,6 +75,11 @@ module Kramdown
             item.value, indentation, content_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
             list.children << item
 
+            item.value.sub!(/^#{IAL_SPAN_START}/) 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
@@ -112,12 +118,11 @@ module Kramdown
           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))
+                                              (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)
-          else
-            it.options[:first_is_block] = true
           end
 
           if it.children.last.type == :blank
@@ -145,7 +150,7 @@ module Kramdown
         end
 
         first_as_para = false
-        deflist = Element.new(:dl)
+        deflist = new_block_el(:dl)
         para = @tree.children.pop
         if para.type == :blank
           para = @tree.children.pop
@@ -153,7 +158,7 @@ module Kramdown
         end
         para.children.first.value.split("\n").each do |term|
           el = Element.new(:dt)
-          el.children << Element.new(:text, term)
+          el.children << Element.new(:raw_text, term)
           deflist.children << el
         end
 
@@ -200,8 +205,6 @@ module Kramdown
             text = it.children.shift.children.first
             text.value += "\n" if !it.children.empty?
             it.children.unshift(text)
-          else
-            it.options[:first_is_block] = true
           end
         end
 

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

@@ -0,0 +1,53 @@
+# -*- 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
+  module Parser
+    class Kramdown
+
+      BLOCK_MATH_START = /^#{OPT_SPACE}(\\)?\$\$(.*?)\$\$\s*?\n/m
+
+      # Parse the math block at the current location.
+      def parse_block_math
+        if @src[1]
+          @src.scan(/^#{OPT_SPACE}\\/)
+          return false
+        end
+        @src.pos += @src.matched_size
+        @tree.children << new_block_el(:math, @src[2], :category => :block)
+        true
+      end
+      define_parser(:block_math, BLOCK_MATH_START)
+
+
+      INLINE_MATH_START = /\$\$(.*?)\$\$/
+
+      # 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)
+      end
+      define_parser(:inline_math, INLINE_MATH_START, '\$')
+
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -32,7 +32,7 @@ module Kramdown
         if @tree.children.last && @tree.children.last.type == :p
           @tree.children.last.children.first.value << "\n" << @src.matched.chomp
         else
-          @tree.children << Element.new(:p)
+          @tree.children << new_block_el(:p)
           add_text(@src.matched.lstrip.chomp, @tree.children.last)
         end
         true

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -17,8 +17,9 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
 #
-#
+#--
 # Parts of this file are based on code from Maruku by Andrea Censi.
 # The needed license statements follow:
 #
@@ -178,8 +179,8 @@ module Kramdown
                   # Special case for e.g. "<i>Custer</i>'s Last Stand."
                   [/("|')(\s|s\b|$)/, [:rquote1, 2]],
                   # Any remaining single quotes should be opening ones:
-                  [/(.?)'/, [1, :lsquo]],
-                  [/(.?)"/, [1, :ldquo]],
+                  [/(.?)'/m, [1, :lsquo]],
+                  [/(.?)"/m, [1, :ldquo]],
                  ] #'"
 
       SQ_SUBSTS = {

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2010 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -37,7 +37,7 @@ module Kramdown
       # Parse the table at the current location.
       def parse_table
         orig_pos = @src.pos
-        table = Element.new(:table, nil, :alignment => [])
+        table = new_block_el(:table, nil, :alignment => [])
 
         @src.scan(TABLE_SEP_LINE)
 
@@ -82,7 +82,7 @@ module Kramdown
             cells.pop if cells.last.strip.empty?
             cells.each do |cell_text|
               tcell = Element.new(:td)
-              tcell.children << Element.new(:text, cell_text.strip)
+              tcell.children << Element.new(:raw_text, cell_text.strip)
               trow.children << tcell
             end
             columns = [columns, cells.length].max
@@ -106,6 +106,7 @@ module Kramdown
             (columns - row.children.length).times do
               row.children << Element.new(:td)
             end
+            row.children.each {|el| el.type = :th} if kind.type == :thead
           end
         end
         if table.options[:alignment].length > columns

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -24,7 +24,7 @@ module Kramdown
   module Parser
     class Kramdown
 
-      TYPOGRAPHIC_SYMS = [['---', :mdash], ['--', :ndash], ['...', :ellipsis],
+      TYPOGRAPHIC_SYMS = [['---', :mdash], ['--', :ndash], ['...', :hellip],
                           ['\\<<', '&lt;&lt;'], ['\\>>', '&gt;&gt;'],
                           ['<< ', :laquo_space], [' >>', :raquo_space],
                           ['<<', :laquo], ['>>', :raquo]]
@@ -37,8 +37,12 @@ module Kramdown
         val = TYPOGRAPHIC_SYMS_SUBST[@src.matched]
         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')
         else
-          add_text(val.dup)
+          @tree.children << Element.new(:entity, 'gt')
+          @tree.children << Element.new(:entity, 'gt')
         end
       end
       define_parser(:typographic_syms, TYPOGRAPHIC_SYMS_RE, '--|\\.\\.\\.|(?:\\\\| )?(?:<<|>>)')

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -23,6 +23,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '0.5.0'
+  VERSION = '0.8.0'
 
 end

data/vendor/extensions/markdown_filter/vendor/kramdown/man/man1/kramdown.1

@@ -0,0 +1,222 @@
+.TH "KRAMDOWN" 1 "February 2010"
+.SH NAME
+kramdown \- a fast, pure-Ruby Markdown-superset converter
+.SH SYNOPSIS
+.B kramdown
+[\fIoptions\fR]
+[\fIFILE\fR ...]
+.SH DESCRIPTION
+kramdown parses a superset of Markdown and converts it to different output formats. It is supports
+standard Markdown (with some minor modifications) and various extensions like tables and definition
+lists.
+
+If \fIFILE\fR is not specified, kramdown reads from the standard input. The result is written to the
+standard output.
+
+There are two sets of options that kramdown accepts: The first one includes the options that are
+used directly by the kramdown binary. The second set of options controls how kramdown parses and
+converts its input.
+.SH OPTIONS
+.TP
+.B \-f, \-\-format ARG
+Specify the output format. Available output formats: html (this is the default) or latex.
+.TP
+.B \-v, \-\-version
+Show the version of kramdown.
+.TP
+.B \-h, \-\-help
+Show the help.
+
+.SH KRAMDOWN OPTIONS
+
+.TP
+.B \-\-template ARG
+
+The name of an ERB template file that should be used to wrap the output
+
+This is used to wrap the output in an environment so that the output can
+be used as a stand-alone document. For example, an HTML template would
+provide the needed header and body tags so that the whole output is a
+valid HTML file. If no template is specified, the output will be just
+the converted text.
+
+When resolving the template file, the given template name is used first.
+If such a file is not found, the converter extension is appended. If the
+file still cannot be found, the templates name is interpreted as a
+template name that is provided by kramdown (without the converter
+extension).
+
+kramdown provides a default template named 'default' for each converter.
+
+Default: ''
+Used by: all converters
+
+
+.TP
+.B \-\-[no\-]auto_ids
+
+Use automatic header ID generation
+
+If this option is `true`, ID values for all headers are automatically
+generated if no ID is explicitly specified.
+
+Default: true
+Used by: HTML/Latex converter
+
+
+.TP
+.B \-\-auto_id_prefix ARG
+
+Prefix used for automatically generated heaer IDs
+
+This option can be used to set a prefix for the automatically generated
+header IDs so that there is no conflict when rendering multiple kramdown
+documents into one output file separately. The prefix should only
+contain characters that are valid in an ID!
+
+Default: ''
+Used by: HTML/Latex converter
+
+
+.TP
+.B \-\-[no\-]parse_block_html
+
+Process kramdown syntax in block HTML tags
+
+If this option is `true`, the kramdown parser processes the content of
+block HTML tags as text containing block level elements. Since this is
+not wanted normally, the default is `false`. It is normally better to
+selectively enable kramdown processing via the markdown attribute.
+
+Default: false
+Used by: kramdown parser
+
+
+.TP
+.B \-\-[no\-]parse_span_html
+
+Process kramdown syntax in span HTML tags
+
+If this option is `true`, the kramdown parser processes the content of
+span HTML tags as text containing span level elements.
+
+Default: true
+Used by: kramdown parser
+
+
+.TP
+.B \-\-[no\-]html_to_native
+
+Convert HTML elements to native elements
+
+If this option is `true`, the parser converts HTML elements to native
+elements. For example, when parsing `<em>hallo</em>` the emphasis tag
+would normally be converted to an `:html` element with tag type `:em`.
+If `html_to_native` is `true`, then the emphasis would be converted to a
+native `:em` element.
+
+This is useful for converters that cannot deal with HTML elements.
+
+Default: false
+Used by: kramdown parser
+
+
+.TP
+.B \-\-footnote_nr ARG
+
+The number of the first footnote
+
+This option can be used to specify the number that is used for the first
+footnote.
+
+Default: 1
+Used by: HTML converter
+
+
+.TP
+.B \-\-filter_html ARG
+
+NOTE: This option is deprecated and will be removed in a future release!
+
+An array of HTML tags that should be filtered from the output
+
+The value can either be specified as array or as a space separated
+string (which will be converted to an array). All HTML tags that are
+listed in the array will be filtered from the output, i.e. only their
+contents is used. This applies only to HTML tags found in the initial
+document.
+
+Default: []
+Used by: HTML converter
+
+
+.TP
+.B \-\-coderay_wrap ARG
+
+Defines how the highlighted code should be wrapped
+
+The possible values are :span, :div or nil.
+
+Default: :div
+Used by: HTML converter
+
+
+.TP
+.B \-\-coderay_line_numbers ARG
+
+Defines how and if line numbers should be shown
+
+The possible values are :table, :inline, :list or nil. If this option is
+nil, no line numbers are shown.
+
+Default: :inline
+Used by: HTML converter
+
+
+.TP
+.B \-\-coderay_line_number_start ARG
+
+The start value for the line numbers
+
+Default: 1
+Used by: HTML converter
+
+
+.TP
+.B \-\-coderay_tab_width ARG
+
+The tab width used in highlighted code
+
+Used by: HTML converter
+
+
+.TP
+.B \-\-coderay_bold_every ARG
+
+Defines how often a line number should be made bold
+
+Default: 10
+Used by: HTML converter
+
+
+.TP
+.B \-\-coderay_css ARG
+
+Defines how the highlighted code gets styled
+
+Possible values are :class (CSS classes are applied to the code
+elements, one must supply the needed CSS file) or :style (default CSS
+styles are directly applied to the code elements).
+
+Default: style
+Used by: HTML converter
+
+
+.SH SEE ALSO
+The kramdown website, http://kramdown.rubyforge.org/ for more information, especially on the support
+input syntax.
+.SH AUTHOR
+kramdown was written by Thomas Leitner <t_leitner@gmx.at>.
+.PP
+This manual page was written by Thomas Leitner <t_leitner@gmx.at>.
+