From ef9878802abe72fd901b03e10b14d619d56a5bc5 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Wed, 10 Dec 2014 15:42:38 +0000
Subject: [PATCH] Transclude the caption field in toc macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For consistency with the way that tabs work.

To see this in action, on tiddlywiki.com open the tiddler
`$:/tags/ControlPanel` and edit it to add the tag “TableOfContents”.
You’ll see the control panel appear at the bottom of the table of
contents.
---
 core/wiki/macros/toc.tid | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index bd13d9f34..9f3824a62 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -7,9 +7,9 @@ tags: $:/tags/Macro
 <$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item">
 <li class=<<toc-item-class>>>
 <$list filter="[all[current]toc-link[no]]" emptyMessage="<$link><$view field='caption'><$view field='title'/></$view></$link>">
-<$view field="caption">
+<$transclude field="caption">
 <$view field="title"/>
-</$view>
+</$transclude>
 </$list>
 <$list filter="""[all[current]] -[[$rootTag$]]""">
 <$macrocall $name="toc-body" rootTag="""$rootTag$""" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -39,9 +39,9 @@ tags: $:/tags/Macro
 {{$:/core/images/down-arrow}}
 </$button>
 </$reveal>
-<$view field="caption">
+<$transclude field="caption">
 <$view field="title"/>
-</$view>
+</$transclude>
 </$link>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$macrocall $name="toc-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -58,17 +58,17 @@ tags: $:/tags/Macro
 <$reveal type="nomatch" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
-<$view field="caption">
+<$transclude field="caption">
 <$view field="title"/>
-</$view>
+</$transclude>
 </$button>
 </$reveal>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
-<$view field="caption">
+<$transclude field="caption">
 <$view field="title"/>
-</$view>
+</$transclude>
 </$button>
 </$reveal>
 <$reveal type="match" state=<<toc-state>> text="open">
@@ -106,9 +106,9 @@ tags: $:/tags/Macro
 </$button>
 </$reveal>
 </$list>
-<$view field="caption">
+<$transclude field="caption">
 <$view field="title"/>
-</$view>
+</$transclude>
 </$link>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$macrocall $name="toc-selective-expandable" tag=<<currentTiddler>> sort="""$sort$""" itemClassFilter="""$itemClassFilter$"""/>
@@ -126,17 +126,17 @@ tags: $:/tags/Macro
 <$reveal type="nomatch" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
-<$view field="caption">
+<$transclude field="caption">
 <$view field="title"/>
-</$view>
+</$transclude>
 </$button>
 </$reveal>
 <$reveal type="match" state=<<toc-state>> text="open">
 <$button set=<<toc-state>> setTo="close" class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
-<$view field="caption">
+<$transclude field="caption">
 <$view field="title"/>
-</$view>
+</$transclude>
 </$button>
 </$reveal>
 </$list>
@@ -173,7 +173,7 @@ tags: $:/tags/Macro
 <div class="tc-tabbed-table-of-contents-content">
 <$reveal state="""$selectedTiddler$""" type="nomatch" text="">
 <$transclude mode="block" tiddler="$template$">
-<h1><$view field="caption"><$view field="title"/></$view></h1>
+<h1><$transclude field="caption"><$view field="title"/></$transclude></h1>
 <$transclude mode="block">$missingText$</$transclude>
 </$transclude>
 </$reveal>