add awesome

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0029fd2e817057e47bc675648127f97283e23c26..80750f502da428188c768c7c99eb62f637b08993 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -680,7 +680,7 @@ sub preprocess ($$$;$$) { #{{{
                        # consider it significant.
                        my @params;
                        while ($params =~ m{
                        # consider it significant.
                        my @params;
                        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{
                (\\?)           # 1: escape?
                \[\[            # directive open
        $content =~ s{
                (\\?)           # 1: escape?
                \[\[            # directive open

-               (\w+)           # 2: command
+               ([-\w]+)        # 2: command

                \s+
                (               # 3: the parameters..
                        (?:
                \s+
                (               # 3: the parameters..
                        (?:

-                               (?:\w+=)?               # named parameter key?
+                               (?:[-\w]+=)?            # named parameter key?

                                (?:
                                        """.*?"""       # triple-quoted value
                                        |
                                (?:
                                        """.*?"""       # triple-quoted value
                                        |