kramdown 0.2.0 → 0.3.0

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

@@ -0,0 +1,225 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009 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/>.
+#++
+#
+
+require 'kramdown/parser/kramdown/blank_line'
+require 'kramdown/parser/kramdown/eob'
+require 'kramdown/parser/kramdown/horizontal_rule'
+
+module Kramdown
+  module Parser
+    class Kramdown
+
+      # Used for parsing the first line of a list item or a definition, i.e. the line with list item
+      # marker or the definition marker.
+      def parse_first_list_line(indentation, content)
+        if content =~ /^\s*\n/
+          indentation = 4
+        else
+          while content =~ /^ *\t/
+            temp = content.scan(/^ */).first.length + indentation
+            content.sub!(/^( *)(\t+)/) {$1 + " "*(4 - (temp % 4)) + " "*($2.length - 1)*4}
+          end
+          indentation += content.scan(/^ */).first.length
+        end
+        content.sub!(/^\s*/, '')
+
+        indent_re = /^ {#{indentation}}/
+        content_re = /^(?:(?:\t| {4}){#{indentation / 4}} {#{indentation % 4}}|(?:\t| {4}){#{indentation / 4 + 1}}).*?\n/
+        [content, indentation, content_re, indent_re]
+      end
+
+
+      LIST_START_UL = /^(#{OPT_SPACE}[+*-])([\t| ].*?\n)/
+      LIST_START_OL = /^(#{OPT_SPACE}\d+\.)([\t| ].*?\n)/
+      LIST_START = /#{LIST_START_UL}|#{LIST_START_OL}/
+
+      # Parse the ordered or unordered list at the current location.
+      def parse_list
+        if @tree.children.last && @tree.children.last.type == :p # last element must not be a paragraph
+          return false
+        end
+
+        type, list_start_re = (@src.check(LIST_START_UL) ? [:ul, LIST_START_UL] : [:ol, LIST_START_OL])
+        list = Element.new(type)
+
+        item = nil
+        indent_re = nil
+        content_re = nil
+        eob_found = false
+        nested_list_found = false
+        while !@src.eos?
+          if @src.check(HR_START)
+            break
+          elsif @src.scan(list_start_re)
+            item = Element.new(:li)
+            item.value, indentation, content_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
+            list.children << item
+
+            list_start_re = (type == :ul ? /^( {0,#{[3, indentation - 1].min}}[+*-])([\t| ].*?\n)/ :
+                             /^( {0,#{[3, indentation - 1].min}}\d+\.)([\t| ].*?\n)/)
+            nested_list_found = false
+          elsif result = @src.scan(content_re)
+            result.sub!(/^(\t+)/) { " "*4*($1 ? $1.length : 0) }
+            result.sub!(indent_re, '')
+            if !nested_list_found && result =~ LIST_START
+              parse_blocks(item, item.value)
+              if item.children.length == 1 && item.children.first.type == :p
+                item.value = ''
+              else
+                item.children.clear
+              end
+              nested_list_found = true
+            end
+            item.value << result
+          elsif result = @src.scan(BLANK_LINE)
+            nested_list_found = true
+            item.value << result
+          elsif @src.scan(EOB_MARKER)
+            eob_found = true
+            break
+          else
+            break
+          end
+        end
+
+        @tree.children << list
+
+        last = nil
+        list.children.each do |it|
+          temp = Element.new(:temp)
+          parse_blocks(temp, it.value)
+          it.children += temp.children
+          it.value = nil
+          next if it.children.size == 0
+
+          if it.children.first.type == :p && (it.children.length < 2 || it.children[1].type != :blank ||
+                                                (it == list.children.last && it.children.length == 2 && !eob_found))
+            text = it.children.shift.children.first
+            text.value += "\n" if !it.children.empty? && it.children[0].type != :blank
+            it.children.unshift(text)
+          else
+            it.options[:first_is_block] = true
+          end
+
+          if it.children.last.type == :blank
+            last = it.children.pop
+          else
+            last = nil
+          end
+        end
+
+        @tree.children << last if !last.nil? && !eob_found
+
+        true
+      end
+      define_parser(:list, LIST_START)
+
+
+      DEFINITION_LIST_START = /^(#{OPT_SPACE}:)([\t| ].*?\n)/
+
+      # Parse the ordered or unordered list at the current location.
+      def parse_definition_list
+        children = @tree.children
+        if !children.last || (children.length == 1 && children.last.type != :p ) ||
+            (children.length >= 2 && children[-1].type != :p && (children[-1].type != :blank || children[-1].value != "\n" || children[-2].type != :p))
+          return false
+        end
+
+        first_as_para = false
+        deflist = Element.new(:dl)
+        para = @tree.children.pop
+        if para.type == :blank
+          para = @tree.children.pop
+          first_as_para = true
+        end
+        para.children.first.value.split("\n").each do |term|
+          el = Element.new(:dt)
+          el.children << Element.new(:text, term)
+          deflist.children << el
+        end
+
+        item = nil
+        indent_re = nil
+        content_re = nil
+        def_start_re = DEFINITION_LIST_START
+        while !@src.eos?
+          if @src.scan(def_start_re)
+            item = Element.new(:dd)
+            item.options[:first_as_para] = first_as_para
+            item.value, indentation, content_re, indent_re = parse_first_list_line(@src[1].length, @src[2])
+            deflist.children << item
+
+            def_start_re = /^( {0,#{[3, indentation - 1].min}}:)([\t| ].*?\n)/
+            first_as_para = false
+          elsif result = @src.scan(content_re)
+            result.sub!(/^(\t+)/) { " "*4*($1 ? $1.length : 0) }
+            result.sub!(indent_re, '')
+            item.value << result
+            first_as_para = false
+          elsif result = @src.scan(BLANK_LINE)
+            first_as_para = true
+            item.value << result
+          else
+            break
+          end
+        end
+
+        last = nil
+        deflist.children.each do |it|
+          next if it.type == :dt
+
+          parse_blocks(it, it.value)
+          it.value = nil
+          next if it.children.size == 0
+
+          if it.children.last.type == :blank
+            last = it.children.pop
+          else
+            last = nil
+          end
+          if it.children.first.type == :p && !it.options.delete(:first_as_para)
+            text = it.children.shift.children.first
+            text.value += "\n" if !it.children.empty?
+            it.children.unshift(text)
+          else
+            it.options[:first_is_block] = true
+          end
+        end
+
+        if @tree.children.length >= 1 && @tree.children.last.type == :dl
+          @tree.children[-1].children += deflist.children
+        elsif @tree.children.length >= 2 && @tree.children[-1].type == :blank && @tree.children[-2].type == :dl
+          @tree.children.pop
+          @tree.children[-1].children += deflist.children
+        else
+          @tree.children << deflist
+        end
+
+        @tree.children << last if !last.nil?
+
+        true
+      end
+      define_parser(:definition_list, DEFINITION_LIST_START)
+
+    end
+  end
+end

data/lib/kramdown/parser/kramdown/paragraph.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009 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 Parser
+    class Kramdown
+
+      PARAGRAPH_START = /^#{OPT_SPACE}[^ \t].*?\n/
+
+      # Parse the paragraph at the current location.
+      def parse_paragraph
+        @src.pos += @src.matched_size
+        if @tree.children.last && @tree.children.last.type == :p
+          @tree.children.last.children.first.value << "\n" << @src.matched.chomp
+        else
+          @tree.children << Element.new(:p)
+          add_text(@src.matched.lstrip.chomp, @tree.children.last)
+        end
+        true
+      end
+      define_parser(:paragraph, PARAGRAPH_START)
+
+    end
+  end
+end

data/lib/kramdown/parser/kramdown/typographic_symbol.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+#
+#--
+# Copyright (C) 2009 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 Parser
+    class Kramdown
+
+      TYPOGRAPHIC_SYMS = [['---', :mdash], ['--', :ndash], ['...', :ellipsis],
+                          ['\\<<', '&lt;&lt;'], ['\\>>', '&gt;&gt;'],
+                          ['<< ', :laquo_space], [' >>', :raquo_space],
+                          ['<<', :laquo], ['>>', :raquo]]
+      TYPOGRAPHIC_SYMS_SUBST = Hash[*TYPOGRAPHIC_SYMS.flatten]
+      TYPOGRAPHIC_SYMS_RE = /#{TYPOGRAPHIC_SYMS.map {|k,v| Regexp.escape(k)}.join('|')}/
+
+      # Parse the typographic symbols at the current location.
+      def parse_typographic_syms
+        @src.pos += @src.matched_size
+        val = TYPOGRAPHIC_SYMS_SUBST[@src.matched]
+        if val.kind_of?(Symbol)
+          @tree.children << Element.new(:typographic_sym, val)
+        else
+          add_text(val.dup)
+        end
+      end
+      define_parser(:typographic_syms, TYPOGRAPHIC_SYMS_RE)
+
+    end
+  end
+end

data/lib/kramdown/version.rb

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

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

@@ -10,3 +10,4 @@
 Blah
 Blah
 -->
+<p>para</p>

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

@@ -9,4 +9,4 @@ para2
 <!--
 Blah
 Blah
---> these chars are ignored
+--> para

data/test/testcases/block/09_html/content_model/tables.text

@@ -1,12 +1,12 @@
 <table class="examples">
 <tr>
-  <th>*Usage*</th>
+  <th markdown="span">*Usage*</th>
   <th>
 Output
   </th>
 </tr>
 <tr>
-  <td>Some *data*</td>
+  <td markdown="span">Some *data*</td>
   <td>
 # Some more
   </td>

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

@@ -7,8 +7,18 @@ This is some text
 </div></div>
 
 <div>
+
 </div>
 
 <div>
 <p><a href="/">Foo</a></p>
 </div>
+
+<p>This is some
+text</p>
+
+<p><a href="http://example.com">http://example.com</a></p>
+
+<div>
+&lt;http://example.com&gt;
+</div>

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

@@ -13,3 +13,12 @@ This is some text
 <div>
 <p><a href="/">Foo</a></p>
 </div>
+
+<p>This is some
+text</p>
+
+<http://example.com>
+
+<div>
+<http://example.com>
+</div>

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

@@ -24,5 +24,9 @@ This should be output
 </p> and nothing should be done
 about it
 <script>
+
+
 </script>
+
+&lt;http://example.com&gt;
 </script>

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

@@ -26,3 +26,5 @@ about it
 </not>
 </p>
 </script>
+
+<http://example.com>

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

@@ -15,3 +15,7 @@
   <pre><code>code block with &lt;/div&gt;
 </code></pre>
 </div>
+
+<div>
+  <p>No matching end tag</p>
+</div>

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

@@ -12,3 +12,6 @@
 <div>
     code block with </div>
 </div>
+
+<div>
+No matching end tag

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

@@ -3,6 +3,7 @@
 <p>para</p>
 
 <?  test  ?>
+<p>para</p>
 
 <p>other</p>
 

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

@@ -2,7 +2,7 @@
 
 para
 
-<?  test  ?> ignored characters
+<?  test  ?> para
 
 other
 

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

@@ -23,25 +23,17 @@ weiter
     </div>
     <div style="&nbsp;"></div>
   </div>
-  <div>bar&nbsp;</div>
+  <div>
+    <p>bar&nbsp;</p>
+  </div>
 </div>
 
 <p>para5</p>
 
-<div>id</div>
-
-<div>id
-</div>
- test
-
-<div>hallo<div>test</div>
-  <p>hallo</p>
-</div>
-
-<div>hallo<div>test
-    <p>hallo</p>
-  </div>
+<div>
+  <p>id</p>
 </div>
+<p>test</p>
 
 <div>
   <p>hallo</p>
@@ -52,7 +44,8 @@ weiter
 
 <p>para6</p>
 
-<div><div class="clear"></div>
+<div>
+  <div class="clear"></div>
   <p>Another para.</p>
 </div>