Add --prefix-directives and --no-prefix-directives options to ikiwiki

This avoids the need to set prefix_directives with --set.

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index cd8f0542c6a8eb3b2623b37ce2f39dfc7fdf03c1..4c08c5b39cd554c8e5ce84bd1da916b0a224d8f5 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -277,6 +277,11 @@ configuration options of their own.
 
   Toggle creating output files named page/index.html (default) instead of page.html.
 
+* --prefix-directives, --no-prefix-directives
+
+  Toggle new '!'-prefixed syntax for preprocessor directives.  ikiwiki currently
+  defaults to --no-prefix-directives.
+
 * --w3mmode, --no-w3mmode
 
   Enable [[w3mmode]], which allows w3m to use ikiwiki as a local CGI script,

diff --git a/ikiwiki.in b/ikiwiki.in
index 1ce7e16887d3389620349ff357ca165a87deabca..e0a59182422ae0d2aaa1b69d15fa3463f144d9c8 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -29,6 +29,7 @@ sub getconfig () { #{{{
                        "render=s" => \$config{render},
                        "wrappers!" => \$config{wrappers},
                        "usedirs!" => \$config{usedirs},
+                       "prefix-directives!" => \$config{prefix_directives},
                        "getctime" => \$config{getctime},
                        "numbacklinks=i" => \$config{numbacklinks},
                        "rcs=s" => \$config{rcs},