From c15f1e31fc3c36349feca1deca16ea42810f0c32 Mon Sep 17 00:00:00 2001
From: Leilei332 <LeiYiXia29@outlook.com>
Date: Fri, 17 Apr 2026 18:11:14 +0800
Subject: [PATCH 1/2] Replace some wikify widget with call dynamic attribute
 syntax

---
 core/ui/Actions/new-journal.tid          |  4 +--
 core/ui/EditTemplate/tags.tid            | 37 +++++++++---------------
 core/ui/TagPickerTagTemplate.tid         |  6 ++--
 core/ui/ViewToolbar/new-journal-here.tid |  4 +--
 4 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid
index 9d663e537c5..1f6dd870771 100644
--- a/core/ui/Actions/new-journal.tid
+++ b/core/ui/Actions/new-journal.tid
@@ -4,13 +4,11 @@ description: create a new journal tiddler
 
 \whitespace trim
 \function get-tags() [<textFieldTags>] [<tagsFieldTags>] +[join[ ]]
-<$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
-<$wikify name="journalTitle" text="<$transclude $variable='now' format=<<journalTitleTemplate>>/>">
+<$let journalTitle=<<now format={{$:/config/NewJournal/Title}}>> textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
 <$reveal type="nomatch" state=<<journalTitle>> text="">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text={{{ [<journalTitle>get[]] }}}/>
 </$reveal>
 <$reveal type="match" state=<<journalTitle>> text="">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text=<<journalText>>/>
 </$reveal>
-</$wikify>
 </$let>
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index bbd3d301eb0..2c9fa6cfa06 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -6,30 +6,21 @@ tags: $:/tags/EditTemplate
 \procedure lingo-base() $:/language/EditTemplate/
 
 \procedure tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
-<$wikify name="foregroundColor"
-	text="""<$macrocall $name="contrastcolour"
-		target=<<colour>>
-		fallbackTarget=<<fallbackTarget>>
-		colourA=<<colourA>>
-		colourB=<<colourB>>/>
-	"""
->
-	<$let backgroundColor=<<colour>> >
-		<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
-			data-tag-title=<<currentTiddler>>
-			style=`color:$(foregroundColor)$; fill:$(foregroundColor)$; background-color:$(backgroundColor)$;`
+<$let foregroundColor=<<contrastcolour target=<<colour>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>>> backgroundColor=<<colour>> >
+	<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
+		data-tag-title=<<currentTiddler>>
+		style=`color:$(foregroundColor)$; fill:$(foregroundColor)$; background-color:$(backgroundColor)$;`
+	>
+		<$transclude tiddler=<<icon>>/>
+		<$view field="title" format="text"/>
+		<$button class="tc-btn-invisible tc-remove-tag-button"
+			style.fill=<<foregroundColor>>
 		>
-			<$transclude tiddler=<<icon>>/>
-			<$view field="title" format="text"/>
-			<$button class="tc-btn-invisible tc-remove-tag-button"
-				style.fill=<<foregroundColor>>
-			>
-				<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="-[{!!title}]"/>
-				{{$:/core/images/close-button}}
-			</$button>
-		</span>
-	</$let>
-</$wikify>
+			<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="-[{!!title}]"/>
+			{{$:/core/images/close-button}}
+		</$button>
+	</span>
+</$let>
 \end
 
 \procedure tag-body(colour,palette,icon,tagField:"tags")
diff --git a/core/ui/TagPickerTagTemplate.tid b/core/ui/TagPickerTagTemplate.tid
index 9e868915397..e6f83ef602e 100644
--- a/core/ui/TagPickerTagTemplate.tid
+++ b/core/ui/TagPickerTagTemplate.tid
@@ -16,15 +16,13 @@ title: $:/core/ui/TagPickerTagTemplate
 	<$set name="backgroundColor"
 		value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
 	>
-		<$wikify name="foregroundColor"
-			text="""<$macrocall $name="contrastcolour" target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>/>"""
-		>
+		<$let foregroundColor=<<contrastcolour target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>>>>
 			<span class="tc-tag-label tc-btn-invisible"
 				style=<<tag-pill-styles>>
 				data-tag-title=<<currentTiddler>>
 			>
 				{{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/>
 			</span>
-		</$wikify>
+		</$let>
 	</$set>
 </$button>
diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid
index 2df7a2a4e69..816e224791d 100644
--- a/core/ui/ViewToolbar/new-journal-here.tid
+++ b/core/ui/ViewToolbar/new-journal-here.tid
@@ -6,7 +6,6 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 \whitespace trim
 \procedure journalButton()
 <$button tooltip={{$:/language/Buttons/NewJournalHere/Hint}} aria-label={{$:/language/Buttons/NewJournalHere/Caption}} class=<<tv-config-toolbar-class>>>
-<$wikify name="journalTitle" text="""<$transclude $variable="now" format=<<journalTitleTemplate>>/>""">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=`[[$(currentTiddlerTag)$]] $(journalTags)$`/>
 <%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/new-journal-button}}
@@ -16,9 +15,8 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 <$text text={{$:/language/Buttons/NewJournalHere/Caption}}/>
 </span>
 <%endif%>
-</$wikify>
 </$button>
 \end
-<$let journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags}} currentTiddlerTag=<<currentTiddler>>>
+<$let journalTitle=<<now format={{$:/config/NewJournal/Title}}>> journalTags={{$:/config/NewJournal/Tags}} currentTiddlerTag=<<currentTiddler>>>
 <<journalButton>>
 </$let>

From b987c5f4beab64bca0449ca096a43cb0652eb66d Mon Sep 17 00:00:00 2001
From: Leilei332 <LeiYiXia29@outlook.com>
Date: Sat, 18 Apr 2026 11:06:26 +0800
Subject: [PATCH 2/2] Apply suggestions

---
 core/ui/Actions/new-journal.tid          | 6 +++++-
 core/ui/EditTemplate/tags.tid            | 4 +++-
 core/ui/TagPickerTagTemplate.tid         | 2 +-
 core/ui/ViewToolbar/new-journal-here.tid | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid
index 1f6dd870771..c885880f4e2 100644
--- a/core/ui/Actions/new-journal.tid
+++ b/core/ui/Actions/new-journal.tid
@@ -4,7 +4,11 @@ description: create a new journal tiddler
 
 \whitespace trim
 \function get-tags() [<textFieldTags>] [<tagsFieldTags>] +[join[ ]]
-<$let journalTitle=<<now format={{$:/config/NewJournal/Title}}>> textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
+<$let journalTitle=<<now format={{$:/config/NewJournal/Title}}>>  
+	textFieldTags={{$:/config/NewJournal/Tags}}
+	tagsFieldTags={{$:/config/NewJournal/Tags!!tags}}
+	journalText={{$:/config/NewJournal/Text}}  
+>  
 <$reveal type="nomatch" state=<<journalTitle>> text="">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text={{{ [<journalTitle>get[]] }}}/>
 </$reveal>
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index 2c9fa6cfa06..20e1cad8e56 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -6,7 +6,9 @@ tags: $:/tags/EditTemplate
 \procedure lingo-base() $:/language/EditTemplate/
 
 \procedure tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
-<$let foregroundColor=<<contrastcolour target=<<colour>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>>> backgroundColor=<<colour>> >
+<$let foregroundColor=<<contrastcolour target=<<colour>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>> >>
+	backgroundColor=<<colour>>  
+>  
 	<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
 		data-tag-title=<<currentTiddler>>
 		style=`color:$(foregroundColor)$; fill:$(foregroundColor)$; background-color:$(backgroundColor)$;`
diff --git a/core/ui/TagPickerTagTemplate.tid b/core/ui/TagPickerTagTemplate.tid
index e6f83ef602e..6083609f96f 100644
--- a/core/ui/TagPickerTagTemplate.tid
+++ b/core/ui/TagPickerTagTemplate.tid
@@ -16,7 +16,7 @@ title: $:/core/ui/TagPickerTagTemplate
 	<$set name="backgroundColor"
 		value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
 	>
-		<$let foregroundColor=<<contrastcolour target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>>>>>
+		<$let foregroundColor=<<contrastcolour target=<<backgroundColor>> fallbackTarget=<<fallbackTarget>> colourA=<<colourA>> colourB=<<colourB>> >> >
 			<span class="tc-tag-label tc-btn-invisible"
 				style=<<tag-pill-styles>>
 				data-tag-title=<<currentTiddler>>
diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid
index 816e224791d..cba1889b7d0 100644
--- a/core/ui/ViewToolbar/new-journal-here.tid
+++ b/core/ui/ViewToolbar/new-journal-here.tid
@@ -17,6 +17,9 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 <%endif%>
 </$button>
 \end
-<$let journalTitle=<<now format={{$:/config/NewJournal/Title}}>> journalTags={{$:/config/NewJournal/Tags}} currentTiddlerTag=<<currentTiddler>>>
+<$let journalTitle=<<now format={{$:/config/NewJournal/Title}}>>
+	journalTags={{$:/config/NewJournal/Tags}}
+	currentTiddlerTag=<<currentTiddler>>  
+>
 <<journalButton>>
 </$let>