Fixed: bold, italics, underline not working within parentheses (#1225).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1434 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: bold, italics, underline not working within parentheses (#1225).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1434 e93f8b46-1217-0410-a6f0-8f06a7374b81
1907c311 · Jean-Philippe Lang · 439c6972 · 1907c311 · 1907c311
Commit 1907c311 authored May 18, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

redcloth.rb lib/redcloth.rb +2 -2

application_helper_test.rb test/unit/helpers/application_helper_test.rb +7 -0

No files found.
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -376,13 +376,13 @@ class RedCloth < String
        re =
            case rtype
            when :limit
-                /(^|[>\s])
+                /(^|[>\s\(])
                (#{rcq})
                (#{C})
                (?::(\S+?))?
                ([^\s\-].*?[^\s\-]|\w)
                #{rcq}
-                (?=[[:punct:]]|\s|$)/x
+                (?=[[:punct:]]|\s|\)|$)/x
            else
                /(#{rcq})
                (#{C})

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -162,6 +162,13 @@ class ApplicationHelperTest < HelperTestCase
    to_test.each { |text, result| assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '') }
  end
  
+  def test_text_formatting
+    to_test = {'*_+bold, italic and underline+_*' => '<strong><em><ins>bold, italic and underline</ins></em></strong>',
+               '(_text within parentheses_)' => '(<em>text within parentheses</em>)'
+              }
+    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
+  end
+  
  def test_wiki_horizontal_rule
    assert_equal '<hr />', textilizable('---')
    assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')