diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-05-18 08:24:31 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-05-18 08:24:31 +0000 |
| commit | 1907c31138d065aea93f53b8e7565e06a44e49f8 (patch) | |
| tree | 80f6de01096bf74b2a6edd21be16239c0e332db6 | |
| parent | 439c697237224a5dde8fbe87a136239bfa0f99b6 (diff) | |
| download | redmine-1907c31138d065aea93f53b8e7565e06a44e49f8.tar.gz redmine-1907c31138d065aea93f53b8e7565e06a44e49f8.zip | |
Fixed: bold, italics, underline not working within parentheses (#1225).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1434 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redcloth.rb | 4 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/redcloth.rb b/lib/redcloth.rb index 7729ced46..f94c95738 100644 --- 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}) diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index e8b5883ce..8bd745124 100644 --- 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: ---') |