From d4f6befb9b199aa5c2e94101870aa4b927084879 Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Wed, 14 Feb 2024 17:21:08 +0100
Subject: [PATCH 1/5] Remove overflow: auto from tiddler preview (#7985)

This removes `overflow: auto` from the tiddler preview.
I'm not sure anymore why it was added.
It causes some problems in the preview with popups for example, see screenshots
---
 themes/tiddlywiki/vanilla/base.tid | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 618afc695..1ca85c6a7 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1577,10 +1577,6 @@ html body.tc-body.tc-single-tiddler-window {
 	padding-left: 4px;
 }
 
-.tc-tiddler-preview {
-	overflow: auto;
-}
-
 .tc-tiddler-editor {
 	display: grid;
 }

From a3521eb67d68503e502b6f99cbf85e6849cc85d2 Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Wed, 14 Feb 2024 17:22:54 +0100
Subject: [PATCH 2/5] Use qualified-preview-state in default body-editor for
 reuse in preview button (#7795)

* Use qualified-preview-state to reuse in preview button

Somehow the editor-body template and the preview button don't qualify the same showeditpreview anymore

* Update preview.tid to use qualified-preview-state

* Update preview.tid

* Update default.tid

* Update preview.tid
---
 core/ui/EditTemplate/body/default.tid | 9 +++++++--
 core/ui/EditorToolbar/preview.tid     | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/ui/EditTemplate/body/default.tid b/core/ui/EditTemplate/body/default.tid
index 04cc64436..d004032f1 100644
--- a/core/ui/EditTemplate/body/default.tid
+++ b/core/ui/EditTemplate/body/default.tid
@@ -1,5 +1,9 @@
 title: $:/core/ui/EditTemplate/body/default
 
+\function edit-preview-state()
+[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] +[get[text]] :else[[no]]
+\end
+
 \define config-visibility-title()
 $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 \end
@@ -10,12 +14,13 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 \whitespace trim
 <$let
-	editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
+	qualified-preview-state=<<qualify "$:/state/showeditpreview">>
+	editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] }}}
 	importTitle=<<qualify $:/ImportImage>>
 	importState=<<qualify $:/state/ImportImage>> >
 <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
 <div>
-<div class={{{ [<editPreviewStateTiddler>get[text]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
+<div class={{{ [<edit-preview-state>match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 
diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid
index ea49c971a..d5c63eb5f 100644
--- a/core/ui/EditorToolbar/preview.tid
+++ b/core/ui/EditorToolbar/preview.tid
@@ -10,7 +10,7 @@ shortcuts: ((preview))
 
 \whitespace trim
 <span>
-	<$transclude $tiddler={{{ [<editPreviewStateTiddler>get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
+	<$transclude $tiddler={{{ [<edit-preview-state>match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
 </span>
 <$action-setfield $tiddler=<<editPreviewStateTiddler>> $value={{{ [<editPreviewStateTiddler>get[text]toggle[yes],[no]] }}} />
-<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
\ No newline at end of file
+<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>

From 53ccc29209fd6dec6df1735ad02e0357394818c9 Mon Sep 17 00:00:00 2001
From: Mario Pietsch <pmariojo@gmail.com>
Date: Wed, 14 Feb 2024 19:36:32 +0100
Subject: [PATCH 3/5] Copy-to-clipboard macro - change tags to $:/tags/Global
 (#7988)

* copy-to-clipboard-macors -- new v5.3.x syntax

* copy-to-clipboard - change tags to $:/tags/Global
---
 core/wiki/macros/copy-to-clipboard.tid | 28 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/core/wiki/macros/copy-to-clipboard.tid b/core/wiki/macros/copy-to-clipboard.tid
index 910e955a9..8903e6722 100644
--- a/core/wiki/macros/copy-to-clipboard.tid
+++ b/core/wiki/macros/copy-to-clipboard.tid
@@ -1,20 +1,26 @@
 title: $:/core/macros/copy-to-clipboard
-tags: $:/tags/Macro
+tags: $:/tags/Global
 
-\define copy-to-clipboard(src,class:"tc-btn-invisible",style)
 \whitespace trim
-<$button class=<<__class__>> style=<<__style__>> message="tm-copy-to-clipboard" param=<<__src__>> tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}>
-{{$:/core/images/copy-clipboard}}
-&#32;
-<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+
+\procedure copy-to-clipboard(src,class:"tc-btn-invisible",style)
+<$button message="tm-copy-to-clipboard"
+	param=<<src>>
+	class=<<class>>
+	style=<<style>>
+	tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}
+>
+	{{$:/core/images/copy-clipboard}}
+	<span class="tc-tiny-gap-left">
+		<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+	</span>
 </$button>
 \end
 
-\define copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
-\whitespace trim
+\procedure copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
 <div style="position: relative;">
-<div style="position: absolute; bottom: 0; right: 0;">
-<$macrocall $name="copy-to-clipboard" src=<<__src__>> class=<<__class__>> style=<<__style__>>/>
-</div>
+	<div style="position: absolute; bottom: 0; right: 0;">
+		<$macrocall $name="copy-to-clipboard" src=<<src>> class=<<class>> style=<<style>>/>
+	</div>
 </div>
 \end

From 699d8b9416a96e0a2eb73cba8a908779821fae50 Mon Sep 17 00:00:00 2001
From: Mario Pietsch <pmariojo@gmail.com>
Date: Wed, 14 Feb 2024 19:44:22 +0100
Subject: [PATCH 4/5] css-macro -- change tags to $:/tags/Global (#7987)

* $:/core/macros/CSS use v5.3.x syntax

* css-macro -- change tags to $:/tags/Global
---
 core/wiki/macros/CSS.tid | 95 +++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 51 deletions(-)

diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 9e6239e90..0fcf5d86d 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -1,76 +1,69 @@
 title: $:/core/macros/CSS
-tags: $:/tags/Macro
+tags: $:/tags/Global
 
-\define colour(name)
-<$transclude tiddler={{$:/palette}} index="$name$"><$transclude tiddler="$:/palettes/Vanilla" index="$name$"><$transclude tiddler="$:/config/DefaultColourMappings/$name$"/></$transclude></$transclude>
+\procedure colour(name)
+\whitespace trim
+<$transclude $tiddler={{$:/palette}} $index=`$(name)$`>
+	<$transclude $tiddler="$:/palettes/Vanilla" $index=`$(name)$`>
+		<$transclude $tiddler=`$:/config/DefaultColourMappings/$(name)$`/>
+	</$transclude>
+</$transclude>
 \end
 
-\define color(name)
-<<colour $name$>>
+\procedure color(name)
+<$macrocall $name=colour name=`$(name)$`/>
 \end
 
-\define box-shadow(shadow)
-``
-  -webkit-box-shadow: $shadow$;
-     -moz-box-shadow: $shadow$;
-          box-shadow: $shadow$;
-``
+\function box-shadow(shadow)
+[[ -webkit-box-shadow: $(shadow)$;
+	-moz-box-shadow: $(shadow)$;
+	box-shadow: $(shadow)$;]substitute[]]
 \end
 
-\define filter(filter)
-``
-  -webkit-filter: $filter$;
-     -moz-filter: $filter$;
-          filter: $filter$;
-``
+\function filter(filter)
+[[ -webkit-filter: $(filter)$;
+	-moz-filter: $(filter)$;
+	filter: $(filter)$;]substitute[]]
 \end
 
-\define transition(transition)
-``
-  -webkit-transition: $transition$;
-     -moz-transition: $transition$;
-          transition: $transition$;
-``
+\function transition(transition)
+[[ -webkit-transition: $(transition)$;
+	-moz-transition: $(transition)$;
+	transition: $(transition)$;]substitute[]]
 \end
 
-\define transform-origin(origin)
-``
-  -webkit-transform-origin: $origin$;
-     -moz-transform-origin: $origin$;
-          transform-origin: $origin$;
-``
+\function transform-origin(origin)
+[[ -webkit-transform-origin: $(origin)$;
+	-moz-transform-origin: $(origin)$;
+	transform-origin: $(origin)$;]substitute[]]
 \end
 
-\define background-linear-gradient(gradient)
-``
-background-image: linear-gradient($gradient$);
-background-image: -o-linear-gradient($gradient$);
-background-image: -moz-linear-gradient($gradient$);
-background-image: -webkit-linear-gradient($gradient$);
-background-image: -ms-linear-gradient($gradient$);
-``
+\function background-linear-gradient(gradient)
+[[	background-image: linear-gradient($(gradient)$);
+	background-image: -o-linear-gradient($(gradient)$);
+	background-image: -moz-linear-gradient($(gradient)$);
+	background-image: -webkit-linear-gradient($(gradient)$);
+	background-image: -ms-linear-gradient($(gradient)$);]substitute[]]
 \end
 
-\define column-count(columns)
-``
--moz-column-count: $columns$;
--webkit-column-count: $columns$;
-column-count: $columns$;
-``
+\function column-count(columns)
+[[-moz-column-count: $(columns)$;
+	-webkit-column-count: $(columns)$;
+	column-count: $(columns)$;]substitute[]]
 \end
 
-\define datauri(title)
-<$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}} _canonical_uri={{$title$!!_canonical_uri}}/>
+\procedure datauri(title)
+<$macrocall $name="makedatauri" type={{{ [<title>get[type]] }}} text={{{ [<title>get[text]] }}} _canonical_uri={{{ [<title>get[_canonical_uri]] }}}/>
 \end
 
-\define if-sidebar(text)
-<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes">$text$</$reveal>
+\procedure if-sidebar(text)
+<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes"><<text>></$reveal>
 \end
 
-\define if-no-sidebar(text)
-<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes">$text$</$reveal>
+\procedure if-no-sidebar(text)
+<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes"><<text>></$reveal>
 \end
 
-\define if-background-attachment(text)
-<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text="">$text$</$reveal>
+\procedure if-background-attachment(text)
+<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text=""><<text>></$reveal>
 \end

From a09106f33b88d9200d8e6638519b8cad119fb852 Mon Sep 17 00:00:00 2001
From: Mario Pietsch <pmariojo@gmail.com>
Date: Wed, 14 Feb 2024 19:45:11 +0100
Subject: [PATCH 5/5] Core-macro-diff-new-syntax (#7986)

* $:/core/macros/diff use v5.3.x syntax and add indentation for better readability -- all tests pass

* diff - set tags: $:/tags/Global
---
 core/wiki/macros/diff.tid | 56 +++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/core/wiki/macros/diff.tid b/core/wiki/macros/diff.tid
index 36564d084..541ab1a05 100644
--- a/core/wiki/macros/diff.tid
+++ b/core/wiki/macros/diff.tid
@@ -1,37 +1,37 @@
 title: $:/core/macros/diff
-tags: $:/tags/Macro
+tags: $:/tags/Global
 
-\define compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
 \whitespace trim
-<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>>>
-<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>>>
-<$diff-text source=<<source>> dest=<<dest>>/>
-</$set>
+
+\procedure compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
+<$set name="source" tiddler=<<sourceTiddlerTitle>> subtiddler=<<sourceSubTiddlerTitle>>>
+	<$set name="dest" tiddler=<<destTiddlerTitle>> subtiddler=<<destSubTiddlerTitle>>>
+		<$diff-text source=<<source>> dest=<<dest>>/>
+	</$set>
 </$set>
 \end
 
-\define compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
-\whitespace trim
+\procedure compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
 <table class="tc-diff-tiddlers">
-<tbody>
-<$set name="sourceFields" filter="[<__sourceTiddlerTitle__>fields[]sort[]]">
-<$set name="destFields" filter="[<__destSubTiddlerTitle__>subtiddlerfields<__destTiddlerTitle__>sort[]]">
-<$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<__exclude__>] +[sort[]]" variable="fieldName">
-<tr>
-<th>
-<$text text=<<fieldName>>/>
-</th>
-<td>
-<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>> field=<<fieldName>>>
-<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>> field=<<fieldName>>>
-<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
-</$set>
-</$set>
-</td>
-</tr>
-</$list>
-</$set>
-</$set>
-</tbody>
+	<tbody>
+		<$set name="sourceFields" filter="[<sourceTiddlerTitle>fields[]sort[]]">
+			<$set name="destFields" filter="[<destSubTiddlerTitle>subtiddlerfields<destTiddlerTitle>sort[]]">
+			<$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<exclude>] +[sort[]]" variable="fieldName">
+				<tr>
+					<th>
+						<$text text=<<fieldName>>/>
+					</th>
+					<td>
+						<$set name="source" tiddler=<<sourceTiddlerTitle>> subtiddler=<<sourceSubTiddlerTitle>> field=<<fieldName>>>
+							<$set name="dest" tiddler=<<destTiddlerTitle>> subtiddler=<<destSubTiddlerTitle>> field=<<fieldName>>>
+								<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
+							</$set>
+						</$set>
+					</td>
+				</tr>
+			</$list>
+			</$set>
+		</$set>
+	</tbody>
 </table>
 \end