web commit by http://ptecza.myopenid.com/: * Question about nested plugins

[git.ikiwiki.info.git] / IkiWiki / Plugin / toggle.pm

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 92a89bd79fe70fa18715bf8451ddc9d831410d57..3f9c4867256ab0f9aa9f23bd1026f9594ee27a39 100644 (file)
--- 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);
 } # }}}
 
@@ -87,15 +87,18 @@ 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 (@) { #{{{