Merge branch 'parameterised-transclusions' into geospatial-plugin

.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
     branches:
       - master
       - tiddlywiki-com
-      - parameterised-transclusions
 env:
   NODE_VERSION: "12"
 jobs:
@@ -16,37 +15,6 @@ jobs:
         with:
           node-version: "${{ env.NODE_VERSION }}"
       - run: "./bin/test.sh"
-  build-parameterised-transclusions:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/parameterised-transclusions'
-    needs: test
-    env:
-      TW5_BUILD_TIDDLYWIKI: "./tiddlywiki.js"
-      TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
-      TW5_BUILD_OUTPUT: "./output/prerelease/parameterised-transclusions"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: "${{ env.NODE_VERSION }}"
-      - run: "./bin/ci-pre-build.sh"
-      # There's another near-duplicate "Set dynamic environment variables" step in
-      # the `build-tiddlywiki-com` job.
-      # These _could_ be extracted as a script (or moved into `ci-pre-build.sh`) to do away with the
-      # duplication, but, the visibility that comes from having these in the workflow file seems
-      # valuable. Environment variables are global variables and setting them at the top-level
-      # makes sense.
-      # Time to reconsider this decision might be when this setup turns out to be mistake-prone.
-      - name: "Set dynamic environment variables"
-        run: |
-          TW5_BUILD_BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
-          echo "TW5_BUILD_BRANCH=${TW5_BUILD_BRANCH}" >> $GITHUB_ENV
-          echo "TW5_BUILD_VERSION=$(./bin/get-plugin-library-version-number)" >> $GITHUB_ENV
-          echo "TW5_BUILD_DETAILS=Prerelease built from branch '$TW5_BUILD_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')" >> $GITHUB_ENV
-      - run: "./bin/build-site.sh"
-      - run: "./bin/ci-push.sh"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}
   build-prerelease:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/master'

editions/prerelease/tiddlers/Release 5.3.0.tid

@@ -1,6 +1,6 @@
 caption: 5.3.0
-created: 20221019081352303
+created: 20230419103154368
-modified: 20221019081352303
+modified: 20230419103154368
 tags: ReleaseNotes
 title: Release 5.3.0
 type: text/vnd.tiddlywiki
@@ -9,8 +9,6 @@ type: text/vnd.tiddlywiki
 
 ! About v5.3.0
 
-<div style="background: yellow; border: 1px solid #880; padding: 0.5em; border-radius: 3px;">This is a preview of a [[pull request|https://github.com/Jermolene/TiddlyWiki5/pull/6666]] which has not yet been merged. At this point, all the changes here are provisional, and may be subject to further changes as a result of feedback from users.</div>
-
 This pre-release introduces a number of significant improvements and new features related to some of TiddlyWiki's most fundamental components: macros, widgets, operators and transclusion.
 
 ! Introduction to v5.3.0

editions/prerelease/tiddlers/system/SiteTitle.tid

@@ -2,4 +2,4 @@ created: 20131211131022562
 modified: 20131211131023829
 title: $:/SiteTitle
 
-[img width=200 [New Release Banner]]<br>TiddlyWiki Pre-release
+TiddlyWiki Pre-release

editions/tw5.com/tiddlers/concepts/Macros.tid

@@ -1,5 +1,5 @@
 created: 20140211171341271
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Concepts Reference
 title: Macros
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/filters/function.tid

@@ -1,6 +1,6 @@
 caption: function
 created: 20220909111836951
-modified: 20221019081352266
+modified: 20230419103154328
 op-input: a [[selection of titles|Title Selection]] passed as input to the function <<.place F>>
 op-output: the [[selection of titles|Title Selection]] returned from the function <<.place F>>
 op-parameter: first parameter is the [[function name|Functions]], subsequent parameters are passed to the function by position

editions/tw5.com/tiddlers/functions/Functions.tid

@@ -1,5 +1,5 @@
 created: 20221009124003601
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Concepts Reference
 title: Functions
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/howtos/Visible Transclusions.tid

@@ -1,5 +1,5 @@
 created: 20220909111836951
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Learning
 title: Visible Transclusions
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _define.tid

@@ -1,5 +1,5 @@
 created: 20220917112233317
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Pragmas
 title: Pragma: \define
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _function.tid

@@ -1,5 +1,5 @@
 created: 20221009162634214
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \function
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid

@@ -1,5 +1,5 @@
 created: 20220917113054582
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \import
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _parameters.tid

@@ -1,5 +1,5 @@
 created: 20220917113154900
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \parameters
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _procedure.tid

@@ -1,5 +1,5 @@
 created: 20221007132845007
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \procedure
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _rules.tid

@@ -1,5 +1,5 @@
 created: 20220917112931273
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \rules
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _whitespace.tid

@@ -1,5 +1,5 @@
 created: 20220917113002350
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \whitespace
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragma_ _widget.tid

@@ -1,5 +1,5 @@
 created: 20221009121950630
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Pragmas
 title: Pragma: \widget
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/pragmas/Pragmas.tid

@@ -1,5 +1,5 @@
 created: 20220917112416666
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Concepts [[WikiText Parser Modes]]
 title: Pragmas
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/procedures/Procedure Calls.tid

@@ -1,6 +1,6 @@
 caption: Macro Calls
 created: 20221007130006705
-modified: 20221019081352266
+modified: 20230419103154329
 tags: WikiText Procedures
 title: Procedure Calls
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid

@@ -1,6 +1,6 @@
 caption: Macro Definitions
 created: 20221007125701001
-modified: 20221019081352266
+modified: 20230419103154329
 tags: WikiText Procedures
 title: Procedure Definitions
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/procedures/Procedure Parameter Handling.tid

@@ -1,6 +1,6 @@
 caption: Macro Definitions
 created: 20221007130538285
-modified: 20221019081352266
+modified: 20230419103154329
 tags: WikiText Procedures
 title: Procedure Parameter Handling
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/procedures/Procedures.tid

@@ -1,5 +1,5 @@
 created: 20221007124007426
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Concepts Reference
 title: Procedures
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/variables/Variables.tid

@@ -1,5 +1,5 @@
 created: 20141002133113496
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Concepts Reference WikiText
 title: Variables
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/widgets/Custom Widgets.tid

@@ -1,5 +1,5 @@
 created: 20221007144237585
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Concepts Reference
 title: Custom Widgets
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/widgets/ErrorWidget.tid

@@ -1,6 +1,6 @@
 caption: error
 created: 20220909111836951
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Widgets
 title: ErrorWidget
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/widgets/FillWidget.tid

@@ -1,6 +1,6 @@
 caption: fill
 created: 20220909111836951
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Widgets
 title: FillWidget
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/widgets/MacroCallWidget.tid

@@ -1,6 +1,6 @@
 caption: macrocall
 created: 20131024141900000
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Widgets $:/deprecated
 title: MacroCallWidget
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/widgets/ParametersWidget.tid

@@ -1,6 +1,6 @@
 caption: parameters
 created: 20220909111836951
-modified: 20221019081352266
+modified: 20230419103154328
 tags: Widgets
 title: ParametersWidget
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/widgets/SlotWidget.tid

@@ -1,6 +1,6 @@
 caption: slot
 created: 20220909111836951
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Widgets
 title: SlotWidget
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid

@@ -1,6 +1,6 @@
 caption: transclude
 created: 20130824142500000
-modified: 20221019081352266
+modified: 20230419103154329
 tags: Widgets
 title: TranscludeWidget
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/wikitext/Macro Calls.tid

@@ -1,6 +1,6 @@
 caption: Macro Calls
 created: 20150220182252000
-modified: 20221019081352266
+modified: 20230419103154328
 tags: WikiText Macros
 title: Macro Calls
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/wikitext/Macro Definitions.tid

@@ -1,6 +1,6 @@
 caption: Macro Definitions
 created: 20150220181617000
-modified: 20221019081352266
+modified: 20230419103154328
 tags: WikiText Macros
 title: Macro Definitions
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/wikitext/Macro Parameter Handling.tid

@@ -1,6 +1,6 @@
 caption: Macro Definitions
 created: 20220917154902906
-modified: 20221019081352266
+modified: 20230419103154328
 tags: WikiText Macros
 title: Macro Parameter Handling
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/wikitext/Macro Pitfalls.tid

@@ -1,5 +1,5 @@
 created: 20220917091428117
-modified: 20221019081352266
+modified: 20230419103154328
 title: Macro Pitfalls
 type: text/vnd.tiddlywiki
 

editions/tw5.com/tiddlers/wikitext/Transclusion and Substitution.tid

@@ -1,5 +1,5 @@
 created: 20141018090608643
-modified: 20221019081352266
+modified: 20230419103154329
 tags: WikiText
 title: Transclusion and Substitution
 type: text/vnd.tiddlywiki