Add new preprocessor directive syntax¸ using a '!' prefix.

Add a prefix_directives option to the setup file to turn this syntax
on; currently defaults to false, for backward compatibility.  Support
optional '!' prefix even with prefix_directives off, and use that in
the underlay to support either setting of prefix_directives.  Add NEWS
entry with migration information.

2 files changed, 11 insertions, 1 deletions

diff --git a/t/linkify.t b/t/linkify.t
index 59af7bd4d..400e2e893 100755
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -24,9 +24,17 @@ sub linkify ($$$$) {
 	}
 	%config=IkiWiki::defaultconfig();
 	$config{cgiurl}="http://somehost/ikiwiki.cgi";
+	$config{srcdir}=$config{destdir}="/dev/null"; # placate checkconfig
 	# currently coded for non usedirs mode (TODO: check both)
 	$config{usedirs}=0;
 
+	# currently coded for prefix_directives=0 (TODO: check both)
+	# Not setting $config{prefix_directives}=0 explicitly; instead, let the
+	# tests break if the default changes, as a reminder to update the
+	# tests.
+
+	IkiWiki::checkconfig();
+
 	return IkiWiki::linkify($lpage, $page, $content);
 }
 
diff --git a/t/preprocess.t b/t/preprocess.t
index 9b029281f..7699f56ba 100755
--- a/t/preprocess.t
+++ b/t/preprocess.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 17;
+use Test::More tests => 19;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -23,6 +23,8 @@ $IkiWiki::hooks{preprocess}{foo}{call}=sub {
 
 is(IkiWiki::preprocess("foo", "foo", "[[foo]]", 0, 0), "[[foo]]", "not wikilink");
 is(IkiWiki::preprocess("foo", "foo", "[[foo ]]", 0, 0), "foo()", "simple");
+is(IkiWiki::preprocess("foo", "foo", "[[!foo ]]", 0, 0), "foo()", "prefixed");
+is(IkiWiki::preprocess("foo", "foo", "[[!foo]]", 0, 0), "[[!foo]]", "prefixed, no space");
 is(IkiWiki::preprocess("foo", "foo", "[[foo a=1]]", 0, 0), "foo(a => 1)");
 is(IkiWiki::preprocess("foo", "foo", "[[foo a=\"1 2 3 4\"]]", 0, 0), "foo(a => 1 2 3 4)");
 is(IkiWiki::preprocess("foo", "foo", "[[foo ]] then [[foo a=2]]", 0, 0),