urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Allow dashes in preprocessor directive commands, and shortcuts.

master
Joey Hess 2007-12-12 16:13:15 -05:00
parent 849f65a343
commit 214bc2b65b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki.pm
View File

@ -680,7 +680,7 @@ sub preprocess ($$$;$$) { #{{{
# consider it significant. # consider it significant.
my @params; my @params;
while ($params =~ m{ while ($params =~ m{
(?:(\w+)=)? # 1: named parameter key? (?:([-\w]+)=)? # 1: named parameter key?
(?: (?:
"""(.*?)""" # 2: triple-quoted value """(.*?)""" # 2: triple-quoted value
| |
@ -740,11 +740,11 @@ sub preprocess ($$$;$$) { #{{{
$content =~ s{ $content =~ s{
(\\?) # 1: escape? (\\?) # 1: escape?
\[\[ # directive open \[\[ # directive open
(\w+) # 2: command ([-\w]+) # 2: command
\s+ \s+
( # 3: the parameters.. ( # 3: the parameters..
(?: (?:
(?:\w+=)? # named parameter key? (?:[-\w]+=)? # named parameter key?
(?: (?:
""".*?""" # triple-quoted value """.*?""" # triple-quoted value
| |

1
debian/changelog vendored
View File

@ -28,6 +28,7 @@ ikiwiki (2.16) UNRELEASED; urgency=low
* Avoid unnecessary stat calls to get mtime when rendering pages, use * Avoid unnecessary stat calls to get mtime when rendering pages, use
cached value. cached value.
* Preserve input file modification times in output files. * Preserve input file modification times in output files.
* Allow dashes in preprocessor directive commands, and shortcuts.
-- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500 -- Joey Hess <joeyh@debian.org> Mon, 03 Dec 2007 14:47:36 -0500

2
doc/plugins/shortcut/discussion.mdwn
View File

@ -3,6 +3,8 @@ I'd like to use a shortcut like \[[gnumach-1-branch ddb/db_expr.h]] to link to
* Dashes are not allowed in shortcut identifiers. Why? * Dashes are not allowed in shortcut identifiers. Why?
> No reason. Fixed in git. --[[Joey]]
* The URL is rewritten to * The URL is rewritten to
<http://cvs.savannah.gnu.org/viewvc/gnumach/ddb%2Fdb%5Fexpr%2Eh?view=log&root=hurd&pathrev=gnumach-1-branch>, <http://cvs.savannah.gnu.org/viewvc/gnumach/ddb%2Fdb%5Fexpr%2Eh?view=log&root=hurd&pathrev=gnumach-1-branch>,
which the remove server doesn't like. Mind the esacping of [^A-Za-z0-9]. which the remove server doesn't like. Mind the esacping of [^A-Za-z0-9].