From 04a9dbfe7daa9c352ae4e9af17df8134248f3806 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 22 Nov 2006 14:28:38 +0000
Subject: updates

---
 IkiWiki/Plugin/goodstuff.mdwn | 30 ------------------------------
 IkiWiki/Plugin/goodstuff.pm   | 30 ++++++++++++++++++++++++++++++
 IkiWiki/Plugin/toggle.pm      |  7 +++++--
 3 files changed, 35 insertions(+), 32 deletions(-)
 delete mode 100644 IkiWiki/Plugin/goodstuff.mdwn
 create mode 100644 IkiWiki/Plugin/goodstuff.pm

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/goodstuff.mdwn b/IkiWiki/Plugin/goodstuff.mdwn
deleted file mode 100644
index 384123f60..000000000
--- a/IkiWiki/Plugin/goodstuff.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/perl
-# Bundle of good stuff.
-package IkiWiki::Plugin::goodstuff;
-
-use warnings;
-use strict;
-use IkiWiki;
-
-my @bundle=qw{
-	brokenlinks
-	img
-	map
-	meta
-	orphans
-	pagecount
-	pagestats
-	shortcut
-	smiley
-	tag
-	template
-	toc
-	toggle
-	otl
-};
-
-sub import { #{{{
-	IkiWiki::loadplugin($_) foreach @bundle;
-} # }}}
-
-1
diff --git a/IkiWiki/Plugin/goodstuff.pm b/IkiWiki/Plugin/goodstuff.pm
new file mode 100644
index 000000000..384123f60
--- /dev/null
+++ b/IkiWiki/Plugin/goodstuff.pm
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+# Bundle of good stuff.
+package IkiWiki::Plugin::goodstuff;
+
+use warnings;
+use strict;
+use IkiWiki;
+
+my @bundle=qw{
+	brokenlinks
+	img
+	map
+	meta
+	orphans
+	pagecount
+	pagestats
+	shortcut
+	smiley
+	tag
+	template
+	toc
+	toggle
+	otl
+};
+
+sub import { #{{{
+	IkiWiki::loadplugin($_) foreach @bundle;
+} # }}}
+
+1
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 92a89bd79..9e1afc08d 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -94,8 +94,11 @@ sub preprocess_toggleable (@) { #{{{
 	my $id=genid($params{page}, $params{id});
 
 	# Should really be a postprocessor directive, oh well. Work around
-	# markdown's dislike of markdown inside a <div>.
-	return "<div class=\"toggleable\" id=\"$id\"></div>\n\n$params{text}\n<div class=\"toggleableend\"></div>";
+	# markdown's dislike of markdown inside a <div> with various funky
+	# whitespace.
+	my ($indent)=$params{text}=~/( +)$/;
+	$indent="" unless defined $indent;
+	return "<div class=\"toggleable\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";
 } # }}}
 
 sub format (@) { #{{{
-- 
cgit v1.2.3