kramdown 0.14.0 → 0.14.1

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    537 Thomas Leitner <t_leitner@gmx.at>
+    543 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>

data/ChangeLog

@@ -1,3 +1,63 @@
+commit 5971fc408de5137b38f1ebe95f47f3f6573a86ed
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Nov 30 18:41:57 2012 +0100
+
+    Updated release notes and version
+
+doc/news/release_0_14_1.page
+doc/sidebar.template
+lib/kramdown/version.rb
+
+commit d3c2777b40f29c27de3ea82dccdbd7484ecd3653
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Fri Nov 30 18:21:35 2012 +0100
+
+    Fixed GH#30: Specifying empty definitions for a definition list now works
+
+lib/kramdown/converter/kramdown.rb
+lib/kramdown/parser/kramdown/list.rb
+test/testcases/block/13_definition_list/simple.html
+test/testcases/block/13_definition_list/simple.text
+
+commit e7e74ad14bfb9036aa0cc771179cdec8d0315c82
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Thu Nov 29 20:32:10 2012 +0100
+
+    Better fix for the output of closed/open elements
+    
+    Using the already defined tags for HTML elements without a body
+    and better output for unknown elements.
+
+lib/kramdown/converter/html.rb
+lib/kramdown/parser/html.rb
+lib/kramdown/parser/kramdown/html.rb
+
+commit 12a9060cd06bb40ea3f73edae1c7397d3e2d1320
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Nov 18 20:42:54 2012 +0100
+
+    Fixed: Using a block IAL before a definition list now works
+
+lib/kramdown/parser/kramdown/list.rb
+test/testcases/block/13_definition_list/deflist_ial.html
+test/testcases/block/13_definition_list/deflist_ial.text
+
+commit 3912de9a399e234c163d792ed84f657ed549d06e
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Nov 18 13:04:08 2012 +0100
+
+    Fixed problem with the output of empty i/b HTML tags
+
+lib/kramdown/converter/html.rb
+
+commit a03c57bb25cc3d97f6c14df4c48d1f6be4b49130
+Author: Thomas Leitner <t_leitner@gmx.at>
+Date:   Sun Oct 28 06:58:49 2012 +0100
+
+    Docu fix
+
+doc/quickref.page
+
 commit a29151de6a88eefbd0a181331ebae298ee441d27
 Author: Thomas Leitner <t_leitner@gmx.at>
 Date:   Sun Sep 16 07:58:38 2012 +0200

data/Rakefile

@@ -95,6 +95,8 @@ if defined? Webgen
       config['contentprocessor.tags.map']['kdexample'] = 'KDExample'
       config['contentprocessor.tags.map']['kdlink'] = 'KDLink'
       config['contentprocessor.kramdown.options'][:coderay_line_numbers] = nil
+      require 'syck'
+      YAML::ENGINE.yamler = 'syck'
     end
   end
 end

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.14.1

data/doc/quickref.page

@@ -277,6 +277,7 @@ following the definition line:
 This *is* a term
 
 : This will be a para
+
   > a blockquote
 
   # A header

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <b>0.14.0</b> and it was released
-on <b>2012-09-16</b>.</p>
+<p>The latest version of kramdown is <b>0.14.1</b> and it was released
+on <b>2012-11-30</b>.</p>
 
 <p>More <a href="{relocatable: news.html}">news</a>…</p>
 

data/lib/kramdown/converter/html.rb

@@ -21,6 +21,7 @@
 #
 
 require 'rexml/parsers/baseparser'
+require 'kramdown/parser/html'
 
 module Kramdown
 
@@ -50,7 +51,7 @@ module Kramdown
       end
 
       include ::Kramdown::Utils::Html
-
+      include ::Kramdown::Parser::Html::Constants
 
       # The amount of indentation used when nesting HTML tags.
       attr_accessor :indent
@@ -183,25 +184,24 @@ module Kramdown
         "#{' '*indent}<dt#{html_attributes(el.attr)}>#{inner(el, indent)}</dt>\n"
       end
 
-      # A list of all HTML tags that need to have a body (even if the body is empty).
-      HTML_TAGS_WITH_BODY=['div', 'span', 'script', 'iframe', 'textarea', 'a'] # :nodoc:
-
       def convert_html_element(el, indent)
         res = inner(el, indent)
         if el.options[:category] == :span
-          "<#{el.value}#{html_attributes(el.attr)}" << (!res.empty? || HTML_TAGS_WITH_BODY.include?(el.value) ? ">#{res}</#{el.value}>" : " />")
+          "<#{el.value}#{html_attributes(el.attr)}" << (res.empty? && HTML_ELEMENTS_WITHOUT_BODY.include?(el.value) ? " />" : ">#{res}</#{el.value}>")
         else
           output = ''
           output << ' '*indent if @stack.last.type != :html_element || @stack.last.options[:content_model] != :raw
           output << "<#{el.value}#{html_attributes(el.attr)}"
-          if !res.empty? && el.options[:content_model] != :block
+          if el.options[:is_closed] && el.options[:content_model] == :raw
+            output << " />"
+          elsif !res.empty? && el.options[:content_model] != :block
             output << ">#{res}</#{el.value}>"
           elsif !res.empty?
             output << ">\n#{res.chomp}\n"  << ' '*indent << "</#{el.value}>"
-          elsif HTML_TAGS_WITH_BODY.include?(el.value)
-            output << "></#{el.value}>"
-          else
+          elsif HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)
             output << " />"
+          else
+            output << "></#{el.value}>"
           end
           output << "\n" if @stack.last.type != :html_element || @stack.last.options[:content_model] != :raw
           output

data/lib/kramdown/converter/kramdown.rb

@@ -161,7 +161,7 @@ module Kramdown
       end
 
       def convert_dd(el, opts)
-        sym, width = ": ", (el.children.first.type == :codeblock ? 4 : 2)
+        sym, width = ": ", (el.children.first && el.children.first.type == :codeblock ? 4 : 2)
         if ial = ial_for_element(el)
           sym << ial << " "
         end
@@ -171,12 +171,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
+        text = first.to_s + (last.empty? ? "" : "\n") + last + newlines
         text.chomp! if text =~ /\n\n\Z/ && opts[:next] && opts[:next].type == :dd
-        text << "\n" if text !~ /\n\n\Z/ && opts[:next] && opts[:next].type == :dt
-        if el.children.first.type == :p && !el.children.first.options[:transparent]
+        text << "\n" if (text !~ /\n\n\Z/ && opts[:next] && opts[:next].type == :dt)
+        text << "\n" if el.children.empty?
+        if el.children.first && el.children.first.type == :p && !el.children.first.options[:transparent]
           "\n#{sym}#{text}"
-        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

@@ -83,9 +83,10 @@ module Kramdown
         # Process the HTML start tag that has already be scanned/checked via @src.
         #
         # Does the common processing steps and then yields to the caller for further processing
-        # (first parameter is the created element, the second parameter is +true+ if the HTML
-        # element is already closed, ie. contains no body).
-        def handle_html_start_tag # :yields: el, closed
+        # (first parameter is the created element; the second parameter is +true+ if the HTML
+        # element is already closed, ie. contains no body; the third parameter specifies whether the
+        # body - and the end tag - need to be handled in case closed=false).
+        def handle_html_start_tag # :yields: el, closed, handle_body
           name = @src[1].downcase
           closed = !@src[4].nil?
           attrs = Utils::OrderedHash.new
@@ -100,9 +101,9 @@ module Kramdown
           end
           if name == 'script' || name == 'style'
             handle_raw_html_tag(name)
-            yield(el, true)
+            yield(el, false, false)
           else
-            yield(el, closed)
+            yield(el, closed, true)
           end
         end
 
@@ -559,8 +560,8 @@ module Kramdown
           end
         end
 
-        tag_handler = lambda do |c, closed|
-          parse_raw_html(c, &tag_handler) if !closed
+        tag_handler = lambda do |c, closed, handle_body|
+          parse_raw_html(c, &tag_handler) if !closed && handle_body
         end
         parse_raw_html(@tree, &tag_handler)
 

data/lib/kramdown/parser/kramdown/html.rb

@@ -35,7 +35,7 @@ module Kramdown
 
       TRAILING_WHITESPACE = /[ \t]*\n/
 
-      def handle_kramdown_html_tag(el, closed)
+      def handle_kramdown_html_tag(el, closed, handle_body)
         el.options[:ial] = @block_ial if @block_ial
 
         content_model = if @tree.type != :html_element || @tree.options[:content_model] != :raw
@@ -49,8 +49,9 @@ module Kramdown
 
         @src.scan(TRAILING_WHITESPACE) if content_model == :block
         el.options[:content_model] = content_model
+        el.options[:is_closed] = closed
 
-        if !closed
+        if !closed && handle_body
           if content_model == :block
             if !parse_blocks(el)
               warning("Found no end tag for '#{el.value}' - auto-closing it")
@@ -143,7 +144,8 @@ module Kramdown
             end
           end
 
-          el = Element.new(:html_element, tag_name, attrs, :category => :span, :content_model => (do_parsing ? :span : :raw))
+          el = Element.new(:html_element, tag_name, attrs, :category => :span,
+                           :content_model => (do_parsing ? :span : :raw), :is_closed => !!@src[4])
           @tree.children << el
           stop_re = /<\/#{Regexp.escape(tag_name)}\s*>/i
           if !@src[4] && HTML_ELEMENTS_WITHOUT_BODY.include?(el.value)

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

@@ -164,6 +164,7 @@ module Kramdown
           el.children << Element.new(:raw_text, term)
           deflist.children << el
         end
+        deflist.options[:ial] = para.options[:ial]
 
         item = nil
         content_re, lazy_re, indent_re = nil
@@ -214,7 +215,8 @@ module Kramdown
           else
             last = nil
           end
-          if it.children.first.type == :p && !it.options.delete(:first_as_para)
+
+          if it.children.first && it.children.first.type == :p && !it.options.delete(:first_as_para)
             it.children.first.children.first.value << "\n" if it.children.size > 1
             it.children.first.options[:transparent] = true
           end

data/lib/kramdown/version.rb

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

data/test/testcases/block/13_definition_list/deflist_ial.html

@@ -0,0 +1,4 @@
+<dl class="dl-horizontal dl-other">
+  <dt>item</dt>
+  <dd>definition</dd>
+</dl>

data/test/testcases/block/13_definition_list/deflist_ial.text

@@ -0,0 +1,4 @@
+{:.dl-horizontal}
+item
+:   definition
+{:.dl-other}

data/test/testcases/block/13_definition_list/simple.html

@@ -1,6 +1,8 @@
 <dl>
   <dt>kram</dt>
   <dd>down</dd>
+  <dt>novalue</dt>
+  <dd></dd>
   <dt>kram</dt>
   <dd>down
 kram</dd>

data/test/testcases/block/13_definition_list/simple.text

@@ -1,6 +1,9 @@
 kram
 : down
 
+novalue
+: 
+
 kram
 :   down
 kram

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -394,9 +394,11 @@ files:
 - test/testcases/block/07_horizontal_rule/error.text
 - test/testcases/block/07_horizontal_rule/normal.text
 - test/testcases/block/07_horizontal_rule/sepspaces.html
+- test/testcases/block/13_definition_list/deflist_ial.html
 - test/testcases/block/13_definition_list/separated_by_eob.html
 - test/testcases/block/13_definition_list/definition_at_beginning.text
 - test/testcases/block/13_definition_list/simple.html
+- test/testcases/block/13_definition_list/deflist_ial.text
 - test/testcases/block/13_definition_list/too_much_space.text
 - test/testcases/block/13_definition_list/item_ial.text
 - test/testcases/block/13_definition_list/multiple_terms.text