From 3faf9bae5c0dfd4f45d2e5de6fe181ab5fe1c356 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Thu, 14 Nov 2024 17:40:58 +0000
Subject: [PATCH] Fix previews of filtered palettes

---
 core/wiki/currpalettepreview.tid | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/wiki/currpalettepreview.tid b/core/wiki/currpalettepreview.tid
index 25a82ff7a..56d301ec8 100644
--- a/core/wiki/currpalettepreview.tid
+++ b/core/wiki/currpalettepreview.tid
@@ -3,14 +3,15 @@ title: $:/snippets/currpalettepreview
 \whitespace trim
 
 \procedure colour-div-filtered(class,styleName,styleColour)
-\function colour(name) [<currentTiddler>getindex<name>] :else[<currentTiddler>get[palette-import]getindex<name>] :else[[none]] :map[subfilter<currentTiddler>]
-<$let colour-filter={{{ [<currentTiddler>getindex<styleColour>] }}}>
-	<!-- Note the join, needed to cope with palette entries containing spaces -->
-	<$let colour-result={{{ [subfilter<colour-filter>join[ ]] }}}>
-		<div class=<<class>> style={{{ [<styleName>addsuffix[:]addsuffix<colour-result>addsuffix[;]] }}}>
-			<$slot $name="ts-raw" $depth="2"/>
-		</div>
-	</$let>
+\function colour(name) [<colour-palette>getindex<name>] :else[<colour-palette>get[palette-import]getindex<name>] :else[[none]] :map[subfilter<currentTiddler>] +[join[ ]]
+<!-- Note the join, needed to cope with palette entries containing spaces -->
+<$let
+	colour-palette=<<currentTiddler>>
+	colour-result={{{ [function[colour],<styleColour>] +[join[ ]] }}}
+>
+	<div class=<<class>> style={{{ [<styleName>addsuffix[:]addsuffix<colour-result>addsuffix[;]] }}}>
+		<$slot $name="ts-raw" $depth="2"/>
+	</div>
 </$let>
 \end colour-div-filtered