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

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1434 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-05-18 08:24:31 +00:00
parent 439c697237
commit 1907c31138
2 changed files with 9 additions and 2 deletions

View File

@ -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})

View File

@ -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: ---')