Ticket #2240: escape_shref.2.patch

trac/wiki/tests/wiki-tests.txt

@@ -564 +564 @@
 <a class="ext-link" href="rfc-2396.compatible://link"><span class="icon"></span>RFC 2396</a>
 </p>
 ==============================
+Test:[[BR]] There should be a line break
+
+!Change:[10] There should be a link to changeset [10]
+
+Other !test:'''bold text''' is not bold
+------------------------------
+<p>
+Test:<br /> There should be a line break
+</p>
+<p>
+Change:<a class="missing changeset" href="/changeset/10" rel="nofollow">[10]</a> There should be a link to changeset <a class="missing changeset" href="/changeset/10" rel="nofollow">[10]</a>
+</p>
+<p>
+Other test:<strong>bold text</strong> is not bold
+</p>
+==============================
+![Test:[[BR]] There should be a line break]
+
+![Change:[10] There should be a link to changeset [10]]
+
+Other ![test:'''bold text''' is not bold]
+------------------------------
+<p>
+[Test:<br /> There should be a line break]
+</p>
+<p>
+[Change:<a class="missing changeset" href="/changeset/10" rel="nofollow">[10]</a> There should be a link to changeset <a class="missing changeset" href="/changeset/10" rel="nofollow">[10]</a>]
+</p>
+<p>
+Other [test:<strong>bold text</strong> is not bold]
+</p>
+==============================
 = ça marche! =
 ------------------------------
 <h1 id="çamarche">ça marche!</h1>

trac/wiki/formatter.py

@@ -147 +147 @@
                   r"(?P<inlinecode2>!?%s(?P<inline2>.*?)%s)" % (INLINE_TOKEN,
                                                                 INLINE_TOKEN),
                   r"(?P<htmlescapeentity>!?&#\d+;)"]
-    _post_rules = [(r"(?P<shref>!?((?P<sns>%s):" % LINK_SCHEME +
+    _post_rules = [(r"(?P<escapehref>!\[?%s:|%s:\[\[(?:br|BR)\]\])" \
+                    % (LINK_SCHEME, LINK_SCHEME)),
+                   (r"(?P<shref>(?P<sns>%s):" % LINK_SCHEME +
                     r"(?P<stgt>'[^']+'|\"[^\"]+\"|"
-                    r"(?:\|(?=[^| ])|&(?!lt;)|[^|& ])*[^|'~_\.,& \)])))"),
-                   (r"(?P<lhref>!?\[(?:(?P<lns>%s):" % LINK_SCHEME +
+                    r"(?:\|(?=[^| ])|&(?!lt;)|[^|& ])*[^|'~_\.,& \)]))"),
+                   (r"(?P<lhref>\[(?:(?P<lns>%s):" % LINK_SCHEME +
                     r"(?P<ltgt>'[^']+'|\"[^\"]+\"|[^\] ]*)"
                     r"|(?P<rel>[/.][^ [\]]*))"
                     r"(?: (?P<label>'[^']+'|\"[^\"]+\"|[^\]]+))?\])"),
@@ -247 +249 @@
             self.open_tag(*italic)
         return tmp
 
+    def _escapehref_formatter(self, match, fullmatch):
+        return match[0] == '!' and match[1:] or '%s<br />' % match[:-6]
+
     def _shref_formatter(self, match, fullmatch):
         ns = fullmatch.group('sns')
         target = fullmatch.group('stgt')