diff --git a/editions/tw5.com/tiddlers/commands/BuildCommand.tid b/editions/tw5.com/tiddlers/commands/BuildCommand.tid index 62eb32faf..64b41b84a 100644 --- a/editions/tw5.com/tiddlers/commands/BuildCommand.tid +++ b/editions/tw5.com/tiddlers/commands/BuildCommand.tid @@ -7,4 +7,4 @@ caption: build {{$:/language/Help/build}} -See TiddlyWikiFolders for details of defining build targets. +See [[tiddlywiki.info Files]] for details of defining build targets. diff --git a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid index 494b28ac4..4e66bb9fc 100644 --- a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid +++ b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExample.tid @@ -12,7 +12,7 @@ TiddlyWiki5 can be used as a simple task management system without further custo <$list filter="[!has[draft.of]tag[task]!tag[done]sort[created]]"> -<$checkbox tag="done"> <$link to={{!!title}}><$view field="title"/> +<$checkbox tag="done"> <$link/> @@ -20,6 +20,6 @@ TiddlyWiki5 can be used as a simple task management system without further custo <$list filter="[!has[draft.of]tag[task]tag[done]sort[created]]"> -<$checkbox tag="done"> ~~<$link to={{!!title}}><$view field="title"/>~~ +<$checkbox tag="done"> ~~<$link/>~~ diff --git a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggable.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggable.tid index 7b0928ff6..e981edd09 100644 --- a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggable.tid +++ b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggable.tid @@ -18,6 +18,6 @@ This is a version of the TaskManagementExample enhanced with the ability to drag <$list filter="[!has[draft.of]tag[task]tag[done]sort[created]]">
-<$checkbox tag="done"> ~~<$link to={{!!title}}><$view field="title"/>~~ +<$checkbox tag="done"> ~~<$link/>~~
diff --git a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggableTemplate.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggableTemplate.tid index 3ccdd98e0..b67312e61 100644 --- a/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggableTemplate.tid +++ b/editions/tw5.com/tiddlers/demonstrations/Tasks/TaskManagementExampleDraggableTemplate.tid @@ -4,4 +4,4 @@ tags: Learning title: TaskManagementExampleDraggableTemplate type: text/vnd.tiddlywiki -<$checkbox tag="done"> <$link to={{!!title}}><$view field="title"/> \ No newline at end of file +<$checkbox tag="done"> <$link/> diff --git a/editions/tw5.com/tiddlers/filters/Filter Operators.tid b/editions/tw5.com/tiddlers/filters/Filter Operators.tid index 393cebfbe..919a49c94 100644 --- a/editions/tw5.com/tiddlers/filters/Filter Operators.tid +++ b/editions/tw5.com/tiddlers/filters/Filter Operators.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki \define .operator-rows(filter) <$list filter="$filter$"> -<$link to={{!!title}}>{{!!caption}} +<$link>{{!!caption}} {{!!op-purpose}} <$list filter="[all[current]tag[Common Operators]]">✓ <$list filter="[all[current]tag[Negatable Operators]]">`!` diff --git a/editions/tw5.com/tiddlers/filters/contains Operator.tid b/editions/tw5.com/tiddlers/filters/contains Operator.tid index 608d22def..f55d91f9e 100644 --- a/editions/tw5.com/tiddlers/filters/contains Operator.tid +++ b/editions/tw5.com/tiddlers/filters/contains Operator.tid @@ -7,7 +7,7 @@ op-output: those input tiddlers in which the list field <<.place F>> contains th op-parameter: a possible value to be found in list field <<.place F>> op-parameter-name: S op-purpose: filter the input by searching list fields for a value -op-suffix: the name of a [[field|TiddlerFields]] +op-suffix: the name of a [[field|TiddlerFields]] (defaults to `list`) op-suffix-name: F tags: [[Filter Operators]] [[Field Operators]] [[Negatable Operators]] title: contains Operator diff --git a/editions/tw5.com/tiddlers/filters/examples/fixed Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/fixed Operator (Examples).tid index 2f60b72b9..8aa9304e3 100644 --- a/editions/tw5.com/tiddlers/filters/examples/fixed Operator (Examples).tid +++ b/editions/tw5.com/tiddlers/filters/examples/fixed Operator (Examples).tid @@ -6,3 +6,4 @@ type: text/vnd.tiddlywiki <<.operator-example 1 "10.123456789 +[fixed[5]]">> <<.operator-example 2 "[[355]divide[113]fixed[7]]">> +<<.operator-example 3 "[[1]divide[2]fixed[3]]">> 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 3b82a0a6a..f665bf09b 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 @@ -34,7 +34,7 @@ In the [[Keyboard Shortcuts Tab|$:/core/ui/ControlPanel/KeyboardShortcuts]] the * $:/config/shortcuts-not-windows/`my-shortcut` * $:/config/shortcuts-not-linux/`my-shortcut` -<<.tip """Note that those platform-specific tiddlers don't have to be created manually if the ''ShortcutInfo'' tiddler as mentioned above is created first and and the shortcut is configured in the ~ControlPanel""">> +<<.tip """Note that those platform-specific tiddlers don't have to be created manually if the ''ShortcutInfo'' tiddler as mentioned above is created first and the shortcut is configured in the ~ControlPanel""">>
@@ -98,7 +98,7 @@ If the tiddler that contains the macro definition is known and - for example - t !!! Messages <$list filter="[tag[navigator-message]]"> -<$link to={{!!title}}><$view field="title"/>
+<$link/>
diff --git a/editions/tw5.com/tiddlers/howtos/Simple ways to write protect tiddlers.tid b/editions/tw5.com/tiddlers/howtos/Simple ways to write protect tiddlers.tid index 0e2ffc8db..dd5ea6829 100644 --- a/editions/tw5.com/tiddlers/howtos/Simple ways to write protect tiddlers.tid +++ b/editions/tw5.com/tiddlers/howtos/Simple ways to write protect tiddlers.tid @@ -26,6 +26,6 @@ Now any tiddler you tag as "Locked" will have the edit button hidden. To get it * Select all the tiddler text. * Click on the excise tool. * In the title box, type `$:/` and then paste the original title. -* Use the defaults to excise and and leave a transclusion +* Use the defaults to excise the text into a new tiddler and replace it with a transclusion -Now you can view the contents of your original tiddler, but to edit them your will have to find the the tiddler with the `$:/` prefix. +Now you can view the contents of your original tiddler, but to edit them you will have to find the the tiddler with the `$:/` prefix. diff --git a/editions/tw5.com/tiddlers/macros/list-thumbnails Macro.tid b/editions/tw5.com/tiddlers/macros/list-thumbnails Macro.tid index a20859832..e366caa8c 100644 --- a/editions/tw5.com/tiddlers/macros/list-thumbnails Macro.tid +++ b/editions/tw5.com/tiddlers/macros/list-thumbnails Macro.tid @@ -1,4 +1,4 @@ -caption: thumbnail +caption: list-thumbnails created: 20200612170158838 modified: 20200612171804473 tags: Macros [[Core Macros]] diff --git a/editions/tw5.com/tiddlers/mechanisms/HistoryMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/HistoryMechanism.tid index b5fdc8763..93ab744d7 100644 --- a/editions/tw5.com/tiddlers/mechanisms/HistoryMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/HistoryMechanism.tid @@ -13,7 +13,7 @@ The history list also maintains the field ''current-tiddler'' that contains the ``` <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop"> -<$button message="tm-close-tiddler" class="tc-btn-invisible tc-btn-mini">× <$link to={{!!title}}><$view field="title"/> <$reveal type="match" state="$:/HistoryList!!current-tiddler" text=<>>✓ +<$button message="tm-close-tiddler" class="tc-btn-invisible tc-btn-mini">× <$link><$view field="title"/> <$reveal type="match" state="$:/HistoryList!!current-tiddler" text=<>>✓ ``` @@ -22,7 +22,7 @@ Which renders the same as the "Open" sidebar tab, with the addition of a tick ag <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop"> -<$button message="tm-close-tiddler" class="tc-btn-invisible tc-btn-mini">× <$link to={{!!title}}><$view field="title"/> <$reveal type="match" state="$:/HistoryList!!current-tiddler" text=<>>✓ +<$button message="tm-close-tiddler" class="tc-btn-invisible tc-btn-mini">× <$link><$view field="title"/> <$reveal type="match" state="$:/HistoryList!!current-tiddler" text=<>>✓ @@ -32,4 +32,4 @@ To display content when the story is empty, create $:/config/EmptyStoryMessage a ``` {{GettingStarted||$:/core/ui/ViewTemplate}} -``` \ No newline at end of file +``` diff --git a/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid index 4d4c933be..5f9d2622c 100644 --- a/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid +++ b/editions/tw5.com/tiddlers/mechanisms/StateMechanism.tid @@ -28,7 +28,7 @@ Note how this approach makes the ''open'' tab in the sidebar very easy to implem ``` <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop"> -<$button message="tm-close-tiddler" class="tc-btn-invisible tc-btn-mini">× <$link to={{!!title}}><$view field="title"/> +<$button message="tm-close-tiddler" class="tc-btn-invisible tc-btn-mini">× <$link/> ``` diff --git a/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid index 44e49d772..1f4a12177 100644 --- a/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid @@ -7,7 +7,19 @@ type: text/vnd.tiddlywiki There are several ways in which custom plugins that are not part of TiddlyWiki's plugin library can be installed when using TiddlyWiki under Node.js. (See [[Installing a plugin from the plugin library]] for instructions on installing plugins from the library). * Arrange the PluginFolders containing the plugins in a convenient shared location and then use [[environment variables|Environment Variables on Node.js]] to tell TiddlyWiki to search those folders. The plugins can be referenced in `tiddlywiki.info` by their name (e.g. `tiddlytools/magic`) -* Place the PluginFolders containing the plugins in a `plugins` folder within the [[wiki folder|TiddlyWikiFolders]] +* Place the PluginFolders containing the plugins in a `plugins` folder within the [[wiki folder|TiddlyWikiFolders]]. TiddlyWiki will attempt to include every subfolder as a plugin. Do not add the plugin names to `tiddlywiki.info`. Do not add the PluginFolders under a specific namespace:
.
+├── plugins
+│   ├── relink
+│   │   ├── js
+│   │   ├── plugin.info
+│   │   └── tiddlers
+│   └── relink-markdown
+│       ├── js
+│       ├── plugin.info
+│       └── readme.tid
+├── tiddlers
+└── tiddlywiki.info
+
* Depending on how TiddlyWiki itself has been installed, plugins can also be installed by copying the plugin folders into the `plugins` folder of the repository. This is only recommended if working with a forked copy of the repo. It is not recommended if TiddlyWiki has been installed with npm because npm is liable to overwrite the installation when performing an update Note that including a plugin as an ordinary tiddler (e.g. by dragging and dropping a plugin into the browser) will result in the plugin only being active in the browser, and not available under Node.js. 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 81a6f9cae..9bcefa85c 100644 --- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid @@ -1,4 +1,4 @@ -caption: $:/tags/Macro +caption: $:/tags/Macro/View created: 20200103092530990 description: marks global macros modified: 20200103092606462 diff --git a/editions/tw5.com/tiddlers/widgets/ActionListopsWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionListopsWidget.tid index bba6dafc6..3dfb8fe5f 100644 --- a/editions/tw5.com/tiddlers/widgets/ActionListopsWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ActionListopsWidget.tid @@ -10,7 +10,7 @@ type: text/vnd.tiddlywiki \define .operator-rows(filter) <$list filter="$filter$"> -<$link to={{!!title}}>{{!!caption}} +<$link>{{!!caption}} {{!!op-purpose}} <$list filter="[all[current]tag[Common Operators]]">{{$:/core/images/done-button}} <$list filter="[all[current]tag[Negatable Operators]]">`!` diff --git a/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid b/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid index 0e0e60ace..a14d99915 100644 --- a/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/NavigatorWidget.tid @@ -18,6 +18,7 @@ The navigator widget displays any contained content, and responds to Messages di |history |Name of the tiddler containing the history list to be manipulated | |openLinkFromInsideRiver |Determines the location for opening new tiddlers from links within the story river: at the ''top'' or ''bottom'' of the story river, or ''above'' or ''below'' the current tiddler | |openLinkFromOutsideRiver|Determines the location for opening new tiddlers from linkes outside the story river: at the ''top'' or ''bottom'' of the story river| +|relinkOnRename|<<.from-version "5.1.14">> Determines if tags in other tiddlers are renamed if the tiddler title changes. ''yes'' or ''no''. default: ''no''| ! Widget Messages @@ -26,9 +27,7 @@ The following [[Messages]] are handled by the navigator widget:
    <$list filter="[tag[navigator-message]]">
  • -<$link to={{!!title}}> -<$view field="title"/> - +<$link/>
diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 5fd7055be..05d30ac5c 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -404,4 +404,8 @@ Csaba Molnar, @mocsa, 2020/04/29 Jonas Passerini, @passuf, 2020/05/14 +Dazhong Xia, @jdangerx, 2020/06/23 + +Diep Pham, @favadi, 2020/07/30 + Adithya Badidey, @adithya-badidey, 2020/08/10 diff --git a/plugins/tiddlywiki/freelinks/readme.tid b/plugins/tiddlywiki/freelinks/readme.tid index aa81d138f..5372ce019 100644 --- a/plugins/tiddlywiki/freelinks/readme.tid +++ b/plugins/tiddlywiki/freelinks/readme.tid @@ -15,7 +15,7 @@ Within view templates, the variable `tv-freelinks` is automatically set to the c !! Notes -To change within which tiddlers freelinking occurs requires customising the shadow tiddler $:/plugins/tiddlywiki/freelinks/macros/view. This tiddler is tagged $:/tags/Macro/View which means that it will be included as a local macro in each view template. By default, its content is: +To change within which tiddlers freelinking occurs requires customising the shadow tiddler [[$:/plugins/tiddlywiki/freelinks/macros/view]]. This tiddler is tagged $:/tags/Macro/View which means that it will be included as a local macro in each view template. By default, its content is: ``` <$set name="tv-freelinks" value={{$:/config/Freelinks/Enable}}/>