From ee876a2907828297c437a2fee15fe0b41897d86b Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Sun, 10 Apr 2005 03:18:10 +0000
Subject: [PATCH] Added some Textile rules to markdown option, in an attempt to
 force RedCloth to _really_ render Markdown

---
 app/models/chunks/engines.rb |  2 +-
 test/unit/revision_test.rb   | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/models/chunks/engines.rb b/app/models/chunks/engines.rb
index 8e9e08ce..6378f843 100644
--- a/app/models/chunks/engines.rb
+++ b/app/models/chunks/engines.rb
@@ -33,7 +33,7 @@ module Engines
 
   class Markdown < AbstractEngine
     def mask
-      RedCloth.new(@content, @content.options[:engine_opts]).to_html(:markdown)
+      RedCloth.new(@content, @content.options[:engine_opts]).to_html(:block_textile_lists, :inline_textile_span, :markdown)
     end
   end
 
diff --git a/test/unit/revision_test.rb b/test/unit/revision_test.rb
index c939ad65..f8cd3cad 100755
--- a/test/unit/revision_test.rb
+++ b/test/unit/revision_test.rb
@@ -71,6 +71,26 @@ class RevisionTest < Test::Unit::TestCase
 	    %{<p>This is a code block:</p>\n\n\n\t<pre><code>def a_method(arg)\n} +
 	    %{return ThatWay</code></pre>\n\n\n\t<p>Nice!</p>}, 
 	    code_block)
+
+    textile_and_markdown = [
+      'Markdown heading',
+      '================',
+      '',
+      'h2. Textile heading',
+      '',
+      '*some* **text** _with_ -styles-',
+      '',
+      '* list 1',
+      '* list 2'
+    ].join("\n")
+    
+    assert_markup_parsed_as(
+      "<h1>Markdown heading</h1>\n\n\n\t" +
+      "<p>h2. Textile heading</p>\n\n\n\t" +
+      "<p><strong>some</strong> <b>text</b> <em>with</em> <del>styles</del></p>\n\n\n\t" +
+      "<ul>\n\t<li>list 1</li>\n\t\t<li>list 2</li>\n\t</ul>",
+      textile_and_markdown)
+    
   end
 
   def test_rdoc