From 4e2f2bebd0f63cd34b5ef26af2637f6f4610be8d Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Sat, 9 Nov 2024 17:02:00 +0000
Subject: [PATCH] Avoid redefining the colour function by adding a
 configuration variable

---
 core/wiki/macros/CSS.tid | 41 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 92c349665..6a68c77e8 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -3,25 +3,24 @@ tags: $:/tags/Macro
 
 \procedure actions-compile-palette(inputTitle,outputTitle)
 <!-- Redefine colour function to use the input palette -->
-\function colour(name)
-	[<inputTitle>getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]]
-\end colour
-<!-- Process modern filter-based palettes -->
-<%if [<inputTitle>get[palette-type]match[modern]] %>
-	<$list filter="[<inputTitle>indexes[]sort[]]" variable="colour-name">
-		<$let colour-filter={{{ [<inputTitle>getindex<colour-name>] }}}>
-			<!-- Note the join, needed to cope with palette entries containing spaces -->
-			<$action-setfield $tiddler=<<outputTitle>> $index=<<colour-name>> $value={{{ [subfilter<colour-filter>join[ ]] }}}/>
-		</$let>
-	</$list>
-<%else%>
-<!-- Process legacy wikified palettes -->
-	<$list filter="[<inputTitle>indexes[]sort[]]" variable="colour-name">
-		<$wikify name="colour-value" text={{{ [<inputTitle>getindex<colour-name>] }}} mode="inline">
-			<$action-setfield $tiddler=<<outputTitle>> $index=<<colour-name>> $value=<<colour-value>>/>
-		</$wikify>
-	</$list>
-<%endif%>
+<$let tv-palette-name=<<inputTitle>>>
+	<!-- Process modern filter-based palettes -->
+	<%if [<inputTitle>get[palette-type]match[modern]] %>
+		<$list filter="[<inputTitle>indexes[]sort[]]" variable="colour-name">
+			<$let colour-filter={{{ [<inputTitle>getindex<colour-name>] }}}>
+				<!-- Note the join, needed to cope with palette entries containing spaces -->
+				<$action-setfield $tiddler=<<outputTitle>> $index=<<colour-name>> $value={{{ [subfilter<colour-filter>join[ ]] }}}/>
+			</$let>
+		</$list>
+	<%else%>
+	<!-- Process legacy wikified palettes -->
+		<$list filter="[<inputTitle>indexes[]sort[]]" variable="colour-name">
+			<$wikify name="colour-value" text={{{ [<inputTitle>getindex<colour-name>] }}} mode="inline">
+				<$action-setfield $tiddler=<<outputTitle>> $index=<<colour-name>> $value=<<colour-value>>/>
+			</$wikify>
+		</$list>
+	<%endif%>
+</$let>
 \end actions-compile-palette
 
 \procedure actions-switch-colour-palette(paletteTitle)
@@ -32,8 +31,10 @@ tags: $:/tags/Macro
 <$transclude $variable="actions-compile-palette" inputTitle=<<paletteTitle>> outputTitle="$:/temp/palette-colours"/>
 \end actions-switch-colour-palette
 
+\procedure tv-palette-name() $:/temp/palette-colours
+
 \function colour(name)
-[[$:/temp/palette-colours]getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]]
+[<tv-palette-name>getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]]
 \end colour
 
 \function color(name)