diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-03-15 13:58:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-03-15 13:58:08 -0400 |
| commit | 5a7a89ffc59d008a6dd6586d26ff1a1fbb3bc51f (patch) | |
| tree | 9226e96dd5883da1024db7c7a2290e9a9f37ede7 | |
| parent | e7ce86db11174606d06a6cfabfa9c41aa3cbd50e (diff) | |
* htmltidy: Pass --markup yes, in case tidy's config file disabled it.
| -rw-r--r-- | IkiWiki/Plugin/htmltidy.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 19271b136..9591fbe04 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -22,7 +22,7 @@ sub sanitize (@) { #{{{ my $pid; my $sigpipe=0; $SIG{PIPE}=sub { $sigpipe=1 }; - $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no'); + $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes'); # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); diff --git a/debian/changelog b/debian/changelog index 85db048e8..4db324aca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low * Fix expiry of old recentchanges changeset pages. * French translation update. Closes: #471010 * external: Fix support of XML::RPC::fault. + * htmltidy: Pass --markup yes, in case tidy's config file disabled it. -- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100 diff --git a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn index d1eaffe55..ec02ddb89 100644 --- a/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn +++ b/doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn @@ -17,3 +17,10 @@ I see two possibilities how to fix this: >> Hmmm, ok. Well, it didn't work. Empty pages, Perl Warnings. I moved my $HOME/.tidyrc away and it worked again. Had a short look into it and the only obvious non-default setting I found was write-back. I'll check what exactly caused the breakage and let you know. --[[XTaran]] >>> Ok, found it. It indeed wasn't `write-back`, but `markup: no`. (I usually only want to see warnings and errors, not the fixed markup.) I now've corrected this in the bug report above. --[[XTaran]] + +> Ok, so should I pass --markup yes, or should I force it not to use +> ~/.tidyrc? I can do that (by setting HOME to /dev/null), but there seems +> to be no way to override it reading /etc/tidy.conf, so options there can +> still screw things up. I guess I'll pass --markup yes and deal with +> overriding other problem settings from config files if they're found +> later. --[[Joey]] [[tag done]] |