kramdown 0.13.5 → 0.13.6

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    498 Thomas Leitner <t_leitner@gmx.at>
+    501 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,43 @@
+commit 40e6cde2d3e1a4f9f6bc14a243b22b4ae3311ca2
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Wed May 9 19:53:47 2012 +0200
+
+    Updated release notes and version number
+
+doc/news/release_0_13_6.page
+doc/sidebar.template
+lib/kramdown/version.rb
+man/man1/kramdown.1.erb
+
+commit 7f66dca331f78d84ef22c489c755360b304cb41f
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue May 8 21:20:46 2012 +0200
+
+    Fixed bug RF#29557: Parsing fails with lists with empty list item
+    
+    If a list item is completely empty, it needs to be handled specially,
+    which is done now.
+
+lib/kramdown/converter/kramdown.rb
+lib/kramdown/parser/kramdown/list.rb
+test/testcases/block/08_list/special_cases.html
+test/testcases/block/08_list/special_cases.text
+
+commit ac00ea8ea590ece6c7a6c53b30920114f349b79b
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Tue May 8 20:02:43 2012 +0200
+
+    Fixed problem with CDATA section in non-XHTML pages
+    
+    The HTML parser does not parse CDATA in script tags and
+    therefore the CDATA tags were displayed in MathJax output.
+    By commenting out the CDATA tags (with LaTeX comment syntax)
+    we avoid this problem.
+
+lib/kramdown/converter/html.rb
+lib/kramdown/parser/html.rb
+test/testcases/block/15_math/normal.html
+
 commit ce785c7cc29372cb7c5c47647535b1943348aff6
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Sun Feb 19 15:34:37 2012 +0100

data/VERSION

@@ -1 +1 @@
-0.13.5
+0.13.6

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <b>0.13.5</b> and it was released
-on <b>2012-02-19</b>.</p>
+<p>The latest version of kramdown is <b>0.13.6</b> and it was released
+on <b>2012-05-09</b>.</p>
 
 <p>More <a href="news.html">news</a>…</p>
 

data/lib/kramdown/converter/html.rb

@@ -315,7 +315,7 @@ module Kramdown
 
       def convert_math(el, indent)
         block = (el.options[:category] == :block)
-        value = (el.value =~ /<|&/ ? "<![CDATA[#{el.value}]]>" : el.value)
+        value = (el.value =~ /<|&/ ? "% <![CDATA[\n#{el.value} %]]>" : el.value)
         "<script type=\"math/tex#{block ? '; mode=display' : ''}\">#{value}</script>#{block ? "\n" : ''}"
       end
 

data/lib/kramdown/converter/kramdown.rb

@@ -134,7 +134,7 @@ module Kramdown
 
       def convert_li(el, opts)
         sym, width = if @stack.last.type == :ul
-                       ['* ', el.children.first.type == :codeblock ? 4 : 2]
+                       ['* ', el.children.first && el.children.first.type == :codeblock ? 4 : 2]
                      else
                        ["#{opts[:index] + 1}.".ljust(4), 4]
                      end
@@ -147,13 +147,13 @@ module Kramdown
         newlines = text.scan(/\n*\Z/).first
         first, *last = text.split(/\n/)
         last = last.map {|l| " "*width + l}.join("\n")
-        text = first + (last.empty? ? "" : "\n") + last + newlines
-        if el.children.first.type == :p && !el.children.first.options[:transparent]
+        text = (first.nil? ? "\n" : first + (last.empty? ? "" : "\n") + last + newlines)
+        if el.children.first && el.children.first.type == :p && !el.children.first.options[:transparent]
           res = "#{sym}#{text}"
           res << "^\n" if el.children.size == 1 && @stack.last.children.last == el &&
             (@stack.last.children.any? {|c| c.children.first.type != :p} || @stack.last.children.size == 1)
           res
-        elsif el.children.first.type == :codeblock
+        elsif el.children.first && el.children.first.type == :codeblock
           "#{sym}\n    #{text}"
         else
           "#{sym}#{text}"

data/lib/kramdown/parser/html.rb

@@ -529,7 +529,7 @@ module Kramdown
 
         def handle_math_tag(el)
           set_basics(el, :math, :category => (el.attr['type'] =~ /mode=display/ ? :block : :span))
-          el.value = el.children.shift.value.sub(/\A<!\[CDATA\[(.*)\]\]>\z/m, '\1')
+          el.value = el.children.shift.value.sub(/\A(?:%\s*)?<!\[CDATA\[\n?(.*?)(?:\s%)?\]\]>\z/m, '\1')
           el.attr.delete('type')
         end
 

data/lib/kramdown/parser/kramdown/list.rb

@@ -123,7 +123,7 @@ module Kramdown
               (it.children.length < 2 || it.children[1].type != :blank ||
                (it == list.children.last && it.children.length == 2 && !eob_found)) &&
               (list.children.last != it || list.children.size == 1 ||
-               list.children[0..-2].any? {|cit| cit.children.first.type != :p || cit.children.first.options[:transparent]})
+               list.children[0..-2].any? {|cit| !cit.children.first || cit.children.first.type != :p || cit.children.first.options[:transparent]})
             it.children.first.children.first.value << "\n" if it.children.size > 1 && it.children[1].type != :blank
             it.children.first.options[:transparent] = true
           end

data/lib/kramdown/version.rb

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

data/man/man1/kramdown.1

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

data/test/testcases/block/08_list/special_cases.html

@@ -53,3 +53,10 @@ here</p>
     <p>but here</p>
   </li>
 </ul>
+
+<p>List item without content:</p>
+
+<ul>
+  <li></li>
+  <li>a</li>
+</ul>

data/test/testcases/block/08_list/special_cases.text

@@ -33,3 +33,8 @@ A normal list:
 * compact
 
 * but here
+
+List item without content:
+
+* 
+* a

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

@@ -6,10 +6,11 @@
 <p><script type="math/tex">\lambda_\alpha > 5</script>
 This is a para.</p>
 
-<script type="math/tex; mode=display"><![CDATA[\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>
 

metadata

@@ -1,48 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kramdown
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 13
-  - 5
-  version: 0.13.5
+version: !ruby/object:Gem::Version
+  version: 0.13.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-19 00:00:00 +01:00
-default_executable: kramdown
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: coderay
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &20421140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-description: |
-  kramdown is yet-another-markdown-parser but fast, pure Ruby,
+  prerelease: false
+  version_requirements: *20421140
+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
@@ -458,36 +449,30 @@ files:
 - test/testcases/block/06_codeblock/normal.text
 - test/testcases/encoding.html
 - test/test_files.rb
-has_rdoc: true
 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 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: kramdown
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: kramdown is a fast, pure-Ruby Markdown-superset converter.
 test_files: []
-