From 94049bfd4e25fbca5eb0b94d788a3868559cc89d Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Fri, 18 Jul 2025 09:58:06 +0100 Subject: [PATCH] Revert "Migrate some old macros to new syntax (#8768)" This reverts commit 2801eee905c3d5d5f82c4ce150df30f4f10e414d. --- core/wiki/macros/colour-picker.tid | 41 ++++++++-------- core/wiki/macros/dumpvariables.tid | 2 +- core/wiki/macros/image-picker.tid | 29 ++++++------ core/wiki/macros/list.tid | 75 ++++++++++++++++-------------- core/wiki/macros/translink.tid | 26 +++++------ core/wiki/macros/tree.tid | 44 ++++++++++-------- 6 files changed, 115 insertions(+), 102 deletions(-) diff --git a/core/wiki/macros/colour-picker.tid b/core/wiki/macros/colour-picker.tid index 3c37dc9b5..7a607a551 100644 --- a/core/wiki/macros/colour-picker.tid +++ b/core/wiki/macros/colour-picker.tid @@ -1,55 +1,58 @@ title: $:/core/macros/colour-picker tags: $:/tags/Macro -\procedure colour-picker-update-recent() +\define colour-picker-update-recent() <$action-listops $tiddler="$:/config/ColourPicker/Recent" - $subfilter="[] [list[$:/config/ColourPicker/Recent]remove] +[limit[8]]" + $subfilter="$(colour-picker-value)$ [list[$:/config/ColourPicker/Recent]remove[$(colour-picker-value)$]] +[limit[8]]" /> \end -\procedure colour-picker-inner(actions) -<$button tag="a" tooltip=<>> -<> -<$transclude $variable="actions"/> -> style.width="100%" style.height="100%" style.borderRadius="50%"/> +\define colour-picker-inner(actions) +<$button tag="a" tooltip="""$(colour-picker-value)$"""> +$(colour-picker-update-recent)$ +<$transclude $variable="__actions__"/> + + + \end +\define colour-picker-recent-inner(actions) \whitespace trim -\procedure colour-picker-recent-inner(actions) -<$set name="colour-picker-value" value=<>> -<$transclude $variable="colour-picker-inner" actions=<>/> +<$set name="colour-picker-value" value="$(recentColour)$"> +<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/> \end -\procedure colour-picker-recent(actions) +\define colour-picker-recent(actions) +\whitespace trim {{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour"> -<$transclude $variable="colour-picker-recent-inner" actions=<>/> +<$macrocall $name="colour-picker-recent-inner" actions=<<__actions__>>/> \end -\procedure colour-picker(actions) +\define colour-picker(actions) +\whitespace trim
-<$transclude $variable="colour-picker-recent" actions=<>/> +<$macrocall $name="colour-picker-recent" actions=<<__actions__>>/> --- <$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black" variable="colour-picker-value"> -<$transclude $variable="colour-picker-inner" actions=<>/> +<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/> --- -<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder="" class="tc-tiny-gap-right"/> +<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder=""/> + <$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/> <$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}> -<%if [{$:/config/ColourPicker/New}!is[blank]] %> -<$transclude $variable="colour-picker-inner" actions=<>/> -<%endif%> +<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid index 835cddabe..0ab9e2001 100644 --- a/core/wiki/macros/dumpvariables.tid +++ b/core/wiki/macros/dumpvariables.tid @@ -1,7 +1,7 @@ title: $:/core/macros/dumpvariables tags: $:/tags/Macro -\procedure dumpvariables() +\define dumpvariables() \whitespace trim
    <$list filter="[variables[]]" variable="varname"> diff --git a/core/wiki/macros/image-picker.tid b/core/wiki/macros/image-picker.tid index 5bda45bca..5f09ced0d 100644 --- a/core/wiki/macros/image-picker.tid +++ b/core/wiki/macros/image-picker.tid @@ -1,36 +1,39 @@ +created: 20170715180840889 +modified: 20170715180914005 tags: $:/tags/Macro title: $:/core/macros/image-picker type: text/vnd.tiddlywiki -\procedure image-picker-thumbnail(actions) -<$button tag="a" tooltip=<>><$transclude $variable="actions"/><$transclude tiddler=<>/> +\define image-picker-thumbnail(actions) +<$button tag="a" tooltip="""$(imageTitle)$"""><$transclude $variable="__actions__"/><$transclude tiddler=<>/> \end -\procedure image-picker-list(filter,actions) +\define image-picker-list(filter,actions) \whitespace trim -<$list filter=<> variable="imageTitle"> -<$transclude $variable="image-picker-thumbnail" actions=<>/> +<$list filter="""$filter$""" variable="imageTitle"> +<$macrocall $name="image-picker-thumbnail" actions=<<__actions__>>/> \end -\procedure image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"") +\define image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"") \whitespace trim
    -<$let state-system=<> tv-filter={{{ [search-replace[$subfilter$],] }}}> +<$vars state-system=<>> <$checkbox tiddler=<> field="text" checked="show" unchecked="hide" default="hide"> -{{$:/language/SystemTiddlers/Include/Prompt}} + +{{$:/language/SystemTiddlers/Include/Prompt}} <$reveal state=<> type="match" text="hide" default="hide" tag="div"> -<$transclude $variable="image-picker-list" filter=`$(tv-filter)$ +[!is[system]]` actions=<>/> +<$macrocall $name="image-picker-list" filter="""$filter$ +[!is[system]]""" actions=<<__actions__>>/> <$reveal state=<> type="nomatch" text="hide" default="hide" tag="div"> -<$transclude $variable="image-picker-list" filter=<> actions=<>/> +<$macrocall $name="image-picker-list" filter="""$filter$""" actions=<<__actions__>>/> - +
    \end -\procedure image-picker-include-tagged-images(actions) -<$transclude $variable="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<>/> +\define image-picker-include-tagged-images(actions) +<$macrocall $name="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<__actions__>>/> \end diff --git a/core/wiki/macros/list.tid b/core/wiki/macros/list.tid index 4019e6617..1e5463259 100644 --- a/core/wiki/macros/list.tid +++ b/core/wiki/macros/list.tid @@ -1,18 +1,14 @@ title: $:/core/macros/list tags: $:/tags/Macro -\procedure list-links-draggable-drop-actions() -<$action-listops $tiddler=<> $field=<> $subfilter="+[insertbefore,]"/> -\end - +\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption") \whitespace trim -\procedure list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption") -<$genesis $type=<> class=<>> - <$list filter=<> emptyMessage=<>> - <$genesis $type=<>> +<$genesis $type=<<__type__>> class=<<__class__>>> + <$list filter=<<__filter__>> emptyMessage=<<__emptyMessage__>>> + <$genesis $type=<<__subtype__>>> <$link to={{!!title}}> <$let tv-wikilinks="no"> - <$transclude field=<>> + <$transclude field=<<__field__>>> <$view field="title"/> @@ -22,19 +18,24 @@ tags: $:/tags/Macro \end -\procedure list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate) +\define list-links-draggable-drop-actions() +<$action-listops $tiddler=<> $field=<> $subfilter="+[insertbefore,]"/> +\end + +\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate) +\whitespace trim - <$let targetTiddler=<> targetField=<>> - <$genesis $type=<> class=<>> - <$list filter="[getenlist-input[]]" emptyMessage=<>> + <$vars targetTiddler="""$tiddler$""" targetField="""$field$"""> + <$genesis $type=<<__type__>> class="$class$"> + <$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>> <$droppable actions=<> - tag=<> + tag="""$subtype$""" enable=<> >
    - <$transclude tiddler=<>> + <$transclude tiddler="""$itemTemplate$"""> <$link to={{!!title}}> <$let tv-wikilinks="no"> <$transclude field="caption"> @@ -59,48 +60,50 @@ tags: $:/tags/Macro - + \end -\procedure list-tagged-draggable-drop-actions(tag) +\define list-tagged-draggable-drop-actions(tag) +\whitespace trim -<$set name="order" filter="[tagging[]]"> +<$set name="order" filter="[<__tag__>tagging[]]"> - <$list filter="[tagging[]]"> + <$list filter="[<__tag__>tagging[]]"> <$action-deletefield $field="list-before"/> <$action-deletefield $field="list-after"/> - <$action-listops $tiddler=<> $field="list" $filter="+[enlist] +[insertbefore,]"/> + <$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist] +[insertbefore,]"/> - + - <$list filter="[!contains:tags]"> + <$list filter="[!contains:tags<__tag__>]"> <$fieldmangler tiddler=<>> - <$action-sendmessage $message="tm-add-tag" $param=<>/> + <$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/> \end -\procedure list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"") +\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"") +\whitespace trim - <$set name="tag" value=<>> + <$set name="tag" value=<<__tag__>>> <$list - filter=`[tagging[]$(subFilter)$]` - emptyMessage=<> - storyview=<> + filter="[<__tag__>tagging[]$subFilter$]" + emptyMessage=<<__emptyMessage__>> + storyview=<<__storyview__>> > - <$genesis $type=<> class="tc-menu-list-item"> + <$genesis $type=<<__elementTag__>> class="tc-menu-list-item"> <$droppable - actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<>/>""" + actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<> > - <$genesis $type=<> class="tc-droppable-placeholder"/> - <$genesis $type=<>> - <$transclude tiddler=<>> + <$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/> + <$genesis $type=<<__elementTag__>>> + <$transclude tiddler="""$itemTemplate$"""> <$link to={{!!title}}> <$let tv-wikilinks="no"> <$transclude field="caption"> @@ -115,11 +118,11 @@ tags: $:/tags/Macro <$tiddler tiddler=""> <$droppable - actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<>/>""" + actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<> > - <$genesis $type=<> class="tc-droppable-placeholder"/> - <$genesis $type=<> style="height:0.5em;"/> + <$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/> + <$genesis $type=<<__elementTag__>> style="height:0.5em;"/> diff --git a/core/wiki/macros/translink.tid b/core/wiki/macros/translink.tid index 34faaa781..9cc465422 100644 --- a/core/wiki/macros/translink.tid +++ b/core/wiki/macros/translink.tid @@ -1,28 +1,28 @@ title: $:/core/macros/translink tags: $:/tags/Macro -\procedure translink(title,mode:"block") +\define translink(title,mode:"block") \whitespace trim -<%if [match[block]] %> +<$list filter="[<__mode__>match[block]]">
    -<$link to=<>> -<h1><$text text=<<title>>/></h1> +<$link to="""$title$"""> +<h1><$text text="""$title$"""/></h1> </$link> -<$transclude tiddler=<<title>> mode="block"> -<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set> +<$transclude tiddler="""$title$""" mode="block"> +<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set> </$transclude> </div> </div> -<%endif%> -<%if [<mode>match[inline]] %> +</$list> +<$list filter="[<__mode__>match[inline]]"> <span class="tc-translink"> -<$link to=<<title>> class="tc-tiny-gap-right"> -<$text text=<<title>>/> +<$link to="""$title$"""> +<$text text="""$title$"""/> </$link> -(<$transclude tiddler=<<title>> mode="inline"> -<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set> + (<$transclude tiddler="""$title$""" mode="inline"> +<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set> </$transclude>) </span> -<%endif%> +</$list> \end diff --git a/core/wiki/macros/tree.tid b/core/wiki/macros/tree.tid index 0d6d67b96..f73bd54fd 100644 --- a/core/wiki/macros/tree.tid +++ b/core/wiki/macros/tree.tid @@ -1,58 +1,62 @@ title: $:/core/macros/tree tags: $:/tags/Macro -\procedure leaf-link(full-title,chunk,separator: "/") -<$link to=<<full-title>>><$text text=<<chunk>>/></$link> +\define leaf-link(full-title,chunk,separator: "/") +<$link to=<<__full-title__>>><$text text=<<__chunk__>>/></$link> \end +\define leaf-node(prefix,chunk) \whitespace trim -\procedure leaf-node(prefix,chunk) <li> -<$list filter="[<prefix>addsuffix<chunk>is[shadow]] [<prefix>addsuffix<chunk>is[tiddler]]" variable="full-title"> -<$list filter="[<full-title>removeprefix<prefix>]" variable="chunk"> -<span class="tc-tiny-gap-right">{{$:/core/images/file}}</span><$transclude $variable="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/> +<$list filter="[<__prefix__>addsuffix<__chunk__>is[shadow]] [<__prefix__>addsuffix<__chunk__>is[tiddler]]" variable="full-title"> +<$list filter="[<full-title>removeprefix<__prefix__>]" variable="chunk"> +<span>{{$:/core/images/file}}</span> <$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/> </$list> </$list> </li> \end -\procedure branch-node(prefix,chunk,separator: "/") +\define branch-node(prefix,chunk,separator: "/") +\whitespace trim <li> -<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<prefix>addsuffix<chunk>] }}}> +<$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<__prefix__>addsuffix<__chunk__>] }}}> <$reveal type="nomatch" stateTitle=<<reveal-state>> text="show"> <$button setTitle=<<reveal-state>> setTo="show" class="tc-btn-invisible"> -{{$:/core/images/folder}} <$text text=<<chunk>>/> +{{$:/core/images/folder}} <$text text=<<__chunk__>>/> </$button> </$reveal> <$reveal type="match" stateTitle=<<reveal-state>> text="show"> <$button setTitle=<<reveal-state>> setTo="hide" class="tc-btn-invisible"> -{{$:/core/images/folder}} <$text text=<<chunk>>/> +{{$:/core/images/folder}} <$text text=<<__chunk__>>/> </$button> </$reveal> -<span class="tc-tiny-gap-left">(<$count filter="[all[shadows+tiddlers]removeprefix<prefix>removeprefix<chunk>] -[<prefix>addsuffix<chunk>]"/>)</span> + +<span>(<$count filter="[all[shadows+tiddlers]removeprefix<__prefix__>removeprefix<__chunk__>] -[<__prefix__>addsuffix<__chunk__>]"/>)</span> <$reveal type="match" stateTitle=<<reveal-state>> text="show"> -<$transclude $variable="tree-node" prefix={{{ [<prefix>addsuffix<chunk>] }}} separator=<<separator>>/> +<$macrocall $name="tree-node" prefix={{{ [<__prefix__>addsuffix<__chunk__>] }}} separator=<<__separator__>>/> </$reveal> </$set> </li> \end -\procedure tree-node(prefix,separator: "/") +\define tree-node(prefix,separator: "/") +\whitespace trim <ol> -<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]!suffix<separator>]" variable="chunk"> -<$transclude $variable="leaf-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/> +<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]!suffix<__separator__>]" variable="chunk"> +<$macrocall $name="leaf-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/> </$list> -<$list filter="[all[shadows+tiddlers]removeprefix<prefix>splitbefore<separator>sort[]suffix<separator>]" variable="chunk"> -<$transclude $variable="branch-node" prefix=<<prefix>> chunk=<<chunk>> separator=<<separator>>/> +<$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]suffix<__separator__>]" variable="chunk"> +<$macrocall $name="branch-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/> </$list> </ol> \end -\procedure tree(prefix: "$:/",separator: "/") +\define tree(prefix: "$:/",separator: "/") +\whitespace trim <div class="tc-tree"> -<span><$text text=<<prefix>>/></span> +<span><$text text=<<__prefix__>>/></span> <div> -<$transclude $variable="tree-node" prefix=<<prefix>> separator=<<separator>>/> +<$macrocall $name="tree-node" prefix=<<__prefix__>> separator=<<__separator__>>/> </div> </div> \end