]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
* Allow dashes in preprocessor directive commands, and shortcuts.
authorJoey Hess <joey@kitenet.net>
Wed, 12 Dec 2007 21:13:15 +0000 (16:13 -0500)
committerJoey Hess <joey@kitenet.net>
Wed, 12 Dec 2007 21:13:15 +0000 (16:13 -0500)
IkiWiki.pm
debian/changelog
doc/plugins/shortcut/discussion.mdwn

index 0029fd2e817057e47bc675648127f97283e23c26..80750f502da428188c768c7c99eb62f637b08993 100644 (file)
@@ -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
                                        |
index af413c831709dc30270ef9742514b130b78f2bd0..8c8f4aa9573ba3d8d04777010f9175a64f569d2c 100644 (file)
@@ -28,6 +28,7 @@ ikiwiki (2.16) UNRELEASED; urgency=low
   * Avoid unnecessary stat calls to get mtime when rendering pages, use
     cached value.
   * 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
 
index 0ecf29537787c4adc634227926d393db441c0528..159e68ad837215f220336366ffff88fedee11c92 100644 (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?
 
+> No reason. Fixed in git. --[[Joey]]
+
 * The URL is rewritten to
     <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].