From bd4b3e4107b4173445e50145e0a2b6722b07f5c4 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Wed, 8 Jan 2025 16:00:29 +0000
Subject: [PATCH] Fix some old-style palette references

---
 core/wiki/macros/tag.tid                                 | 6 +++---
 plugins/tiddlywiki/codemirror/styles.tid                 | 4 ++--
 plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/wiki/macros/tag.tid b/core/wiki/macros/tag.tid
index 2c539b42e..737aa7ef7 100644
--- a/core/wiki/macros/tag.tid
+++ b/core/wiki/macros/tag.tid
@@ -34,9 +34,9 @@ color:$(foregroundColor)$;
 	tag=<<__tag__>>
 	icon=<<__icon__>>
 	colour=<<__colour__>>
-	fallbackTarget={{$palette$##tag-background}}
-	colourA={{$palette$##foreground}}
-	colourB={{$palette$##background}}
+	fallbackTarget=<<colour tag-background>>
+	colourA=<<colour foreground>>
+	colourB=<<colour background>>
 	element-tag=<<__element-tag__>>
 	element-attributes=<<__element-attributes__>>
 	actions=<<__actions__>>
diff --git a/plugins/tiddlywiki/codemirror/styles.tid b/plugins/tiddlywiki/codemirror/styles.tid
index d0083805d..44bd09e54 100755
--- a/plugins/tiddlywiki/codemirror/styles.tid
+++ b/plugins/tiddlywiki/codemirror/styles.tid
@@ -10,7 +10,7 @@ name: tiddlywiki
 </$set>
 \end
 \define set-fat-cursor-background-colours(palette)
-<$macrocall $name="set-fat-cursor-background-css" colour={{$palette$##foreground}} colourA="#77ee77" colourB="#586e75"/>
+<$macrocall $name="set-fat-cursor-background-css" colour=<<colour foreground>> colourA="#77ee77" colourB="#586e75"/>
 \end
 \define set-fat-cursor-background()
 <$macrocall $name="set-fat-cursor-background-colours" palette={{$:/palette}}/>
@@ -28,7 +28,7 @@ name: tiddlywiki
 </$wikify>
 \end
 \define set-selection-background-colours(palette)
-<$macrocall $name="set-selection-background-css" colour={{$palette$##foreground}} colourA={{{ [{$palette$##selection-background}!match[]!prefix[<<]!suffix[>>]] ~#073642 }}} colourB={{{ [{$palette$##selection-background}!match[]!prefix[<<]!suffix[>>]] ~#eee8d5 }}} tiddlerEditorBackground={{$palette$##tiddler-editor-background}}/>
+<$macrocall $name="set-selection-background-css" colour=<<colour foreground>> colourA=<<colour selection-background>> colourB=<<colour selection-background>> tiddlerEditorBackground=<<colour tiddler-editor-background>>/>
 \end
 \define set-selection-background()
 <$macrocall $name="set-selection-background-colours" palette={{$:/palette}}/>
diff --git a/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid b/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid
index c2c14a7b0..f0f3abb98 100644
--- a/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid
+++ b/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid
@@ -45,9 +45,9 @@ color:$(foregroundColor)$;
 	tag=<<__tag__>>
 	icon=<<__icon__>>
 	colour=<<__colour__>>
-	fallbackTarget={{$palette$##tag-background}}
-	colourA={{$palette$##foreground}}
-	colourB={{$palette$##background}}
+	fallbackTarget=<<colour tag-background>>
+	colourA=<<colour foreground>>
+	colourB=<<colour background>>
 	element-tag=<<__element-tag__>>
 	element-attributes=<<__element-attributes__>>
 	actions=<<__actions__>>