From 297ae7eccbfcde4589951dcfd962b4978fff59e7 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Sun, 10 Nov 2024 09:52:43 +0000
Subject: [PATCH] Fix preview of filtered palettes

---
 core/palette-templates/TwentyTwenties.tid     |  4 +-
 .../palette-templates/TwentyTwentiesGreen.tid |  4 +-
 core/wiki/currpalettepreview.tid              | 39 ++++++++++++++-----
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/core/palette-templates/TwentyTwenties.tid b/core/palette-templates/TwentyTwenties.tid
index 95f98252d..67bc3e820 100644
--- a/core/palette-templates/TwentyTwenties.tid
+++ b/core/palette-templates/TwentyTwenties.tid
@@ -59,7 +59,7 @@ muted-foreground: #bbbbbb
 network-activity-foreground: #448844
 notification-background: #ffffdd
 notification-border: #999999
-page-background: [function[colour],[primary]colour-oklch[0.9]]
+page-background: [function[colour],[primary]colour-oklch:l[0.5]colour-oklch:c[.1]]
 pre-background: #f5f5f5
 pre-border: #cccccc
 primary: #5778d8
@@ -104,7 +104,7 @@ tag-foreground: #ffffff
 testcase-accent-level-1: #c1eaff
 testcase-accent-level-2: #E3B740
 testcase-accent-level-3: #5FD564
-tiddler-background: [function[colour],[page-background]colour-oklch:h[0.5]]
+tiddler-background: [function[colour],[page-background]colour-oklch:c[.4]]
 tiddler-border: [function[colour],[background]]
 tiddler-controls-foreground-hover: #888888
 tiddler-controls-foreground-selected: #444444
diff --git a/core/palette-templates/TwentyTwentiesGreen.tid b/core/palette-templates/TwentyTwentiesGreen.tid
index 128c0b0dd..1ebb5306a 100644
--- a/core/palette-templates/TwentyTwentiesGreen.tid
+++ b/core/palette-templates/TwentyTwentiesGreen.tid
@@ -1,10 +1,10 @@
 title: $:/palettes/TwentyTwenties/Green
 name: TwentyTwenties (Green)
-description: Modern and flexible
+description: Modern and flexible, Greenish
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 color-scheme: light
 palette-type: modern
 palette-import: $:/palettes/TwentyTwenties
 
-page-background: #6e803c
\ No newline at end of file
+primary: #3c6e80
\ No newline at end of file
diff --git a/core/wiki/currpalettepreview.tid b/core/wiki/currpalettepreview.tid
index f19326916..15cb1c2e4 100644
--- a/core/wiki/currpalettepreview.tid
+++ b/core/wiki/currpalettepreview.tid
@@ -2,22 +2,41 @@ title: $:/snippets/currpalettepreview
 
 \whitespace trim
 
-\procedure colour(name)
+\procedure colour-div-filtered(class,styleName,styleColour)
+\function colour(name) [<currentTiddler>getindex<name>] :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>
+</$let>
+\end colour-div-filtered
+
+\procedure colour-div-wikified(class,styleName,styleColour)
+<!-- Define our own deeply backwards compatible local versions of the colour macro -->
+\define colour(name)
 \whitespace trim
-<$transclude $tiddler=<<currentTiddler>> $index=<<name>>>
-	<$transclude $tiddler="$:/palettes/Vanilla" $index=<<name>>>
-		<$transclude $tiddler={{{ [[$:/config/DefaultColourMappings/]addsuffix<name>] }}}/>
-	</$transclude>
+<$transclude tiddler=<<currentTiddler>> index="$name$">
+	<$transclude tiddler="$:/config/DefaultColourMappings/$name$"/>
 </$transclude>
 \end colour
+\define color(name) <<colour $name$>>
+<$wikify name="colour-result" text={{{ [[<<colour ]addsuffix<styleColour>addsuffix[>>]] }}} mode="inline">
+	<div class=<<class>> style={{{ [<styleName>addsuffix[:]addsuffix<colour-result>addsuffix[;]] }}}>
+		<$slot $name="ts-raw" $depth="2"/>
+	</div>
+</$wikify>
+\end colour-div-wikified
 
 \widget $colour.div(class,styleName,styleColour)
 <%if [<styleName>!match[]] %>
-<$wikify name="colour-result" text={{{ [[<<colour ]addsuffix<styleColour>addsuffix[>>]] }}} mode="inline">
-	<div class=<<class>> style={{{ [<styleName>addsuffix[:]addsuffix<colour-result>addsuffix[;]] }}}>
-		<$slot $name="ts-raw"/>
-	</div>
-</$wikify>
+	<%if [<currentTiddler>get[palette-type]match[modern]] %>
+		<$transclude $variable="colour-div-filtered" class=<<class>> styleName=<<styleName>> styleColour=<<styleColour>>/>
+	<%else%>
+		<$transclude $variable="colour-div-wikified" class=<<class>> styleName=<<styleName>> styleColour=<<styleColour>>/>
+	<%endif%>
 <%else%>
 	<div class=<<class>>>
 		<$slot $name="ts-raw"/>