fixups tidy change

Need checkconfig hook; examples don't become default values.

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 8a0e8f42874cd4cc0eddc70f0f48830185a8b4c4..185d01dd68c54a3db899ee299a7a5552ba62a519 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -25,13 +25,18 @@ sub getsetup () {
                },
                htmltidy => {
                        type => "string",
-                       example => "tidy --show-body-only yes --show-warnings no --tidy-mark no --markup yes -quiet -asxhtml -utf8",
                        description => "tidy command line",
                        safe => 0, # path
-                       rebuild => 0,
+                       rebuild => undef,
                },
 }
 
+sub checkconfig () {
+       if (! defined $config{htmltidy}) {
+               $config{htmltidy}="tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes";
+       }
+}
+
 sub sanitize (@) {
        my %params=@_;
 

diff --git a/debian/changelog b/debian/changelog
index 527dd788407d54f2e7031d9b9c747eed7ebfab94..c59c19af798ce4371a52523809e19e2d06c4f21f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100927) UNRELEASED; urgency=low
 
   * Fix test suite failure on other side of date line.
+  * htmltidy: Allow configuring tidy parameters in setup file.
+    (W. Trevor King)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400