summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/htmltidy.pm9
-rw-r--r--debian/changelog2
2 files changed, 9 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 8a0e8f428..185d01dd6 100644
--- 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 527dd7884..c59c19af7 100644
--- 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