diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-03-12 13:43:11 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-03-12 13:43:11 +0000 |
| commit | 24b4c5f48dc0a8cf7896efe8cd205b1f506d8c19 (patch) | |
| tree | 9802daa80620031e3eb561d73f6c913ec8b9db43 /lib | |
| parent | 6ea1ef77e5e54dc19bc3e2987852e101cb64a5cf (diff) | |
| download | redmine-24b4c5f48dc0a8cf7896efe8cd205b1f506d8c19.tar.gz redmine-24b4c5f48dc0a8cf7896efe8cd205b1f506d8c19.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redcloth3.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index 37816a06a..1e3d31ab1 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -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 }" |