mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-09-11 15:26:05 +00:00
Code Issues Releases Wiki Activity

Remove unneeded scheme processing

Browse Source 
Now that we're dealing with the schemes during the import process it is no longer necessary for the compilation process to worry about it.
This commit is contained in:
Jeremy Ruston
2025-02-05 18:05:57 +00:00
parent 796c33bc46
commit 0d9ab2e2f6
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/wiki/macros/CSS.tid
View File

@@ -1,35 +1,31 @@
title: $:/core/macros/CSS title: $:/core/macros/CSS
tags: $:/tags/Macro tags: $:/tags/Macro
\procedure actions-compile-palette-filtered(consolidatedPalette,outputPalette,scheme) \procedure actions-compile-palette-filtered(consolidatedPalette,outputPalette)
<!-- Note the join, needed to cope with palette entries containing spaces --> <!-- Note the join, needed to cope with palette entries containing spaces -->
\function colour(name) [<name>addsuffix[@]addsuffix<scheme>] :map[<consolidatedPalette>getindex<currentTiddler>] +[!match[]] :else[<consolidatedPalette>getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>addsuffix[@]addsuffix<scheme>get[text]] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]] :map[subfilter<currentTiddler>join[ ]] \function colour(name) [<consolidatedPalette>getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]] :map[subfilter<currentTiddler>join[ ]]
\function color(name) [function[colour],<name>] \function color(name) [function[colour],<name>]
<!-- Make the colour function use the input palette --> <!-- Make the colour function use the input palette -->
<$list filter="[<consolidatedPalette>indexes[]sort[]]" variable="colour-name"> <$list filter="[<consolidatedPalette>indexes[]sort[]]" variable="colour-name">
<$let filter-text={{{ [<colour-name>addsuffix[@]addsuffix<scheme>] :map[<consolidatedPalette>getindex<currentTiddler>] +[!match[]] :else[<consolidatedPalette>getindex<colour-name>] :else[[$:/config/DefaultColourMappings/]addsuffix<colour-name>addsuffix[@]addsuffix<scheme>get[text]] :else[[$:/config/DefaultColourMappings/]addsuffix<colour-name>get[text]] }}}> <$let filter-text={{{ [<consolidatedPalette>getindex<colour-name>] :else[[$:/config/DefaultColourMappings/]addsuffix<colour-name>get[text]] }}}>
<!-- Note the join, needed to cope with palette entries containing spaces --> <!-- Note the join, needed to cope with palette entries containing spaces -->
<$action-setfield $tiddler=<<outputPalette>> $index=<<colour-name>> $value={{{ [subfilter<filter-text>join[ ]] }}}/> <$action-setfield $tiddler=<<outputPalette>> $index=<<colour-name>> $value={{{ [subfilter<filter-text>join[ ]] }}}/>
</$let> </$let>
</$list> </$list>
\end actions-compile-palette-filtered \end actions-compile-palette-filtered
\procedure actions-compile-palette-wikified(consolidatedPalette,outputPalette,scheme) \procedure actions-compile-palette-wikified(consolidatedPalette,outputPalette)
<!-- Define our own deeply backwards compatible local versions of the colour macro --> <!-- Define our own deeply backwards compatible local versions of the colour macro -->
\define colour(name) \define colour(name)
\whitespace trim \whitespace trim
<$transclude tiddler=<<consolidatedPalette>> index="$name$@$(scheme)$"> <$transclude tiddler=<<consolidatedPalette>> index="$name$">
<$transclude tiddler=<<consolidatedPalette>> index="$name$"> <$transclude tiddler="$:/config/DefaultColourMappings/$name$"/>
<$transclude tiddler="$:/config/DefaultColourMappings/$name$@$(scheme)$">
<$transclude tiddler="$:/config/DefaultColourMappings/$name$"/>
</$transclude>
</$transclude>
</$transclude> </$transclude>
\end colour \end colour
\define color(name) <<colour $name$>> \define color(name) <<colour $name$>>
<$list filter="[<consolidatedPalette>indexes[]sort[]]" variable="colour-name" $debug="yes"> <$list filter="[<consolidatedPalette>indexes[]sort[]]" variable="colour-name" $debug="yes">
<$let <$let
palette-entry-text={{{ [<colour-name>addsuffix[@]addsuffix<scheme>] :map[<consolidatedPalette>getindex<currentTiddler>] +[!match[]] :else[<consolidatedPalette>getindex<colour-name>] :else[[$:/config/DefaultColourMappings/]addsuffix<colour-name>get[text]] }}} palette-entry-text={{{ [<consolidatedPalette>getindex<colour-name>] :else[[$:/config/DefaultColourMappings/]addsuffix<colour-name>get[text]] }}}
> >
<$wikify name="colour-value" text=<<palette-entry-text>> mode="inline"> <$wikify name="colour-value" text=<<palette-entry-text>> mode="inline">
<$action-setfield $tiddler=<<outputPalette>> $index=<<colour-name>> $value=<<colour-value>>/> <$action-setfield $tiddler=<<outputPalette>> $index=<<colour-name>> $value=<<colour-value>>/>
@@ -91,9 +87,9 @@ tags: $:/tags/Macro
<$action-setfield $tiddler=<<outputPalette>> $field="color-scheme" $value=<<scheme>>/> <$action-setfield $tiddler=<<outputPalette>> $field="color-scheme" $value=<<scheme>>/>
<!-- Compile the temporary palette to the output palette --> <!-- Compile the temporary palette to the output palette -->
<%if [<inputPalette>get[palette-type]match[modern]] %> <%if [<inputPalette>get[palette-type]match[modern]] %>
<$transclude $variable="actions-compile-palette-filtered" consolidatedPalette=<<consolidatedPalette>> outputPalette=<<outputPalette>> scheme=<<scheme>>/> <$transclude $variable="actions-compile-palette-filtered" consolidatedPalette=<<consolidatedPalette>> outputPalette=<<outputPalette>>/>
<%else%> <%else%>
<$transclude $variable="actions-compile-palette-wikified" consolidatedPalette=<<consolidatedPalette>> outputPalette=<<outputPalette>> scheme=<<scheme>>/> <$transclude $variable="actions-compile-palette-wikified" consolidatedPalette=<<consolidatedPalette>> outputPalette=<<outputPalette>>/>
<%endif%> <%endif%>
<!-- Remove the temporary consolidated palette --> <!-- Remove the temporary consolidated palette -->
<!-- <$action-deletetiddler $tiddler=<<consolidatedPalette>>/> --> <!-- <$action-deletetiddler $tiddler=<<consolidatedPalette>>/> -->