leading colon breaks wiki syntax

[vittorio@…]

A leading colon breaks some (maybe all) wiki syntax.

Some Tests:

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

Output:

Test:
There should be a line break

Change:[10] There should be a link to [10]

Other test:bold text is not bold

tested using trunk r2385, python 2.3.5, mod_python

[Christian Boos]

Well, this is the syntax for TracLinks. With the current trunk, the example you gave don't make sense as links, but with InterTrac / InterWiki, they will:

• with InterTrac, what comes after the ":" is meant to be a shorthand to some object in the system. So Change:[10] would be interpreted as changeset 10 in the project named Change.
• with InterWiki, what comes after the ":" is simply appended to the URL corresponding to the InterWiki prefix. It's even possible to have multiple colon-separated arguments and have them replaced in arbitrary position in the URL (see #1414). So Test:[[BR]] could be a valid InterWiki link.
• lastly, test:'''...''' is interpreted as a link to test:'' followed by '...''', because single quotes (or double quotes) are use to quote target with embedded spaces.

That being said, there should be an easy way to escape those constructs.

I would propose to use the "!" prefix before what would otherwise look like a link prefix:

!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

[Christian Boos]

Use "!" before a TracLinks for escaping the link (second version, small fix)

[Christian Boos]

The attachment:escape_shref.patch​ implements the previous idea, and also enables the escaping of TracLinks with title, e.g.:

![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]

[Christian Boos]

Careful readers might have caught the two errors in my examples above… Well, I got the unit-tests right, at least :)

Need to work on #454…

[Christian Boos]

Take two, adding as a special case link:[[BR]] to translate to link:<br /> without the need of "!"

[Christian Boos]

Take three, this time on top of r2399:

tests/wiki-tests.txt

@@ -357 +357 @@
 </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:  There should be a line break
+
+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>
+
+Other test:<strong>bold text</strong> is not bold
+==============================
 {{{
 Preformatted text.
 }}}

formatter.py

@@ -137 +137 @@
 
     QUOTED_STRING = r"'[^']+'|\"[^\"]+\""
 
+    SHREF_TARGET_FIRST = r"[\w/?!#@]"
     SHREF_TARGET_MIDDLE = r"(?:\|(?=[^|\s])|&(?!lt;)|[^|&\s])"
-    SHREF_TARGET_LAST_CHAR = r"[^|'~_\.,&\s\)\]:?!]"
+    SHREF_TARGET_LAST = r"[a-zA-Z0-9/=]" # we don't want "_"
 
     LHREF_RELATIVE_TARGET = r"[/.][^\s[\]]*"
 
@@ -163 +164 @@
 
     _post_rules = [
         # shref corresponds to short TracLinks, i.e. sns:stgt
-        r"(?P<shref>((?P<sns>%s):(?P<stgt>%s|%s*%s)))" \
+        r"(?P<shref>((?P<sns>%s):(?P<stgt>%s|%s(?:%s*%s)?)))" \
         % (LINK_SCHEME, QUOTED_STRING,
-           SHREF_TARGET_MIDDLE, SHREF_TARGET_LAST_CHAR),
+           SHREF_TARGET_FIRST, SHREF_TARGET_MIDDLE, SHREF_TARGET_LAST),
         # lhref corresponds to long TracLinks, i.e. [lns:ltgt label?]
         r"(?P<lhref>\[(?:(?P<lns>%s):(?P<ltgt>%s|[^\]\s]*)|(?P<rel>%s))"
         r"(?:\s+(?P<label>%s|[^\]]+))?\])" \

For the rational about the SHREF_TARGET_LAST, see related #1153.

[vittorio@…]

using trunk r2400 patched with Ticket #1153: shref_fixes_r2399.patch, the three tests in the ticket description do work again! i couldnt find a problem when playing a bit with wiki and this patch.

[Christian Boos]

Fixed in r2401.

I'll reuse and update the attachment:escape_shref.2.patch​ for fixing #2251…