urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* htmltidy: Pass --markup yes, in case tidy's config file disabled it.

master
Joey Hess 2008-03-15 13:58:08 -04:00
parent e7ce86db11
commit 5a7a89ffc5
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/htmltidy.pm
View File

@ -22,7 +22,7 @@ sub sanitize (@) { #{{{
my $pid; my $pid;
my $sigpipe=0; my $sigpipe=0;
$SIG{PIPE}=sub { $sigpipe=1 }; $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'" # open2 doesn't respect "use open ':utf8'"
binmode (IN, ':utf8'); binmode (IN, ':utf8');

1
debian/changelog vendored
View File

@ -41,6 +41,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low
* Fix expiry of old recentchanges changeset pages. * Fix expiry of old recentchanges changeset pages.
* French translation update. Closes: #471010 * French translation update. Closes: #471010
* external: Fix support of XML::RPC::fault. * 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 -- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100

7
doc/bugs/htmltidy_has_no_possibilty_to_use_an_alternative_config_file_which_may_break_other_usages.mdwn
View File

@ -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]] >> 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, 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]]