Fixed: text formatting breaks when using parenthesis inside bold tags (#1334).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3563 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2010-03-12 13:43:11 +00:00
parent 6ea1ef77e5
commit 24b4c5f48d
2 changed files with 28 additions and 9 deletions
+10 -9
View File
@@ -380,14 +380,12 @@ class RedCloth3 < String
re =
case rtype
when :limit
/(^|[>\s\(])
(#{QTAGS_JOIN}|)
(#{rcq})
(#{C})
(?::(\S+?))?
(\w|[^\s].*?[^\s])
/(^|[>\s\(]) # sta
(#{QTAGS_JOIN}|) # oqs
(#{rcq}) # qtag
(\w|[^\s].*?[^\s]) # content
#{rcq}
(#{QTAGS_JOIN}|)
(#{QTAGS_JOIN}|) # oqa
(?=[[:punct:]]|\s|\)|$)/x
else
/(#{rcq})
@@ -772,13 +770,16 @@ class RedCloth3 < String
case rtype
when :limit
sta,oqs,qtag,atts,cite,content,oqa = $~[1..7]
sta,oqs,qtag,content,oqa = $~[1..6]
atts = nil
if content =~ /^(#{C})(.+)$/
atts, content = $~[1..2]
end
else
qtag,atts,cite,content = $~[1..4]
sta = ''
end
atts = pba( atts )
atts << " cite=\"#{ cite }\"" if cite
atts = shelve( atts ) if atts
"#{ sta }#{ oqs }<#{ ht }#{ atts }>#{ content }</#{ ht }>#{ oqa }"