kramdown 0.14.1 → 0.14.2

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    543 Thomas Leitner <t_leitner@gmx.at>
+    553 Thomas Leitner <t_leitner@gmx.at>
       6 Gioele Barabucci <gioele@svario.it>
       3 gettalong <t_leitner@gmx.at>
       3 Ben Armston <ben.armston@googlemail.com>

data/ChangeLog

@@ -1,3 +1,131 @@
+commit 2c5f0da1bd0ef6c91715522dfbe011c84274e627
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 20 13:55:59 2013 +0100
+
+    Updated release notes, version and homepage.
+
+doc/default.template
+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/img/graph-ruby-1.9.3p125-125.png
+doc/img/graph-ruby-1.9.3p327-327.png
+doc/img/graph-ruby-2.0.0dev--1.png
+doc/index.page
+doc/news/release_0_14_2.page
+doc/sidebar.template
+doc/tests.page
+lib/kramdown/version.rb
+
+commit 33c6e172569d50f783cc472d4648f089125cfea5
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 20 12:21:20 2013 +0100
+
+    Added webgen-tmp to gitignore
+
+.gitignore
+
+commit a830a73f20c16c97123be54ad8026366aae76f91
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 20 11:53:53 2013 +0100
+
+    Added new option link_defs for kramdown parser
+    
+    This option allows to pre-define link definitions that can be used
+    by reference style links in the document.
+
+lib/kramdown/options.rb
+lib/kramdown/parser/kramdown.rb
+test/testcases/span/01_link/reference.html
+test/testcases/span/01_link/reference.html.19
+test/testcases/span/01_link/reference.options
+test/testcases/span/01_link/reference.text
+
+commit 24811c707f7c271443936a78a43bc8136df522d9
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 13 16:27:07 2013 +0100
+
+    Removed unused parameter in Converter::Toc#add_to_toc private method
+
+lib/kramdown/converter/toc.rb
+
+commit a81b0b4a1054ff20de73fb9b96769d9ac2317e69
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 13 16:24:17 2013 +0100
+
+    Updated kramdown website
+    
+    * Now using webgen 1.0.0 for generating the site
+    * Added two additional menus to the sidebar for documentation
+      pages to make navigating between pages easier
+
+Rakefile
+doc/converter/html.page
+doc/converter/kramdown.page
+doc/converter/latex.page
+doc/converter/remove_html_tags.page
+doc/default.scss.css
+doc/default.template
+doc/documentation.page
+doc/documentation.template
+doc/index.page
+doc/metainfo
+doc/news.feed
+doc/news.page
+doc/options.page
+doc/parser/html.page
+doc/parser/kramdown.page
+doc/quickref.page
+doc/syntax.page
+doc/tests.page
+webgen.config
+
+commit 68572252546ba3251ae9630a197f94817ddec4c5
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 13 15:48:27 2013 +0100
+
+    Added Redcarpet to benchmark, benchmark must now be run manually for tests.page
+
+benchmark/benchmark.rb
+doc/tests.page
+
+commit c655bac7f8a26ec43ec5afc3182385245dcdfeb6
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 13 13:15:03 2013 +0100
+
+    Background of main content now always white regardless of its height
+
+doc/default.template
+doc/design.scss.css
+
+commit 2101d7b8ed8605cad70be804d484c687f9e2ba2a
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 13 09:12:03 2013 +0100
+
+    Mentioned that the coderay library must be installed for syntax highlighting to work
+
+doc/converter/html.page
+
+commit 1db179c7da8a886b8a1004b16b1ff19f4009f26e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 13 09:08:56 2013 +0100
+
+    Fixed bug with atx headers without header text
+
+lib/kramdown/parser/kramdown/header.rb
+test/testcases/block/04_header/atx_header.html
+test/testcases/block/04_header/atx_header.text
+
+commit 836778220d09a21409801b8e60b6645c2d1be94d
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jan 13 09:00:13 2013 +0100
+
+    Added helper methods for formatting the elements as HTML tags in HTML converter
+
+lib/kramdown/converter/html.rb
+
 commit 5971fc408de5137b38f1ebe95f47f3f6573a86ed
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Fri Nov 30 18:41:57 2012 +0100

data/Rakefile

@@ -8,9 +8,7 @@ rescue LoadError
 end
 
 begin
-  require 'webgen/webgentask'
   require 'webgen/page'
-  require 'webgen/website'
 rescue LoadError
 end
 
@@ -79,26 +77,13 @@ task :clobber do
   ruby "setup.rb clean"
 end
 
-
-if defined? Webgen
+if defined?(Webgen)
   desc "Generate the HTML documentation"
-  Webgen::WebgenTask.new('htmldoc') do |site|
-    site.clobber_outdir = true
-    site.config_block = lambda do |config|
-      config['sources'] = [['/', "Webgen::Source::FileSystem", 'doc']]
-      config['output'] = ['Webgen::Output::FileSystem', 'htmldoc']
-      config.default_processing_pipeline('Page' => 'erb,tags,kramdown,blocks,fragments')
-      config.optionsdisplay.items [], :mandatory => 'default'
-      config.kdlink.oid nil, :mandatory => true
-      config.kdlink.part nil, :mandatory => true
-      config['contentprocessor.tags.map']['options'] = 'OptionsDisplay'
-      config['contentprocessor.tags.map']['kdexample'] = 'KDExample'
-      config['contentprocessor.tags.map']['kdlink'] = 'KDLink'
-      config['contentprocessor.kramdown.options'][:coderay_line_numbers] = nil
-      require 'syck'
-      YAML::ENGINE.yamler = 'syck'
-    end
+  task :htmldoc do
+    ruby "-Ilib -S webgen"
   end
+  CLOBBER << "htmldoc/"
+  CLOBBER << "webgen-tmp"
 end
 
 if defined? RDoc::Task
@@ -319,55 +304,3 @@ EOF
 end
 
 task :clobber => ['dev:clobber']
-
-# Helper methods and misc  ###################################################################
-
-if defined? Webgen
-
-  class OptionsDisplay
-
-    include Webgen::Tag::Base
-
-    def call(tag, body, context)
-      param('optionsdisplay.items').collect do |opt|
-        Kramdown::Options.definitions[opt]
-      end.collect do |term|
-        lines = term.desc.split(/\n/)
-        first = lines.shift
-        rest = lines[0..-2].collect {|l| "  " + l}.join("\n")
-        "`#{term.name}`\n: #{first}\n#{rest}\n\n"
-      end.join("\n")
-    end
-
-  end
-
-  require 'cgi'
-
-  class KDExample
-
-    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'><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
-
-  end
-
-  class KDLink
-
-    include Webgen::Tag::Base
-
-    def call(tag, body, context)
-      link = "<a href='syntax.html##{param('kdlink.oid')}'>&rarr; Syntax for #{param('kdlink.part')}</a>"
-      "<div class='kdsyntaxlink'>#{link}\n</div>"
-    end
-
-  end
-
-end

data/VERSION

@@ -1 +1 @@
-0.14.1
+0.14.2

data/benchmark/benchmark.rb

@@ -7,6 +7,7 @@ require 'maruku'
 require 'maruku/version'
 require 'rdiscount'
 require 'bluefeather'
+require 'redcarpet'
 
 module MaRuKu::Errors
   def tell_user(s)
@@ -30,5 +31,6 @@ FILES.each do |file|
     b.report("BlueFeather #{BlueFeather::VERSION}") { RUNS.times { BlueFeather.parse(data) } }
     b.report("BlueCloth #{BlueCloth::VERSION}") { RUNS.times { BlueCloth.new(data).to_html } }
     b.report("RDiscount #{RDiscount::VERSION}") { RUNS.times { RDiscount.new(data).to_html } }
+    b.report("redcarpet #{Redcarpet::VERSION}") { RUNS.times { Redcarpet::Markdown.new(Redcarpet::Render::HTML).render(data) } }
   end
 end

data/doc/default.scss.css

@@ -81,33 +81,30 @@ aside a {
         opacity: 0;
     }
 
-    pre.kdexample-before {
-        width: 45%;
-        float: left;
-        margin: 0;
+    table.kdexample td {
+        vertical-align: top;
     }
 
-    pre.kdexample-before:hover + pre {
+    table.kdexample pre {
+        margin: 5px 0px;
+    }
+
+    .kdexample:hover .kdexample-after-source {
         display: block;
     }
 
-    pre.kdexample-after-source {
+    .kdexample-after-source {
         display: none;
-        width: 45%;
-        float: right;
         background-color: #ffffee;
         border: 2px solid #e6e8e9;
         margin: 0 10px;
         padding: 5px;
     }
 
-    div.kdexample-after-live {
-        width: 45%;
-        float: right;
-        clear: none;
+    .kdexample-after-live {
         background-color: #eeffee;
         border: 2px solid #e6e8e9;
-        margin: 0 10px 12px;
+        margin: 5px 0px 12px;
         padding: 5px;
     }
 

data/doc/default.template

@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta name="author" content="Thomas Leitner" />
-    <meta name="copyright" content="2009-2012 Thomas Leitner" />
+    <meta name="copyright" content="2009-2013 Thomas Leitner" />
     <meta name="description" content="kramdown is a fast, pure-Ruby Markdown-superset converter" />
     <meta name="keywords" content="ruby, kramdown, markdown, text markup" />
     <link href="{relocatable: default.css}" type="text/css" rel="stylesheet" media="screen,projection" />
@@ -19,12 +19,12 @@
       </hgroup>
 
       <nav>
-        {menu: {max_levels: 1, used_nodes: files}}
+        {menu: {options: {mi: {in_menu: true}, sort: sort_info, flatten: true}}}
       </nav>
     </header>
 
     <div id="wrapper">
-      <% if context.content_node.node_info[:page].blocks.has_key?('intro') %>
+      <% if context.content_node.blocks.has_key?('intro') %>
       <aside class="banner">
         <webgen:block name="intro" node="first" />
       </aside>
@@ -37,12 +37,13 @@
       </aside>
 
       <div id="content">
-        <webgen:block name="content" />
+        <webgen:block name="content" node="first" />
       </div>
+      <div style="clear:both"></div>
     </div>
 
     <footer>
-      <div class="float-left">Copyright © 2009-2012 Thomas Leitner</div>
+      <div class="float-left">Copyright © 2009-2013 Thomas Leitner</div>
       <div class="float-right">Generated by <a href="http://webgen.rubyforge.org">webgen</a></div>
     </footer>
 

data/doc/design.scss.css

@@ -259,7 +259,7 @@ nav {
 }
 
 aside {
-    position: absolute;
+    float: right;
     right: 0;
     background-color: white;
     width: 252px;

data/doc/documentation.page

@@ -3,6 +3,8 @@ title: Documentation
 in_menu: true
 sort_info: 7
 ---
+# kramdown Documentation
+
 ## Overview
 
 kramdown is first and foremost a library for converting text written in a superset of Markdown to
@@ -20,6 +22,10 @@ formats. The following input and output formats are currently supported:
 The [kramdown syntax page](syntax.html) describes in detail what is supported and how it differs
 from standard Markdown.
 
+For all available options have a look at the [options documentation](options.html) or have a look at
+a parser/converter page to see which options they support!
+
+
 ## Usage
 
 {:ruby: .language-ruby}

data/doc/documentation.template

@@ -0,0 +1,20 @@
+--- name:sidebar pipeline:erb,tags,kramdown
+<h1>Documentation</h1>
+
+* Parsers
+  * [kramdown](parser/kramdown.html)
+  * [Markdown](parser/markdown.html)
+  * [HTML](parser/html.html)
+* Converters
+  * [HTML](converter/html.html)
+  * [LaTeX](converter/latex.html)
+  * [kramdown](converter/kramdown.html)
+  * [RemoveHtmlTags](converter/remove_html_tags.html)
+* [Configuration Options](options.html)
+* [Tests](tests.html)
+
+<% if context.node.children.first && context.node.children.first.children.length > 1 %>
+<h1>Contents</h1>
+<% end %>
+
+{menu: {options: {descendants: true, levels: [3,6]}}}

data/doc/index.page

@@ -12,12 +12,13 @@ its parsers/converters. The [quick reference](quickref.html) provides a overview
 you need a more detailed description of the superset of Markdown which kramdown supports the [syntax
 page](syntax.html) is the place to go!
 
-{tikz:: path: overview.png
+{tikz::
+path: overview.png
 img_attr: {style: 'background:transparent'}
-libraries: [mindmap, trees, arrows]
-transparent: true
-resolution: 300 100
-opts: |
+content_processor.tikz.libraries: [mindmap, trees, arrows]
+content_processor.tikz.transparent: true
+content_processor.tikz.resolution: 300 100
+content_processor.tikz.opts: |
   mindmap, concept color=black, text=white,
   root concept/.append style={font=\Large},
   level 1 concept/.append style={font=\Large, minimum size=2.6cm},
@@ -85,7 +86,7 @@ Markdown implementations because kramdown borrowed many ideas from existing pack
 completely written in Ruby, supports standard Markdown (with some minor modifications) and various
 extensions that have been made popular by the [PHP Markdown Extra] package and [Maruku].
 
-It is probably the fastest pure-Ruby Markdown converter available (February 2012), being about 4x
+It is probably the fastest pure-Ruby Markdown converter available (January 2013), being about 4x
 faster than [Maruku] and about 5x faster than [BlueFeather].
 
 [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/

data/doc/metainfo

@@ -0,0 +1,3 @@
+--- alcn
+[converter/*.html, parser/*.html, documentation.en.html, options.en.html, tests.en.html]:
+  template: ../documentation.template

data/doc/news.feed

@@ -4,7 +4,7 @@ description: kramdown - a fast, pure Ruby Markdown-superset converter
 site_url: http://kramdown.rubyforge.org/
 author: Thomas Leitner
 author_url: http://kramdown.rubyforge.org
-number_of_entries: 10
-rss: false
-entries: [news/*.html]
+entries: {alcn: news/*.html, sort: sort_info, reverse: true, limit: 10}
+versions:
+  atom:
 

data/doc/news.page

@@ -12,10 +12,11 @@ sort_info: 30
 
 --- name:newsdata pipeline:erb
 <%
-context.content_node.tree.node_access[:alcn].select do |na,no|
-  na =~ /\/news\/.+/ && no.is_file?
-end.collect {|na,no| no}.sort.reverse.each do |node|
-  context.options['contentprocessor.kramdown.options'] = {:auto_id_prefix => node.lcn.tr('.', '-')}
+opts = {:alcn => '/news/*.html', :sort => 'sort_info', :reverse => true, :flatten => true}
+context.website.ext.item_tracker.add(context.dest_node, :nodes, :node_finder_option_set,
+  {:opts => opts, :ref_alcn => context.node.alcn}, :content)
+context.website.ext.node_finder.find(opts, context.node).each do |node|
+ # context.options['contentprocessor.kramdown.options'] = {:auto_id_prefix => node.lcn.tr('.', '-')}
 %>
 
 <div class='news-item'>