From 6732b3c0d963eb64f01627fdcf1002e2aae6d235 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 5 Jan 2020 13:54:06 +0000 Subject: [PATCH] Use match operator instead of prefix Fixes #4407 --- .../Page_and_tiddler_layout_customisation.tid | 4 ++-- .../Page and tiddler layout customisation.tid | 4 ++-- .../Page and tiddler layout customisation.tid | 4 ++-- plugins/tiddlywiki/help/help.tid | 8 ++++---- plugins/tiddlywiki/markdown/new-markdown.tid | 4 ++-- .../qrcode/ViewToolbarButton/Button.tid | 4 ++-- .../templates/interactive/tiddler.tid | 4 ++-- .../text-slicer/templates/plain/tiddler.tid | 20 +++++++++---------- .../text-slicer/templates/static/tiddler.tid | 20 +++++++++---------- .../text-slicer/ui/slice-toolbar-button.tid | 4 ++-- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/editions/es-ES/tiddlers/Page_and_tiddler_layout_customisation.tid b/editions/es-ES/tiddlers/Page_and_tiddler_layout_customisation.tid index bdfa4f0ef..4e28c453e 100644 --- a/editions/es-ES/tiddlers/Page_and_tiddler_layout_customisation.tid +++ b/editions/es-ES/tiddlers/Page_and_tiddler_layout_customisation.tid @@ -40,10 +40,10 @@ Digamos que tienes un tiddler llamado <<.tid "Plantilla Recetas">> y quieres un $param="TÍTULO DE LA PLANTILLA QUE QUIERES QUE ABRA" title="New tiddler" tags=<> /> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{NOMBRE DE LA IMAGEN DEL BOTÓN}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> <$text text="NOMBRE DEL BOTÓN PARA MOSTRAR EN PANTALLA"/> diff --git a/editions/fr-FR/tiddlers/Page and tiddler layout customisation.tid b/editions/fr-FR/tiddlers/Page and tiddler layout customisation.tid index 5622f0d38..b30932517 100644 --- a/editions/fr-FR/tiddlers/Page and tiddler layout customisation.tid +++ b/editions/fr-FR/tiddlers/Page and tiddler layout customisation.tid @@ -39,10 +39,10 @@ Imaginons que vous ayez un tiddler squelette appelé 'Modèle Recette', et que v $param="TITLE DE VOTRE BOUTON SQUELETTE" title="New tiddler" tags=<> /> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{TITRE DE VOTRE TIDDLER IMAGE SVG}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> <$text text="CAPTION DE VOTRE BOUTON"/> diff --git a/editions/tw5.com/tiddlers/customising/Page and tiddler layout customisation.tid b/editions/tw5.com/tiddlers/customising/Page and tiddler layout customisation.tid index a783a59f0..7a233d396 100644 --- a/editions/tw5.com/tiddlers/customising/Page and tiddler layout customisation.tid +++ b/editions/tw5.com/tiddlers/customising/Page and tiddler layout customisation.tid @@ -37,10 +37,10 @@ Let's say you have a skeleton tiddler called 'Recipe template', and you want to $param="TITLE OF YOUR SKELETON BUTTON" title="New tiddler" tags=<> /> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{TITLE OF YOUR SVG IMAGE TIDDLER}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> <$text text="CAPTION FOR YOUR BUTTON"/> diff --git a/plugins/tiddlywiki/help/help.tid b/plugins/tiddlywiki/help/help.tid index 599ccf6a2..e2e7e9f0b 100644 --- a/plugins/tiddlywiki/help/help.tid +++ b/plugins/tiddlywiki/help/help.tid @@ -8,20 +8,20 @@ description: {{$:/language/Buttons/Help/Hint}} \whitespace trim <$reveal type="match" state="$:/config/ShowHelp" text="yes"> <$button set="$:/config/ShowHelp" setTo="no" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class="""$(tv-config-toolbar-class)$ tc-selected"""> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{$:/core/images/help}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> <$text text={{$:/language/Buttons/Help/Caption}}/> <$reveal type="nomatch" state="$:/config/ShowHelp" text="yes"> <$button set="$:/config/ShowHelp" setTo="yes" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class=<>> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{$:/core/images/help}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> <$text text={{$:/language/Buttons/Help/Caption}}/> diff --git a/plugins/tiddlywiki/markdown/new-markdown.tid b/plugins/tiddlywiki/markdown/new-markdown.tid index ff6d40c82..50e4065b5 100755 --- a/plugins/tiddlywiki/markdown/new-markdown.tid +++ b/plugins/tiddlywiki/markdown/new-markdown.tid @@ -7,10 +7,10 @@ list-after: $:/core/ui/Buttons/new-tiddler \whitespace trim <$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<>> <$action-sendmessage $message="tm-new-tiddler" type="text/x-markdown"/> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{$:/plugins/tiddlywiki/markdown/images/new-markdown-button}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> <$text text={{$:/language/Buttons/NewMarkdown/Caption}}/> diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid index 7b496d812..20339b22e 100644 --- a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid +++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid @@ -8,10 +8,10 @@ description: Generate QR code for this tiddler \whitespace trim <$button popup=<> tooltip={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!description}} aria-label={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}} class=<> class=<> selectedClass="tc-selected"> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{$:/plugins/tiddlywiki/qrcode/icon}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> <$text text=" "/> <$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/> diff --git a/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid index 54dbb7354..95253a13f 100644 --- a/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid +++ b/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid @@ -7,12 +7,12 @@ $then$ \end \define include-component(type) -< """>> \end -<$list filter="[prefix[yes]]" variable="hasToolbar"> +<$list filter="[match[yes]]" variable="hasToolbar"> {{||$:/plugins/tiddlywiki/text-slicer/ui/tiddler/toolbar}} diff --git a/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid index f2b67200a..65f947c07 100644 --- a/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid +++ b/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid @@ -2,43 +2,43 @@ title: $:/plugins/tiddlywiki/text-slicer/templates/plain/tiddler <$vars toc-type={{!!toc-type}}> -<$list filter="[prefix[document]]" variable="item"> +<$list filter="[match[document]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/document" mode="block"/> -<$list filter="[prefix[heading]]" variable="item"> +<$list filter="[match[heading]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/heading" mode="block"/> -<$list filter="[prefix[paragraph]]" variable="item"> +<$list filter="[match[paragraph]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/paragraph" mode="block"/> -<$list filter="[prefix[note]]" variable="item"> +<$list filter="[match[note]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/note" mode="block"/> -<$list filter="[prefix[list]]" variable="item"> +<$list filter="[match[list]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/list" mode="block"/> -<$list filter="[prefix[item]]" variable="item"> +<$list filter="[match[item]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/item" mode="block"/> -<$list filter="[prefix[image]]" variable="item"> +<$list filter="[match[image]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/image" mode="block"/> -<$list filter="[prefix[def-list]]" variable="item"> +<$list filter="[match[def-list]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/def-list" mode="block"/> -<$list filter="[prefix[term]]" variable="item"> +<$list filter="[match[term]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/term" mode="block"/> -<$list filter="[prefix[definition]]" variable="item"> +<$list filter="[match[definition]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/definition" mode="block"/> diff --git a/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid index 8f4c6fe59..c46c55c69 100644 --- a/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid +++ b/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid @@ -2,61 +2,61 @@ title: $:/plugins/tiddlywiki/text-slicer/templates/static/tiddler <$vars toc-type={{!!toc-type}}> -<$list filter="[prefix[document]]" variable="item"> +<$list filter="[match[document]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/document" mode="block"/> -<$list filter="[prefix[heading]]" variable="item"> +<$list filter="[match[heading]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/heading" mode="block"/> -<$list filter="[prefix[paragraph]]" variable="item"> +<$list filter="[match[paragraph]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/paragraph" mode="block"/> -<$list filter="[prefix[note]]" variable="item"> +<$list filter="[match[note]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/note" mode="block"/> -<$list filter="[prefix[list]]" variable="item"> +<$list filter="[match[list]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/list" mode="block"/> -<$list filter="[prefix[item]]" variable="item"> +<$list filter="[match[item]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/item" mode="block"/> -<$list filter="[prefix[image]]" variable="item"> +<$list filter="[match[image]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/image" mode="block"/> -<$list filter="[prefix[def-list]]" variable="item"> +<$list filter="[match[def-list]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/def-list" mode="block"/> -<$list filter="[prefix[term]]" variable="item"> +<$list filter="[match[term]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/term" mode="block"/> -<$list filter="[prefix[definition]]" variable="item"> +<$list filter="[match[definition]]" variable="item"> <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/definition" mode="block"/> diff --git a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid index 1a52ff905..42ef547b1 100644 --- a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid +++ b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid @@ -13,10 +13,10 @@ Slice this text tiddler into chunks <$list filter="[!is[image]!is[binary]]" variable="ignore"> <$button tooltip=<> aria-label=<> class=<>> <$action-sendmessage $message="tm-modal" $param="$:/plugins/tiddlywiki/text-slicer/ui/slice-modal" currentTiddler=<>/> -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}} -<$list filter="[prefix[yes]]"> +<$list filter="[match[yes]]"> Slice tiddler