diff options
author | Joey Hess <joey@kitenet.net> | 2007-12-12 16:13:15 -0500 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2007-12-12 16:13:15 -0500 |
commit | 214bc2b65be0e8797c1235adea7a19325babf46f (patch) | |
tree | 142126cc7bb9a25e1cb15bb666878135f2399d70 /IkiWiki.pm | |
parent | 849f65a3437391562b88fef9c450d0931676342f (diff) | |
download | ikiwiki-214bc2b65be0e8797c1235adea7a19325babf46f.tar ikiwiki-214bc2b65be0e8797c1235adea7a19325babf46f.tar.gz |
* Allow dashes in preprocessor directive commands, and shortcuts.
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r-- | IkiWiki.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 0029fd2e8..80750f502 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -680,7 +680,7 @@ sub preprocess ($$$;$$) { #{{{ # consider it significant. my @params; while ($params =~ m{ - (?:(\w+)=)? # 1: named parameter key? + (?:([-\w]+)=)? # 1: named parameter key? (?: """(.*?)""" # 2: triple-quoted value | @@ -740,11 +740,11 @@ sub preprocess ($$$;$$) { #{{{ $content =~ s{ (\\?) # 1: escape? \[\[ # directive open - (\w+) # 2: command + ([-\w]+) # 2: command \s+ ( # 3: the parameters.. (?: - (?:\w+=)? # named parameter key? + (?:[-\w]+=)? # named parameter key? (?: """.*?""" # triple-quoted value | |