* Work on firming up the plugin interface:

  - Plugins should not need to load IkiWiki::Render to get commonly
    used functions, so moved some functions from there to IkiWiki.
  - Picked out the set of functions and variables that most plugins
    use, documented them, and made IkiWiki export them by default,
    like a proper perl module should.
  - Use the other functions at your own risk.
  - This is not quite complete, I still have to decide whether to
    export some other things.
* Changed all plugins included in ikiwiki to not use "IkiWiki::" when
  referring to stuff now exported by the IkiWiki module.
* Anyone with a third-party ikiwiki plugin is strongly enrouraged
  to make like changes to it and avoid use of non-exported symboles from
  "IkiWiki::".
* Link debian/changelog and debian/news to NEWS and CHANGELOG.
* Support hyperestradier version 1.4.2, which adds a new required phraseform
  setting.

1 files changed, 6 insertions, 6 deletions

diff --git a/t/pagespec_merge.t b/t/pagespec_merge.t
index c2860709b..cbb06219c 100755
--- a/t/pagespec_merge.t
+++ b/t/pagespec_merge.t
@@ -3,20 +3,20 @@ use warnings;
 use strict;
 use Test::More tests => 25;
 
+BEGIN { use_ok("IkiWiki"); }
+
 sub same {
 	my $a=shift;
 	my $b=shift;
 	my $match=shift;
 	
-	my $imatch=(IkiWiki::pagespec_match($match, $a) ||
-		    IkiWiki::pagespec_match($match, $b));
-	my $cmatch=IkiWiki::pagespec_match($match, IkiWiki::pagespec_merge($a, $b));
+	my $imatch=(pagespec_match($match, $a) ||
+		    pagespec_match($match, $b));
+	my $cmatch=pagespec_match($match, IkiWiki::pagespec_merge($a, $b));
 	
 	return $imatch == $cmatch;
 }
 
-BEGIN { use_ok("IkiWiki"); }
-
 ok(same("foo", "bar", "foo"), "basic match 1");
 ok(same("foo", "bar", "bar"), "basic match 2");
 ok(same("foo", "bar", "foobar"), "basic failed match");
@@ -36,7 +36,7 @@ ok(same("f?? !f??", "!bar", "bar"), "matching glob and matching inverted glob");
 ok(same("b??", "!b?z", "bar"), "matching glob and non-matching inverted glob");
 ok(same("f?? !f?z", "!bar", "bar"), "matching glob and non-matching inverted glob");
 ok(same("!foo bar baz", "!bar", "bar"), "matching list and matching inversion");
-ok(IkiWiki::pagespec_match("foo/Discussion",
+ok(pagespec_match("foo/Discussion",
 	IkiWiki::pagespec_merge("* !*/Discussion", "*/Discussion")), "should match");
 ok(same("* !*/Discussion", "*/Discussion", "foo/Discussion"), "Discussion merge 1");
 ok(same("*/Discussion", "* !*/Discussion", "foo/Discussion"), "Discussion merge 2");