+
+
+<%endif%>
\ No newline at end of file
diff --git a/core/ui/TestCases/DefaultTemplate.tid b/core/ui/TestCases/DefaultTemplate.tid
index 04623cbc6..39c6bab52 100644
--- a/core/ui/TestCases/DefaultTemplate.tid
+++ b/core/ui/TestCases/DefaultTemplate.tid
@@ -2,91 +2,141 @@ title: $:/core/ui/testcases/DefaultTemplate
code-body: yes
\whitespace trim
+
+\function tf.state() [
+<>
+
+
- >>
+ <$tiddler tiddler="Output">
+ <$transclude $tiddler="Output" $mode="block"/>
+
+
+\end
+
+\procedure testcase-output()
+]
+-[prefix[$:/state/popup/export]]
+\end
+
+\procedure testcase-source()
+>
\ No newline at end of file
diff --git a/core/ui/TestCases/actions/Export.tid b/core/ui/TestCases/actions/Export.tid
index 0d5f976e5..79c6eb93a 100644
--- a/core/ui/TestCases/actions/Export.tid
+++ b/core/ui/TestCases/actions/Export.tid
@@ -1,4 +1,4 @@
title: $:/core/ui/testcases/actions/Export
tags: $:/tags/TestCase/Actions
-<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
\ No newline at end of file
+<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
\ No newline at end of file
diff --git a/core/wiki/tags/ViewTemplateBodyFilter.tid b/core/wiki/tags/ViewTemplateBodyFilter.tid
index 0143c1f88..c7510cb09 100644
--- a/core/wiki/tags/ViewTemplateBodyFilter.tid
+++ b/core/wiki/tags/ViewTemplateBodyFilter.tid
@@ -1,2 +1,2 @@
title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default
\ No newline at end of file
+list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/default
diff --git a/editions/test/tiddlers/tests/test-wikitext-parser.js b/editions/test/tiddlers/tests/test-wikitext-parser.js
index 04d041ec9..a488ff030 100644
--- a/editions/test/tiddlers/tests/test-wikitext-parser.js
+++ b/editions/test/tiddlers/tests/test-wikitext-parser.js
@@ -324,6 +324,100 @@ describe("WikiText parser tests", function() {
});
+ it("should parse tables", function() {
+ let wikitext = `
+|!Cell1 |!Cell2 |
+|Cell3 |Cell4 |`.trim();
+
+ let expectedParseTree = [{
+ type: 'element',
+ tag: 'table',
+ start: 0,
+ end: 33,
+ rule: 'table',
+ children: [{
+ type: 'element',
+ tag: 'tbody',
+ start: 0,
+ end: 33,
+ children: [{
+ type: 'element',
+ tag: 'tr',
+ attributes: {
+ 'class': { name: 'class', type: 'string', value: 'evenRow' },
+ },
+ orderedAttributes: [
+ { name: 'class', type: 'string', value: 'evenRow' },
+ ],
+ start: 0,
+ end: 18,
+ children: [{
+ type: 'element',
+ tag: 'th',
+ attributes: {
+ 'align': { name: 'align', type: 'string', value: 'left' },
+ },
+ orderedAttributes: [
+ { name: 'align', type: 'string', value: 'left' },
+ ],
+ start: 1,
+ end: 8,
+ children: [{type: 'text', text: 'Cell1', start: 2, end: 7}],
+ }, {
+ type: 'element',
+ tag: 'th',
+ attributes: {
+ 'align': { name: 'align', type: 'string', value: 'left' },
+ },
+ orderedAttributes: [
+ { name: 'align', type: 'string', value: 'left' },
+ ],
+ start: 9,
+ end: 16,
+ children: [{type: 'text', text: 'Cell2', start: 10, end: 15}],
+ }],
+ }, {
+ type: 'element',
+ tag: 'tr',
+ attributes: {
+ 'class': { name: 'class', type: 'string', value: 'oddRow' },
+ },
+ orderedAttributes: [
+ { name: 'class', type: 'string', value: 'oddRow' },
+ ],
+ start: 18,
+ end: 33,
+ children: [{
+ type: 'element',
+ tag: 'td',
+ attributes: {
+ 'align': { name: 'align', type: 'string', value: 'left' },
+ },
+ orderedAttributes: [
+ { name: 'align', type: 'string', value: 'left' },
+ ],
+ start: 19,
+ end: 25,
+ children: [{type: 'text', text: 'Cell3', start: 19, end: 24}],
+ }, {
+ type: 'element',
+ tag: 'td',
+ attributes: {
+ 'align': { name: 'align', type: 'string', value: 'left' },
+ },
+ orderedAttributes: [
+ { name: 'align', type: 'string', value: 'left' },
+ ],
+ start: 26,
+ end: 32,
+ children: [{type: 'text', text: 'Cell4', start: 26, end: 31}],
+ }],
+ }],
+ }],
+ }];
+
+ expect(parse(wikitext)).toEqual(expectedParseTree);
+ });
});
})();
diff --git a/editions/tw.org/tiddlywiki.info b/editions/tw.org/tiddlywiki.info
index 5e4202ccc..3dbd86516 100644
--- a/editions/tw.org/tiddlywiki.info
+++ b/editions/tw.org/tiddlywiki.info
@@ -16,6 +16,8 @@
"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
"--setfield","[tag[external-image]]","text","","text/plain",
"--render","$:/core/save/all","index.html","text/plain"],
+ "readmes": [
+ "--render","[[Code of Conduct]]","code-of-conduct.md","text/html"],
"favicon": [
"--savetiddler","$:/favicon.ico","favicon.ico"],
"static": [
diff --git a/editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid b/editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid
index 02f177082..07576617b 100644
--- a/editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid
+++ b/editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid
@@ -4,6 +4,6 @@ tags: Definitions
title: Intertwingled Innovations
type: text/vnd.tiddlywiki
-Intertwingled Innovations Limited is the company through which [[JeremyRuston]] performs commercial consultancy work helping companies and individuals release the businesss value of TiddlyWiki.
+Intertwingled Innovations Limited is the company through which [[JeremyRuston]] performs commercial consultancy work helping companies and individuals release the business value of TiddlyWiki.
See https://intertwingledinnovations.com/ for more information.
diff --git a/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid b/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid
index 084586e77..14e324456 100644
--- a/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid
+++ b/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
By default, a [[TiddlyWiki on Node.js]] instance using a [[wiki folder|TiddlyWikiFolders]] will create new tiddler files by using the sanitised and disambiguated title as filename. All filepath operations are relative to a `default-tiddler-location` which defaults to the wiki folder's `tiddlers/` directory. This can be overridden by mapping a path in the wiki's tiddlywiki.info file, by using a `default-tiddler-location` property in the `config` object.
-The default file extension of `.tid` is used for tiddlers that are missing the `type` field, or for tiddlers of type "text/vnd.tiddlywiki". Tidders of other types are saved according to their MIME types (defined at boot startup).
+The default file extension of `.tid` is used for tiddlers that are missing the `type` field, or for tiddlers of type "text/vnd.tiddlywiki". Tiddlers of other types are saved according to their MIME types (defined at boot startup).
Both the logical path (directory and file name) and the file extension can be customised independently by creating optional tiddlers [[$:/config/FileSystemPaths]] and [[$:/config/FileSystemExtensions]].
@@ -29,7 +29,7 @@ Logical paths do not include the file-on-disk's extension (see below), and they
<<.note "All paths are relative to the wiki's `default-tiddler-location`.">>
-This will store newly created system tiddlers that are not drafts of other tiddlers in `./_system/` (after stripping the `$:/` prefix). Next, all drafts have the path separator characters in their titles replaced by "_" and are stored in `./drafts/`. Then tiddlers tagged [[task]] are stored in a subdirectory `./mytasks/`. Finally, all tidders not tagged with "externalnote" will match the final `[!tag[externalnote]addprefix[wiki/]]` storing these in `./wiki/`. In this example, tiddlers tagged with "externalnote" have been imported using [[tiddlywiki.files Files]] with an "isEditableFile" flag set to true, causing the server to remember their original file path in the $:/config/OriginalTiddlerPaths tiddler.
+This will store newly created system tiddlers that are not drafts of other tiddlers in `./_system/` (after stripping the `$:/` prefix). Next, all drafts have the path separator characters in their titles replaced by "_" and are stored in `./drafts/`. Then tiddlers tagged [[task]] are stored in a subdirectory `./mytasks/`. Finally, all tiddlers not tagged with "externalnote" will match the final `[!tag[externalnote]addprefix[wiki/]]` storing these in `./wiki/`. In this example, tiddlers tagged with "externalnote" have been imported using [[tiddlywiki.files Files]] with an "isEditableFile" flag set to true, causing the server to remember their original file path in the $:/config/OriginalTiddlerPaths tiddler.
Whenever a tiddler generates a $:/config/FileSystemPaths filter match, any `/` or `\` in the tiddler title is mapped to a path separator. With the above filters, the non-system, non-draft tiddler titled `some/thing/entirely/new` (with no tags) will be saved to `./wiki/some/thing/entirely/new.tid` (ie, the file `new.tid` in a directory called `entirely/`). Thus, $:/config/FileSystemPaths itself will end up in `./_system/config/FileSystemPaths.tid` or `.\_system\config\FileSystemPaths.tid`, depending on the platform.
@@ -39,7 +39,7 @@ Normally, the file system extension of a tiddler on disk is determined by the pr
If the tiddler does not have such field values, then the `type` field is referenced to find a matching file-type, with `.tid` used for tiddlers without a type value. The boot engine defines a set of these tiddler-type to file-type relationships in the [[$:/boot/boot.js]] tiddler. Search for `// Add file extension information` to find the section of code that defines these relationships.
-The file extension of individual tidders can be customised by creating a tiddler [[$:/config/FileSystemExtensions]] containing one or more [[filter expressions|Filter Syntax]], each on a line of its own. Every time a tiddler is saved to disk it is tested against these filters, and the first output of the first filter to produce any output is taken as the file extension to be used for the tiddler file. Extensions should always start with a leading dot (see example). If no filter matches, the default extension is used. If the extension has changed a new file is created and the old file is deleted.
+The file extension of individual tiddlers can be customised by creating a tiddler [[$:/config/FileSystemExtensions]] containing one or more [[filter expressions|Filter Syntax]], each on a line of its own. Every time a tiddler is saved to disk it is tested against these filters, and the first output of the first filter to produce any output is taken as the file extension to be used for the tiddler file. Extensions should always start with a leading dot (see example). If no filter matches, the default extension is used. If the extension has changed a new file is created and the old file is deleted.
<<.note """A result of ".tid" will force the tiddler to be written to disk as a single-file text tiddler. A result of ".json" will force the tiddler to be written to disk as a single file tiddler in json-format (a single tiddler fields object in an array), NOT as a tiddler of type "application/json". All other recognised file-types will be saved using their defined extension along with an accompanying *.meta file of the same name which describes all fields but the "text" field.""">>
@@ -51,6 +51,6 @@ The file extension of individual tidders can be customised by creating a tiddler
[tag[.tid]then[.tid]]
```
-This will cause all tidders that have the tag ".txt" to be saved at the filepath determined by the File System Paths filters, but with their text field saved as a *.txt file, and all other fields saved as a *.txt.meta file.
+This will cause all tiddlers that have the tag ".txt" to be saved at the filepath determined by the File System Paths filters, but with their text field saved as a *.txt file, and all other fields saved as a *.txt.meta file.
Next, all tiddlers that have the ".json" tag are saved as *.json files. Finally, all tiddlers that have tag ".tid" are saved as single files. If a tiddler matches none of the filters, the default extension determined by the tiddlers `type` field would be used.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/releasenotes/Releases.tid b/editions/tw5.com/tiddlers/releasenotes/Releases.tid
index 57e5d3fd4..bd68f1ac6 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Releases.tid
+++ b/editions/tw5.com/tiddlers/releasenotes/Releases.tid
@@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki
New releases of TiddlyWiki and TiddlyDesktop are announced via the [[official discussion groups|Forums]] and [[Twitter|https://twitter.com/TiddlyWiki]]
+The prerelease of the next version of TiddlyWiki can be found at https://tiddlywiki.com/prerelease for testing and review purposes.
+
See the [[TiddlyWiki Archive]] to download older versions.
<>
diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
index 000b3219f..8daf3f4e1 100644
--- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid
@@ -1,6 +1,6 @@
caption: link
created: 20131024141900000
-modified: 20231113093304323
+modified: 20240730065043721
tags: Widgets
title: LinkWidget
type: text/vnd.tiddlywiki
@@ -69,11 +69,13 @@ This causes the tooltip to be the ''tooltip'' field of the target tiddler. If th
The link widget automatically determines and applies the following classes to links:
-* `tc-tiddlylink` - applied to all links
+* `tc-tiddlylink` - applied to ''all'' links
* `tc-tiddlylink-external` - applied to external, non-tiddler links
* `tc-tiddlylink-internal` - applied to tiddler links
* `tc-tiddlylink-missing` - applied to tiddler links where the target tiddler doesn't exist
* `tc-tiddlylink-resolves` - applied to tiddler links when the target tiddler does exist
+* `tc-tiddlylink-shadow` - applied to tiddler links when the target is a shadow tiddler
+** `tc-tiddlylink-shadow tc-tiddlylink-resolves` - applied to ''overwritten'' shadow tiddlers
Use the `class` attribute to specify additional css classes, or `overrideClass` to apply only that but not the above defaults, e.g. when used in a LinkCatcherWidget:
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index 504abac5c..2f3ddade8 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -1,16 +1,13 @@
{
"description": "Documentation from https://tiddlywiki.com",
"plugins": [
- "tiddlywiki/nodewebkitsaver",
"tiddlywiki/browser-sniff",
"tiddlywiki/railroad",
- "tiddlywiki/evernote",
"tiddlywiki/internals",
"tiddlywiki/menubar",
"tiddlywiki/confetti",
"tiddlywiki/dynannotate",
- "tiddlywiki/tour",
- "tiddlywiki/qrcode"
+ "tiddlywiki/tour"
],
"themes": [
"tiddlywiki/vanilla",
diff --git a/plugins/tiddlywiki/markdown/styles.tid b/plugins/tiddlywiki/markdown/styles.tid
index f4d953d1b..4185d4304 100644
--- a/plugins/tiddlywiki/markdown/styles.tid
+++ b/plugins/tiddlywiki/markdown/styles.tid
@@ -36,7 +36,7 @@ code-body: yes
margin-left: 0.25em;
}
.markdown a.footnote-ref:target, .markdown .footnote-item:target {
- background-color: <>;
+ background-color: <>;
scroll-margin-top: {{{ [{$:/themes/tiddlywiki/vanilla/options/stickytitles}match[yes]then[120px]else[60px]] }}};
}
.markdown li > p:first-child {
-
- <$genesis $type={{{ [
+
+\end
+
+\procedure testcase-narrative()
+
- <$genesis $type={{{ [!match[]then[$link]else[span]] }}} to=<>>
- <%if [!match[]] %>
- !match[fail]then[tc-test-case-result-icon-pass]] [match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
- <%if [!match[fail]] %>
- {{$:/core/images/done-button}}
- <%else%>
- {{$:/core/images/close-button}}
- <%endif%>
-
+\procedure testcase-header()
+
+
+ <$genesis $type={{{ [!match[]then[$link]else[span]] }}} to=<>>
+ <%if [!match[]] %>
+ !match[fail]then[tc-test-case-result-icon-pass]]
+ [match[fail]then[tc-test-case-result-icon-fail]]
+ +[join[ ]] }}}
+ >
+ <%if [!match[fail]] %>
+ {{$:/core/images/done-button}}
+ <%else%>
+ {{$:/core/images/close-button}}
<%endif%>
- <$view tiddler="Description" mode="inline"/>
-
-
-
+ <%endif%>
+ <$view tiddler="Description" mode="inline"/>
+
+
+
+
+\end
+
+\procedure testcase-toolbar()
+<$button popup=`$(tf.state)$-more`
+ tooltip={{$:/language/Buttons/More/Hint}}
+ aria-label={{$:/language/Buttons/More/Caption}}
+ class="tc-btn-invisible"
+ selectedClass="tc-selected"
+>
+ {{$:/core/images/down-arrow}}
+
+<$let
+ tv-config-toolbar-icons="yes"
+ tv-config-toolbar-text="yes"
+ tv-config-toolbar-class="tc-btn-invisible"
+>
+ <$reveal state=`$(tf.state)$-more` type="popup" position="belowleft" animate="yes">
+
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
+ variable="listItem"
+ >
+ <$transclude $tiddler=<> $mode="inline"/>
+
- <%if [[Narrative]is[tiddler]] %>
-
- <$transclude $tiddler="Narrative" $mode="block"/>
-
- <%endif%>
- <%if [match[fail]] %>
-
-
- TEST FAILED
-
-
- <$diff-text source=<> dest=<>/>
-
-
- <%endif%>
-
-
- <$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix] -Description -Narrative -Output Output +[putfirst[]] -[has[plugin-type]]" state=<> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
-
-
-
-
- <%if [!match[]else[wikitext]match[plaintext]] %>
- <$view tiddler="Output" format="plainwikified" mode="block"/>
- <%else%>
- <$linkcatcher actions=<>>
- <$tiddler tiddler="Output">
- <$transclude $tiddler="Output" $mode="block"/>
-
-
- <%endif%>
-
-
-
+
+ <$genesis $type={{{ [
+ <%endif%>
+ <$view tiddler="Description" mode="inline"/>
+
+
+
+
+\end
+
+\procedure testcase-toolbar()
+<$button popup=`$(tf.state)$-more`
+ tooltip={{$:/language/Buttons/More/Hint}}
+ aria-label={{$:/language/Buttons/More/Caption}}
+ class="tc-btn-invisible"
+ selectedClass="tc-selected"
+>
+ {{$:/core/images/down-arrow}}
+
+<$let
+ tv-config-toolbar-icons="yes"
+ tv-config-toolbar-text="yes"
+ tv-config-toolbar-class="tc-btn-invisible"
+>
+ <$reveal state=`$(tf.state)$-more` type="popup" position="belowleft" animate="yes">
+
+ <$genesis $type={{{ [!match[]then[$link]else[span]] }}} to=<>>
+ <%if [!match[]] %>
+ !match[fail]then[tc-test-case-result-icon-pass]]
+ [match[fail]then[tc-test-case-result-icon-fail]]
+ +[join[ ]] }}}
+ >
+ <%if [!match[fail]] %>
+ {{$:/core/images/done-button}}
+ <%else%>
+ {{$:/core/images/close-button}}
<%endif%>
- <$view tiddler="Description" mode="inline"/>
-
-
-
+ <%endif%>
+ <$view tiddler="Description" mode="inline"/>
+
+
+
+
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
+ variable="listItem"
+ >
+ <$transclude $tiddler=<> $mode="inline"/>
+
- <%if [[Narrative]is[tiddler]] %>
-
- <$transclude $tiddler="Narrative" $mode="block"/>
-
- <%endif%>
- <%if [
-
- <%endif%>
-
- TEST FAILED
-
-
- <$diff-text source=<> dest=<>/>
-
-
-
-
- <$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix] -Description -Narrative -Output Output +[putfirst[]] -[has[plugin-type]]" state=<> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
-
-
-
-
- <%if [!match[]else[wikitext]match[plaintext]] %>
- >>
- <$tiddler tiddler="Output">
- <$transclude $tiddler="Output" $mode="block"/>
-
-
- <%endif%>
-
- <$view tiddler="Output" format="plainwikified" mode="block"/>- <%else%> - <$linkcatcher actions=<
+ <$transclude $tiddler="Narrative" $mode="block"/>
+
+\end
+
+\procedure testcase-fail()
+
+
+\end
+
+\procedure testcase-output-wikified()
+<$linkcatcher actions=<
+ TEST FAILED
+
+
+ <$diff-text source=<> dest=<>/>
+
+
+ <%if [!match[]else[wikitext]match[plaintext]] %>
+ >
+ <%endif%>
+
+\end
+
+\procedure testcase-tabsList()
+[all[tiddlers]sort[]] Output +[putfirst[]]
+-Description
+-Narrative
+-[has[plugin-type]]
+-[prefix<$view tiddler="Output" format="plainwikified" mode="block"/>+ <%else%> + <
+ <$macrocall $name="tabs"
+ tabsList=<>
+ explicitState=<>
+ default="Output"
+ template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"
+ />
+
+\end
+
+\procedure testcase-panes()
+
+ <>
+
+ <>
+
+\end
+
+\procedure testcase-body()
+
+ <>
+ <%if [[Narrative]is[tiddler]] %>
+ <>
+ <%endif%>
+ <%if [match[fail]] %>
+ <>
+ <%endif%>
+ <>
+
+\end
+
+<