From 473160c947f7c986ac692814190422ad85242346 Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Tue, 18 Nov 2008 11:25:13 +0000
Subject: [PATCH 1/2] htmlbalance: don't compact whitespace, and set misc other
options
Not compacting whitespace is the most important one: now that we run
sanitize hooks on individual posted comments in the comments plugin,
whitespace that is significant to Markdown (but not HTML) is lost.
(cherry picked from commit cb5aaa3cee8b35d6fc6e88a7449a9477a6587c7a)
---
IkiWiki/Plugin/htmlbalance.pm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 3a2d62d15..dcd92055f 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -30,7 +30,15 @@ sub sanitize (@) { #{{{
my %params=@_;
my $ret = '';
- my $tree = HTML::TreeBuilder->new_from_content($params{content});
+ my $tree = HTML::TreeBuilder->new();
+ $tree->ignore_unknown(0);
+ $tree->ignore_ignorable_whitespace(0);
+ $tree->no_space_compacting(1);
+ $tree->p_strict(1);
+ $tree->store_comments(0);
+ $tree->store_declarations(0);
+ $tree->store_pis(0);
+ $tree->parse_content($params{content});
my @nodes = $tree->disembowel();
foreach my $node (@nodes) {
if (ref $node) {
From 1f43a4fccc8b3b7ad4947b3052cbd803275bcbf0 Mon Sep 17 00:00:00 2001
From: Joey Hess
Date: Fri, 12 Dec 2008 14:23:33 -0500
Subject: [PATCH 2/2] add log entry
---
debian/changelog | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/changelog b/debian/changelog
index bf14860dd..76f00157d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
* inline: Support feedfile option to change the filename of the feed
generated.
* meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
+ * htmlbalance: don't compact whitespace, and set misc other options (smcv)
-- Joey Hess Mon, 17 Nov 2008 14:02:10 -0500