kramdown 0.13.6 → 0.13.7

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    501 Thomas Leitner <t_leitner@gmx.at>
+    513 Thomas Leitner <t_leitner@gmx.at>
       3 gettalong <t_leitner@gmx.at>
       3 Ben Armston <ben.armston@googlemail.com>
       3 Alex Marandon <contact@alexmarandon.com>

data/ChangeLog

@@ -1,3 +1,134 @@
+commit 0914bb652dad9ab1d48abc6de6da7a5ccc0e7996
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 09:48:58 2012 +0200
+
+    Updated release notes and version number
+
+doc/news/release_0_13_7.page
+doc/sidebar.template
+lib/kramdown/version.rb
+
+commit 02bdb1072156b80ef114afbf363db92b6c62f65f
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 09:42:26 2012 +0200
+
+    Docu fix
+
+doc/converter/html.page
+
+commit 6eeb2cc07876257eec1aaff77a213962378431e2
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 09:00:14 2012 +0200
+
+    Updated kramdown executable to specify output format chain
+    
+    This was needed since the new RemoteHtmlTags converter can only be
+    used before any standard converter.
+
+bin/kramdown
+man/man1/kramdown.1.erb
+
+commit af9adbc5a94e55e05023d609fb3fb9f6878dd645
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 08:59:13 2012 +0200
+
+    Implemented converter RemoveHtmlTags
+    
+    This converter conditionally removes all plain block and/or span
+    HTML elements from an element tree. The resulting tree should, in
+    most cases, only consist of native kramdown elements.
+
+doc/converter/remove_html_tags.page
+doc/documentation.page
+lib/kramdown/converter.rb
+lib/kramdown/converter/remove_html_tags.rb
+lib/kramdown/options.rb
+test/test_files.rb
+
+commit 912e905f952e5d1ffc3d2ce4973228bdd89a6750
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 08:45:21 2012 +0200
+
+    Doctype declaration is now correctly parsed independent of case
+
+lib/kramdown/parser/html.rb
+
+commit ae13451867f8ca9070c6e714c0183754992bcff1
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 07:28:10 2012 +0200
+
+    Fixed problem parsing multi-line link titles
+
+lib/kramdown/parser/kramdown/link.rb
+
+commit 8dc30e47144bde35bac1af8b74567fc09b553735
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 07:10:55 2012 +0200
+
+    Fixed problems with setting Symbol options
+    
+    * The nil value can now be specified by the String value 'nil'
+    * A colon at the start of a String value is removed before
+      converting the String value into a Symbol
+
+lib/kramdown/options.rb
+
+commit 4727a0a3816f149b9c7bea523b918602eb77962e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Jun 3 06:57:51 2012 +0200
+
+    Fixed bug RF#29575: Added &shy; entity
+
+lib/kramdown/converter/latex.rb
+lib/kramdown/utils/entities.rb
+
+commit 17625c80825a494065b5d9e4201f1e2fc6ab5104
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sat Jun 2 09:13:16 2012 +0200
+
+    Added new option for setting default coderay highlighting language
+
+doc/converter/html.page
+lib/kramdown/converter/html.rb
+lib/kramdown/options.rb
+test/testcases/block/06_codeblock/highlighting.html
+test/testcases/block/06_codeblock/highlighting.options
+test/testcases/block/06_codeblock/highlighting.text
+
+commit b0fed40ba8d863f349e3f90e7cc40146bf01507a
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sat Jun 2 08:54:07 2012 +0200
+
+    Fixed RF#29576: Footnotes in headers resulted in duplicated id attr in TOC
+    
+    Footnotes are now removed from the TOC to avoid this problem.
+
+lib/kramdown/converter/html.rb
+test/testcases/block/16_toc/toc_with_footnotes.html
+test/testcases/block/16_toc/toc_with_footnotes.options
+test/testcases/block/16_toc/toc_with_footnotes.text
+
+commit c3ae4a3a0272cb376947f95ad1444c1bd4878301
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sat Jun 2 08:52:39 2012 +0200
+
+    Fixed toc test cases
+    
+    Test went green although the meaning of the test was not
+    satisfied due to copy-paste.
+
+test/testcases/block/16_toc/no_toc.html
+test/testcases/block/16_toc/no_toc.options
+test/testcases/block/16_toc/toc_levels.options
+
+commit 56f3eb3c2610100c9785d98904d1dcd823e02917
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Mon May 21 21:56:07 2012 +0200
+
+    RF#29577: Fixed broken link
+
+doc/sidebar.template
+
 commit 40e6cde2d3e1a4f9f6bc14a243b22b4ae3311ca2
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Wed May 9 19:53:47 2012 +0200

data/VERSION

@@ -1 +1 @@
-0.13.6
+0.13.7

data/bin/kramdown

@@ -25,7 +25,7 @@ require 'optparse'
 require 'kramdown'
 
 options = {}
-format = 'html'
+format = ['html']
 OptionParser.new do |opts|
   opts.banner = "Usage: kramdown [options] [FILE FILE ...]"
   opts.summary_indent = ' '*4
@@ -35,7 +35,7 @@ OptionParser.new do |opts|
   opts.separator ""
 
   opts.on("-i", "--input ARG", "Specify the input format: kramdown (default) or html") {|v| options[:input] = v}
-  opts.on("-o", "--output ARG", "Specify the output format: html (default), kramdown or latex") {|v| format = v}
+  opts.on("-o", "--output ARG", Array, "Specify one or more output formats separated by commas: html (default), kramdown, latex or remove_html_tags") {|v| format = v}
 
   opts.on("-v", "--version", "Show the version of kramdown") do
     puts Kramdown::VERSION
@@ -70,7 +70,9 @@ end.parse!
 
 begin
   doc = Kramdown::Document.new(ARGF.read, options)
-  puts doc.send("to_#{format}")
+  result = ''
+  format.each {|f| result = doc.send("to_#{f}")}
+  puts result
   doc.warnings.each {|warn| $stderr.puts "Warning: #{warn}"}
 rescue Kramdown::Error => e
   $stderr.puts "Error: #{e.message}"

data/doc/documentation.page

@@ -9,9 +9,13 @@ kramdown is first and foremost a library for converting text written in a supers
 HTML. However, due to its modular architecture it is able to support additional input and output
 formats. The following input and output formats are currently supported:
 
-* Input: [kramdown](parser/kramdown.html) (a superset of Markdown), [Markdown](parser/markdown.html),
-  [HTML](parser/html.html)
-* Output: [HTML](converter/html.html), [LaTeX](converter/latex.html), [kramdown](converter/kramdown.html)
+* Input: [kramdown](parser/kramdown.html) (a superset of Markdown),
+  [Markdown](parser/markdown.html), [HTML](parser/html.html)
+
+* Output: [HTML](converter/html.html), [LaTeX](converter/latex.html),
+  [kramdown](converter/kramdown.html), [RemoveHtmlTags](converter/remove_html_tags.html) (a special
+  converter which removes HTML tags, normally used in conjunction with the LaTeX or kramdown
+  converters)
 
 The [kramdown syntax page](syntax.html) describes in detail what is supported and how it differs
 from standard Markdown.

data/doc/sidebar.template

@@ -1,9 +1,9 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <b>0.13.6</b> and it was released
-on <b>2012-05-09</b>.</p>
+<p>The latest version of kramdown is <b>0.13.7</b> and it was released
+on <b>2012-06-03</b>.</p>
 
-<p>More <a href="news.html">news</a>…</p>
+<p>More <a href="{relocatable: news.html}">news</a>…</p>
 
 <h2>Support kramdown</h2>
 

data/lib/kramdown/converter.rb

@@ -35,6 +35,7 @@ module Kramdown
     autoload :Latex, 'kramdown/converter/latex'
     autoload :Kramdown, 'kramdown/converter/kramdown'
     autoload :Toc, 'kramdown/converter/toc'
+    autoload :RemoveHtmlTags, 'kramdown/converter/remove_html_tags'
 
   end
 

data/lib/kramdown/converter/html.rb

@@ -108,12 +108,13 @@ module Kramdown
       end
 
       def convert_codeblock(el, indent)
-        if el.attr['lang'] && HIGHLIGHTING_AVAILABLE
+        if (el.attr['lang'] || @options[:coderay_default_lang]) && HIGHLIGHTING_AVAILABLE
           attr = el.attr.dup
           opts = {:wrap => @options[:coderay_wrap], :line_numbers => @options[:coderay_line_numbers],
             :line_number_start => @options[:coderay_line_number_start], :tab_width => @options[:coderay_tab_width],
             :bold_every => @options[:coderay_bold_every], :css => @options[:coderay_css]}
-          result = CodeRay.scan(el.value, attr.delete('lang').to_sym).html(opts).chomp << "\n"
+          lang = (attr.delete('lang') || @options[:coderay_default_lang]).to_sym
+          result = CodeRay.scan(el.value, lang).html(opts).chomp << "\n"
           "#{' '*indent}<div#{html_attributes(attr)}>#{result}#{' '*indent}</div>\n"
         else
           result = escape_html(el.value)
@@ -348,7 +349,7 @@ module Kramdown
           li = Element.new(:li, nil, nil, {:level => level})
           li.children << Element.new(:p, nil, nil, {:transparent => true})
           a = Element.new(:a, nil, {'href' => "##{id}"})
-          a.children.concat(children)
+          a.children.concat(remove_footnotes(Marshal.load(Marshal.dump(children))))
           li.children.last.children << a
           li.children << Element.new(type)
 
@@ -375,6 +376,14 @@ module Kramdown
         sections
       end
 
+      # Remove all footnotes from the given elements.
+      def remove_footnotes(elements)
+        elements.delete_if do |c|
+          remove_footnotes(c.children)
+          c.type == :footnote
+        end
+      end
+
       # Obfuscate the +text+ by using HTML entities.
       def obfuscate(text)
         result = ""

data/lib/kramdown/converter/latex.rb

@@ -429,6 +429,7 @@ module Kramdown
         174 => ['\textregistered'],
         170 => ['\textordfeminine'],
         172 => ['$\neg$'],
+        173 => ['\-'],
         176 => ['$\degree$', 'mathabx'],
         177 => ['$\pm$'],
         180 => ['\''],

data/lib/kramdown/converter/remove_html_tags.rb

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+#
+
+module Kramdown
+
+  module Converter
+
+    # Removes all block (and optionally span) level HTML tags from the element tree.
+    #
+    # This converter can be used on parsed HTML documents to get an element tree that will only
+    # contain native kramdown elements.
+    #
+    # *Note* that the returned element tree may not be fully conformant (i.e. the content models of
+    # *some elements may be violated)!
+    #
+    # This converter modifies the given tree in-place and returns it.
+    class RemoveHtmlTags < Base
+
+      def initialize(root, options)
+        super
+        @options[:template] = ''
+      end
+
+      def convert(el)
+        children = el.children.dup
+        index = 0
+        while index < children.length
+          if [:xml_pi].include?(children[index].type) ||
+              (children[index].type == :html_element && %w[style script].include?(children[index].value))
+            children[index..index] = []
+          elsif children[index].type == :html_element &&
+            ((@options[:remove_block_html_tags] && children[index].options[:category] == :block) ||
+             (@options[:remove_span_html_tags] && children[index].options[:category] == :span))
+            children[index..index] = children[index].children
+          else
+            convert(children[index])
+            index += 1
+          end
+        end
+        el.children = children
+        el
+      end
+
+    end
+
+  end
+end

data/lib/kramdown/options.rb

@@ -110,7 +110,9 @@ module Kramdown
                elsif @options[name].type == Float
                  Float(data) rescue raise Kramdown::Error, "Invalid float value for option '#{name}': '#{data}'"
                elsif @options[name].type == Symbol
-                 (data.strip.empty? ? nil : data.to_sym)
+                 data.strip!
+                 data = data[1..-1] if data[0] == ?:
+                 (data.empty? || data == 'nil' ? nil : data.to_sym)
                elsif @options[name].type == Boolean
                  data.downcase.strip != 'false' && !data.empty?
                end
@@ -253,7 +255,7 @@ EOF
     define(:coderay_line_numbers, Symbol, :inline, <<EOF)
 Defines how and if line numbers should be shown
 
-The possible values are :table, :inline, :list or nil. If this option is
+The possible values are :table, :inline or nil. If this option is
 nil, no line numbers are shown.
 
 Default: :inline
@@ -289,6 +291,17 @@ styles are directly applied to the code elements).
 
 Default: style
 Used by: HTML converter
+EOF
+
+    define(:coderay_default_lang, Symbol, nil, <<EOF)
+Sets the default language for highlighting.
+
+If no language is set for a code block, the default language is used
+instead. The value has to be one of the languages supported by coderay
+or nil if no default language should be used.
+
+Default: nil
+Used by: HTML converter
 EOF
 
     define(:entity_output, Symbol, :as_char, <<EOF)
@@ -368,6 +381,26 @@ EOF
       val
     end
 
+    define(:remove_block_html_tags, Boolean, true, <<EOF)
+Remove block HTML tags
+
+If this option is `true`, the RemoveHtmlTags converter removes
+block HTML tags.
+
+Default: true
+Used by: RemoveHtmlTags converter
+EOF
+
+    define(:remove_span_html_tags, Boolean, false, <<EOF)
+Remove span HTML tags
+
+If this option is `true`, the RemoveHtmlTags converter removes
+span HTML tags.
+
+Default: false
+Used by: RemoveHtmlTags converter
+EOF
+
   end
 
 end

data/lib/kramdown/parser/html.rb

@@ -37,7 +37,7 @@ module Kramdown
 
         #:stopdoc:
         # The following regexps are based on the ones used by REXML, with some slight modifications.
-        HTML_DOCTYPE_RE = /<!DOCTYPE.*?>/m
+        HTML_DOCTYPE_RE = /<!DOCTYPE.*?>/im
         HTML_COMMENT_RE = /<!--(.*?)-->/m
         HTML_INSTRUCTION_RE = /<\?(.*?)\?>/m
         HTML_ATTRIBUTE_RE = /\s*(#{REXML::Parsers::BaseParser::UNAME_STR})(?:\s*=\s*(["'])(.*?)\2)?/m

data/lib/kramdown/parser/kramdown/link.rb

@@ -60,7 +60,7 @@ module Kramdown
       LINK_BRACKET_STOP_RE = /(\])|!?\[/
       LINK_PAREN_STOP_RE = /(\()|(\))|\s(?=['"])/
       LINK_INLINE_ID_RE = /\s*?\[([^\]]+)?\]/
-      LINK_INLINE_TITLE_RE = /\s*?(["'])(.+?)\1\s*?\)/
+      LINK_INLINE_TITLE_RE = /\s*?(["'])(.+?)\1\s*?\)/m
       LINK_START = /!?\[(?=[^^])/
 
       # Parse the link at the current scanner position. This method is used to parse normal links as

data/lib/kramdown/utils/entities.rb

@@ -200,6 +200,7 @@ module Kramdown
                       [174, 'reg'],
                       [170, 'ordf'],
                       [172, 'not'],
+                      [173, 'shy'],
                       [176, 'deg'],
                       [177, 'plusmn'],
                       [180, 'acute'],

data/lib/kramdown/version.rb

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

data/man/man1/kramdown.1

@@ -23,7 +23,8 @@ converts its input.
 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.
+Specify one or more output formats separated by commas: html (default), kramdown, latex or
+remove_html_tags.
 .TP
 .B \-v, \-\-version
 Show the version of kramdown.
@@ -34,78 +35,66 @@ Show the help.
 .SH KRAMDOWN OPTIONS
 
 .TP
-.B \-\-template ARG
-
-The name of an ERB template file that should be used to wrap the output
+.B \-\-[no\-]remove-span-html-tags
 
-This is used to wrap the output in an environment so that the output can
-be used as a stand-alone document. For example, an HTML template would
-provide the needed header and body tags so that the whole output is a
-valid HTML file. If no template is specified, the output will be just
-the converted text.
+Remove span HTML tags
 
-When resolving the template file, the given template name is used first.
-If such a file is not found, the converter extension is appended. If the
-file still cannot be found, the templates name is interpreted as a
-template name that is provided by kramdown (without the converter
-extension).
+If this option is `true`, the RemoveHtmlTags converter removes
+span HTML tags.
 
-kramdown provides a default template named 'document' for each converter.
-
-Default: ''
-Used by: all converters
+Default: false
+Used by: RemoveHtmlTags converter
 
 
 .TP
-.B \-\-[no\-]auto-ids
-
-Use automatic header ID generation
+.B \-\-coderay-tab-width ARG
 
-If this option is `true`, ID values for all headers are automatically
-generated if no ID is explicitly specified.
+The tab width used in highlighted code
 
-Default: true
-Used by: HTML/Latex converter
+Used by: HTML converter
 
 
 .TP
-.B \-\-auto-id-prefix ARG
+.B \-\-toc-levels ARG
 
-Prefix used for automatically generated heaer IDs
+Defines the levels that are used for the table of contents
 
-This option can be used to set a prefix for the automatically generated
-header IDs so that there is no conflict when rendering multiple kramdown
-documents into one output file separately. The prefix should only
-contain characters that are valid in an ID!
+The individual levels can be specified by separating them with commas
+(e.g. 1,2,3) or by using the range syntax (e.g. 1..3). Only the
+specified levels are used for the table of contents.
 
-Default: ''
+Default: 1..6
 Used by: HTML/Latex converter
 
 
 .TP
-.B \-\-[no\-]parse-block-html
+.B \-\-[no\-]parse-span-html
 
-Process kramdown syntax in block HTML tags
+Process kramdown syntax in span HTML tags
 
 If this option is `true`, the kramdown parser processes the content of
-block HTML tags as text containing block-level elements. Since this is
-not wanted normally, the default is `false`. It is normally better to
-selectively enable kramdown processing via the markdown attribute.
+span HTML tags as text containing span-level elements.
 
-Default: false
+Default: true
 Used by: kramdown parser
 
 
 .TP
-.B \-\-[no\-]parse-span-html
+.B \-\-coderay-bold-every ARG
 
-Process kramdown syntax in span HTML tags
+Defines how often a line number should be made bold
 
-If this option is `true`, the kramdown parser processes the content of
-span HTML tags as text containing span-level elements.
+Default: 10
+Used by: HTML converter
 
-Default: true
-Used by: kramdown parser
+
+.TP
+.B \-\-line-width ARG
+
+Defines the line width to be used when outputting a document
+
+Default: 72
+Used by: kramdown converter
 
 
 .TP
@@ -126,76 +115,112 @@ Used by: kramdown parser
 
 
 .TP
-.B \-\-footnote-nr ARG
+.B \-\-coderay-css ARG
 
-The number of the first footnote
+Defines how the highlighted code gets styled
 
-This option can be used to specify the number that is used for the first
-footnote.
+Possible values are :class (CSS classes are applied to the code
+elements, one must supply the needed CSS file) or :style (default CSS
+styles are directly applied to the code elements).
 
-Default: 1
+Default: style
 Used by: HTML converter
 
 
 .TP
-.B \-\-coderay-wrap ARG
+.B \-\-latex-headers ARG
 
-Defines how the highlighted code should be wrapped
+Defines the LaTeX commands for different header levels
 
-The possible values are :span, :div or nil.
+The commands for the header levels one to six can be specified by
+separating them with commas.
 
-Default: :div
-Used by: HTML converter
+Default: section,subsection,subsubsection,paragraph,subparagraph,subsubparagraph
+Used by: Latex converter
 
 
 .TP
-.B \-\-coderay-line-numbers ARG
+.B \-\-footnote-nr ARG
 
-Defines how and if line numbers should be shown
+The number of the first footnote
 
-The possible values are :table, :inline, :list or nil. If this option is
-nil, no line numbers are shown.
+This option can be used to specify the number that is used for the first
+footnote.
 
-Default: :inline
+Default: 1
 Used by: HTML converter
 
 
 .TP
-.B \-\-coderay-line-number-start ARG
+.B \-\-template ARG
 
-The start value for the line numbers
+The name of an ERB template file that should be used to wrap the output
 
-Default: 1
-Used by: HTML converter
+This is used to wrap the output in an environment so that the output can
+be used as a stand-alone document. For example, an HTML template would
+provide the needed header and body tags so that the whole output is a
+valid HTML file. If no template is specified, the output will be just
+the converted text.
+
+When resolving the template file, the given template name is used first.
+If such a file is not found, the converter extension is appended. If the
+file still cannot be found, the templates name is interpreted as a
+template name that is provided by kramdown (without the converter
+extension).
+
+kramdown provides a default template named 'document' for each converter.
+
+Default: ''
+Used by: all converters
 
 
 .TP
-.B \-\-coderay-tab-width ARG
+.B \-\-coderay-default-lang ARG
 
-The tab width used in highlighted code
+Sets the default language for highlighting.
+
+If no language is set for a code block, the default language is used
+instead. The value has to be one of the languages supported by coderay
+or nil if no default language should be used.
 
+Default: nil
 Used by: HTML converter
 
 
 .TP
-.B \-\-coderay-bold-every ARG
+.B \-\-coderay-line-numbers ARG
 
-Defines how often a line number should be made bold
+Defines how and if line numbers should be shown
 
-Default: 10
+The possible values are :table, :inline or nil. If this option is
+nil, no line numbers are shown.
+
+Default: :inline
 Used by: HTML converter
 
 
 .TP
-.B \-\-coderay-css ARG
+.B \-\-smart-quotes ARG
 
-Defines how the highlighted code gets styled
+Defines the HTML entity names or code points for smart quote output
 
-Possible values are :class (CSS classes are applied to the code
-elements, one must supply the needed CSS file) or :style (default CSS
-styles are directly applied to the code elements).
+The entities identified by entity name or code point that should be
+used for, in order, a left single quote, a right single quote, a left
+double and a right double quote are specified by separating them with
+commas.
 
-Default: style
+Default: lsquo,rsquo,ldquo,rdquo
+Used by: HTML/Latex converter
+
+
+.TP
+.B \-\-coderay-wrap ARG
+
+Defines how the highlighted code should be wrapped
+
+The possible values are :span, :div or nil.
+
+Default: :div
 Used by: HTML converter
 
 
@@ -215,53 +240,66 @@ Used by: HTML converter, kramdown converter
 
 
 .TP
-.B \-\-toc-levels ARG
+.B \-\-auto-id-prefix ARG
 
-Defines the levels that are used for the table of contents
+Prefix used for automatically generated heaer IDs
 
-The individual levels can be specified by separating them with commas
-(e.g. 1,2,3) or by using the range syntax (e.g. 1..3). Only the
-specified levels are used for the table of contents.
+This option can be used to set a prefix for the automatically generated
+header IDs so that there is no conflict when rendering multiple kramdown
+documents into one output file separately. The prefix should only
+contain characters that are valid in an ID!
 
-Default: 1..6
+Default: ''
 Used by: HTML/Latex converter
 
 
 .TP
-.B \-\-line-width ARG
+.B \-\-[no\-]remove-block-html-tags
 
-Defines the line width to be used when outputting a document
+Remove block HTML tags
 
-Default: 72
-Used by: kramdown converter
+If this option is `true`, the RemoveHtmlTags converter removes
+block HTML tags.
 
+Default: true
+Used by: RemoveHtmlTags converter
 
-.TP
-.B \-\-latex-headers ARG
 
-Defines the LaTeX commands for different header levels
+.TP
+.B \-\-coderay-line-number-start ARG
 
-The commands for the header levels one to six can be specified by
-separating them with commas.
+The start value for the line numbers
 
-Default: section,subsection,subsubsection,paragraph,subparagraph,subsubparagraph
-Used by: Latex converter
+Default: 1
+Used by: HTML converter
 
 
 .TP
-.B \-\-smart-quotes ARG
+.B \-\-[no\-]auto-ids
 
-Defines the HTML entity names or code points for smart quote output
+Use automatic header ID generation
 
-The entities identified by entity name or code point that should be
-used for, in order, a left single quote, a right single quote, a left
-double and a right double quote are specified by separating them with
-commas.
+If this option is `true`, ID values for all headers are automatically
+generated if no ID is explicitly specified.
 
-Default: lsquo,rsquo,ldquo,rdquo
+Default: true
 Used by: HTML/Latex converter
 
 
+.TP
+.B \-\-[no\-]parse-block-html
+
+Process kramdown syntax in block HTML tags
+
+If this option is `true`, the kramdown parser processes the content of
+block HTML tags as text containing block-level elements. Since this is
+not wanted normally, the default is `false`. It is normally better to
+selectively enable kramdown processing via the markdown attribute.
+
+Default: false
+Used by: kramdown parser
+
+
 .SH EXIT STATUS
 The exit status is 0 if no error happened. Otherwise it is 1.
 .SH SEE ALSO

data/test/test_files.rb

@@ -166,7 +166,7 @@ class TestFiles < Test::Unit::TestCase
   Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
     opts_file = text_file.sub(/\.text$/, '.options')
     options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :footnote_nr => 1}
-    (Kramdown::Converter.constants.map {|c| c.to_sym} - [:Base]).each do |conv_class|
+    (Kramdown::Converter.constants.map {|c| c.to_sym} - [:Base, :RemoveHtmlTags]).each do |conv_class|
       define_method("test_whether_#{conv_class}_modifies_tree_with_file_#{text_file.tr('.', '_')}") do
         doc = Kramdown::Document.new(File.read(text_file), options)
         options_before = Marshal.load(Marshal.dump(doc.options))

data/test/testcases/block/06_codeblock/highlighting.html

@@ -0,0 +1,6 @@
+<div><span class="CodeRay">x = <span class="constant">Class</span>.new
+</span>
+</div>
+<div><span class="CodeRay"><span class="tag">&lt;a&gt;</span>href<span class="tag">&lt;/a&gt;</span>
+</span>
+</div>

data/test/testcases/block/06_codeblock/highlighting.options

@@ -0,0 +1,5 @@
+:coderay_default_lang: ruby
+:coderay_wrap: span
+:coderay_line_numbers: ~
+:coderay_css: class
+

data/test/testcases/block/06_codeblock/highlighting.text

@@ -0,0 +1,4 @@
+    x = Class.new
+^
+    <a>href</a>
+{: lang="html"}

data/test/testcases/block/16_toc/no_toc.html

@@ -1,33 +1,14 @@
-<ul id="markdown-toc">
-  <li><a href="#header-level-1">Header level 1</a>    <ul>
-      <li><a href="#header-level-2">Header level 2</a>        <ul>
-          <li><a href="#header-level-3">Header level 3</a>            <ul>
-              <li><a href="#header-level-4">Header level 4</a></li>
-            </ul>
-          </li>
-        </ul>
-      </li>
-    </ul>
-  </li>
-  <li><a href="#other-header-level-1">Other header level 1</a>    <ul>
-      <li><a href="#other-header-level-2">Other header level 2</a>        <ul>
-          <li><a href="#other-header-level-3">Other header level 3</a></li>
-        </ul>
-      </li>
-    </ul>
-  </li>
-</ul>
 
-<h1 id="header-level-1">Header level 1</h1>
+<h1>Header level 1</h1>
 
-<h2 id="header-level-2">Header level 2</h2>
+<h2>Header level 2</h2>
 
-<h3 id="header-level-3">Header level 3</h3>
+<h3>Header level 3</h3>
 
-<h4 id="header-level-4">Header level 4</h4>
+<h4>Header level 4</h4>
 
-<h1 id="other-header-level-1">Other header level 1</h1>
+<h1>Other header level 1</h1>
 
-<h2 id="other-header-level-2">Other header level 2</h2>
+<h2>Other header level 2</h2>
 
-<h3 id="other-header-level-3">Other header level 3</h3>
+<h3>Other header level 3</h3>

data/test/testcases/block/16_toc/toc_levels.options

@@ -1 +1,2 @@
 :toc_levels: 2..3
+:auto_ids: true

data/test/testcases/block/16_toc/toc_with_footnotes.html

@@ -0,0 +1,13 @@
+<ul id="markdown-toc">
+  <li><a href="#header1-level-1">Header level 1</a></li>
+</ul>
+
+<h1 id="header1-level-1">Header<sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup> level 1</h1>
+
+<div class="footnotes">
+  <ol>
+    <li id="fn:1">
+      <p>Some footnote content here<a href="#fnref:1" rel="reference">&#8617;</a></p>
+    </li>
+  </ol>
+</div>

data/test/testcases/block/16_toc/toc_with_footnotes.text

@@ -0,0 +1,6 @@
+* Here comes the table of content
+{:toc}
+
+# Header[^1] level 1
+
+[^1]: Some footnote content here

metadata

@@ -1,39 +1,50 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: kramdown
-version: !ruby/object:Gem::Version
-  version: 0.13.6
+version: !ruby/object:Gem::Version 
+  hash: 37
   prerelease: 
+  segments: 
+  - 0
+  - 13
+  - 7
+  version: 0.13.7
 platform: ruby
-authors:
+authors: 
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: coderay
-  requirement: &20421140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *20421140
-description: ! 'kramdown is yet-another-markdown-parser but fast, pure Ruby,
-
+  version_requirements: *id001
+description: |
+  kramdown is yet-another-markdown-parser but fast, pure Ruby,
   using a strict syntax definition and supporting several common extensions.
 
-'
 email: t_leitner@gmx.at
-executables:
+executables: 
 - kramdown
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README
-files:
+files: 
 - Rakefile
 - setup.rb
 - COPYING
@@ -89,6 +100,7 @@ files:
 - lib/kramdown/element.rb
 - lib/kramdown/converter/base.rb
 - lib/kramdown/converter/latex.rb
+- lib/kramdown/converter/remove_html_tags.rb
 - lib/kramdown/converter/html.rb
 - lib/kramdown/converter/kramdown.rb
 - lib/kramdown/converter/toc.rb
@@ -417,16 +429,20 @@ files:
 - test/testcases/block/05_blockquote/with_code_blocks.text
 - test/testcases/block/05_blockquote/nested.html
 - test/testcases/block/05_blockquote/with_code_blocks.html
-- test/testcases/block/16_toc/no_toc.options
 - test/testcases/block/16_toc/no_toc.text
+- test/testcases/block/16_toc/toc_with_footnotes.options
 - test/testcases/block/16_toc/no_toc.html
 - test/testcases/block/16_toc/toc_levels.html
 - test/testcases/block/16_toc/toc_levels.text
+- test/testcases/block/16_toc/toc_with_footnotes.html
+- test/testcases/block/16_toc/toc_with_footnotes.text
 - test/testcases/block/16_toc/toc_levels.options
 - test/testcases/block/01_blank_line/spaces.html
 - test/testcases/block/01_blank_line/tabs.text
 - test/testcases/block/01_blank_line/spaces.text
 - test/testcases/block/01_blank_line/tabs.html
+- test/testcases/block/06_codeblock/highlighting.html
+- test/testcases/block/06_codeblock/highlighting.options
 - test/testcases/block/06_codeblock/whitespace.text
 - test/testcases/block/06_codeblock/with_eob_marker.text
 - test/testcases/block/06_codeblock/tilde_syntax.html
@@ -443,6 +459,7 @@ files:
 - test/testcases/block/06_codeblock/no_newline_at_end_1.html
 - test/testcases/block/06_codeblock/error.html
 - test/testcases/block/06_codeblock/lazy.text
+- test/testcases/block/06_codeblock/highlighting.text
 - test/testcases/block/06_codeblock/whitespace.html
 - test/testcases/block/06_codeblock/no_newline_at_end.html
 - test/testcases/block/06_codeblock/error.text
@@ -451,28 +468,37 @@ files:
 - test/test_files.rb
 homepage: http://kramdown.rubyforge.org
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: kramdown
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: kramdown is a fast, pure-Ruby Markdown-superset converter.
 test_files: []
+