From 291e3a42b529e6494ea75ca6e98974cfe3aefe28 Mon Sep 17 00:00:00 2001
From: pmario <pmariojo@gmail.com>
Date: Thu, 8 Feb 2024 14:44:34 +0100
Subject: [PATCH] allow toc-filter fields to created open/close chevrons

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

diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index 1bd293157..65dd30966 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -124,14 +124,18 @@ v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
 \procedure toc-tagChildFilter()     [tag<currentTiddler>]
 
 <!-- this function uses the variables NOT the tiddler fields -->
-\function tf.toc-hasChildren() [<tagField>!is[blank]then<toc-tagLikeChildFilter>] :else[<parentField>!is[blank]then<toc-parentChildFilter>else<toc-tagChildFilter>]
+\function tf.toc-hasChildren()
+	[<tagField>!is[blank]then<toc-tagLikeChildFilter>]
+	:else[<parentField>!is[blank]then<toc-parentChildFilter>else<toc-tagChildFilter>]
+\end
 
 \procedure toc-openBranch(path,currentTiddler,manual:"no")
 \procedure recursiveOpen(exclude, path)
 	<!-- tf-toc-stateTitle needs the path variable! -->
 	<$let path={{{ [<path>] "/" [<currentTiddler>] +[join[]] }}}>
+		<!-- It's common that users tag the <currentTiddler> with itself, so avoid redundant state tiddlers with -[<currentTiddler>] -->
 		<$list filter="[subfilter<tf.toc-hasChildren>] [subfilter<tf.toc-curTidInclude>] -[<currentTiddler>] -[subfilter<exclude>]" >
-			<% if [subfilter<tf.toc-hasChildren>] %>
+			<% if [subfilter<tf.toc-hasChildren>] [subfilter<tf.toc-curTidInclude>] -[<currentTiddler>] -[subfilter<exclude>] %>
 				<$set name="_excluded" filter="[subfilter<exclude>] [<currentTiddler>]">
 					<!-- tf-toc-stateTitle needs the path variable! -->
 					<$qualify name="toc-state" title=<<tf.toc-stateTitle>> >
@@ -261,7 +265,7 @@ Shows an expandable toc. Item always have an open/close chevron
 </$set>
 \end
 
-\function tf.toc-curTidInclude() [<currentTiddler>get<toc-includeField>]
+\function tf.toc-curTidInclude() [<currentTiddler>get<toc-includeField>] [<currentTiddler>get<toc-filterField>]
 
 \procedure toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path,captionField,tagField,parentField,itemTemplate)
 <$qualify name="toc-state" title=<<tf.toc-stateTitle>>>