Changeset 8696
- Timestamp:
- Oct 26, 2009, 6:34:17 PM (14 years ago)
- Location:
- trunk/trac/wiki
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/trac/wiki/formatter.py
r8636 r8696 364 364 ns = fullmatch.group('sns') 365 365 target = self._unquote(fullmatch.group('stgt')) 366 match = match[1:-1] 367 return '<%s>' % \ 368 self._make_link(ns, target, match, match, fullmatch) 369 370 def _shref2_formatter(self, match, fullmatch): 371 ns = fullmatch.group('sns2') 372 target = self._unquote(fullmatch.group('stgt2')) 366 373 return self._make_link(ns, target, match, match, fullmatch) 367 374 -
trunk/trac/wiki/parser.py
r8679 r8696 78 78 # > ... 79 79 r"(?P<citation>^(?P<cdepth>>(?: *>)*))", 80 # <wiki:Trac links> 81 r"(?P<shref>!?<(?P<sns>%s):(?P<stgt>[^>]+)>)" % LINK_SCHEME, 80 82 # &, < and > to &, < and > 81 83 r"(?P<htmlescape>[&<>])", 82 84 # wiki:TracLinks 83 r"(?P<shref >!?((?P<sns>%s):(?P<stgt>%s|%s(?:%s*%s)?)))" \85 r"(?P<shref2>!?((?P<sns2>%s):(?P<stgt2>%s|%s(?:%s*%s)?)))" \ 84 86 % (LINK_SCHEME, QUOTED_STRING, 85 87 SHREF_TARGET_FIRST, SHREF_TARGET_MIDDLE, SHREF_TARGET_LAST), -
trunk/trac/wiki/tests/wiki-tests.txt
r8679 r8696 152 152 link:1 153 153 Thing [link:1 number 1], CS[link:1], [link:bar] 154 </p> 155 ------------------------------ 156 ============================== Link resolvers, alternative short form 157 <link:1> 158 159 Thing<link:2 and (3)> 160 ------------------------------ 161 <p> 162 <<a class="odd resolver" href="/thing/1">link:1</a>> 163 </p> 164 <p> 165 Thing<<a class="text resolver" href="/stuff/2%20and%20%283%29">link:2 and (3)</a>> 166 </p> 167 ------------------------------ 168 ============================== Escaping links resolvers, alternative short form 169 !<link:1> 170 ------------------------------ 171 <p> 172 <link:1> 154 173 </p> 155 174 ------------------------------
Note:
See TracChangeset
for help on using the changeset viewer.