From 3da0a9431c1af421f51ef3e7c21d9ca71f217f01 Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Tue, 9 May 2023 15:46:54 +0100
Subject: [PATCH] Introduce $:/tags/Global tag

And also $:/tags/Global/View and $:/tags/Global/View/Body
---
 core/modules/wiki.js                                     | 2 +-
 core/templates/exporters/StaticRiverContent.tid          | 2 +-
 core/templates/exporters/TidFile.tid                     | 2 +-
 core/templates/external-js/save-all-external-js.tid      | 2 +-
 core/templates/external-js/save-offline-external-js.tid  | 2 +-
 core/templates/save-all.tid                              | 2 +-
 core/templates/server/static.tiddler.html.tid            | 2 +-
 core/templates/single.tiddler.window.tid                 | 2 +-
 core/templates/static.tiddler.html.tid                   | 2 +-
 core/ui/ControlPanel/Modals/AddPlugins.tid               | 2 +-
 core/ui/EditTemplate/Preview/output.tid                  | 2 +-
 core/ui/PageStylesheet.tid                               | 2 +-
 core/ui/PageTemplate.tid                                 | 2 +-
 core/ui/ViewTemplate.tid                                 | 4 ++--
 core/ui/ViewTemplate/body.tid                            | 2 +-
 core/wiki/config/GlobalImportFilter.tid                  | 2 ++
 editions/dynaviewdemo/tiddlers/ViewTemplate.tid          | 2 +-
 editions/fr-FR/tiddlers/ReadMe.tid                       | 2 +-
 .../Customising TiddlyWiki's user interface.tid          | 2 +-
 editions/tw5.com/tiddlers/features/StartupActions.tid    | 2 +-
 .../tiddlers/howtos/How to create keyboard shortcuts.tid | 4 ++--
 editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid    | 2 +-
 .../tiddlers/procedures/Procedure Definitions.tid        | 8 ++++----
 editions/tw5.com/tiddlers/readme/ReadMe.tid              | 2 +-
 editions/tw5.com/tiddlers/system/$__SplashScreen.tid     | 2 +-
 .../tiddlers/systemtags/SystemTag_ $__tags_Global.tid    | 9 +++++++++
 .../systemtags/SystemTag_ $__tags_Global_View.tid        | 9 +++++++++
 .../systemtags/SystemTag_ $__tags_Global_View_Body.tid   | 9 +++++++++
 .../tiddlers/systemtags/SystemTag_ $__tags_Macro.tid     | 2 +-
 .../systemtags/SystemTag_ $__tags_Macro_View.tid         | 2 +-
 .../systemtags/SystemTag_ $__tags_Macro_View_Body.tid    | 2 +-
 plugins/tiddlywiki/blog/templates/html-page/page.tid     | 2 +-
 plugins/tiddlywiki/blog/templates/html-page/post.tid     | 2 +-
 plugins/tiddlywiki/tiddlyweb/save-offline.tid            | 2 +-
 34 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 core/wiki/config/GlobalImportFilter.tid
 create mode 100644 editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global.tid
 create mode 100644 editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View.tid
 create mode 100644 editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View_Body.tid

diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 6ae16a2b4..8cb12cc39 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -1149,7 +1149,7 @@ exports.makeTranscludeWidget = function(title,options) {
 		if(options.importVariables) {
 			parseTreeImportVariables.attributes.filter.value = options.importVariables;
 		} else if(options.importPageMacros) {
-			parseTreeImportVariables.attributes.filter.value = "[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]";
+			parseTreeImportVariables.attributes.filter.value = this.getTiddlerText("$:/core/config/GlobalImportFilter");
 		}
 		parseTreeDiv.tree[0].children.push(parseTreeImportVariables);
 		parseTreeImportVariables.children.push(parseTreeTransclude);
diff --git a/core/templates/exporters/StaticRiverContent.tid b/core/templates/exporters/StaticRiverContent.tid
index 0b04549f9..3d42be807 100644
--- a/core/templates/exporters/StaticRiverContent.tid
+++ b/core/templates/exporters/StaticRiverContent.tid
@@ -3,5 +3,5 @@ title: $:/core/templates/exporters/StaticRiver/Content
 \define renderContent()
 {{{ $(exportFilter)$ ||$:/core/templates/static-tiddler}}}
 \end
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 <<renderContent>>
diff --git a/core/templates/exporters/TidFile.tid b/core/templates/exporters/TidFile.tid
index 1dbd3503b..7b0bb2d78 100644
--- a/core/templates/exporters/TidFile.tid
+++ b/core/templates/exporters/TidFile.tid
@@ -7,5 +7,5 @@ condition: [<count>compare:lte[1]]
 \define renderContent()
 {{{ $(exportFilter)$ +[limit[1]] ||$:/core/templates/tid-tiddler}}}
 \end
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 <<renderContent>>
\ No newline at end of file
diff --git a/core/templates/external-js/save-all-external-js.tid b/core/templates/external-js/save-all-external-js.tid
index 193b6e90c..ff5bbc851 100644
--- a/core/templates/external-js/save-all-external-js.tid
+++ b/core/templates/external-js/save-all-external-js.tid
@@ -1,7 +1,7 @@
 title: $:/core/save/all-external-js
 
 \whitespace trim
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
diff --git a/core/templates/external-js/save-offline-external-js.tid b/core/templates/external-js/save-offline-external-js.tid
index 01ae88aa0..564a34948 100644
--- a/core/templates/external-js/save-offline-external-js.tid
+++ b/core/templates/external-js/save-offline-external-js.tid
@@ -1,7 +1,7 @@
 title: $:/core/save/offline-external-js
 
 \whitespace trim
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
diff --git a/core/templates/save-all.tid b/core/templates/save-all.tid
index b298ad49f..d7473ba5b 100644
--- a/core/templates/save-all.tid
+++ b/core/templates/save-all.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/all
 
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
 [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
diff --git a/core/templates/server/static.tiddler.html.tid b/core/templates/server/static.tiddler.html.tid
index 1a803bd86..a8409e50f 100644
--- a/core/templates/server/static.tiddler.html.tid
+++ b/core/templates/server/static.tiddler.html.tid
@@ -2,7 +2,7 @@ title: $:/core/templates/server/static.tiddler.html
 
 \whitespace trim
 \define tv-wikilink-template() $uri_encoded$
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
diff --git a/core/templates/single.tiddler.window.tid b/core/templates/single.tiddler.window.tid
index 0d14509e5..aa5175c01 100644
--- a/core/templates/single.tiddler.window.tid
+++ b/core/templates/single.tiddler.window.tid
@@ -4,7 +4,7 @@ title: $:/core/templates/single.tiddler.window
 \define containerClasses()
 tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$
 \end
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 
 <$vars
 	tv-config-toolbar-icons={{$:/config/Toolbar/Icons}}
diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid
index a4537305a..f90818464 100644
--- a/core/templates/static.tiddler.html.tid
+++ b/core/templates/static.tiddler.html.tid
@@ -4,7 +4,7 @@ title: $:/core/templates/static.tiddler.html
 \define tv-config-toolbar-icons() no
 \define tv-config-toolbar-text() no
 \define tv-config-toolbar-class() tc-btn-invisible
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 `<!doctype html>
 <html>
 <head>
diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid
index ce8612b72..56d3d5085 100644
--- a/core/ui/ControlPanel/Modals/AddPlugins.tid
+++ b/core/ui/ControlPanel/Modals/AddPlugins.tid
@@ -211,7 +211,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 </div>
 \end
 
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 \whitespace trim
 
 <div>
diff --git a/core/ui/EditTemplate/Preview/output.tid b/core/ui/EditTemplate/Preview/output.tid
index 4e5bf0e33..5c53d8c22 100644
--- a/core/ui/EditTemplate/Preview/output.tid
+++ b/core/ui/EditTemplate/Preview/output.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/EditTemplate/body/preview/output
 tags: $:/tags/EditPreview
 caption: {{$:/language/EditTemplate/Body/Preview/Type/Output}}
 
-\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View/Body]!is[draft]]
 <$set name="tv-tiddler-preview" value="yes">
 
 <$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />
diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid
index f7df349e9..0b32df5f8 100644
--- a/core/ui/PageStylesheet.tid
+++ b/core/ui/PageStylesheet.tid
@@ -1,6 +1,6 @@
 title: $:/core/ui/PageStylesheet
 
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 \whitespace trim
 
 <$set name="currentTiddler" value={{$:/language}}>
diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index 892e1b166..f0ab4852a 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -4,7 +4,7 @@ description: {{$:/language/PageTemplate/Description}}
 icon: $:/core/images/layout-button
 
 \whitespace trim
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 
 <$vars
 	tv-config-toolbar-icons={{$:/config/Toolbar/Icons}}
diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid
index f0aba9c97..dcba5c953 100644
--- a/core/ui/ViewTemplate.tid
+++ b/core/ui/ViewTemplate.tid
@@ -5,10 +5,10 @@ title: $:/core/ui/ViewTemplate
 $:/state/folded/$(currentTiddler)$
 \end
 \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/>
-\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View]!is[draft]]
 <$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">>>
 <div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ [all[shadows+tiddlers]tag[$:/tags/ClassFilters/TiddlerTemplate]!is[draft]] :map:flat[subfilter{!!text}] tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}} role="article">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!is[draft]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>
 </div>
diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid
index 86d83bf30..34e6aaa38 100644
--- a/core/ui/ViewTemplate/body.tid
+++ b/core/ui/ViewTemplate/body.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/ViewTemplate/body
 tags: $:/tags/ViewTemplate
 
-\import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View/Body]!is[draft]]
 
 <$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
 
diff --git a/core/wiki/config/GlobalImportFilter.tid b/core/wiki/config/GlobalImportFilter.tid
new file mode 100644
index 000000000..4d07e3f37
--- /dev/null
+++ b/core/wiki/config/GlobalImportFilter.tid
@@ -0,0 +1,2 @@
+title: $:/core/config/GlobalImportFilter
+text: [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global]!is[draft]]
diff --git a/editions/dynaviewdemo/tiddlers/ViewTemplate.tid b/editions/dynaviewdemo/tiddlers/ViewTemplate.tid
index cbf6eca2a..91bcfae86 100644
--- a/editions/dynaviewdemo/tiddlers/ViewTemplate.tid
+++ b/editions/dynaviewdemo/tiddlers/ViewTemplate.tid
@@ -5,7 +5,7 @@ title: $:/core/ui/ViewTemplate
 $:/state/folded/$(currentTiddler)$
 \end
 \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/>
-\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View]!is[draft]]
 <$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">>>
 <div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
 <$set name="state" value={{{ [[$:/state/viewtemplate/visibility/]addsuffix<currentTiddler>] }}}>
diff --git a/editions/fr-FR/tiddlers/ReadMe.tid b/editions/fr-FR/tiddlers/ReadMe.tid
index b02b564cb..aedcfd423 100644
--- a/editions/fr-FR/tiddlers/ReadMe.tid
+++ b/editions/fr-FR/tiddlers/ReadMe.tid
@@ -5,7 +5,7 @@ type: text/vnd.tiddlywiki
 
 \define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html
 
-<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
+<$importvariables filter={{$:/core/config/GlobalImportFilter}}>
 
 Bienvenue sur <<tw>>, un carnet de notes personnel web et non-linéaire que tout le monde peut utiliser et conserver, sans dépendre d'une quelconque entreprise.
 
diff --git a/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid b/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid
index 78990f453..bf3357fae 100644
--- a/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid	
+++ b/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid	
@@ -45,7 +45,7 @@ Special tags assign special behaviour or appearance to all of the tiddlers to wh
 
 For example:
 
-* $:/tags/Macro causes the macros defined in a tiddler to be available globally
+* $:/tags/Global causes the definitions in a tiddler to be available globally
 * $:/tags/Stylesheet causes the tiddler to be interpreted as a CSS stylesheet
 * $:/tags/SideBar causes the tiddler to be displayed as a sidebar tab
 
diff --git a/editions/tw5.com/tiddlers/features/StartupActions.tid b/editions/tw5.com/tiddlers/features/StartupActions.tid
index 29edb8378..596b92564 100644
--- a/editions/tw5.com/tiddlers/features/StartupActions.tid
+++ b/editions/tw5.com/tiddlers/features/StartupActions.tid
@@ -36,7 +36,7 @@ The initial startup actions are useful for customising TiddlyWiki according to e
 Note that global macros are not available within initial startup action tiddlers by default. If you need to access them then you'll need to explicitly include them with an [[Pragma: \import]] at the top of the tiddler:
 
 ```
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 ```
 
 !! Post-Render Startup Actions
diff --git a/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid b/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid
index 16243cd54..a149b7539 100644
--- a/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid	
+++ b/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid	
@@ -77,11 +77,11 @@ In the [[Keyboard Shortcuts Tab|$:/core/ui/ControlPanel/KeyboardShortcuts]] the
 > If the tiddler has the tag <<tag $:/tags/KeyboardShortcut>>, the field ''key'' with the [[Keyboard Shortcut Descriptor]] as its value and some actions in its text field, the actions will be triggered when the mechanism detects the configured key-combination
 
 <br>
-<$macrocall $name=".tip" _="""''Macros'' defined ''outside'' a global keyboard-shortcut (through a tiddler tagged `$:/tags/Macro`) need to be ''imported'' in order to be accessible.
+<$macrocall $name=".tip" _="""''Macros'' defined ''outside'' a global keyboard-shortcut (through a tiddler tagged `$:/tags/Global`) need to be ''imported'' in order to be accessible.
 The [[import pragma|Pragma]] can be used for that"""/>
 
 <pre>
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 </pre>
 
 If the tiddler that contains the macro definition is known and - for example - titled `my-macro-tiddler`
diff --git a/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid b/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid
index 5971a5490..121ba8525 100644
--- a/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid	
+++ b/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid	
@@ -13,5 +13,5 @@ The ''\import'' [[pragma|Pragmas]] is used to import definitions from other tidd
 For example:
 
 ```
-\import [all[shadows+tiddlers]tag[$:/tags/Macro]]
+\import [all[shadows+tiddlers]tag[$:/tags/Global]]
 ```
diff --git a/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid b/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid
index e108f219d..4eb1f17ff 100644
--- a/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid	
+++ b/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid	
@@ -34,10 +34,10 @@ Procedures are implemented as a special kind of [[variable|Variables]] and so in
 
 The [[Pragma: \import]] or <<.wlink ImportVariablesWidget>> widget can be used to copy procedure definitions from another tiddler.
 
-!! `$:/tags/Macro` Tag
+!! `$:/tags/Global` Tag
 
-Global procedures can be defined using the [[SystemTag: $:/tags/Macro]].
+Global procedures can be defined using the [[SystemTag: $:/tags/Global]].
 
-The tag [[SystemTag: $:/tags/Macro/View]] is used to define procedures that should only be available within the main view template and the preview panel.
+The tag [[SystemTag: $:/tags/Global/View]] is used to define procedures that should only be available within the main view template and the preview panel.
 
-The tag [[SystemTag: $:/tags/Macro/View/Body]] is used to define procedures that should only be available within the main view template body and the preview panel.
+The tag [[SystemTag: $:/tags/Global/View/Body]] is used to define procedures that should only be available within the main view template body and the preview panel.
diff --git a/editions/tw5.com/tiddlers/readme/ReadMe.tid b/editions/tw5.com/tiddlers/readme/ReadMe.tid
index 615b3ab68..2fbf83eab 100644
--- a/editions/tw5.com/tiddlers/readme/ReadMe.tid
+++ b/editions/tw5.com/tiddlers/readme/ReadMe.tid
@@ -4,7 +4,7 @@ title: ReadMe
 type: text/vnd.tiddlywiki
 
 \define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 
 Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.
 
diff --git a/editions/tw5.com/tiddlers/system/$__SplashScreen.tid b/editions/tw5.com/tiddlers/system/$__SplashScreen.tid
index 044b6446e..a4301de46 100644
--- a/editions/tw5.com/tiddlers/system/$__SplashScreen.tid
+++ b/editions/tw5.com/tiddlers/system/$__SplashScreen.tid
@@ -4,7 +4,7 @@ tags: $:/tags/RawMarkupWikified/TopBody
 title: $:/SplashScreen
 type: text/vnd.tiddlywiki
 
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 
 \procedure show-icon(title)
 <$wikify name="icon" text={{{ [<title>addprefix[{{]addsuffix[}}]] }}} output="html">
diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global.tid
new file mode 100644
index 000000000..ff04dd990
--- /dev/null
+++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global.tid	
@@ -0,0 +1,9 @@
+caption: $:/tags/Global
+created: 20230419103154329
+description: marks global definitions
+modified: 20230419103154329
+tags: SystemTags
+title: SystemTag: $:/tags/Global
+type: text/vnd.tiddlywiki
+
+The [[system tag|SystemTags]] `$:/tags/Global` marks global definitions that are made available everywhere.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View.tid
new file mode 100644
index 000000000..ce317d6bd
--- /dev/null
+++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View.tid	
@@ -0,0 +1,9 @@
+caption: $:/tags/Global/View
+created: 20230419103154329
+description: marks global definitions only active in View template
+modified: 20230419103154329
+tags: SystemTags
+title: SystemTag: $:/tags/Global/View
+type: text/vnd.tiddlywiki
+
+The [[system tag|SystemTags]] `$:/tags/Global/View` marks definitions that are only made available within the main view templates and the preview panel.
diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View_Body.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View_Body.tid
new file mode 100644
index 000000000..af3f94a87
--- /dev/null
+++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View_Body.tid	
@@ -0,0 +1,9 @@
+caption: $:/tags/Global/View/Body
+created: 20230419103154329
+description: marks global definitions only active in View template body
+modified: 20230419103154329
+tags: SystemTags
+title: SystemTag: $:/tags/Global/View/Body
+type: text/vnd.tiddlywiki
+
+The [[system tag|SystemTags]] `$:/tags/Global/View/Body` marks definitions that are only made available within the main view template bodies and the preview panel.
diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid
index a031fc998..6eaa005ab 100644
--- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid	
+++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid	
@@ -6,4 +6,4 @@ tags: SystemTags
 title: SystemTag: $:/tags/Macro
 type: text/vnd.tiddlywiki
 
-The [[system tag|SystemTags]] `$:/tags/Macro` marks global macros
\ No newline at end of file
+The [[system tag|SystemTags]] `$:/tags/Macro` marks global macros. It is now deprecated in favour of [[SystemTag $:/tags/Global]].
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid
index 723b0b130..a1831affd 100644
--- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid	
+++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid	
@@ -6,4 +6,4 @@ tags: SystemTags
 title: SystemTag: $:/tags/Macro/View
 type: text/vnd.tiddlywiki
 
-The [[system tag|SystemTags]] `$:/tags/Macro/View` marks macros that are only made available within the main view templates and the preview panel.
+The [[system tag|SystemTags]] `$:/tags/Macro/View` marks macros that are only made available within the main view templates and the preview panel. It is now deprecated in favour of [[SystemTag $:/tags/Global/View]].
diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid
index 88a00fb2a..e413dcf89 100644
--- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid	
+++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid	
@@ -6,4 +6,4 @@ tags: SystemTags
 title: SystemTag: $:/tags/Macro/View/Body
 type: text/vnd.tiddlywiki
 
-The [[system tag|SystemTags]] `$:/tags/Macro/View/Body` marks macros that are only made available within the main view template bodies and the preview panel.
+The [[system tag|SystemTags]] `$:/tags/Macro/View/Body` marks macros that are only made available within the main view template bodies and the preview panel. It is now deprecated in favour of [[SystemTag $:/tags/Global/View/Body]].
diff --git a/plugins/tiddlywiki/blog/templates/html-page/page.tid b/plugins/tiddlywiki/blog/templates/html-page/page.tid
index 4aab9653e..20b7eae77 100644
--- a/plugins/tiddlywiki/blog/templates/html-page/page.tid
+++ b/plugins/tiddlywiki/blog/templates/html-page/page.tid
@@ -22,7 +22,7 @@ title: $:/plugins/tiddlywiki/blog/templates/html-page/page
 <body class="tc-body">
 `{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
 <section class="tc-story-river">
-`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
+`<$importvariables filter={{$:/core/config/GlobalImportFilter}}>
 <$view tiddler="$:/plugins/tiddlywiki/blog/templates/tiddler" format="htmlwikified"/>
 </$importvariables>`
 </section>
diff --git a/plugins/tiddlywiki/blog/templates/html-page/post.tid b/plugins/tiddlywiki/blog/templates/html-page/post.tid
index b4d631f82..6f3b4584c 100644
--- a/plugins/tiddlywiki/blog/templates/html-page/post.tid
+++ b/plugins/tiddlywiki/blog/templates/html-page/post.tid
@@ -22,7 +22,7 @@ title: $:/plugins/tiddlywiki/blog/templates/html-page/post
 <body class="tc-body">
 `{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
 <section class="tc-story-river">
-`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]">
+`<$importvariables filter={{$:/core/config/GlobalImportFilter}}>
 <$view tiddler="$:/plugins/tiddlywiki/blog/templates/tiddler" format="htmlwikified"/>
 <$view tiddler="$:/plugins/tiddlywiki/blog/templates/menu" format="htmlwikified"/>
 </$importvariables>`
diff --git a/plugins/tiddlywiki/tiddlyweb/save-offline.tid b/plugins/tiddlywiki/tiddlyweb/save-offline.tid
index 798072833..591a1e438 100644
--- a/plugins/tiddlywiki/tiddlyweb/save-offline.tid
+++ b/plugins/tiddlywiki/tiddlyweb/save-offline.tid
@@ -1,6 +1,6 @@
 title: $:/plugins/tiddlywiki/tiddlyweb/save/offline
 
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
 [is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$
 \end