radiant 0.9.1 → 1.0.0.rc1

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

@@ -23,6 +23,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '0.8.0'
+  VERSION = '0.11.0'
 
 end

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

@@ -1,4 +1,4 @@
-.TH "KRAMDOWN" 1 "February 2010"
+.TH "KRAMDOWN" 1 "July 2010"
 .SH NAME
 kramdown \- a fast, pure-Ruby Markdown-superset converter
 .SH SYNOPSIS
@@ -6,9 +6,10 @@ kramdown \- a fast, pure-Ruby Markdown-superset converter
 [\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.
+kramdown is primarily used for parsing a superset of Markdown and converting it to different output
+formats. It supports standard Markdown (with some minor modifications) and various extensions like
+tables and definition lists. Due to its modular architecture it also allows other input formats than
+Markdown, for example, HTML.
 
 If \fIFILE\fR is not specified, kramdown reads from the standard input. The result is written to the
 standard output.
@@ -18,8 +19,11 @@ used directly by the kramdown binary. The second set of options controls how kra
 converts its input.
 .SH OPTIONS
 .TP
-.B \-f, \-\-format ARG
-Specify the output format. Available output formats: html (this is the default) or latex.
+.B \-i, \-\-input ARG
+Specify the input format. Available input formats: kramdown (this is the default) or html.
+.TP
+.B \-o, \-\-output ARG
+Specify the output format. Available output formats: html (this is the default), kramdown or latex.
 .TP
 .B \-v, \-\-version
 Show the version of kramdown.
@@ -53,7 +57,7 @@ Used by: all converters
 
 
 .TP
-.B \-\-[no\-]auto_ids
+.B \-\-[no\-]auto-ids
 
 Use automatic header ID generation
 
@@ -65,7 +69,7 @@ Used by: HTML/Latex converter
 
 
 .TP
-.B \-\-auto_id_prefix ARG
+.B \-\-auto-id-prefix ARG
 
 Prefix used for automatically generated heaer IDs
 
@@ -79,7 +83,7 @@ Used by: HTML/Latex converter
 
 
 .TP
-.B \-\-[no\-]parse_block_html
+.B \-\-[no\-]parse-block-html
 
 Process kramdown syntax in block HTML tags
 
@@ -93,7 +97,7 @@ Used by: kramdown parser
 
 
 .TP
-.B \-\-[no\-]parse_span_html
+.B \-\-[no\-]parse-span-html
 
 Process kramdown syntax in span HTML tags
 
@@ -105,7 +109,7 @@ Used by: kramdown parser
 
 
 .TP
-.B \-\-[no\-]html_to_native
+.B \-\-[no\-]html-to-native
 
 Convert HTML elements to native elements
 
@@ -122,7 +126,7 @@ Used by: kramdown parser
 
 
 .TP
-.B \-\-footnote_nr ARG
+.B \-\-footnote-nr ARG
 
 The number of the first footnote
 
@@ -134,24 +138,7 @@ 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
+.B \-\-coderay-wrap ARG
 
 Defines how the highlighted code should be wrapped
 
@@ -162,7 +149,7 @@ Used by: HTML converter
 
 
 .TP
-.B \-\-coderay_line_numbers ARG
+.B \-\-coderay-line-numbers ARG
 
 Defines how and if line numbers should be shown
 
@@ -174,7 +161,7 @@ Used by: HTML converter
 
 
 .TP
-.B \-\-coderay_line_number_start ARG
+.B \-\-coderay-line-number-start ARG
 
 The start value for the line numbers
 
@@ -183,7 +170,7 @@ Used by: HTML converter
 
 
 .TP
-.B \-\-coderay_tab_width ARG
+.B \-\-coderay-tab-width ARG
 
 The tab width used in highlighted code
 
@@ -191,7 +178,7 @@ Used by: HTML converter
 
 
 .TP
-.B \-\-coderay_bold_every ARG
+.B \-\-coderay-bold-every ARG
 
 Defines how often a line number should be made bold
 
@@ -200,7 +187,7 @@ Used by: HTML converter
 
 
 .TP
-.B \-\-coderay_css ARG
+.B \-\-coderay-css ARG
 
 Defines how the highlighted code gets styled
 
@@ -212,8 +199,45 @@ Default: style
 Used by: HTML converter
 
 
+.TP
+.B \-\-entity-output ARG
+
+Defines how entities are output
+
+The possible values are :as_input (entities are output in the same
+form as found in the input), :numeric (entities are output in numeric
+form), :symbolic (entities are output in symbolic form if possible) or
+:as_char (entities are output as characters if possible, only available
+on Ruby 1.9).
+
+Default: :as_char
+Used by: HTML converter, kramdown converter
+
+
+.TP
+.B \-\-toc-depth ARG
+
+Defines the maximum level of headers which will be used to generate the table of
+contents. For instance, with a value of 2, toc entries will be generated for h1
+and h2 headers but not for h3, h4, etc. A value of 0 uses all header levels.
+
+Default: 0
+Used by: HTML/Latex converter
+
+
+.TP
+.B \-\-line-width ARG
+
+Defines the line width to be used when outputting a document
+
+Default: 72
+Used by: kramdown converter
+
+
+.SH EXIT STATUS
+The exit status is 0 if no error happened. Otherwise it is 1.
 .SH SEE ALSO
-The kramdown website, http://kramdown.rubyforge.org/ for more information, especially on the support
+The kramdown website, http://kramdown.rubyforge.org/ for more information, especially on the supported
 input syntax.
 .SH AUTHOR
 kramdown was written by Thomas Leitner <t_leitner@gmx.at>.

data/vendor/extensions/markdown_filter/vendor/kramdown/test/run_tests.rb

@@ -45,7 +45,7 @@ Dir[arg].each {|f| fwidth = [fwidth, f.length + 10].max }.each do |file|
   html_file = file.sub('.text', '.html')
   opts_file = file.sub('.text', '.options')
   opts_file = File.join(File.dirname(file), 'options') if !File.exist?(opts_file)
-  options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :filter_html => [], :footnote_nr => 1}
+  options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
   doc = Kramdown::Document.new(File.read(file), options)
   begin
     assert_equal(File.read(html_file), doc.to_html)

data/vendor/extensions/markdown_filter/vendor/kramdown/test/test_files.rb

@@ -25,6 +25,8 @@ require 'kramdown'
 require 'yaml'
 require 'tmpdir'
 
+Encoding.default_external = 'utf-8' if RUBY_VERSION >= '1.9'
+
 class TestFiles < Test::Unit::TestCase
 
   # Generate test methods for kramdown-to-xxx conversion
@@ -32,11 +34,13 @@ class TestFiles < Test::Unit::TestCase
     basename = text_file.sub(/\.text$/, '')
     opts_file = text_file.sub(/\.text$/, '.options')
     (Dir[basename + ".*"] - [text_file, opts_file]).each do |output_file|
-      output_format = File.extname(output_file)[1..-1]
+      next if (RUBY_VERSION >= '1.9' && File.exist?(output_file + '.19')) ||
+        (RUBY_VERSION < '1.9' && output_file =~ /\.19$/)
+      output_format = File.extname(output_file.sub(/\.19$/, ''))[1..-1]
       next if !Kramdown::Converter.const_defined?(output_format[0..0].upcase + output_format[1..-1])
       define_method('test_' + text_file.tr('.', '_') + "_to_#{output_format}") do
         opts_file = File.join(File.dirname(text_file), 'options') if !File.exist?(opts_file)
-        options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :filter_html => [], :footnote_nr => 1}
+        options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
         doc = Kramdown::Document.new(File.read(text_file), options)
         assert_equal(File.read(output_file), doc.send("to_#{output_format}"))
       end
@@ -49,7 +53,8 @@ class TestFiles < Test::Unit::TestCase
     warn("Skipping html-to-html 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/block/09_html/simple.html', # bc of xml elements
+                          'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
                          ]
     Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
       next if EXCLUDE_HTML_FILES.any? {|f| html_file =~ /#{f}$/}
@@ -61,7 +66,8 @@ class TestFiles < Test::Unit::TestCase
   end
 
   def tidy_output(out)
-    result = IO.popen("tidy -q -raw 2>/dev/null", 'r+') do |io|
+    cmd = "tidy -q --doctype omit #{RUBY_VERSION >= '1.9' ? '-utf8' : '-raw'} 2>/dev/null"
+    result = IO.popen(cmd, 'r+') do |io|
       io.write(out)
       io.close_write
       io.read
@@ -97,4 +103,60 @@ class TestFiles < Test::Unit::TestCase
     end
   end
 
+  # Generate test methods for text->kramdown->html conversion
+  `tidy -v 2>&1`
+  if $?.exitstatus != 0
+    warn("Skipping text->kramdown->html tests because tidy executable is missing")
+  else
+    EXCLUDE_TEXT_FILES = ['test/testcases/span/05_html/markdown_attr.text',  # bc of markdown attr
+                          'test/testcases/block/09_html/markdown_attr.text', # bc of markdown attr
+                          'test/testcases/span/extension/options.text',      # bc of parse_span_html option
+                          'test/testcases/block/12_extension/options.text',  # bc of options option
+                          'test/testcases/block/12_extension/options3.text', # bc of options option
+                          'test/testcases/block/09_html/content_model/tables.text',  # bc of parse_block_html option
+                          'test/testcases/block/09_html/html_to_native/header.text', # bc of auto_ids option that interferes
+                          'test/testcases/block/09_html/simple.text',        # bc of webgen:block elements
+                          'test/testcases/block/11_ial/simple.text',         # bc of change of ordering of attributes in header
+                          'test/testcases/span/extension/comment.text',      # bc of comment text modifications (can this be avoided?)
+                         ]
+    Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
+      next if EXCLUDE_TEXT_FILES.any? {|f| text_file =~ /#{f}$/}
+      define_method('test_' + text_file.tr('.', '_') + "_to_kramdown_to_html") do
+        html_file = text_file.sub(/\.text$/, '.html')
+        html_file += '.19' if RUBY_VERSION >= '1.9' && File.exist?(html_file + '.19')
+        opts_file = text_file.sub(/\.text$/, '.options')
+        opts_file = File.join(File.dirname(text_file), 'options') if !File.exist?(opts_file)
+        options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
+        kdtext = Kramdown::Document.new(File.read(text_file), options).to_kramdown
+        html = Kramdown::Document.new(kdtext, options).to_html
+        assert_equal(tidy_output(File.read(html_file)), tidy_output(html))
+      end
+    end
+  end
+
+  # Generate test methods for html-to-kramdown-to-html conversion
+  `tidy -v 2>&1`
+  if $?.exitstatus != 0
+    warn("Skipping html-to-kramdown-to-html tests because tidy executable is missing")
+  else
+    EXCLUDE_HTML_KD_FILES = ['test/testcases/span/extension/options.html',        # bc of parse_span_html option
+                             'test/testcases/span/05_html/normal.html',           # bc of br tag before closing p tag
+                             'test/testcases/block/12_extension/nomarkdown.html', # bc of nomarkdown extension
+                             'test/testcases/block/09_html/simple.html',          # bc of webgen:block elements
+                             'test/testcases/block/09_html/markdown_attr.html',   # bc of markdown attr
+                             'test/testcases/block/09_html/html_to_native/table_simple.html', # bc of invalidly converted simple table
+                             'test/testcases/block/06_codeblock/whitespace.html', # bc of entity to char conversion
+                             'test/testcases/block/11_ial/simple.html',           # bc of change of ordering of attributes in header
+                             'test/testcases/span/03_codespan/highlighting.html', # bc of span elements inside code element
+                            ]
+    Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
+      next if EXCLUDE_HTML_KD_FILES.any? {|f| html_file =~ /#{f}$/}
+      define_method('test_' + html_file.tr('.', '_') + "_to_kramdown_to_html") do
+        kd = Kramdown::Document.new(File.read(html_file), :input => 'html', :auto_ids => false, :footnote_nr => 1).to_kramdown
+        doc = Kramdown::Document.new(kd, :auto_ids => false, :footnote_nr => 1)
+        assert_equal(tidy_output(File.read(html_file)), tidy_output(doc.to_html))
+      end
+    end
+  end
+
 end

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/02_eob/middle.html

@@ -1,2 +1 @@
 
-

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.html

@@ -10,6 +10,9 @@
 
 <h6>This is a header</h6>
 
+<h1>Header</h1>
+<h1>Header</h1>
+
 <h2>Header</h2>
 <blockquote>
   <p>blockquote</p>
@@ -19,9 +22,9 @@
 <p>paragraph</p>
 
 <blockquote>
-  <p>blockquote</p>
+  <p>blockquote
+### not a header</p>
 </blockquote>
-<p>### not a header</p>
 
 <h3 id="id">Header</h3>
 

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/atx_header.text

@@ -10,7 +10,9 @@
 
 ###### This is a header
 
-
+# Header
+^
+# Header
 
 ##Header   #####
 > blockquote

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html

@@ -5,9 +5,8 @@
 <h2>test</h2>
 <p>para</p>
 
-<pre><code>   header
+<pre><code>   header =
 </code></pre>
-<p>=</p>
 
 <p>=</p>
 
@@ -17,10 +16,10 @@ And not a header.
 =================</p>
 
 <blockquote>
-  <p>Blockquote.</p>
+  <p>Blockquote.
+Not a Header
+&mdash;</p>
 </blockquote>
-<p>Not a Header</p>
-<hr />
 
 <h2 id="id">header</h2>
 

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/setext_header.html.19

@@ -0,0 +1,30 @@
+<h2>test</h2>
+
+<h1>test2</h1>
+
+<h2>test</h2>
+<p>para</p>
+
+<pre><code>   header =
+</code></pre>
+
+<p>=</p>
+
+<p>This is a para.
+With two lines.
+And not a header.
+=================</p>
+
+<blockquote>
+  <p>Blockquote.
+Not a Header
+—</p>
+</blockquote>
+
+<h2 id="id">header</h2>
+
+<h1 id="id">header</h1>
+
+<h2>header{#noid}</h2>
+
+<h2>header</h2>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/05_blockquote/lazy.html

@@ -0,0 +1,34 @@
+<blockquote>
+  <p>This is a long
+long line.</p>
+</blockquote>
+
+<blockquote>
+  <blockquote>
+    <p>Nested quote
+inside
+still inside</p>
+  </blockquote>
+</blockquote>
+
+<blockquote>
+  <blockquote>
+    <p>This is a subquote.
+over multipline lines.
+continuing
+here</p>
+  </blockquote>
+</blockquote>
+
+<blockquote>
+  <p>This is a quote
+    no code</p>
+</blockquote>
+
+<blockquote id="id">
+  <p>This is a quote</p>
+</blockquote>
+
+<blockquote>
+  <p>This is a quote</p>
+</blockquote>