kramdown 0.14.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGVjNDY0Nzc3OTdiZjA1Yzg2MTEwZWJjMGE2NjllNjJiYzk4OTk5OQ==
+  data.tar.gz: !binary |-
+    NzNlYWRiNGEyZjg2OTA0ZjA2Zjk3MmFlYTRkYzk4ZTBjNmE2ZTc0OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGRmZGQ1NjUwOWNlYzM0NjIyZDczNTliYWE0OGM1NjQwYTdkN2VkY2Y4MDIz
+    YTMwZjE1ZTYyNDAyNDlkZTc2ZjdhZDJjNWVlYmZiZTFlZTRkMzE0MjZhMmM1
+    ZDljMzJkNzQyZGM4NzFiMDQ3MTIwMjBhZWRkOTg0ZjhiNjAwNjI=
+  data.tar.gz: !binary |-
+    ZDg2ZDA4MDc2ZjMxYmZlNzk4NDk4YzI4MTM5ZTAyZjYwNTk4ZTNmNjFjNGE2
+    ZmEyZDU4OTRiYjc2MjU4NTEyZTAwMTA0MTJiNGI2NmNmNGRjZDFlMDI3M2Nl
+    Y2RhZmJiNDBkZTM0ZjMzYzk2N2U3YmViNDVkY2YxMjE2MDJlNDg=

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    553 Thomas Leitner <t_leitner@gmx.at>
+    571 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>
@@ -9,6 +9,7 @@
       1 tomykaira <tomykaira@gmail.com>
       1 Tim Bates <tim@rumpuslabs.com>
       1 Postmodern <postmodern.mod3@gmail.com>
+      1 myqlarson <myqlarson@gmail.com>
       1 Michal Till <michal.till@gmail.com>
       1 John Croisant <jacius@gmail.com>
       1 Joe Fiorini <joe@faithfulgeek.org>

data/COPYING

@@ -1,18 +1,24 @@
 kramdown - fast, pure-Ruby Markdown-superset converter
-Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+Copyright (C) 2009-2013 Thomas Leitner <t_leitner@gmx.at>
 
-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.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-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.
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 Some test cases and the benchmark files are based on test cases from

data/README.md

@@ -1,5 +1,16 @@
 # kramdown
 
+## Readme first!
+
+kramdown was originally licensed under the GPL until the 1.0.0 release. However, due to the many
+requests it is now released under the MIT license and therefore can easily be used in commercial
+projects, too.
+
+However, if you use kramdown in a commerical setting, please consider **contributing back any
+changes** for the benefit of the community and/or **making a donation** (see the links in the
+sidebar on the [kramdown homepage](http://kramdown.rubyforge.org/)!
+
+
 ## Introduction
 
 kramdown is yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition and
@@ -47,4 +58,4 @@ probably want to install `rake` so that you can use the provided rake tasks. Asi
 
 ## License
 
-GPLv3 - see the **COPYING** file.
+MIT - see the **COPYING** file.

data/Rakefile

@@ -26,7 +26,7 @@ begin
       require 'kramdown/options'
 
       # Add options documentation to Kramdown::Options module
-      opt_module = RDoc::TopLevel.all_classes_and_modules.find {|m| m.full_name == 'Kramdown::Options'}
+      opt_module = @store.all_classes_and_modules.find {|m| m.full_name == 'Kramdown::Options'}
       opt_defs = Kramdown::Options.definitions.sort.collect do |n, definition|
         desc = definition.desc.split(/\n/).map {|l| "    #{l}"}
         desc[-2] = []
@@ -125,8 +125,8 @@ EOF
   PKG_FILES = FileList.new([
                             'Rakefile',
                             'setup.rb',
-                            'COPYING', 'GPL', 'README.md', 'AUTHORS',
-                            'VERSION', 'ChangeLog', 'CONTRIBUTERS',
+                            'COPYING', 'README.md', 'AUTHORS',
+                            'VERSION', 'CONTRIBUTERS',
                             'bin/*',
                             'benchmark/*',
                             'lib/**/*.rb',
@@ -142,12 +142,6 @@ EOF
     File.open('VERSION', 'w+') {|file| file.write(Kramdown::VERSION + "\n")}
   end
 
-  CLOBBER << 'ChangeLog'
-  file 'ChangeLog' do
-    puts "Generating ChangeLog file"
-    `git log --name-only > ChangeLog`
-  end
-
   CLOBBER << 'CONTRIBUTERS'
   file 'CONTRIBUTERS' do
     puts "Generating CONTRIBUTERS file"
@@ -178,6 +172,7 @@ EOF
       s.version = Kramdown::VERSION
       s.summary = SUMMARY
       s.description = DESCRIPTION
+      s.license = 'MIT'
 
       #### Dependencies, requirements and files
       s.files = PKG_FILES.to_a
@@ -222,7 +217,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}
@@ -241,7 +236,7 @@ EOF
       rf.configure
       rf.login
 
-      content = REL_PAGE.blocks['content'].content
+      content = REL_PAGE.blocks['content']
       content += "\n\n\nAbout kramdown\n\n#{SUMMARY}\n\n#{DESCRIPTION}"
       rf.post_news('kramdown', "kramdown #{Kramdown::VERSION} released", content)
       puts "done"
@@ -264,22 +259,9 @@ EOF
   COPYRIGHT=<<EOF
 #
 #--
-# Copyright (C) 2009-2012 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.
+# Copyright (C) 2009-2013 Thomas Leitner <t_leitner@gmx.at>
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 EOF

data/VERSION

@@ -1 +1 @@
-0.14.2
+1.0.0

data/benchmark/testing.sh

@@ -2,8 +2,11 @@
 
 source ~/.bashrc
 
+COMMAND="$@"
+if [[ -z "$COMMAND" ]]; then COMMAND="rake test"; fi
+
 for VERSION in `rvm list strings | sort`; do
 	rvm $VERSION
 	echo $(ruby -v)
-	RUBYOPT=-rubygems rake test
+	RUBYOPT=-rubygems $COMMAND
 done

data/bin/kramdown

@@ -2,22 +2,9 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2013 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/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 

data/doc/index.page

@@ -71,7 +71,6 @@ Markdown implementations because kramdown borrowed many ideas from existing pack
 
 * Thomas Leitner
 * e-Mail: <t_leitner@gmx.at>
-* GPG Key-Id: 0xB2D0A854
 
 
 [PHP Markdown Extra]: http://michelf.com/projects/php-markdown/extra/
@@ -81,12 +80,12 @@ Markdown implementations because kramdown borrowed many ideas from existing pack
 
 --- name:intro
 
-**kramdown** (sic, not Kramdown or KramDown, just kramdown) is a *free* GPL-licensed
+**kramdown** (sic, not Kramdown or KramDown, just kramdown) is a *free* MIT-licensed
 [Ruby](http://www.ruby-lang.org) library for parsing and converting a superset of Markdown. It is
 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 (January 2013), being about 4x
+It is probably the fastest pure-Ruby Markdown converter available (March 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/news.feed

@@ -1,7 +1,6 @@
 ---
 title: kramdown News
 description: kramdown - a fast, pure Ruby Markdown-superset converter
-site_url: http://kramdown.rubyforge.org/
 author: Thomas Leitner
 author_url: http://kramdown.rubyforge.org
 entries: {alcn: news/*.html, sort: sort_info, reverse: true, limit: 10}

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <b>0.14.2</b> and it was released
-on <b>2013-01-20</b>.</p>
+<p>The latest version of kramdown is <b>1.0.0</b> and it was released
+on <b>2013-03-10</b>.</p>
 
 <p>More <a href="{relocatable: news.html}">news</a>…</p>
 

data/doc/syntax.page

@@ -802,7 +802,7 @@ Given the above components, a table is specified by
 Also note
 
 * that the first line of a table must not have more than three spaces of indentation before the
-  first none space character,
+  first non-space character,
 * that each line of a table needs to have at least one not escaped pipe character so that kramdown
   recognizes it as a line belonging to the table and
 * that tables have to start and end on [block boundaries](#block-boundaries)!

data/doc/tests.page

@@ -83,9 +83,9 @@ different Ruby interpreters:
 ![ruby 1.8.6p399]({relocatable: img/graph-ruby-1.8.6-399.png})
 ![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})
-![ruby 1.9.3p327]({relocatable: img/graph-ruby-1.9.3p327-327.png})
-![ruby 2.0.0dev]({relocatable: img/graph-ruby-2.0.0dev--1.png})
+![ruby 1.9.2p320]({relocatable: img/graph-ruby-1.9.2p320-320.png})
+![ruby 1.9.3p392]({relocatable: img/graph-ruby-1.9.3p392-392.png})
+![ruby 2.0.0]({relocatable: img/graph-ruby-2.0.0p0-0.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.rb

@@ -1,22 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2013 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/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 

data/lib/kramdown/compatibility.rb

@@ -1,22 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2013 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/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 # All the code in this file is backported from Ruby 1.8.7 sothat kramdown works under 1.8.5

data/lib/kramdown/converter.rb

@@ -1,22 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2013 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/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 

data/lib/kramdown/converter/base.rb

@@ -1,26 +1,14 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2013 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/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
 require 'erb'
+require 'kramdown/utils'
 
 module Kramdown
 
@@ -90,6 +78,7 @@ module Kramdown
         converter = new(tree, ::Kramdown::Options.merge(options.merge(tree.options[:options] || {})))
         result = converter.convert(tree)
         result = apply_template(converter, result) if !converter.options[:template].empty?
+        result.encode!(tree.options[:encoding]) if result.respond_to?(:encode!)
         [result, converter.warnings]
       end
 
@@ -164,6 +153,7 @@ module Kramdown
       # Uses the option +auto_id_prefix+: the value of this option is prepended to every generated
       # ID.
       def generate_id(str)
+        str = ::Kramdown::Utils::Unidecoder.decode(str) if @options[:transliterated_header_ids]
         gen_id = str.gsub(/^[^a-zA-Z]+/, '')
         gen_id.tr!('^a-zA-Z0-9 -', '')
         gen_id.tr!(' ', '-')

data/lib/kramdown/converter/html.rb

@@ -1,22 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2013 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/>.
+# This file is part of kramdown which is licensed under the MIT.
 #++
 #
 
@@ -280,7 +267,7 @@ module Kramdown
         number = @footnote_counter
         @footnote_counter += 1
         @footnotes << [el.options[:name], el.value]
-        "<sup id=\"fnref:#{el.options[:name]}\"><a href=\"#fn:#{el.options[:name]}\" rel=\"footnote\">#{number}</a></sup>"
+        "<sup id=\"fnref:#{el.options[:name]}\"><a href=\"#fn:#{el.options[:name]}\" class=\"footnote\">#{number}</a></sup>"
       end
 
       def convert_raw(el, indent)
@@ -427,7 +414,7 @@ module Kramdown
           li.children = Marshal.load(Marshal.dump(data.children))
           ol.children << li
 
-          ref = Element.new(:raw, "<a href=\"#fnref:#{name}\" rel=\"reference\">&#8617;</a>")
+          ref = Element.new(:raw, "<a href=\"#fnref:#{name}\" class=\"reversefootnote\">&#8617;</a>")
           if li.children.last.type == :p
             para = li.children.last
           else