Ticket #2029: external_link_fix.patch

tests/wiki-tests.txt

@@ -61 +61 @@
 </p>
 ==============================
 ticket:1, changeset:1, report:1, source:foo/bar
+
+Issue [ticket:1], CS[changeset:1], Listing [report:1], File [source:foo/bar]
 ------------------------------
 <p>
 <a class="missing ticket" href="/ticket/1" rel="nofollow">ticket:1</a>, <a class="missing changeset" href="/changeset/1" rel="nofollow">changeset:1</a>, <a class="report" href="/report/1">report:1</a>, <a class="source" href="/browser/foo/bar">source:foo/bar</a>
 </p>
+<p>
+Issue <a class="missing ticket" href="/ticket/1" rel="nofollow">1</a>, CS<a class="missing changeset" href="/changeset/1" rel="nofollow">1</a>, Listing <a class="report" href="/report/1">1</a>, File <a class="source" href="/browser/foo/bar">foo/bar</a>
+</p>
 ==============================
 [ticket:1 ticket 1], [changeset:1 changeset 1], [report:1 report 1], 
 [source:foo/bar source foo/bar], [http://www.edgewall.com/ edgewall]
@@ -135 +140 @@
 wiki:Foo%20Bar wiki:Foo%20Bar#baz
 
 [wiki:Foo%20Bar Foo Bar] [wiki:Foo%20Bar#baz Foo Bar]
+
+[wiki:Argv "*argv[] versus **argv"]
 ------------------------------
 <p>
 <a class="missing wiki" href="/wiki/WikiStart" rel="nofollow">Foo?</a> <a class="ext-link" href="http://www.edgewall.com/"><span class="icon"></span>Edgewall</a>
@@ -145 +152 @@
 <p>
 <a class="missing wiki" href="/wiki/Foo%20Bar" rel="nofollow">Foo Bar?</a> <a class="missing wiki" href="/wiki/Foo%20Bar#baz" rel="nofollow">Foo Bar?</a>
 </p>
+<p>
+<a class="missing wiki" href="/wiki/Argv" rel="nofollow">*argv[] versus **argv?</a>
+</p>
 ==============================
 foo (FooBar)
 

formatter.py

@@ -155 +155 @@
                    (r"(?P<lhref>!?\[(?:(?P<lns>%s):" % LINK_SCHEME +
                     r"(?P<ltgt>'[^']+'|\"[^\"]+\"|[^\] ]+)"
                     r"|(?P<rel>[/.][^ [\]]*))"
-                    r"(?: (?P<label>.*?))?\])"),
+                    r"(?: (?P<label>'[^']+'|\"[^\"]+\"|[^\]]+))?\])"),
                    (r"(?P<macro>!?\[\[(?P<macroname>[\w/+-]+)"
                     r"(\]\]|\((?P<macroargs>.*?)\)\]\]))"),
                    r"(?P<heading>^\s*(?P<hdepth>=+)\s.*\s(?P=hdepth)\s*$)",
@@ -289 +289 @@
         target = fullmatch.group('ltgt') 
         if target and target[0] in "'\"":
             target = target[1:-1]
-        label = fullmatch.group('label') or target
+        label = fullmatch.group('label')
+        if not label:
+            if target:
+                label = target.startswith('//') and ns+':'+target or target
+            else:
+                label = ns
+        if label and label[0] in "'\"":
+            label = label[1:-1]
         rel = fullmatch.group('rel')
         if rel:
             return self._make_relative_link(rel, label or rel)