From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 17 Feb 2012 22:37:03 +0000 (+0000)
Subject: Merged r8902 from trunk.
X-Git-Tag: 1.3.2~37
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f8875ee5135a31ae4850068fb00e747c7119cb9c;p=redmine.git

Merged r8902 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8903 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index d09804f41..117b64b25 100644
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -340,9 +340,9 @@ class RedCloth3 < String
     #
     A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/
     A_VLGN = /[\-^~]/
-    C_CLAS = '(?:\([^)]+\))'
-    C_LNGE = '(?:\[[^\[\]]+\])'
-    C_STYL = '(?:\{[^}]+\})'
+    C_CLAS = '(?:\([^")]+\))'
+    C_LNGE = '(?:\[[^"\[\]]+\])'
+    C_STYL = '(?:\{[^"}]+\})'
     S_CSPN = '(?:\\\\\d+)'
     S_RSPN = '(?:/\d+)'
     A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)"