Changeset 128

Timestamp:

05/19/2006 15:52:10 (2 years ago)

Author:

cardmagic

Message:

Fixing hardbreaks

Location:

trunk

Files:

• lib/redcloth/base.rb (modified) (1 diff)
• run-tests.rb (modified) (1 diff)
• test/textile_hardbreaks.yml (added)

trunk/lib/redcloth/base.rb

@@ -392 +392 @@
 
     def hard_break( text )
-        text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
+        text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
     end
 

trunk/run-tests.rb

@@ -11 +11 @@
     errors = []
     tests = 0
+    options = (testfile =~ /hardbreaks/) ? [:hard_breaks] : []
+    
     print File.basename(testfile)+":\n\t"
     YAML::load_documents( File.open( testfile ) ) do |doc|
         if doc['in'] and doc['out']
             tests += 1
-            red = RedCloth.new( doc['in'] )
+            red = RedCloth.new( doc['in'], options )
             html = if testfile =~ /markdown/
                        red.to_html( :markdown )
                    elsif testfile =~ /docbook/
                                                                                          red.to_docbook
+                   elsif testfile =~ /textile/
+                       red.to_html( :textile )
                    else
                        red.to_html