kramdown 0.13.4 → 0.13.5

data/lib/kramdown/utils/html.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -50,7 +50,7 @@ module Kramdown
 
       # Return the HTML representation of the attributes +attr+.
       def html_attributes(attr)
-        attr.map {|k,v| v.nil? ? '' : " #{k}=\"#{escape_html(v.to_s, :attribute)}\"" }.join('')
+        attr.map {|k,v| v.nil? || (k == 'id' && v.strip.empty?) ? '' : " #{k}=\"#{escape_html(v.to_s, :attribute)}\"" }.join('')
       end
 
       # :stopdoc:

data/lib/kramdown/utils/ordered_hash.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #

data/lib/kramdown/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009-2010 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #
@@ -23,6 +23,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '0.13.4'
+  VERSION = '0.13.5'
 
 end

data/man/man1/kramdown.1

@@ -33,6 +33,29 @@ Show the help.
 
 .SH KRAMDOWN OPTIONS
 
+.TP
+.B \-\-auto-id-prefix ARG
+
+Prefix used for automatically generated heaer IDs
+
+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: ''
+Used by: HTML/Latex converter
+
+
+.TP
+.B \-\-coderay-line-number-start ARG
+
+The start value for the line numbers
+
+Default: 1
+Used by: HTML converter
+
+
 .TP
 .B \-\-template ARG
 
@@ -57,29 +80,28 @@ Used by: all converters
 
 
 .TP
-.B \-\-[no\-]auto-ids
+.B \-\-toc-levels ARG
 
-Use automatic header ID generation
+Defines the levels that are used for the table of contents
 
-If this option is `true`, ID values for all headers are automatically
-generated if no ID is explicitly specified.
+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: true
+Default: 1..6
 Used by: HTML/Latex converter
 
 
 .TP
-.B \-\-auto-id-prefix ARG
+.B \-\-coderay-line-numbers ARG
 
-Prefix used for automatically generated heaer IDs
+Defines how and if line numbers should be shown
 
-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 possible values are :table, :inline, :list or nil. If this option is
+nil, no line numbers are shown.
 
-Default: ''
-Used by: HTML/Latex converter
+Default: :inline
+Used by: HTML converter
 
 
 .TP
@@ -97,105 +119,108 @@ Used by: kramdown parser
 
 
 .TP
-.B \-\-[no\-]parse-span-html
-
-Process kramdown syntax in span HTML tags
+.B \-\-coderay-tab-width ARG
 
-If this option is `true`, the kramdown parser processes the content of
-span HTML tags as text containing span-level elements.
+The tab width used in highlighted code
 
-Default: true
-Used by: kramdown parser
+Used by: HTML converter
 
 
 .TP
-.B \-\-[no\-]html-to-native
-
-Convert HTML elements to native elements
-
-If this option is `true`, the parser converts HTML elements to native
-elements. For example, when parsing `<em>hallo</em>` the emphasis tag
-would normally be converted to an `:html` element with tag type `:em`.
-If `html_to_native` is `true`, then the emphasis would be converted to a
-native `:em` element.
+.B \-\-line-width ARG
 
-This is useful for converters that cannot deal with HTML elements.
+Defines the line width to be used when outputting a document
 
-Default: false
-Used by: kramdown parser
+Default: 72
+Used by: kramdown converter
 
 
 .TP
-.B \-\-footnote-nr ARG
+.B \-\-[no\-]parse-span-html
 
-The number of the first footnote
+Process kramdown syntax in span HTML tags
 
-This option can be used to specify the number that is used for the first
-footnote.
+If this option is `true`, the kramdown parser processes the content of
+span HTML tags as text containing span-level elements.
 
-Default: 1
-Used by: HTML converter
+Default: true
+Used by: kramdown parser
 
 
 .TP
-.B \-\-coderay-wrap ARG
-
-Defines how the highlighted code should be wrapped
+.B \-\-coderay-bold-every ARG
 
-The possible values are :span, :div or nil.
+Defines how often a line number should be made bold
 
-Default: :div
+Default: 10
 Used by: HTML converter
 
 
 .TP
-.B \-\-coderay-line-numbers ARG
+.B \-\-latex-headers ARG
 
-Defines how and if line numbers should be shown
+Defines the LaTeX commands for different header levels
 
-The possible values are :table, :inline, :list or nil. If this option is
-nil, no line numbers are shown.
+The commands for the header levels one to six can be specified by
+separating them with commas.
 
-Default: :inline
-Used by: HTML converter
+Default: section,subsection,subsubsection,paragraph,subparagraph,subsubparagraph
+Used by: Latex converter
 
 
 .TP
-.B \-\-coderay-line-number-start ARG
+.B \-\-[no\-]html-to-native
 
-The start value for the line numbers
+Convert HTML elements to native elements
 
-Default: 1
-Used by: HTML converter
+If this option is `true`, the parser converts HTML elements to native
+elements. For example, when parsing `<em>hallo</em>` the emphasis tag
+would normally be converted to an `:html` element with tag type `:em`.
+If `html_to_native` is `true`, then the emphasis would be converted to a
+native `:em` element.
+
+This is useful for converters that cannot deal with HTML elements.
+
+Default: false
+Used by: kramdown parser
 
 
 .TP
-.B \-\-coderay-tab-width ARG
+.B \-\-coderay-css ARG
 
-The tab width used in highlighted code
+Defines how the highlighted code gets styled
 
+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: style
 Used by: HTML converter
 
 
 .TP
-.B \-\-coderay-bold-every ARG
+.B \-\-smart-quotes ARG
 
-Defines how often a line number should be made bold
+Defines the HTML entity names or code points for smart quote output
 
-Default: 10
-Used by: HTML converter
+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: lsquo,rsquo,ldquo,rdquo
+Used by: HTML/Latex converter
 
 
 .TP
-.B \-\-coderay-css ARG
+.B \-\-footnote-nr ARG
 
-Defines how the highlighted code gets styled
+The number of 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).
+This option can be used to specify the number that is used for the first
+footnote.
 
-Default: style
+Default: 1
 Used by: HTML converter
 
 
@@ -215,50 +240,25 @@ Used by: HTML converter, kramdown converter
 
 
 .TP
-.B \-\-toc-levels ARG
-
-Defines the levels that are used for the table of contents
-
-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: 1..6
-Used by: HTML/Latex converter
-
-
-.TP
-.B \-\-line-width ARG
-
-Defines the line width to be used when outputting a document
-
-Default: 72
-Used by: kramdown converter
-
-
-.TP
-.B \-\-latex-headers ARG
+.B \-\-coderay-wrap ARG
 
-Defines the LaTeX commands for different header levels
+Defines how the highlighted code should be wrapped
 
-The commands for the header levels one to six can be specified by
-separating them with commas.
+The possible values are :span, :div or nil.
 
-Default: section,subsection,subsubsection,paragraph,subparagraph,subsubparagraph
-Used by: Latex converter
+Default: :div
+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
 
 

data/test/run_tests.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #

data/test/test_files.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 #--
-# Copyright (C) 2009 Thomas Leitner <t_leitner@gmx.at>
+# Copyright (C) 2009-2012 Thomas Leitner <t_leitner@gmx.at>
 #
 # This file is part of kramdown.
 #

data/test/testcases/block/04_header/with_auto_ids.html

@@ -15,3 +15,5 @@
 <h1 id="section-1">33333</h1>
 
 <h2 id="hallo-2">hallO</h2>
+
+<h1>Header without ID</h1>

data/test/testcases/block/04_header/with_auto_ids.text

@@ -17,3 +17,6 @@ Not now
 # 33333
 
 ## hallO
+
+# Header without ID
+{: id=""}

data/test/testcases/block/09_html/html5_attributes.html

@@ -0,0 +1,13 @@
+<p lang="en" style="nothing" class="">paragraph</p>
+
+<p lang="en" style="nothing" class="">paragraph</p>
+
+<p lang="en" style="nothing" class="">paragraph</p>
+
+<p lang="en" class="" style="nothing">paragraph</p>
+
+<p class="" lang="en" style="nothing">paragraph</p>
+
+<p class="">paragraph</p>
+
+<p class="">paragraph</p>

data/test/testcases/block/09_html/html5_attributes.text

@@ -0,0 +1,13 @@
+<p lang="en" style='nothing' class>paragraph</p>
+
+<p lang='en' style="nothing" class>paragraph</p>
+
+<p lang='en' style="nothing" class >paragraph</p>
+
+<p lang='en' class style="nothing">paragraph</p>
+
+<p class lang='en' style="nothing">paragraph</p>
+
+<p cLaSs>paragraph</p>
+
+<p class >paragraph</p>

data/test/testcases/block/09_html/simple.text

@@ -40,7 +40,7 @@ hallo
 
 para6
 
-<div><div class="clear"></div>
+<div><div cLASs="clear"></div>
 Another para.
 </div>
 

data/test/testcases/block/15_math/normal.html

@@ -6,10 +6,10 @@
 <p><script type="math/tex">\lambda_\alpha > 5</script>
 This is a para.</p>
 
-<script type="math/tex; mode=display">\begin{align*}
+<script type="math/tex; mode=display"><![CDATA[\begin{align*}
 &=5 \\
 &=6 \\
-\end{align*}</script>
+\end{align*}]]></script>
 
 <script type="math/tex; mode=display">5+5</script>
 

data/test/testcases/span/05_html/normal.html

@@ -1,4 +1,4 @@
-<p>Empty <a name="anchor" id="anchor"></a>!</p>
+<p>Empty <a name="anchor" id="anchor" class=""></a>!</p>
 
 <p><a href="test">title</a> is a title.</p>
 

data/test/testcases/span/05_html/normal.text

@@ -1,4 +1,4 @@
-Empty <a name="anchor" id="anchor"></A>!
+Empty <a NaMe="anchor" ID="anchor" cLaSs></A>!
 
 <a href="test">title</a> is a title.
 

data/test/testcases/span/math/normal.html

@@ -3,3 +3,7 @@
 <p><script type="math/tex">5+5</script> inline math, $5.00 $$no math$$</p>
 
 <p>$$5+5$$ inline math</p>
+
+<p><script type="math/tex">5+5</script></p>
+
+<p>$$5+5$$</p>