X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4a40b5f9d56e4a36112af0007f52357761a5b3fb..43c647edd31c224e0ca07785ef1ac7e856639c09:/IkiWiki/Plugin/toggle.pm

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 92a89bd79..df5a2a737 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::toggle;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 # Here's the javascript that makes this possible. A key feature is the use
 # of css to hide toggleables, to avoid any flashing on page load. The css
@@ -58,7 +58,7 @@ sub import { #{{{
 	hook(type => "preprocess", id => "toggle",
 		call => \&preprocess_toggle);
 	hook(type => "preprocess", id => "toggleable",
-		call => \&preprocess_toggleable, scan => 1);
+		call => \&preprocess_toggleable);
 	hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 
@@ -80,22 +80,31 @@ sub preprocess_toggle (@) { #{{{
 	my %params=(id => "default", text => "more", @_);
 
 	my $id=genid($params{page}, $params{id});
-	return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
+	if (! $params{preview}) {
+		return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
+	}
+	else {
+		return "$params{text} ".
+			gettext("(not toggleable in preview mode)");
+	}
 } # }}}
 
 sub preprocess_toggleable (@) { #{{{
 	my %params=(id => "default", text => "", @_);
 
 	# Preprocess the text to expand any preprocessor directives
-	# embedded inside it. This is why scan is set for this preprocessor
-	# directive, since it could expand to something with a link in it.
-	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
+	# embedded inside it.
+	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
+		IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
 	
 	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 (@) { #{{{