kramdown 0.13.2 → 0.13.3

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    455 Thomas Leitner <t_leitner@gmx.at>
+    472 Thomas Leitner <t_leitner@gmx.at>
       3 Ben Armston <ben.armston@googlemail.com>
       3 Alex Marandon <contact@alexmarandon.com>
       1 Damien Pollet <damien.pollet@gmail.com>

data/ChangeLog

@@ -1,3 +1,199 @@
+commit 91889069d843273d5847330cdce4b1068e74108f
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri May 6 15:39:50 2011 +0200
+
+    Fixed problems with running tests
+
+lib/kramdown/utils/ordered_hash.rb
+test/test_files.rb
+
+commit fb83e9d8534b7f2b6f3143e9f394bc3c03c3e219
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri May 6 15:17:22 2011 +0200
+
+    Updated benchmark graphs
+
+doc/img/graph-jruby-1.5.3-249.png
+doc/img/graph-jruby-1.6.0-330.png
+doc/img/graph-ruby-1.8.5-231.png
+doc/img/graph-ruby-1.8.6-399.png
+doc/img/graph-ruby-1.8.7-249.png
+doc/img/graph-ruby-1.8.7-302.png
+doc/img/graph-ruby-1.9.2p136-136.png
+doc/tests.page
+
+commit 05865df588767fa89996282719ab4a9302ab01a7
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri May 6 15:07:36 2011 +0200
+
+    Updated release notes and version for release
+
+doc/index.page
+doc/news/release_0_13_3.page
+doc/news/release_0_X_X.page
+lib/kramdown/version.rb
+
+commit 9766c5c47e45bff0b92e96e5b6dc926cfb219941
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 5 17:45:34 2011 +0200
+
+    Nicer HTML block element output in kramdown converter
+
+lib/kramdown/converter/kramdown.rb
+
+commit c40c34b28de32114d4b62a5e0ff6858209eae8f4
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 5 17:45:07 2011 +0200
+
+    Fixed kramdown converter to correctly output table cells with attributes
+
+doc/news/release_0_X_X.page
+lib/kramdown/converter/kramdown.rb
+
+commit 3317b5ebf72ba96423c643275ee40bee54a57de9
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 5 17:42:33 2011 +0200
+
+    Fixed HTML-to-native conversion of unsupported HTML elements
+    
+    The conversion of HTML elements that have no native representation was
+    flawed because they were processed like elements with a native
+    representation.
+
+doc/news/release_0_X_X.page
+lib/kramdown/parser/html.rb
+test/testcases/block/09_html/content_model/tables.html
+test/testcases/block/09_html/content_model/tables.text
+test/testcases/block/09_html/html_to_native/emphasis.html
+test/testcases/block/09_html/html_to_native/table_normal.html
+test/testcases/block/09_html/html_to_native/table_simple.html
+
+commit b598a800dad68766b728545a0c1137eee33ac36a
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 5 17:31:34 2011 +0200
+
+    Updated HTML parser to support more HTML5 elements
+
+doc/news/release_0_X_X.page
+lib/kramdown/parser/html.rb
+
+commit 7a6512cd034f4ff11f2b8a5d63d8aafdb07df95d
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon May 2 15:28:33 2011 +0200
+
+    Table cell alignments in HTML are now done using a style attribute on the cells
+
+doc/news/release_0_X_X.page
+lib/kramdown/converter/html.rb
+lib/kramdown/parser/html.rb
+test/testcases/block/14_table/header.html
+
+commit 09b538a79b8074dfd6b1e31bf0390b5906c1da0e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sat Apr 30 08:05:14 2011 +0200
+
+    Fixed problem with footnotes in LaTeX tables
+    
+    The tabular environment doesn't support footnotes in LaTeX tables.
+    Therefore tables are now set using the longtable environment.
+
+data/kramdown/document.latex
+doc/news/release_0_X_X.page
+lib/kramdown/converter/latex.rb
+test/testcases/block/14_table/table_with_footnote.html
+test/testcases/block/14_table/table_with_footnote.latex
+test/testcases/block/14_table/table_with_footnote.text
+
+commit 33d07594485db205c327e9ace467538bd61d40c2
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Apr 28 17:27:06 2011 +0200
+
+    Fixed problems and inconsistencies in quick reference
+
+Rakefile
+doc/default.scss.css
+doc/news/release_0_X_X.page
+doc/quickref.page
+
+commit a0816c07176b3951a0d43908c581e45c61ea7468
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Apr 28 17:24:16 2011 +0200
+
+    Fixed problem with block HTML tag being treated as header text
+
+doc/news/release_0_X_X.page
+lib/kramdown/parser/kramdown.rb
+test/testcases/block/09_html/html_and_headers.html
+test/testcases/block/09_html/html_and_headers.text
+
+commit ebd006a9a6bc0d576420fe4bc137f6315af4c079
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon Apr 25 22:47:57 2011 +0200
+
+    Removed all <tt> tags from RDoc comments
+
+lib/kramdown/converter/base.rb
+lib/kramdown/converter/html.rb
+lib/kramdown/converter/latex.rb
+lib/kramdown/document.rb
+lib/kramdown/parser/base.rb
+lib/kramdown/parser/html.rb
+lib/kramdown/parser/kramdown.rb
+lib/kramdown/parser/kramdown/extensions.rb
+lib/kramdown/parser/kramdown/link.rb
+lib/kramdown/utils/html.rb
+
+commit 054aa7f5d610731ba13b326d5beca11a967d2c8a
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Apr 28 17:46:42 2011 +0200
+
+    Fixed bug in LaTeX image converter
+
+doc/news/release_0_X_X.page
+lib/kramdown/converter/latex.rb
+
+commit e1b83c85f9ae1f98f0305b1e8f8b3ce201fe3d4b
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Apr 28 17:41:40 2011 +0200
+
+    Fixed place where the document tree was modified during conversion
+
+doc/news/release_0_X_X.page
+lib/kramdown/converter/kramdown.rb
+test/test_files.rb
+
+commit 3a4aa5e3cafcc9d4c7922c31cda92430edb6b0ad
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon Apr 25 18:04:42 2011 +0200
+
+    Added OrderedHash#dup
+
+doc/news/release_0_X_X.page
+lib/kramdown/utils/ordered_hash.rb
+
+commit 23fdb20ad7604271d21c63ee8b9b4a3092872bb8
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Mar 4 15:26:44 2011 +0100
+
+    Adapted table parser patch from Masahiro Kitajima
+    
+    * "|a|`b`" was parsed as "|a`b`"
+    * error condition occured when parsing "|`a`"
+
+doc/news/release_0_X_X.page
+lib/kramdown/parser/kramdown/table.rb
+test/testcases/block/14_table/simple.html
+test/testcases/block/14_table/simple.html.19
+test/testcases/block/14_table/simple.text
+
+commit 9d0a09e8273ee6bd366bd61eab2b072102c40a9b
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Mar 4 14:50:37 2011 +0100
+
+    Added release notes file
+
+doc/news/release_0_X_X.page
+
 commit d26fde6293ac67157f58cc64339085e0a6bc2fc3
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Mon Feb 21 18:05:33 2011 +0100

data/Rakefile

@@ -233,7 +233,7 @@ EOF
       rf.configure
       rf.login
 
-      rf.userconfig["release_notes"] = REL_PAGE.blocks['content'].content
+      rf.userconfig["release_notes"] = REL_PAGE.blocks['content'].content.force_encoding('ASCII-8BIT')
       rf.userconfig["preformatted"] = false
 
       files = %w[.gem .tgz .zip].collect {|ext| "pkg/kramdown-#{Kramdown::VERSION}" + ext}
@@ -344,10 +344,12 @@ if defined? Webgen
     include Webgen::Tag::Base
 
     def call(tag, body, context)
+      body.strip!
       result = ::Kramdown::Document.new(body, :auto_ids => false).to_html
-      before = "<pre class='kdexample-before'>#{body}<code>\n</code></pre>"
-      after = "<pre class='kdexample-after-source'>#{CGI::escapeHTML(result)}<code>\n</code></pre>"
+      before = "<pre class='kdexample-before'><code>#{CGI::escapeHTML(body)}\n</code></pre>"
+      after = "<pre class='kdexample-after-source'><code>#{CGI::escapeHTML(result)}\n</code></pre>"
       afterhtml = "<div class='kdexample-after-live'>#{result}</div>"
+
       "<div class='kdexample'>#{before}#{after}#{afterhtml}\n</div><div class='clear'></div>"
     end
 

data/VERSION

@@ -1 +1 @@
-0.13.2
+0.13.3

data/data/kramdown/document.latex

@@ -28,9 +28,9 @@ encmap = {
 <% end %>
 \usepackage[T1]{fontenc}
 \usepackage{listings}
-\usepackage{hyperref}
 <% @converter.data[:packages].each {|pkg| %>\usepackage{<%= pkg %>}
 <% } %>
+\usepackage{hyperref}
 
 <% if @converter.data[:packages].include?('fancyvrb') %>
 \VerbatimFootnotes

data/doc/default.scss.css

@@ -435,13 +435,19 @@ body, table, code {
         pre.kdexample-before {
             width: 45%;
             float: left;
+            margin: 10px 10px 3px 10px;
+        }
+        pre.kdexample-before:hover + pre {
+            display: block;
         }
 
         pre.kdexample-after-source {
+            display: none;
             width: 45%;
             float: right;
             background-color: #ffffee;
             border: 2px solid #e6e8e9;
+            margin: 10px 10px 3px 10px;
             margin-left: 10px;
             margin-right: 10px;
             margin-bottom: 3px;
@@ -453,7 +459,7 @@ body, table, code {
             clear: right;
             background-color: #eeffee;
             border: 2px solid #e6e8e9;
-            margin: 0px 10px;
+            margin: 10px 10px 3px 10px;
             padding: 5px;
         }
 

data/doc/index.page

@@ -90,7 +90,7 @@ It is probably the fastest pure-Ruby Markdown converter available (January 2011)
 faster than [Maruku] and about 5x faster than [BlueFeather].
 
 <p class="a-center">
-The latest version of kramdown is <b>0.13.2</b> and it was released on <b>2011-02-21</b>.
+The latest version of kramdown is <b>0.13.3</b> and it was released on <b>2011-05-06</b>.
 </p>
 
 [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/

data/doc/quickref.page

@@ -20,8 +20,8 @@ kramdown has two main classes of elements: block and span-level elements. Block-
 used to create paragraphs, headers, lists and so on whereas span-level elements are used to markup
 text phrases as emphasized, as a link and so on.
 
-All examples below feature the kramdown source, the converted HTML source and the output as it
-appears in the browser. This looks like this:
+All examples below feature the kramdown source, the converted HTML source (shown when hovering over
+the kramdown source) and the output as it appears in the browser. This looks like this:
 
 <div class="kdexample">
 <pre class="kdexample-before"><code>kramdown example code</code></pre>
@@ -39,7 +39,8 @@ Live browser view of example code
 
 {kdlink: {oid: paragraphs, part: "paragraphs"}}
 
-Paragraphs are separated by one or more blank lines:
+Consecutive lines of text are considered to be one paragraph. As with other block level elements you
+have to add a blank line to separate it from the following block-level element:
 
 {kdexample::}
 The first paragraph.
@@ -62,6 +63,7 @@ which contains a hard line break.
 kramdown supports Setext style headers and atx style headers. A header must always be preceded by a
 blank line except at the beginning of the document:
 
+
 {kdexample::}
 First level header
 ==================
@@ -104,6 +106,7 @@ elements inside a blockquote:
 
 {kdexample::}
 > A sample blockquote.
+>
 > >Nested blockquotes are
 > >also possible.
 >
@@ -111,6 +114,15 @@ elements inside a blockquote:
 > This is the outer quote again.
 {kdexample}
 
+You may also be lazy with the `>` markers as long as there is no blank line:
+
+{kdexample::}
+> This is a blockquote
+continued on this
+and this line.
+
+But this is a separate paragraph.
+{kdexample}
 
 ## Code Blocks
 
@@ -167,7 +179,14 @@ to the list item:
 1. This is a list item
 2. And another item
 2. And the third one
-   with additional. text
+   with additional text
+{kdexample}
+
+As with block quotes, you may be lazy when using the list item marker:
+
+{kdexample::}
+* A list item
+with additional text
 {kdexample}
 
 As the content consists of block-level elements you can do things like the following:
@@ -298,7 +317,9 @@ level or span-level text, depending on the tag:
 <div style="float: right">
 Something that stays right and is not wrapped in a para.
 </div>
-{options: parse_block_html="true"}
+
+{::options parse_block_html="true" /}
+
 <div>
 This is wrapped in a para.
 </div>
@@ -372,14 +393,14 @@ Here is an example that shows how to insert comments into text:
 
 {kdexample::}
 This is a paragraph
-{:comment}
+{::comment}
 This is a comment which is
 completely ignored.
 {:/comment}
 ... paragraph continues here.
 
 Extensions can also be used
-inline {:nomarkdown}**see**{:/}!
+inline {::nomarkdown}**see**{:/}!
 {kdexample}
 
 As one can see from the above example, the syntax for extensions is nearly identical to that of
@@ -390,7 +411,7 @@ the extension name. Also, if the extension does not have a body, there needs to
 before the closing brace:
 
 {kdexample::}
-{:options auto_ids="false" /}
+{::options auto_ids="false" /}
 
 # Header without id
 {kdexample}

data/doc/tests.page

@@ -46,7 +46,7 @@ different Ruby interpreters:
 ![ruby 1.8.7p249]({relocatable: img/graph-ruby-1.8.7-249.png})
 ![ruby 1.8.7p302]({relocatable: img/graph-ruby-1.8.7-302.png})
 ![ruby 1.9.2p136]({relocatable: img/graph-ruby-1.9.2p136-136.png})
-![jruby 1.5.3]({relocatable: img/graph-jruby-1.5.3-249.png})
+![jruby 1.6.0]({relocatable: img/graph-jruby-1.6.0-330.png})
 
 [Markdown Test Suite]: http://daringfireball.net/projects/downloads/MarkdownTest_1.0.zip
 [MDTest]: http://www.michelf.com/docs/projets/mdtest-1.0.zip

data/lib/kramdown/converter/base.rb

@@ -40,8 +40,8 @@ module Kramdown
     #
     # Implementing a new converter is rather easy: just derive a new class from this class and put
     # it in the Kramdown::Converter module (the latter is only needed if auto-detection should work
-    # properly). Then you need to implement the <tt>convert(el)</tt> method which has to contain
-    # the conversion code for converting an element and has to return the conversion result.
+    # properly). Then you need to implement the #convert method which has to contain the conversion
+    # code for converting an element and has to return the conversion result.
     #
     # The actual transformation of the document tree can be done in any way. However, writing one
     # method per element type is a straight forward way to do it - this is how the Html and Latex
@@ -81,10 +81,10 @@ module Kramdown
       #
       # 1. Look in the current working directory for the template.
       #
-      # 2. Append <tt>.convertername</tt> (e.g. +.html+) to the template name and look for the
-      #    resulting file in the current working directory.
+      # 2. Append +.convertername+ (e.g. +.html+) to the template name and look for the resulting
+      #    file in the current working directory.
       #
-      # 3. Append <tt>.convertername</tt> to the template name and look for it in the kramdown data
+      # 3. Append +.convertername+ to the template name and look for it in the kramdown data
       #    directory.
       def self.convert(tree, options = {})
         converter = new(tree, ::Kramdown::Options.merge(options.merge(tree.options[:options] || {})))

data/lib/kramdown/converter/html.rb

@@ -28,8 +28,8 @@ module Kramdown
 
     # Converts a Kramdown::Document to HTML.
     #
-    # You can customize the HTML converter by sub-classing it and overriding the
-    # <tt>convert_NAME</tt> methods. Each such method takes the following parameters:
+    # You can customize the HTML converter by sub-classing it and overriding the +convert_NAME+
+    # methods. Each such method takes the following parameters:
     #
     # [+el+] The element of type +NAME+ to be converted.
     #
@@ -69,8 +69,8 @@ module Kramdown
       # The mapping of element type to conversion method.
       DISPATCHER = Hash.new {|h,k| h[k] = "convert_#{k}"}
 
-      # Dispatch the conversion of the element +el+ to a <tt>convert_TYPE</tt> method using the
-      # +type+ of the element.
+      # Dispatch the conversion of the element +el+ to a +convert_TYPE+ method using the +type+ of
+      # the element.
       def convert(el, indent = -@indent)
         send(DISPATCHER[el.type], el, indent)
       end
@@ -78,8 +78,8 @@ module Kramdown
       # Return the converted content of the children of +el+ as a string. The parameter +indent+ has
       # to be the amount of indentation used for the element +el+.
       #
-      # Pushes +el+ onto the <tt>@stack</tt> before converting the child elements and pops it from
-      # the stack afterwards.
+      # Pushes +el+ onto the @stack before converting the child elements and pops it from the stack
+      # afterwards.
       def inner(el, indent)
         result = ''
         indent += @indent
@@ -212,14 +212,7 @@ module Kramdown
       alias :convert_xml_pi :convert_xml_comment
 
       def convert_table(el, indent)
-        if el.options[:alignment].all? {|a| a == :default}
-          alignment = ''
-        else
-          alignment = el.options[:alignment].map do |a|
-            "#{' '*(indent + @indent)}" << (a == :default ? "<col />" : "<col align=\"#{a}\" />") << "\n"
-          end.join('')
-        end
-        "#{' '*indent}<table#{html_attributes(el.attr)}>\n#{alignment}#{inner(el, indent)}#{' '*indent}</table>\n"
+        "#{' '*indent}<table#{html_attributes(el.attr)}>\n#{inner(el, indent)}#{' '*indent}</table>\n"
       end
 
       def convert_thead(el, indent)
@@ -234,7 +227,13 @@ module Kramdown
       def convert_td(el, indent)
         res = inner(el, indent)
         type = (@stack[-2].type == :thead ? :th : :td)
-        "#{' '*indent}<#{type}#{html_attributes(el.attr)}>#{res.empty? ? entity_to_str(ENTITY_NBSP) : res}</#{type}>\n"
+        attr = el.attr
+        alignment = @stack[-3].options[:alignment][@stack.last.children.index(el)]
+        if alignment != :default
+          attr = el.attr.dup
+          attr['style'] = (attr.has_key?('style') ? "#{attr['style']}; ": '') << "text-align: #{alignment}"
+        end
+        "#{' '*indent}<#{type}#{html_attributes(attr)}>#{res.empty? ? entity_to_str(ENTITY_NBSP) : res}</#{type}>\n"
       end
 
       def convert_comment(el, indent)