From dc89360f03796465df96093b5a18a4abd661b4a3 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 11 Aug 2007 21:46:59 +0000
Subject: * The toc directive doesn't work well or make sense inside an inlined
 page.   Disable it when the page with the toc is nested inside another page.

---
 IkiWiki/Plugin/toc.pm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index bc62f71d6..070c07b0e 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -17,13 +17,20 @@ my %tocpages;
 sub preprocess (@) { #{{{
 	my %params=@_;
 
-	$params{levels}=1 unless exists $params{levels};
+	if ($params{page} eq $params{destpage}) {
+		$params{levels}=1 unless exists $params{levels};
 
-	# It's too early to generate the toc here, so just record the
-	# info.
-	$tocpages{$params{destpage}}=\%params;
+		# It's too early to generate the toc here, so just record the
+		# info.
+		$tocpages{$params{destpage}}=\%params;
 
-	return "\n<div class=\"toc\"></div>\n";
+		return "\n<div class=\"toc\"></div>\n";
+	}
+	else {
+		# Don't generate toc in an inlined page, doesn't work
+		# right.
+		return "";
+	}
 } # }}}
 
 sub format (@) { #{{{
-- 
cgit v1.2.3