kramdown 0.6.0 → 0.7.0

data/ChangeLog

@@ -1,3 +1,349 @@
+commit 0e73d548e89a77b0318efa151aa1c6279d7f1c00
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri May 7 12:17:58 2010 +0200
+
+    Last changes before release
+
+doc/index.page
+doc/news/release_0_7_0.page
+
+commit c83af0ac96ea60aeb5d90afdfe31746106e0de9f
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 6 20:20:20 2010 +0200
+
+    Fixed small problem with :input document option
+
+lib/kramdown/document.rb
+
+commit 4c6261dad0dc80235a76866a54ed5a9bf55d6174
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 6 20:19:30 2010 +0200
+
+    Made kramdown parser class better subclass-able and added example subclass
+
+lib/kramdown/parser/kramdown.rb
+
+commit 1cb4d538ff62cfb78c88fdf858283c1902b8cd7d
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 6 16:53:11 2010 +0200
+
+    Modified block IAL syntax so that placing an IAL before an element is possible
+
+doc/news/release_0_7_0.page
+doc/syntax.page
+lib/kramdown/parser/kramdown.rb
+lib/kramdown/parser/kramdown/attribute_list.rb
+lib/kramdown/parser/kramdown/blank_line.rb
+lib/kramdown/parser/kramdown/blockquote.rb
+lib/kramdown/parser/kramdown/codeblock.rb
+lib/kramdown/parser/kramdown/eob.rb
+lib/kramdown/parser/kramdown/header.rb
+lib/kramdown/parser/kramdown/horizontal_rule.rb
+lib/kramdown/parser/kramdown/list.rb
+lib/kramdown/parser/kramdown/math.rb
+lib/kramdown/parser/kramdown/paragraph.rb
+lib/kramdown/parser/kramdown/table.rb
+test/testcases/block/11_ial/simple.html
+test/testcases/block/11_ial/simple.text
+
+commit d63445c83d7ccb545e649763454e0a5a2619295d
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 6 08:01:21 2010 +0200
+
+    Fixed problem with invalid IDs on news page
+
+doc/news.page
+
+commit eb9d114114f0a2333d149e4554805063689dac5a
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu May 6 08:00:24 2010 +0200
+
+    Updated HTML ToC generation to either create ordered or unordered lists
+
+doc/converter/html.page
+lib/kramdown/converter/html.rb
+
+commit 6fe31bd9900390ae389e884edc85f9f4bdd3070e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed May 5 08:27:50 2010 +0200
+
+    Added option for prefixing auto_ids with a string
+
+doc/news/release_0_7_0.page
+lib/kramdown/converter/base.rb
+lib/kramdown/options.rb
+test/testcases/block/04_header/with_auto_id_prefix.html
+test/testcases/block/04_header/with_auto_id_prefix.options
+test/testcases/block/04_header/with_auto_id_prefix.text
+
+commit e39be57de665f72d83c38c05ac243cb13f316516
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed May 5 08:08:52 2010 +0200
+
+    Implemented support for applying an IAL to a list item
+
+doc/news/release_0_7_0.page
+doc/syntax.page
+lib/kramdown/parser/kramdown/list.rb
+test/testcases/block/08_list/item_ial.html
+test/testcases/block/08_list/item_ial.text
+
+commit 598478881b809a6f76121ce5741d1105483e3276
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed May 5 08:03:32 2010 +0200
+
+    Fixed unnecessary recursions when replacing abbreviations
+
+lib/kramdown/parser/kramdown.rb
+
+commit 1994f6f62e2317d1a302668b7e237e8554eff47e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed May 5 07:56:30 2010 +0200
+
+    Invalid span IALs are now removed from the output
+
+doc/news/release_0_7_0.page
+doc/syntax.page
+lib/kramdown/parser/kramdown/attribute_list.rb
+test/testcases/span/ial/simple.html
+test/testcases/span/ial/simple.text
+
+commit c5a7ce9ca428258f275a9ad82277e8c430f0fd55
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed May 5 07:29:07 2010 +0200
+
+    Fixed problem with invalid error message
+
+lib/kramdown/document.rb
+
+commit 7da28a8abd9fa16dd5c8fc165b02d49af57e6cb8
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue May 4 20:12:55 2010 +0200
+
+    Added support for automatic generation of ToC
+
+doc/converter/html.page
+doc/converter/latex.page
+doc/news/release_0_7_0.page
+lib/kramdown/converter/html.rb
+lib/kramdown/converter/latex.rb
+
+commit 9c3272eaf95e11d655b3f49fe4c097e5b245c949
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon May 3 16:22:38 2010 +0200
+
+    Updated testing script to use all available rvm ruby versions
+
+benchmark/testing.sh
+
+commit 6776bfccbc1dd82a8dd54109d7dc61b5f6eba1b5
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon May 3 16:21:58 2010 +0200
+
+    Removed leading colon from option names
+
+doc/news/release_0_2_0.page
+doc/news/release_0_7_0.page
+
+commit 4c32df245a179a338b4295e1f84e8b7fb0b09c59
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon May 3 16:20:41 2010 +0200
+
+    Fixed ambiguity problem of new extension syntax
+    
+    The sequence {:comment} could mean an IAL with a reference to the comment ALD
+    or the beginning of the extension named comment. To resolve this problem,
+    extensions now have to begin with two colons
+
+doc/syntax.page
+lib/kramdown/parser/kramdown/extension.rb
+test/testcases/block/12_extension/comment.text
+test/testcases/block/12_extension/ignored.text
+test/testcases/block/12_extension/nomarkdown.text
+test/testcases/block/12_extension/options.text
+test/testcases/block/12_extension/options2.text
+test/testcases/block/12_extension/options3.text
+test/testcases/span/extension/comment.text
+test/testcases/span/extension/ignored.text
+test/testcases/span/extension/nomarkdown.text
+test/testcases/span/extension/options.text
+
+commit b48f6ede0237db9bf30cf79a4abd6841a1d70f49
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Apr 22 20:52:15 2010 +0200
+
+    Restructured syntax documentation
+
+doc/syntax.page
+
+commit 2c0d469ee9365a19b0a79752532e727310cfbe79
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Apr 22 07:41:26 2010 +0200
+
+    Updated documentation
+    
+    * Option names are now always used without the leading colon
+    * All converter specific options are now described on their respective
+      documentation page and not on the kramdown syntax page anymore
+
+Rakefile
+doc/converter/html.page
+doc/converter/latex.page
+doc/links.markdown
+doc/news/release_0_4_0.page
+doc/parser/kramdown.page
+doc/syntax.page
+
+commit c61f553f181f6bda2bcdb3e5e01a3716513e38db
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Apr 21 19:34:38 2010 +0200
+
+    Re-implemented custom extensions for docu as webgen tags
+
+Rakefile
+doc/quickref.page
+
+commit 210d61a1ddf5cceb89f5f29b7df4dd57d871cb76
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Apr 21 19:01:13 2010 +0200
+
+    Updated block extension code to use new syntax
+    
+    The old code is still available and will be removed in a future
+    version of kramdown.
+
+doc/news/release_0_7_0.page
+lib/kramdown/parser/kramdown.rb
+lib/kramdown/parser/kramdown/extension.rb
+test/testcases/block/12_extension/comment.text
+test/testcases/block/12_extension/ignored.html
+test/testcases/block/12_extension/ignored.text
+test/testcases/block/12_extension/nomarkdown.text
+test/testcases/block/12_extension/options.text
+test/testcases/block/12_extension/options2.text
+test/testcases/block/12_extension/options3.text
+
+commit 2f7b852c80a185f63f8ea77bf56833c345669264
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Apr 21 08:44:00 2010 +0200
+
+    Implemented support for span extension using the new syntax
+
+doc/news/release_0_7_0.page
+doc/quickref.page
+doc/syntax.page
+lib/kramdown/parser/kramdown.rb
+lib/kramdown/parser/kramdown/extension.rb
+test/testcases/span/extension/comment.html
+test/testcases/span/extension/comment.text
+test/testcases/span/extension/ignored.html
+test/testcases/span/extension/ignored.text
+test/testcases/span/extension/nomarkdown.html
+test/testcases/span/extension/nomarkdown.text
+test/testcases/span/extension/options.html
+test/testcases/span/extension/options.text
+
+commit 4bc26bba49b53259c5bea118459298aaf0eca663
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue Apr 20 17:44:45 2010 +0200
+
+    Added deprecation warning for old extension parser
+
+doc/news/release_0_7_0.page
+lib/kramdown/parser/kramdown/extension.rb
+
+commit 6ffc5f341f26637391c669c9f47b59cffde88adc
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Apr 18 08:33:34 2010 +0200
+
+    Fixed check-in of invalid file
+
+test/testcases/span/abbreviations/.abbrev.html.swp
+
+commit f0d4f182db8b04d631da27fe2ec1fb8347f6b50b
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Apr 18 08:32:59 2010 +0200
+
+    Moved option :auto_ids from parser to converters
+
+doc/news/release_0_7_0.page
+doc/quickref.page
+lib/kramdown/converter/base.rb
+lib/kramdown/converter/html.rb
+lib/kramdown/converter/latex.rb
+lib/kramdown/options.rb
+lib/kramdown/parser/kramdown/header.rb
+test/testcases/block/11_ial/auto_id_and_ial.html
+test/testcases/block/11_ial/auto_id_and_ial.text
+test/testcases/block/12_extension/options.html
+test/testcases/block/12_extension/options.text
+
+commit e846fd69fe278880c1bb2559f0378c31e64b1cfe
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Apr 16 11:58:12 2010 +0200
+
+    Added syntax support for abbreviations
+
+doc/news/release_0_7_0.page
+doc/quickref.page
+doc/syntax.page
+lib/kramdown/converter/html.rb
+lib/kramdown/converter/latex.rb
+lib/kramdown/parser/kramdown.rb
+lib/kramdown/parser/kramdown/abbreviation.rb
+test/testcases/span/abbreviations/.abbrev.html.swp
+test/testcases/span/abbreviations/abbrev.html
+test/testcases/span/abbreviations/abbrev.text
+test/testcases/span/abbreviations/abbrev_defs.html
+test/testcases/span/abbreviations/abbrev_defs.text
+
+commit 719f35ee0046328f661581915d10899ba21cd39b
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Apr 9 10:26:04 2010 +0200
+
+    Fixed special case of smart quotes parsing
+
+doc/news/release_0_7_0.page
+lib/kramdown/parser/kramdown/smart_quotes.rb
+test/testcases/span/text_substitutions/typography.html
+test/testcases/span/text_substitutions/typography.text
+
+commit 6e9dd27242cb193900c975822d534a20a5754144
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Apr 9 10:25:29 2010 +0200
+
+    Fixed dependency problem in Rakefile
+    
+    Rakefile should always load fine even if webgen is not installed.
+
+Rakefile
+
+commit d6c22539b6c8513f059f27e5560831dc49a5b578
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Apr 9 10:18:57 2010 +0200
+
+    Fixed problem with invalid error reporting
+
+lib/kramdown/document.rb
+
+commit 6a957f7a635b26677e80efb68538238eaba07fd6
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Apr 7 17:39:44 2010 +0200
+
+    Removed deprecated CLI option -f
+
+bin/kramdown
+doc/news/release_0_7_0.page
+
+commit 7a20c25cf1490f84a4ddca12431d4df282326d6f
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed Apr 7 09:44:49 2010 +0200
+
+    Bumped version number and added news file
+
+doc/news/release_0_7_0.page
+lib/kramdown/version.rb
+
 commit 01986057b7e458aaf352f7d8fddb587ae2fcc16e
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Tue Apr 6 12:13:36 2010 +0200

data/Rakefile

@@ -62,7 +62,11 @@ if defined? Webgen
       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'
     end
   end
 
@@ -272,45 +276,48 @@ task :clobber => ['dev:clobber']
 
 # Helper methods and misc  ###################################################################
 
+if defined? Webgen
 
-class OptionsDisplay
+  class OptionsDisplay
 
-  include Webgen::Tag::Base
+    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.inspect}`\n: #{first}\n#{rest}"
-    end.join("\n")
-  end
+    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}"
+      end.join("\n")
+    end
 
-end
+  end
 
+  require 'cgi'
 
-module Kramdown
+  class KDExample
 
-  class Parser::Kramdown::Extension
+    include Webgen::Tag::Base
 
-    def parse_kdexample(parser, opts, body)
-      wrap = Element.new(:html_element, 'div', :attr => {'class' => 'kdexample'})
-      wrap.children << Element.new(:codeblock, body, :attr => {'class' => 'kdexample-before'})
-      doc = ::Kramdown::Document.new(body)
-      wrap.children << Element.new(:codeblock, doc.to_html,  :attr => {'class' => 'kdexample-after-source'})
-      wrap.children << Element.new(:html_element, 'div', :attr => {'class' => 'kdexample-after-live'})
-      wrap.children.last.children << Element.new(:raw, doc.to_html)
-      parser.tree.children << wrap
-      parser.tree.children << Element.new(:html_element, 'div', :attr => {'class' => 'clear'})
+    def call(tag, body, context)
+      result = ::Kramdown::Document.new(body).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>"
+      afterhtml = "<div class='kdexample-after-live'>#{result}</div>"
+      "<div class='kdexample'>#{before}#{after}#{afterhtml}\n</div><div class='clear'></div>"
     end
 
-    def parse_kdlink(parser, opts, body)
-      wrap = Element.new(:html_element, 'div', :attr => {'class' => 'kdsyntaxlink'})
-      wrap.children << Element.new(:a, nil, :attr => {'href' => "syntax.html##{opts['id']}"})
-      wrap.children.last.children << Element.new(:text, "&rarr; Syntax for #{opts['part']}")
-      parser.tree.children << wrap
+  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

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/benchmark/testing.sh

@@ -2,7 +2,7 @@
 
 source ~/.bashrc
 
-for VERSION in 1.8.5 1.8.6 1.8.7 1.9.1 1.9.2 'jruby 1.4.0'; do
+for VERSION in `rvm list strings`; do
 	rvm $VERSION
 	echo $(ruby -v)
 	RUBYOPT=-rubygems rake test