From 9adc30f69fba169813638021780263ff0df4e2bc Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Wed, 10 Sep 2014 21:55:11 +0100
Subject: [PATCH] Fix bugs with selective expandable toc macro

---
 core/wiki/macros/toc.tid | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index 6bfdae950..6d3ef402b 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -81,7 +81,7 @@ tags: $:/tags/Macro
 <$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
 <li>
 <$link>
-<$list filter="[all[current]tagging[]limit[1]]" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
+<$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
 <$reveal type="nomatch" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
@@ -107,7 +107,7 @@ tags: $:/tags/Macro
 \define toc-unlinked-selective-expandable-body(tag,sort:"")
 <$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
 <li>
-<$list filter="[all[current]tagging[]limit[1]]" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
+<$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button> <$view field='caption'><$view field='title'/></$view>">
 <$reveal type="nomatch" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
@@ -135,7 +135,7 @@ tags: $:/tags/Macro
 \define toc-selective-expandable(tag,sort:"")
 <ol class="tc-toc toc-selective-expandable">
 <$list filter="[tag[$tag$]$sort$]">
-<$list filter="[is[current]toc-link[no]]" emptyMessage="<<toc-linked-selective-expandable-body tag:'$tag$' sort:'$sort$'>>">
+<$list filter="[is[current]toc-link[no]]" variable="ignore" emptyMessage="<<toc-linked-selective-expandable-body tag:'$tag$' sort:'$sort$'>>">
 <<toc-unlinked-selective-expandable-body tag:"$tag$" sort:"$sort$">>
 </$list>
 </$list>