diff --git a/core/templates/exporters/StaticRiverContent.tid b/core/templates/exporters/StaticRiverContent.tid index 0046ede7b..0b04549f9 100644 --- a/core/templates/exporters/StaticRiverContent.tid +++ b/core/templates/exporters/StaticRiverContent.tid @@ -3,6 +3,5 @@ title: $:/core/templates/exporters/StaticRiver/Content \define renderContent() {{{ $(exportFilter)$ ||$:/core/templates/static-tiddler}}} \end -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] <> - diff --git a/core/templates/exporters/TidFile.tid b/core/templates/exporters/TidFile.tid index 003dd90ee..dec294c06 100644 --- a/core/templates/exporters/TidFile.tid +++ b/core/templates/exporters/TidFile.tid @@ -6,4 +6,5 @@ extension: .tid \define renderContent() {{{ $(exportFilter)$ +[limit[1]] ||$:/core/templates/tid-tiddler}}} \end -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"><> \ No newline at end of file +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of] +<> \ No newline at end of file diff --git a/core/templates/server/static.tiddler.html.tid b/core/templates/server/static.tiddler.html.tid index 7966baeb1..7afaa37d5 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$ -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of] @@ -25,5 +25,4 @@ title: $:/core/templates/server/static.tiddler.html - - \ No newline at end of file + \ No newline at end of file diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid index 6fb56b6cd..57f6dc9e9 100644 --- a/core/templates/static.tiddler.html.tid +++ b/core/templates/static.tiddler.html.tid @@ -4,6 +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] ` @@ -22,9 +23,7 @@ title: $:/core/templates/static.tiddler.html `{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
-`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> -<$view tiddler="$:/core/ui/ViewTemplate" format="htmlwikified"/> -` +`<$view tiddler="$:/core/ui/ViewTemplate" format="htmlwikified"/>`
diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid index b86f5351f..29ea69a2e 100644 --- a/core/ui/ControlPanel/Modals/AddPlugins.tid +++ b/core/ui/ControlPanel/Modals/AddPlugins.tid @@ -119,10 +119,8 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \end -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]
<>
- - diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid index 462f016cd..86cb65bca 100644 --- a/core/ui/PageStylesheet.tid +++ b/core/ui/PageStylesheet.tid @@ -1,6 +1,6 @@ title: $:/core/ui/PageStylesheet -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of] <$set name="currentTiddler" value={{$:/language}}> @@ -13,5 +13,3 @@ title: $:/core/ui/PageStylesheet - - diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid index 04c51cf18..c92cf88d0 100644 --- a/core/ui/PageTemplate.tid +++ b/core/ui/PageTemplate.tid @@ -3,8 +3,7 @@ title: $:/core/ui/PageTemplate \define containerClasses() tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$ \end - -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of] <$set name="tv-config-toolbar-icons" value={{$:/config/Toolbar/Icons}}> @@ -51,5 +50,3 @@ tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$ - - diff --git a/editions/tw5.com/tiddlers/features/StartupActions.tid b/editions/tw5.com/tiddlers/features/StartupActions.tid index 4ae567beb..9132ea09c 100644 --- a/editions/tw5.com/tiddlers/features/StartupActions.tid +++ b/editions/tw5.com/tiddlers/features/StartupActions.tid @@ -22,10 +22,8 @@ Startup actions are useful for customising TiddlyWiki according to environmental ``` -Note that global macros are not available within startup action tiddlers by default. If you need to access them then you'll need to explicitly include them: +Note that global macros are not available within startup action tiddlers by default. If you need to access them then you'll need to explicitly include them with an ''import'' [[pragma|Pragma]] at the top of the tiddler: ``` -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> -...actions that depend upon global macros... - +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of] ``` diff --git a/editions/tw5.com/tiddlers/readme/ReadMe.tid b/editions/tw5.com/tiddlers/readme/ReadMe.tid index efbe009c3..706ae7784 100644 --- a/editions/tw5.com/tiddlers/readme/ReadMe.tid +++ b/editions/tw5.com/tiddlers/readme/ReadMe.tid @@ -4,8 +4,7 @@ title: ReadMe 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]]"> +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of] Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation. @@ -32,5 +31,3 @@ Developer documentation is in progress at https://tiddlywiki.com/dev/ <> //This readme file was automatically generated by TiddlyWiki// - -