diff --git a/core/images/discord.tid b/core/images/discord.tid new file mode 100644 index 000000000..7510babb4 --- /dev/null +++ b/core/images/discord.tid @@ -0,0 +1,5 @@ +title: $:/core/images/discord +tags: $:/tags/Image + +\parameters (size:"22pt") +> height=<> class="tc-image-discord tc-image-button" viewBox="0 -28.5 256 256"> \ No newline at end of file diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 15273d18e..30f89eec7 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -80,6 +80,7 @@ NewMarkdown/Caption: new Markdown tiddler NewMarkdown/Hint: Create a new Markdown tiddler NewTiddler/Caption: new tiddler NewTiddler/Hint: Create a new tiddler +OpenControlPanel/Hint: Open control panel OpenWindow/Caption: open in new window OpenWindow/Hint: Open tiddler in new window Palette/Caption: palette diff --git a/core/language/en-GB/Snippets/FunctionDefinition.tid b/core/language/en-GB/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..e000e38b1 --- /dev/null +++ b/core/language/en-GB/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: Function definition + +\function f.name(param1,param2:"default value") [!is[blank]else] + +<> diff --git a/core/language/en-GB/Snippets/ProcedureDefinition.tid b/core/language/en-GB/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..632abcc01 --- /dev/null +++ b/core/language/en-GB/Snippets/ProcedureDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: Procedure definition + +\procedure procName(param1:"default value",param2) +Your text comes here. +\end diff --git a/core/language/en-GB/Types/image_x-icon.tid b/core/language/en-GB/Types/image_x-icon.tid deleted file mode 100644 index 55420387a..000000000 --- a/core/language/en-GB/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO icon -name: image/x-icon -group: Image -group-sort: 1 diff --git a/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..4fb3f2ec1 --- /dev/null +++ b/core/language/en-GB/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TiddlyWiki 5 compound tiddler +name: text/vnd.tiddlywiki-multiple +group: Developer +group-sort: 2 diff --git a/core/modules/config.js b/core/modules/config.js index 399af598b..fdcf94d0f 100644 --- a/core/modules/config.js +++ b/core/modules/config.js @@ -30,7 +30,7 @@ exports.textPrimitives.wikiLink = exports.textPrimitives.upperLetter + "+" + exports.textPrimitives.upperLetter + exports.textPrimitives.anyLetter + "*"; -exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 }; +exports.htmlEntities = {quot:34, dollar:36, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, nobreak:8288, NoBreak:8288, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 }; exports.htmlVoidElements = "area,base,br,col,command,embed,hr,img,input,keygen,link,meta,param,source,track,wbr".split(","); diff --git a/core/modules/storyviews/classic.js b/core/modules/storyviews/classic.js index 044cd97f0..a85e458c5 100644 --- a/core/modules/storyviews/classic.js +++ b/core/modules/storyviews/classic.js @@ -30,12 +30,8 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) { if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) { return; } - if(duration) { - // Scroll the node into view - this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement}); - } else { - targetElement.scrollIntoView(); - } + // Scroll the node into view + this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement}); }; ClassicStoryView.prototype.insert = function(widget) { diff --git a/core/modules/widgets/data.js b/core/modules/widgets/data.js index 63f12e1f9..c3da00919 100644 --- a/core/modules/widgets/data.js +++ b/core/modules/widgets/data.js @@ -75,7 +75,9 @@ DataWidget.prototype.computeDataTiddlerValues = function() { } }); // Deal with $tiddler, $filter or $compound-tiddler attributes - var tiddlers = [],title; + var tiddlers = [], + compoundTiddlers, + title; if(this.hasAttribute("$tiddler")) { title = this.getAttribute("$tiddler"); if(title) { @@ -103,8 +105,17 @@ DataWidget.prototype.computeDataTiddlerValues = function() { tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title)); } } + if(this.hasAttribute("$compound-filter")) { + filter = this.getAttribute("$compound-filter"); + if(filter) { + compoundTiddlers = this.wiki.filterTiddlers(filter); + $tw.utils.each(compoundTiddlers, function(title){ + tiddlers.push.apply(tiddlers,self.extractCompoundTiddler(title)); + }); + } + } // Return the literal item if none of the special attributes were used - if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler")) { + if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler") && !this.hasAttribute("$compound-filter")) { if(Object.keys(item).length > 0 && !!item.title) { return [new $tw.Tiddler(item)]; } else { diff --git a/core/ui/EditorToolbar/bold.tid b/core/ui/EditorToolbar/bold.tid index ffe84de61..1cde1be39 100644 --- a/core/ui/EditorToolbar/bold.tid +++ b/core/ui/EditorToolbar/bold.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/bold caption: {{$:/language/Buttons/Bold/Caption}} description: {{$:/language/Buttons/Bold/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((bold)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/excise.tid b/core/ui/EditorToolbar/excise.tid index f478abdc2..fe5c5288b 100644 --- a/core/ui/EditorToolbar/excise.tid +++ b/core/ui/EditorToolbar/excise.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/excise caption: {{$:/language/Buttons/Excise/Caption}} description: {{$:/language/Buttons/Excise/Hint}} -condition: [type[]] [type[text/vnd.tiddlywiki]] +[first[]] +condition: [type[]] [get[type]prefix[text/vnd.tiddlywiki]] +[first[]] shortcuts: ((excise)) dropdown: $:/core/ui/EditorToolbar/excise-dropdown diff --git a/core/ui/EditorToolbar/heading-1.tid b/core/ui/EditorToolbar/heading-1.tid index 2f0f41847..d7d2e5032 100644 --- a/core/ui/EditorToolbar/heading-1.tid +++ b/core/ui/EditorToolbar/heading-1.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-1 caption: {{$:/language/Buttons/Heading1/Caption}} description: {{$:/language/Buttons/Heading1/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((heading-1)) diff --git a/core/ui/EditorToolbar/heading-2.tid b/core/ui/EditorToolbar/heading-2.tid index 7139bf3d0..8f873ad19 100644 --- a/core/ui/EditorToolbar/heading-2.tid +++ b/core/ui/EditorToolbar/heading-2.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-2 caption: {{$:/language/Buttons/Heading2/Caption}} description: {{$:/language/Buttons/Heading2/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-2)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-3.tid b/core/ui/EditorToolbar/heading-3.tid index e00dd832b..96d053cee 100644 --- a/core/ui/EditorToolbar/heading-3.tid +++ b/core/ui/EditorToolbar/heading-3.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-3 caption: {{$:/language/Buttons/Heading3/Caption}} description: {{$:/language/Buttons/Heading3/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-3)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-4.tid b/core/ui/EditorToolbar/heading-4.tid index 4a4b7a90b..c3d373016 100644 --- a/core/ui/EditorToolbar/heading-4.tid +++ b/core/ui/EditorToolbar/heading-4.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-4 caption: {{$:/language/Buttons/Heading4/Caption}} description: {{$:/language/Buttons/Heading4/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-4)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-5.tid b/core/ui/EditorToolbar/heading-5.tid index 09f0bcf4c..fd961df4b 100644 --- a/core/ui/EditorToolbar/heading-5.tid +++ b/core/ui/EditorToolbar/heading-5.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-5 caption: {{$:/language/Buttons/Heading5/Caption}} description: {{$:/language/Buttons/Heading5/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-5)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-6.tid b/core/ui/EditorToolbar/heading-6.tid index d5d8dc045..d573cc89f 100644 --- a/core/ui/EditorToolbar/heading-6.tid +++ b/core/ui/EditorToolbar/heading-6.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-6 caption: {{$:/language/Buttons/Heading6/Caption}} description: {{$:/language/Buttons/Heading6/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-6)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/italic.tid b/core/ui/EditorToolbar/italic.tid index 518f3d0c2..7f3505ddb 100644 --- a/core/ui/EditorToolbar/italic.tid +++ b/core/ui/EditorToolbar/italic.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/italic caption: {{$:/language/Buttons/Italic/Caption}} description: {{$:/language/Buttons/Italic/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((italic)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/link.tid b/core/ui/EditorToolbar/link.tid index e0527cfab..719b05c50 100644 --- a/core/ui/EditorToolbar/link.tid +++ b/core/ui/EditorToolbar/link.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/link caption: {{$:/language/Buttons/Link/Caption}} description: {{$:/language/Buttons/Link/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((link)) dropdown: $:/core/ui/EditorToolbar/link-dropdown diff --git a/core/ui/EditorToolbar/linkify.tid b/core/ui/EditorToolbar/linkify.tid index 68a45857e..e8b5fed62 100644 --- a/core/ui/EditorToolbar/linkify.tid +++ b/core/ui/EditorToolbar/linkify.tid @@ -1,5 +1,5 @@ caption: {{$:/language/Buttons/Linkify/Caption}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] description: {{$:/language/Buttons/Linkify/Hint}} icon: $:/core/images/linkify list-before: $:/core/ui/EditorToolbar/mono-block diff --git a/core/ui/EditorToolbar/list-bullet.tid b/core/ui/EditorToolbar/list-bullet.tid index dfa14cc18..5a18f77d9 100644 --- a/core/ui/EditorToolbar/list-bullet.tid +++ b/core/ui/EditorToolbar/list-bullet.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/list-bullet caption: {{$:/language/Buttons/ListBullet/Caption}} description: {{$:/language/Buttons/ListBullet/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((list-bullet)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/list-number.tid b/core/ui/EditorToolbar/list-number.tid index 81b9152d0..0bf2ba160 100644 --- a/core/ui/EditorToolbar/list-number.tid +++ b/core/ui/EditorToolbar/list-number.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/list-number caption: {{$:/language/Buttons/ListNumber/Caption}} description: {{$:/language/Buttons/ListNumber/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((list-number)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/mono-block.tid b/core/ui/EditorToolbar/mono-block.tid index 4ef741695..72ec82d90 100644 --- a/core/ui/EditorToolbar/mono-block.tid +++ b/core/ui/EditorToolbar/mono-block.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/mono-block caption: {{$:/language/Buttons/MonoBlock/Caption}} description: {{$:/language/Buttons/MonoBlock/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((mono-block)) diff --git a/core/ui/EditorToolbar/mono-line.tid b/core/ui/EditorToolbar/mono-line.tid index 15ca77de1..2df863171 100644 --- a/core/ui/EditorToolbar/mono-line.tid +++ b/core/ui/EditorToolbar/mono-line.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/mono-line caption: {{$:/language/Buttons/MonoLine/Caption}} description: {{$:/language/Buttons/MonoLine/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((mono-line)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/picture.tid b/core/ui/EditorToolbar/picture.tid index cf10c0017..0a3fee736 100644 --- a/core/ui/EditorToolbar/picture.tid +++ b/core/ui/EditorToolbar/picture.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/picture caption: {{$:/language/Buttons/Picture/Caption}} description: {{$:/language/Buttons/Picture/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((picture)) dropdown: $:/core/ui/EditorToolbar/picture-dropdown diff --git a/core/ui/EditorToolbar/quote.tid b/core/ui/EditorToolbar/quote.tid index 1fe5fd9e1..d97974325 100644 --- a/core/ui/EditorToolbar/quote.tid +++ b/core/ui/EditorToolbar/quote.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/quote caption: {{$:/language/Buttons/Quote/Caption}} description: {{$:/language/Buttons/Quote/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((quote)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/strikethrough.tid b/core/ui/EditorToolbar/strikethrough.tid index 53808cac3..0b00df486 100644 --- a/core/ui/EditorToolbar/strikethrough.tid +++ b/core/ui/EditorToolbar/strikethrough.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/strikethrough caption: {{$:/language/Buttons/Strikethrough/Caption}} description: {{$:/language/Buttons/Strikethrough/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((strikethrough)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/subscript.tid b/core/ui/EditorToolbar/subscript.tid index e2c83abbd..1c980a896 100644 --- a/core/ui/EditorToolbar/subscript.tid +++ b/core/ui/EditorToolbar/subscript.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/subscript caption: {{$:/language/Buttons/Subscript/Caption}} description: {{$:/language/Buttons/Subscript/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((subscript)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/superscript.tid b/core/ui/EditorToolbar/superscript.tid index c1a40efea..ee4713409 100644 --- a/core/ui/EditorToolbar/superscript.tid +++ b/core/ui/EditorToolbar/superscript.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/superscript caption: {{$:/language/Buttons/Superscript/Caption}} description: {{$:/language/Buttons/Superscript/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((superscript)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/transcludify.tid b/core/ui/EditorToolbar/transcludify.tid index dbc008d56..d24b2041c 100644 --- a/core/ui/EditorToolbar/transcludify.tid +++ b/core/ui/EditorToolbar/transcludify.tid @@ -1,5 +1,5 @@ caption: {{$:/language/Buttons/Transcludify/Caption}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] description: {{$:/language/Buttons/Transcludify/Hint}} icon: $:/core/images/transcludify list-before: $:/core/ui/EditorToolbar/mono-block diff --git a/core/ui/EditorToolbar/underline.tid b/core/ui/EditorToolbar/underline.tid index ec6d63319..9f0fc9c30 100644 --- a/core/ui/EditorToolbar/underline.tid +++ b/core/ui/EditorToolbar/underline.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/underline caption: {{$:/language/Buttons/Underline/Caption}} description: {{$:/language/Buttons/Underline/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((underline)) <$action-sendmessage diff --git a/core/ui/KeyboardShortcuts/open-control-panel.tid b/core/ui/KeyboardShortcuts/open-control-panel.tid new file mode 100644 index 000000000..adb99048a --- /dev/null +++ b/core/ui/KeyboardShortcuts/open-control-panel.tid @@ -0,0 +1,8 @@ +title: $:/core/ui/KeyboardShortcuts/open-control-panel +tags: $:/tags/KeyboardShortcut +key: ((open-control-panel)) + +\whitespace trim +<$navigator story="$:/StoryList" history="$:/HistoryList"> +<$action-navigate $to="$:/ControlPanel" $scroll="yes"/> + diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid index 49e836671..6b17fe971 100644 --- a/core/ui/TagTemplate.tid +++ b/core/ui/TagTemplate.tid @@ -9,7 +9,7 @@ title: $:/core/ui/TagTemplate colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="$button" - element-attributes="""popup=<> dragFilter="[all[current]tagging[]]" tag='span'""" + element-attributes="""popup=<> dragFilter="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'""" /> <$reveal state=<> type="popup" position="below" animate="yes" class="tc-drop-down"> <$set name="tv-show-missing-links" value="yes"> diff --git a/core/ui/TestCaseTemplate.tid b/core/ui/TestCaseTemplate.tid index 9871a2904..8761abdd5 100644 --- a/core/ui/TestCaseTemplate.tid +++ b/core/ui/TestCaseTemplate.tid @@ -13,7 +13,8 @@ title: $:/core/ui/TestCaseTemplate testActions="Actions" testHideIfPass=<> > + <$data $compound-filter={{!!import-compound}}/> <$data $compound-tiddler=<>/> - <$data title="Description" text={{!!description}}/> + <%if [{!!description}!is[blank]] %><$data title="Description" text={{!!description}}/><%endif%> diff --git a/core/ui/ViewTemplate/body/code.tid b/core/ui/ViewTemplate/body/code.tid index 8c0494b19..9d2250395 100644 --- a/core/ui/ViewTemplate/body/code.tid +++ b/core/ui/ViewTemplate/body/code.tid @@ -1,3 +1,4 @@ title: $:/core/ui/ViewTemplate/body/code +<$transclude $variable="copy-to-clipboard-above-right" src={{{ [get[text]] }}} /> <$codeblock code={{{ [get[text]] }}} language={{{ [get[type]else[text/vnd.tiddlywiki]] }}}/> diff --git a/core/wiki/config/ShortcutInfo.multids b/core/wiki/config/ShortcutInfo.multids index bebd02dea..b2c843f35 100644 --- a/core/wiki/config/ShortcutInfo.multids +++ b/core/wiki/config/ShortcutInfo.multids @@ -32,6 +32,7 @@ mono-line: {{$:/language/Buttons/MonoLine/Hint}} new-image: {{$:/language/Buttons/NewImage/Hint}} new-journal: {{$:/language/Buttons/NewJournal/Hint}} new-tiddler: {{$:/language/Buttons/NewTiddler/Hint}} +open-control-panel: {{$:/language/Buttons/OpenControlPanel/Hint}} picture: {{$:/language/Buttons/Picture/Hint}} preview: {{$:/language/Buttons/Preview/Hint}} quote: {{$:/language/Buttons/Quote/Hint}} diff --git a/core/wiki/config/TagPillDragFilter.tid b/core/wiki/config/TagPillDragFilter.tid new file mode 100644 index 000000000..188c50b9e --- /dev/null +++ b/core/wiki/config/TagPillDragFilter.tid @@ -0,0 +1,2 @@ +title: $:/core/config/TagPillDragFilter +text: [all[current]tagging[]] +[!is[draft]] diff --git a/core/wiki/config/ViewTemplateBodyFilters.multids b/core/wiki/config/ViewTemplateBodyFilters.multids index e1dd62880..42a7ad823 100644 --- a/core/wiki/config/ViewTemplateBodyFilters.multids +++ b/core/wiki/config/ViewTemplateBodyFilters.multids @@ -4,7 +4,7 @@ tags: $:/tags/ViewTemplateBodyFilter testcase: [tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]] [tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]] stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]] core-ui-tags: [tag[$:/tags/PageTemplate]] [tag[$:/tags/EditTemplate]] [tag[$:/tags/ViewTemplate]] [tag[$:/tags/KeyboardShortcut]] [tag[$:/tags/ImportPreview]] [tag[$:/tags/EditPreview]][tag[$:/tags/EditorToolbar]] [tag[$:/tags/Actions]] :then[[$:/core/ui/ViewTemplate/body/code]] -system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]] +system: [prefix[$:/boot/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/config/]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/info/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/temp/]] :and[!is[image]] :then[[$:/core/ui/ViewTemplate/body/code]] code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]] import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]] plugin: [has[plugin-type]then[$:/core/ui/ViewTemplate/body/plugin]] diff --git a/core/wiki/config/shortcuts/shortcuts.multids b/core/wiki/config/shortcuts/shortcuts.multids index 551833012..470988a9a 100644 --- a/core/wiki/config/shortcuts/shortcuts.multids +++ b/core/wiki/config/shortcuts/shortcuts.multids @@ -28,6 +28,7 @@ list-bullet: ctrl-shift-L list-number: ctrl-shift-N mono-block: ctrl-shift-M mono-line: ctrl-M +open-control-panel: ctrl-alt-C picture: ctrl-shift-I preview: alt-P quote: ctrl-Q diff --git a/core/wiki/tags/TextEditorSnippet.tid b/core/wiki/tags/TextEditorSnippet.tid new file mode 100644 index 000000000..4d54212be --- /dev/null +++ b/core/wiki/tags/TextEditorSnippet.tid @@ -0,0 +1,2 @@ +title: $:/tags/TextEditor/Snippet +list: $:/language/Snippets/ProcedureDefinition $:/language/Snippets/FunctionDefinition $:/language/Snippets/ListByTag $:/language/Snippets/Table4x3 $:/language/Snippets/TableOfContents $:/language/Snippets/MacroDefinition \ No newline at end of file diff --git a/editions/geospatialdemo/tiddlers/real-estate-demo/schema.json b/editions/geospatialdemo/tiddlers/real-estate-demo/schema.json index e7decf5a1..31cca45b4 100644 --- a/editions/geospatialdemo/tiddlers/real-estate-demo/schema.json +++ b/editions/geospatialdemo/tiddlers/real-estate-demo/schema.json @@ -16,7 +16,7 @@ {"name": "nearest-volcano", "caption": "Nearest Volcano", "type": "string", "display": "[{$:/geospatialdemo/features/harvard-volcanoes-of-the-world}geonearestpoint]"} ], "variables": { - "coords": "[] :map[geopoint{!!long},{!!lat}]", - "census-data": "[] :map[geopoint{!!long},{!!lat}geolookup{$:/geospatialdemo/features/canada-census-subdivision-millesime}]" + "coords": "[] :map[geopoint{!!lat},{!!long}]", + "census-data": "[] :map[geopoint{!!lat},{!!long}geolookup{$:/geospatialdemo/features/canada-census-subdivision-millesime}]" } } diff --git a/editions/geospatialdemo/tiddlers/ui/geomarker.tid b/editions/geospatialdemo/tiddlers/ui/geomarker.tid index cf561c704..89e9fd950 100644 --- a/editions/geospatialdemo/tiddlers/ui/geomarker.tid +++ b/editions/geospatialdemo/tiddlers/ui/geomarker.tid @@ -73,7 +73,7 @@ title: ui/geomarker !! Distance to other markers <$let - thisLocation={{{ [geopoint{!!long},{!!lat}] }}} + thisLocation={{{ [geopoint{!!lat},{!!long}] }}} >
    <$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoMarker]sort[caption]] -[]"> @@ -81,7 +81,7 @@ title: ui/geomarker <$link><$view field="caption"><$view field="title"/> -- <$let - otherLocation={{{ [geopoint{!!long},{!!lat}] }}} + otherLocation={{{ [geopoint{!!lat},{!!long}] }}} > <$text text={{{ [geodistance,,[miles]fixed[0]] }}}/> miles @@ -93,7 +93,7 @@ title: ui/geomarker !! GeoFeature Lookups <$let - thisLocation={{{ [geopoint{!!long},{!!lat}] }}} + thisLocation={{{ [geopoint{!!lat},{!!long}] }}} >
      <$list filter="[all[shadows+tiddlers]tag[$:/tags/GeoFeature]sort[caption]]"> diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index b337a3ad1..f35234cbf 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -1,12 +1,18 @@ title: TiddlyWiki Pre-release modified: 20230731122156493 -This is a pre-release build of TiddlyWiki provided for testing and review purposes. ''Please don't try to depend on the pre-release for anything important'' -- you should use the latest official release from https://tiddlywiki.com. +
      + +!!! This is a pre-release build of TiddlyWiki provided for testing and review purposes. + +''Please don't try to depend on the pre-release for anything important'' -- you should use the latest official release from https://tiddlywiki.com. All of the changes in this pre-release are provisional until it is released and they become frozen by our backwards compatibility policies. This is the perfect time to raise questions or make suggestions. Please [[open a ticket at GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/issues/new/choose]] or make a post at https://talk.tiddlywiki.org/. The pre-release is also available as an [[empty wiki|https://tiddlywiki.com/prerelease/empty.html]] ready for reuse. +
      + <$list filter="[tag[ReleaseNotes]!has[released]!sort[created]]">

      <$text text=<>/>

      diff --git a/editions/prerelease/tiddlers/system/styles.tid b/editions/prerelease/tiddlers/system/styles.tid new file mode 100644 index 000000000..2f63c5a48 --- /dev/null +++ b/editions/prerelease/tiddlers/system/styles.tid @@ -0,0 +1,17 @@ +tags: $:/tags/Stylesheet +title: $:/_tw5.com/prerelease-styles +type: text/vnd.tiddlywiki + +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock + +.tc-scary-warning { + font-weight: bold; + padding: 0 1em; + margin-left: -1em; + margin-right: -1em; + color: #f22; + border-radius: 4px; + border: 3px solid transparent; + background: #ffd; + background: linear-gradient(#ffd, #ffd) padding-box, repeating-linear-gradient(-45deg, red 0, red 25%, transparent 0, transparent 50%) 0 / .6em .6em; +} \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid b/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid index c4a049a6a..b6817b3f7 100644 --- a/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/CompoundTiddlers.tid @@ -1,7 +1,8 @@ -title: CompoundTiddlers -modified: 20240507221902644 created: 20240507221902644 +modified: 20240729082610287 tags: Concepts +title: CompoundTiddlers +type: text/vnd.tiddlywiki Compound tiddlers are a special type of tiddler that can store one or more payload tiddlers. The tiddlers within a compound tiddler are only accessible via special operations, typically with the TestCaseWidget. @@ -29,3 +30,5 @@ tags: five six This is the third tiddler ``` + +Also see: [[TestCaseTiddlers]] \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid b/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid index cf42c67d7..fae4bab55 100644 --- a/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid +++ b/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid @@ -1,26 +1,30 @@ -title: TestCaseTiddlers -modified: 20240507221902644 created: 20240507221902644 +modified: 20240729083054531 tags: Concepts +title: TestCaseTiddlers +type: text/vnd.tiddlywiki -Test case tiddlers encapsulate one or more tiddlers that can be displayed as a [[test case|TestCaseWidget]]: an independent embedded wiki that can be used for testing or learning purposes. +Test case tiddlers encapsulate one or more tiddlers that can be displayed as a <<.wlink TestCaseWidget>>: an independent embedded wiki that can be used for testing or learning purposes. Test case tiddlers are formatted as CompoundTiddlers, allowing them to contain multiple tiddlers packed into one. -Test case tiddlers have the following fields: +Test case tiddlers have the following ''fields'': |!Field |!Description | -|<<.field type>> | Should be set to `text/vnd.tiddlywiki-multiple` | -|<<.field tags>> | Test cases are tagged [[$:/tags/wiki-test-spec]]. Test cases that intentionally fail are tagged [[$:/tags/wiki-test-spec-failing]] | +|<<.field type>> |Needs to be set to `text/vnd.tiddlywiki-multiple` | +|<<.field tags>> |Test cases are tagged [[$:/tags/wiki-test-spec]]. Test cases that intentionally fail are tagged [[$:/tags/wiki-test-spec-failing]] | |<<.field description>> |Descriptive heading for the test, intended to make it easy to identify the test | |<<.field display-format>> |Optional, defaults to `wikitext`. Set to `plaintext` to cause the output to be rended as plain text | +|<<.field import-compound>> |<<.from-version "5.3.6">> A filter string, that defines a list of compound tiddlers, that should be imported. See: <<.wlink DataWidget>> widget | -Test case tiddlers with the appropriate tag are shown in $:/ControlPanel +Test case tiddlers with the appropriate tag are shown in the $:/ControlPanel ''-> Advanced -> Test Cases '' -Some payload tiddlers are set aside for special purposes: +Some ''payload ''tiddlers are set aside for special purposes: |!Tiddler |!Description | |''Narrative'' |Narrative description of the test, intended to explain the purpose and operation of the test | |''Output'' |The tiddler that produces the test output | |''~ExpectedResult'' |HTML of expected result of rendering the ''Output'' tiddler | -|''Description'' |Set to the text of the <<.field description>> field | +|''Description'' |Set to the text of the <<.field description>> field, if the field exists | + +Also see: TestCaseWidget, DataWidget \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/definitions/Federatial.tid b/editions/tw5.com/tiddlers/definitions/Federatial.tid deleted file mode 100644 index ce256709d..000000000 --- a/editions/tw5.com/tiddlers/definitions/Federatial.tid +++ /dev/null @@ -1,21 +0,0 @@ -created: 20130825154900000 -modified: 20170718160846820 -modified: 20221204165636777 -tags: Definitions -title: Federatial -type: text/vnd.tiddlywiki - -Federatial Limited helps organisations explore new user interaction concepts through rapid prototyping of sophisticated web-based tools. Services include: - -* Consultancy advice on TiddlyWiki adoption -* Development of custom solutions based on TiddlyWiki -* Multi-user TiddlyWiki hosting – no outages since 2016 -* Sponsorship of TiddlyWiki core development - -See https://federatial.com/ and https://twitter.com/federatial for more information. - -JeremyRuston founded Federatial Limited in 2011 to support his work on TiddlyWiki for the advertised 25 years. Since then, Federatial has been privileged to have worked with a wide range of fantastic clients in very different sectors, on some very diverse projects: - -* For a law firm in the Washington DC, developing a custom multi-user ~TiddlyWiki application. It replaced a Microsoft Word document hosted on ~SharePoint that had grown to 18,000 pages and 10 million words, and was increasingly unwieldy to manage. We converted the document to a non-linear TiddlyWiki structure. Startup, searching and browsing are an order of magnitude faster than using Word and ~SharePoint -* For a publishing firm in Paris, devising a new TiddlyWiki-based format for interactive electronic publications (including conversion from the established EPUB format). See https://twpub-tools.org/ -* For a charity in London, maintaining a multiuser instance of TiddlyWiki running on Amazon's serverless infrastructure. It has more than 1,000 users, and over 15,000 tiddlers in 500 interlinked wikis. See https://manuals.annafreud.org/ambit diff --git a/editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid b/editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid new file mode 100644 index 000000000..02f177082 --- /dev/null +++ b/editions/tw5.com/tiddlers/definitions/Intertwingled Innovations.tid @@ -0,0 +1,9 @@ +created: 20240726184622817 +modified: 20240726184622817 +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. + +See https://intertwingledinnovations.com/ for more information. diff --git a/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid b/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid index 1893d58f9..bf139ea1e 100644 --- a/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid +++ b/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid @@ -4,7 +4,7 @@ tags: Definitions title: JeremyRuston type: text/vnd.tiddlywiki -I'm the original inventor of TiddlyWiki. You can hire me through [[Federatial]], and find me on these services: +I'm the original inventor of TiddlyWiki. You can hire me through [[Intertwingled Innovations]], and find me on these services: * jeremy (at) jermolene (dot) com * [[Jermolene on GitHub|https://github.com/Jermolene]] diff --git a/editions/tw5.com/tiddlers/definitions/WordJoiner.tid b/editions/tw5.com/tiddlers/definitions/WordJoiner.tid new file mode 100644 index 000000000..f3561dabc --- /dev/null +++ b/editions/tw5.com/tiddlers/definitions/WordJoiner.tid @@ -0,0 +1,9 @@ +created: 20240726074915230 +modified: 20240726075106830 +tags: Definitions +title: WordJoiner +type: text/vnd.tiddlywiki + +>The word joiner (WJ) is a Unicode format character which is used to indicate that line breaking should not occur at its position. It does not affect the formation of ligatures or cursive joining and is ignored for the purpose of text segmentation. It is encoded since Unicode version 3.2 (released in 2002) as U+2060 WORD JOINER (`⁠`). +> +>https://en.wikipedia.org/wiki/Word_joiner \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/definitions/Xememex.tid b/editions/tw5.com/tiddlers/definitions/Xememex.tid index 5457f23cc..e69c17e8b 100644 --- a/editions/tw5.com/tiddlers/definitions/Xememex.tid +++ b/editions/tw5.com/tiddlers/definitions/Xememex.tid @@ -5,10 +5,10 @@ modified: 20230410105035569 [img width=340 [Xememex Logo]] -Xememex is a multiuser TiddlyWiki from [[Federatial]]. It allows large groups of people to work together on intertwingled wikis that can share content. It is implemented as a serverless application on Amazon Web Services. +Xememex is a multiuser TiddlyWiki from [[Intertwingled Innovations]]. It allows large groups of people to work together on intertwingled wikis that can share content. It is implemented as a serverless application on Amazon Web Services. The largest customer implementation has hundreds of online wikis with thousands of users. See https://manuals.annafreud.org/ -Xememex is currently only available under commercial terms from Federatial. Contact [[Jeremy Ruston at Federatial|mailto:jeremy@federatial.com]] for more details. +Xememex is currently only available under commercial terms from Intertwingled Innovations. Contact [[Jeremy Ruston at Intertwingled Innovations|mailto:jeremy@intertwingledinnovations.com]] for more details.
      \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/empty-tag-node-template.tid b/editions/tw5.com/tiddlers/empty-tag-node-template.tid index 6827c6fe2..79905b77c 100644 --- a/editions/tw5.com/tiddlers/empty-tag-node-template.tid +++ b/editions/tw5.com/tiddlers/empty-tag-node-template.tid @@ -5,7 +5,8 @@ tags: $:/tags/ViewTemplate title: $:/editions/tw5.com/empty-tag-node-template type: -<$list filter='[!has[text]!has[tags]] :filter[tagging[]]'> +<% if [!has[text]!has[tags]tagging[]] %> The following tiddlers are tagged with <>: - -<!has[text]!has[tags]tagging[]]" class:"multi-columns">> \ No newline at end of file + +<!has[text]!has[tags]tagging[]]" class:"multi-columns">> +<% endif %> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/functions/Functions.tid b/editions/tw5.com/tiddlers/functions/Functions.tid index dadce73a1..028747a34 100644 --- a/editions/tw5.com/tiddlers/functions/Functions.tid +++ b/editions/tw5.com/tiddlers/functions/Functions.tid @@ -1,5 +1,5 @@ created: 20221009124003601 -modified: 20230419103154328 +modified: 20240619211228560 tags: Concepts Reference title: Functions type: text/vnd.tiddlywiki @@ -11,17 +11,17 @@ type: text/vnd.tiddlywiki Functions are usually defined with the [[Pragma: \function]]: ``` -\function my-function(parameter:"2") -[multiply[1.5]] +\function myfun(param:"2") +[multiply[1.5]] \end ``` Functions can be invoked in several ways: -* Directly transclude functions with the syntax `<>` -* Assign functions to widget attributes with the syntax `
      >>` -* Invoke functions via the [[function Operator]] with the syntax `[function[myfn],[value],...]` -* Directly invoke functions whose names contain a period as custom filter operators with the syntax `[my.fn[value]]` or `[.myfn[value]]` +* Directly transclude functions with the syntax `<>` +* Assign functions to widget attributes with the syntax `
      >>` +* Invoke functions via the [[function Operator]] with the syntax `[function[myfun],[value],...]` +* Directly invoke functions whose names contain a period as custom filter operators with the syntax `[my.fun[value]]` or `[.myfun[value]]` !! How Functions Work diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index e2e1cfdeb..88125a043 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -41,6 +41,9 @@ TiddlyWiki lets you choose where to keep your data, guaranteeing that in the dec {{$:/core/images/video}} ~YouTube + +{{$:/core/images/discord}} Discord + {{$:/core/images/twitter}} Twitter diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid index d46890d66..033371172 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid @@ -1,5 +1,5 @@ created: 20150414070451144 -list: [[HelloThumbnail - Newsletter]] [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Federatial]] +list: [[HelloThumbnail - Newsletter]] [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Grok TiddlyWiki]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - TiddlyWikiLinks]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Funding]] [[HelloThumbnail - Marketplace]] [[HelloThumbnail - Intertwingled Innovations]] modified: 20150414070948246 title: HelloThumbnail type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/hellothere/quickstart/xememex.tid b/editions/tw5.com/tiddlers/hellothere/quickstart/xememex.tid index 7fb562083..3600418ff 100644 --- a/editions/tw5.com/tiddlers/hellothere/quickstart/xememex.tid +++ b/editions/tw5.com/tiddlers/hellothere/quickstart/xememex.tid @@ -7,4 +7,4 @@ button-text: Find out more background: linear-gradient(90deg,#fff1fe, #ffffff) link: Xememex -For companies and teams, a multiuser ~TiddlyWiki from Federatial \ No newline at end of file +For companies and teams, a multiuser ~TiddlyWiki from Intertwingled Innovations \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid new file mode 100644 index 000000000..aa8e26689 --- /dev/null +++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Intertwingled Innovations.tid @@ -0,0 +1,10 @@ +background-color: #EDB431 +caption: Intertwingled Innovations +color: #ff0 +image: Intertwingled Innovations.png +link: Intertwingled Innovations +tags: HelloThumbnail +title: HelloThumbnail - Intertwingled Innovations +type: text/vnd.tiddlywiki + +Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Intertwingled Innovations Limited \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid deleted file mode 100644 index 9d76619a7..000000000 --- a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Federatial.tid +++ /dev/null @@ -1,11 +0,0 @@ -background-color: #EDB431 -caption: Federatial -color: #ff0 -image: Federatial.png -link: Federatial -tags: HelloThumbnail -title: HelloThumbnail - Federatial -type: text/vnd.tiddlywiki -ribbon-text: NEW - -Support the development of ~TiddlyWiki by hiring Jeremy Ruston through Federatial Limited \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Tag Pill Drag Filter.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Tag Pill Drag Filter.tid new file mode 100644 index 000000000..c8e2c9c77 --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Tag Pill Drag Filter.tid @@ -0,0 +1,22 @@ +created: 20240508093242925 +modified: 20240728134955433 +tags: [[Hidden Settings]] +title: Hidden Setting: Tag Pill Drag Filter +type: text/vnd.tiddlywiki + +The ''~$:/core/config/TagPillDragFilter'' defines the filter string, that is used to drag & drop a tap-pill eg: <> from 1 wiki to an other wiki. + +* By default the set contains all tiddlers that are ''tagged:'' HelloThere ''without'' the HelloThere tag-tiddler itself +** Core Default: <$transclude $tiddler="$:/core" $subtiddler="$:/core/config/TagPillDragFilter" output="text/plain" /> +* If you do want to include the tag-tiddler use the following filter: +** Tagged tiddlers only: `[all[current]tagging[]] [all[current]is[tiddler]] +[!is[draft]]` + +Your $:/core/config/TagPillDragFilter +<%if [[$:/core/config/TagPillDragFilter]is[tiddler]] %> +''has been overwritten'' and contains: +<%else%> +defaults to: +<%endif%> +{{$:/core/config/TagPillDragFilter}} + +<<.note title:"Be Aware" _:"The core default filter does //not// include shadow-tiddlers. It will //include overwritten// shadow tiddlers. See: [[is Operator]] for details about the `is[tiddler]` and other possibilities.">> diff --git a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid index 421f99dce..f22167fe3 100644 --- a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid +++ b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid @@ -27,6 +27,7 @@ Keyboard shortcuts are available for common editing operations within the Text E |Focusing sidebar search |<<.from-version 5.1.20>>ctrl-shift-F | |Toggling the sidebar |<<.from-version 5.1.20>>shift-alt-S | |Advanced search |<<.from-version 5.1.20>>ctrl-shift-A | +|Open [[Control Panel|$:/ControlPanel]] |<<.from-version 5.3.6>>ctrl-alt-C | The current shortcuts can be inspected and customised in the "Keyboard Shortcuts" tab of the [[Control Panel|$:/ControlPanel]] <<.icon $:/core/images/options-button>>. diff --git a/editions/tw5.com/tiddlers/images/Federatial.png b/editions/tw5.com/tiddlers/images/Federatial.png deleted file mode 100644 index 3adde3a11..000000000 Binary files a/editions/tw5.com/tiddlers/images/Federatial.png and /dev/null differ diff --git a/editions/tw5.com/tiddlers/images/Federatial.png.meta b/editions/tw5.com/tiddlers/images/Federatial.png.meta deleted file mode 100644 index 528629786..000000000 --- a/editions/tw5.com/tiddlers/images/Federatial.png.meta +++ /dev/null @@ -1,3 +0,0 @@ -title: Federatial.png -type: image/png -tags: picture diff --git a/editions/tw5.com/tiddlers/images/Intertwingled Innovations.png b/editions/tw5.com/tiddlers/images/Intertwingled Innovations.png new file mode 100644 index 000000000..b405ec3f6 Binary files /dev/null and b/editions/tw5.com/tiddlers/images/Intertwingled Innovations.png differ diff --git a/editions/tw5.com/tiddlers/images/Intertwingled Innovations.png.meta b/editions/tw5.com/tiddlers/images/Intertwingled Innovations.png.meta new file mode 100644 index 000000000..a6336bfc4 --- /dev/null +++ b/editions/tw5.com/tiddlers/images/Intertwingled Innovations.png.meta @@ -0,0 +1,3 @@ +title: Intertwingled Innovations.png +type: image/png +tags: picture diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid index 9746af1ae..e4a898ad8 100644 --- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid +++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid @@ -1,6 +1,6 @@ code-body: yes created: 20150117184156000 -modified: 20240315144208842 +modified: 20240716181836632 tags: $:/tags/Macro title: $:/editions/tw5.com/wikitext-macros type: text/vnd.tiddlywiki @@ -80,12 +80,12 @@ type: text/vnd.tiddlywiki \end \procedure tw-code(tiddler) -<$codeblock language={{$tiddler$!!type}} code={{$tiddler$}}/> +<$codeblock language={{{ [get[type]] }}} code={{{ [get[text]] }}}/> \end \procedure tw-code-link(tiddler) -[[$tiddler$]]: -<> +<$link to=<>/>: +<$transclude $variable=tw-code tiddler=<> /> \end \procedure flex-card(class,bordercolor:"",backgroundcolor:"",textcolor:"",imageField:"image",captionField:"caption",subtitle:"",descriptionField:"description",linkField:"link") diff --git a/editions/tw5.com/tiddlers/variables/Behaviour of invoked variables depends on how the variable was declared.tid b/editions/tw5.com/tiddlers/variables/Behaviour of invoked variables depends on how the variable was declared.tid index 319bf2c78..98fbf6b28 100644 --- a/editions/tw5.com/tiddlers/variables/Behaviour of invoked variables depends on how the variable was declared.tid +++ b/editions/tw5.com/tiddlers/variables/Behaviour of invoked variables depends on how the variable was declared.tid @@ -1,5 +1,5 @@ created: 20230726145210484 -modified: 20230726145757234 +modified: 20240619211734149 tags: [[Variable Usage]] title: Behaviour of invoked variables depends on how the variable was declared type: text/vnd.tiddlywiki @@ -8,19 +8,19 @@ type: text/vnd.tiddlywiki \procedure p1(a1) $a1$ - <<__a1__>> - <> \function f1(a1) "$a1$" "-" [<__a1__>] ="-" [] :and[join[ ]] -Invoked in normal wikitext context: `<$transclude $variable=macro/>` or `<>` +Invoked in normal wikitext context: `<$transclude $variable=myvar/>` or `<>` {{Behaviour of variables invoked via normal wikitext}} -Invoked via widget attribute: `
      >/>` +Invoked via widget attribute: `
      >/>` {{Behaviour of variables invoked via widget attributes}} -Invoked via filter operator parameter: `[]` +Invoked via filter operator parameter: `[]` {{Behaviour of variables invoked via filter operator parameter}} -Invoked via function call in a filter expression: `[function[macro]]` +Invoked via function call in a filter expression: `[function[.myfun]]` {{Behaviour of variables invoked via filter expression function call}} diff --git a/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via normal wikitext.tid b/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via normal wikitext.tid index 0caa74c26..0eae9acff 100644 --- a/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via normal wikitext.tid +++ b/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via normal wikitext.tid @@ -1,5 +1,5 @@ created: 20230726142925020 -modified: 20230726150648189 +modified: 20240619211452297 tags: [[Variable Usage]] title: Behaviour of variables invoked via normal wikitext type: text/vnd.tiddlywiki @@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki |!how declared|!behaviour| |\define|All wikitext and variable substitution and textual substitution takes place| |<<.wlink SetWidget>>, <<.wlink LetWidget>>, <<.wlink VarsWidget>>, \procedure, \widget|All wikitext and variable substitution takes place| -|\function|Invoking a function in this way (`<>`) is a synonym for `<$text text={{{[function[macro]]}}}/>`. As with any filtered transclusion (i.e. triple curly braces), all results except the first are discarded| \ No newline at end of file +|\function|Invoking a function in this way (`<<.myfun>>`) is a synonym for `<$text text={{{[function[.myfun]]}}}/>`. As with any filtered transclusion (i.e. triple curly braces), all results except the first are discarded| \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via widget attributes.tid b/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via widget attributes.tid index 3bf06e219..3784c94e3 100644 --- a/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via widget attributes.tid +++ b/editions/tw5.com/tiddlers/variables/Behaviour of variables invoked via widget attributes.tid @@ -1,5 +1,5 @@ created: 20230726143332803 -modified: 20230726150616232 +modified: 20240619210723396 tags: [[Variable Usage]] title: Behaviour of variables invoked via widget attributes type: text/vnd.tiddlywiki @@ -8,4 +8,4 @@ type: text/vnd.tiddlywiki |!how declared|!behaviour| |\define|Textual substitution of parameters is performed on the body text. No further processing takes place. The result after textual substitution is used as the attribute's value| |<<.wlink SetWidget>>, <<.wlink LetWidget>>, <<.wlink VarsWidget>>, \procedure, \widget|Body text is retrieved as-is and used as the attribute's value.| -|\function|When a function is invoked as `
      >/>`, it is a synonym for `
      `. As with any filtered transclusion (i.e. triple curly braces), all results except the first are discarded. That first result is used as the attribute's value. Note that functions are recursively processed even when invoked in this form. In other words a filter expression in a function can invoke another function and the processing will continue| \ No newline at end of file +|\function|When a function (e.g. `.myfun`) is invoked as `
      >/>`, it is a synonym for `
      `. As with any filtered transclusion (i.e. triple curly braces), all results except the first are discarded. That first result is used as the attribute's value. Note that functions are recursively processed even when invoked in this form. In other words a filter expression in a function can invoke another function and the processing will continue| \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/DataWidget.tid b/editions/tw5.com/tiddlers/widgets/DataWidget.tid index 8aaf1efaf..dc2e7ab2a 100644 --- a/editions/tw5.com/tiddlers/widgets/DataWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/DataWidget.tid @@ -1,6 +1,6 @@ caption: data created: 20240507221902644 -modified: 20240507221902644 +modified: 20240729084028713 tags: Widgets title: DataWidget type: text/vnd.tiddlywiki @@ -17,6 +17,7 @@ The content of the data widget is ignored. It supports the following attributes: |<<.attr $tiddler>> |Optional title of a tiddler to be used as a payload tiddler (optional) | |<<.attr $filter>> |Optional filter string identifying tiddlers to be used as payload tiddlers (optional) | |<<.attr $compound-tiddler>> |Optional title of a tiddler containing payload tiddlers in `text/vnd.tiddlywiki-multiple` format (see below) | +|<<.attr $compound-filter>> |<<.from-version "5.3.6">> Optional filter, to create a list of tiddlers that contain compound tiddlers. <<.infoBox """Tiddlers will be imported in order. Existing testcase tiddlers will be overwritten, so the currentTiddler wins""">>| |//any attribute
      not starting
      with $// |Field values to be assigned to the payload tiddler(s) | The data widget is not rendered when used within the <<.wlink TestCaseWidget>> widget or the [[Innerwiki Plugin]] but for ease of testing, when used elsewhere it renders a JSON representation of the payload tiddlers. diff --git a/editions/tw5.com/tiddlers/wikitext/HTML Entities.tid b/editions/tw5.com/tiddlers/wikitext/HTML Entities.tid index 59b674575..e2fab5589 100644 --- a/editions/tw5.com/tiddlers/wikitext/HTML Entities.tid +++ b/editions/tw5.com/tiddlers/wikitext/HTML Entities.tid @@ -1,5 +1,5 @@ created: 20130204165019000 -modified: 20221025124615415 +modified: 20240726074846436 tags: WikiText title: HTML Entities type: text/vnd.tiddlywiki @@ -30,7 +30,8 @@ Comprehensive lists of html entities can be found at... !! Examples Of Common And Useful Entities |>|>|>|>|>|>| ! HTML Entities | -| &nbsp; |   | no-break space |    | &apos; | ' | single quote, apostrophe | +| &nbsp; |   | no-break space |    | | | | +| &~NoBreak; | ⁠ | zerro width WordJoiner |    | &apos; | ' | single quote, apostrophe | | &ndash; | – | en dash |~| &quot; | " | quotation mark | | &mdash; | — | em dash |~| &prime; | ′ | prime; minutes; feet | | &hellip; | … | horizontal ellipsis |~| &Prime; | ″ | double prime; seconds; inches | diff --git a/languages/ca-ES/Types/image%2Fx-icon.tid b/languages/ca-ES/Types/image%2Fx-icon.tid deleted file mode 100644 index ba79c8f76..000000000 --- a/languages/ca-ES/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Format de fitxer d'icona ICO -name: image/x-icon -group: Imatge diff --git a/languages/cs-CZ/Types/image%2Fx-icon.tid b/languages/cs-CZ/Types/image%2Fx-icon.tid deleted file mode 100644 index ff8d12f81..000000000 --- a/languages/cs-CZ/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO format icon file -name: image/x-icon -group: Image diff --git a/languages/da-DK/Types/image%2Fx-icon.tid b/languages/da-DK/Types/image%2Fx-icon.tid deleted file mode 100644 index 7dd30a011..000000000 --- a/languages/da-DK/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO ikon fil -name: image/x-icon -group: Billede diff --git a/languages/de-DE/Snippets/FunctionDefinition.tid b/languages/de-DE/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..a4c1a0152 --- /dev/null +++ b/languages/de-DE/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: Function Definition + +\function f.name(param1,param2:"default value") [!is[blank]else] + +<> diff --git a/languages/de-DE/Snippets/MacroDefinition.tid b/languages/de-DE/Snippets/MacroDefinition.tid index a50cb0c9f..3d07c55c4 100644 --- a/languages/de-DE/Snippets/MacroDefinition.tid +++ b/languages/de-DE/Snippets/MacroDefinition.tid @@ -3,6 +3,6 @@ tags: $:/tags/TextEditor/Snippet caption: Makro Definition \define makroName(param1:"standard parameter", param2) -Text des Makros. Zugriff auf den <<__param1__>>. +Ihr Text kommt hier her. Zugriff auf <<__param1__>>. <<__param2__>> \end diff --git a/languages/de-DE/Snippets/ProcedureDefinition.tid b/languages/de-DE/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..074eea13d --- /dev/null +++ b/languages/de-DE/Snippets/ProcedureDefinition.tid @@ -0,0 +1,8 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: Procedure Definition + +\procedure procName(param1:"standard parameter", param2) +Ihr Text kommt hier her. Zugriff auf <<__param1__>>. +<<__param2__>> +\end diff --git a/languages/de-DE/Types/application_javascript.tid b/languages/de-DE/Types/application_javascript.tid index 5d8355058..894a8f727 100644 --- a/languages/de-DE/Types/application_javascript.tid +++ b/languages/de-DE/Types/application_javascript.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/javascript description: JS - JavaScript Code name: application/javascript group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/application_json.tid b/languages/de-DE/Types/application_json.tid index 07599cf57..c1768b93f 100644 --- a/languages/de-DE/Types/application_json.tid +++ b/languages/de-DE/Types/application_json.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/json description: JSON - Daten name: application/json group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/application_x_tiddler_dictionary.tid b/languages/de-DE/Types/application_x_tiddler_dictionary.tid index 0eeb94feb..97ba09970 100644 --- a/languages/de-DE/Types/application_x_tiddler_dictionary.tid +++ b/languages/de-DE/Types/application_x_tiddler_dictionary.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/application/x-tiddler-dictionary description: TiddlyWiki Datenkatalog name: application/x-tiddler-dictionary group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/image_gif.tid b/languages/de-DE/Types/image_gif.tid index cadd49999..a214a46b6 100644 --- a/languages/de-DE/Types/image_gif.tid +++ b/languages/de-DE/Types/image_gif.tid @@ -1,4 +1,5 @@ title: $:/language/Docs/Types/image/gif description: GIF - Bild name: image/gif -group: Bilder \ No newline at end of file +group: Bilder +group-sort: 1 \ No newline at end of file diff --git a/languages/de-DE/Types/image_jpeg.tid b/languages/de-DE/Types/image_jpeg.tid index 2a0c59998..15b3ec725 100644 --- a/languages/de-DE/Types/image_jpeg.tid +++ b/languages/de-DE/Types/image_jpeg.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/jpeg description: JPEG - Bild name: image/jpeg group: Bilder +group-sort: 1 diff --git a/languages/de-DE/Types/image_png.tid b/languages/de-DE/Types/image_png.tid index 1f330eff1..140b669f3 100644 --- a/languages/de-DE/Types/image_png.tid +++ b/languages/de-DE/Types/image_png.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/png description: PNG - Portable Netzwerkgrafik name: image/png group: Bilder +group-sort: 1 diff --git a/languages/de-DE/Types/image_svg_xml.tid b/languages/de-DE/Types/image_svg_xml.tid index 6a008c87f..ab9ee72ec 100644 --- a/languages/de-DE/Types/image_svg_xml.tid +++ b/languages/de-DE/Types/image_svg_xml.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/image/svg+xml description: SVG - Strukturierte Vektor Graphik name: image/svg+xml group: Bilder +group-sort: 1 diff --git a/languages/de-DE/Types/image_x-icon.tid b/languages/de-DE/Types/image_x-icon.tid deleted file mode 100644 index 043071d97..000000000 --- a/languages/de-DE/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO - Piktogramm (Icon) -name: image/x-icon -group: Bilder diff --git a/languages/de-DE/Types/text_css.tid b/languages/de-DE/Types/text_css.tid index 0ac501127..95038c03c 100644 --- a/languages/de-DE/Types/text_css.tid +++ b/languages/de-DE/Types/text_css.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/css description: CSS - Cascading Style Sheets name: text/css group: Entwickler +group-sort: 2 diff --git a/languages/de-DE/Types/text_html.tid b/languages/de-DE/Types/text_html.tid index a94db47c4..974920715 100644 --- a/languages/de-DE/Types/text_html.tid +++ b/languages/de-DE/Types/text_html.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/html description: HTML - Auszeichnungssprache name: text/html group: Text +group-sort: 0 \ No newline at end of file diff --git a/languages/de-DE/Types/text_plain.tid b/languages/de-DE/Types/text_plain.tid index 8246411ba..d1e96034c 100644 --- a/languages/de-DE/Types/text_plain.tid +++ b/languages/de-DE/Types/text_plain.tid @@ -2,3 +2,4 @@ title: $:/language/Docs/Types/text/plain description: TXT - Unformatierter Text name: text/plain group: Text +group-sort: 0 \ No newline at end of file diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki.tid b/languages/de-DE/Types/text_vnd.tiddlywiki.tid index fdcc917dd..ec8342a24 100644 --- a/languages/de-DE/Types/text_vnd.tiddlywiki.tid +++ b/languages/de-DE/Types/text_vnd.tiddlywiki.tid @@ -1,4 +1,5 @@ title: $:/language/Docs/Types/text/vnd.tiddlywiki -description: TW5 - TiddlyWiki Version 5 Wikitext +description: TW5 - TiddlyWiki Wikitext name: text/vnd.tiddlywiki group: Text +group-sort: 0 \ No newline at end of file diff --git a/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..2c192f96f --- /dev/null +++ b/languages/de-DE/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TW5 - TiddlyWiki Wikitext Verbund Tiddler +name: text/vnd.tiddlywiki-multiple +group: Entwickler +group-sort: 2 diff --git a/languages/el-GR/Types/image%2Fx-icon.tid b/languages/el-GR/Types/image%2Fx-icon.tid deleted file mode 100644 index 43fc68aeb..000000000 --- a/languages/el-GR/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Αρχείο Εικονιδίου μορφής ICO -name: image/x-icon -group: Εικόνας diff --git a/languages/es-ES/Types/image_x-icon.tid b/languages/es-ES/Types/image_x-icon.tid deleted file mode 100644 index 9a3574bca..000000000 --- a/languages/es-ES/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Archivo de icono en formato .ICO -name: image/x-icon -group: Imagen -group-sort: 1 diff --git a/languages/fr-FR/Types/image_x-icon.tid b/languages/fr-FR/Types/image_x-icon.tid deleted file mode 100644 index 15f41cb65..000000000 --- a/languages/fr-FR/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: icône au format ICO -name: image/x-icon -group: Image -group-sort: 1 diff --git a/languages/he-IL/Types/image%2Fx-icon.tid b/languages/he-IL/Types/image%2Fx-icon.tid deleted file mode 100644 index 55a37c04a..000000000 --- a/languages/he-IL/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO format קובץ סמליל -name: image/x-icon -group: תמונה diff --git a/languages/hi-IN/Types/image%2Fx-icon.tid b/languages/hi-IN/Types/image%2Fx-icon.tid deleted file mode 100644 index 2f2ec7b8e..000000000 --- a/languages/hi-IN/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO के प्रारूप आइकन फ़ाइल -name: image/x-icon -group: - छवि diff --git a/languages/ia-IA/Types/image%2Fx-icon.tid b/languages/ia-IA/Types/image%2Fx-icon.tid deleted file mode 100644 index d5057ea68..000000000 --- a/languages/ia-IA/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: File de formato de icones ICO -name: image/x-icon -group: Imagine diff --git a/languages/it-IT/Types/image_x-icon.tid b/languages/it-IT/Types/image_x-icon.tid deleted file mode 100644 index f0c922f95..000000000 --- a/languages/it-IT/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: File icona ICO -name: image/x-icon -group: Immagine -group-sort: 1 diff --git a/languages/ja-JP/Types/image%2Fx-icon.tid b/languages/ja-JP/Types/image%2Fx-icon.tid deleted file mode 100644 index 9baa98ea8..000000000 --- a/languages/ja-JP/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: アイコンファイル（ICO 形式） -name: image/x-icon -group: Image diff --git a/languages/ko-KR/Types/image%2Fx-icon.tid b/languages/ko-KR/Types/image%2Fx-icon.tid deleted file mode 100644 index c0708db36..000000000 --- a/languages/ko-KR/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO 형식 아이콘 파일 -name: image/x-icon -group: 그림 diff --git a/languages/mk-MK/Types/image%2Fx-icon.tid b/languages/mk-MK/Types/image%2Fx-icon.tid deleted file mode 100644 index 0f28bb5b8..000000000 --- a/languages/mk-MK/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO икона -name: image/x-icon -group: Фотографија diff --git a/languages/nl-NL/Types/image%2Fx-icon.tid b/languages/nl-NL/Types/image%2Fx-icon.tid deleted file mode 100644 index 5cfa06148..000000000 --- a/languages/nl-NL/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO pictogram (icon) -name: image/x-icon -group: Afbeelding diff --git a/languages/pa-IN/Types/image%2Fx-icon.tid b/languages/pa-IN/Types/image%2Fx-icon.tid deleted file mode 100644 index dfee8dc3d..000000000 --- a/languages/pa-IN/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO ਫਾਰਮੈਟ ਆਈਕਾਨ ਫਾਇਲ -name: image/x-icon -group: ਚਿੱਤਰ diff --git a/languages/pl-PL/Types/image_x-icon.tid b/languages/pl-PL/Types/image_x-icon.tid deleted file mode 100644 index 624000820..000000000 --- a/languages/pl-PL/Types/image_x-icon.tid +++ /dev/null @@ -1,5 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Ikona w formacie ICO -name: image/x-icon -group: Image -group-sort: 1 diff --git a/languages/pt-BR/Types/image%2Fx-icon.tid b/languages/pt-BR/Types/image%2Fx-icon.tid deleted file mode 100644 index 2cbf89338..000000000 --- a/languages/pt-BR/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Ícone em formato de arquivo ICO -name: image/x-icon -group: Imagem diff --git a/languages/pt-PT/Types/image%2Fx-icon.tid b/languages/pt-PT/Types/image%2Fx-icon.tid deleted file mode 100644 index 04f08c6e8..000000000 --- a/languages/pt-PT/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Ícone em formato de ficheiro ICO -name: image/x-icon -group: Imagem diff --git a/languages/ru-RU/Types/image%2Fx-icon.tid b/languages/ru-RU/Types/image%2Fx-icon.tid deleted file mode 100644 index fc268f917..000000000 --- a/languages/ru-RU/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO значок -name: image/x-icon -group: Изображение diff --git a/languages/sk-SK/Types/image%2Fx-icon.tid b/languages/sk-SK/Types/image%2Fx-icon.tid deleted file mode 100644 index 56695bf3b..000000000 --- a/languages/sk-SK/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO formát pre súbor ikony -name: image/x-icon -group: Obrázok diff --git a/languages/sl-SI/Types/image%2Fx-icon.tid b/languages/sl-SI/Types/image%2Fx-icon.tid deleted file mode 100644 index 7007c1ac3..000000000 --- a/languages/sl-SI/Types/image%2Fx-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: Datoteka s ikono oblike ICO -name: image/x-icon -group: Slika diff --git a/languages/sv-SE/Types/image_x-icon.tid b/languages/sv-SE/Types/image_x-icon.tid deleted file mode 100755 index 78ba4e19b..000000000 --- a/languages/sv-SE/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO ikonfil -name: image/x-icon -group: Bild diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index 3fa13f740..87be34a82 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -80,6 +80,7 @@ NewMarkdown/Caption: 添加 Markdown 条目 NewMarkdown/Hint: 创建一个新的 Markdown 条目 NewTiddler/Caption: 添加条目 NewTiddler/Hint: 创建一个新的条目 +OpenControlPanel/Hint: 开启控制台 OpenWindow/Caption: 开启于新窗口 OpenWindow/Hint: 在新窗口中开启条目 Palette/Caption: 调色板 diff --git a/languages/zh-Hans/Snippets/FunctionDefinition.tid b/languages/zh-Hans/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..fa7793d8a --- /dev/null +++ b/languages/zh-Hans/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: 函数定义 + +\function f.name(param1,param2:"默认值") [!is[blank]else] + +<> diff --git a/languages/zh-Hans/Snippets/ProcedureDefinition.tid b/languages/zh-Hans/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..3b4f60212 --- /dev/null +++ b/languages/zh-Hans/Snippets/ProcedureDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: 程序定义 + +\procedure procName(param1:"默认值",param2) +这里就是您的文本了。 +\end diff --git a/languages/zh-Hans/Types/image_x-icon.tid b/languages/zh-Hans/Types/image_x-icon.tid deleted file mode 100644 index a5b5159bc..000000000 --- a/languages/zh-Hans/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO 图标 -name: image/x-icon -group: 图像 diff --git a/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid b/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..dd8e72be9 --- /dev/null +++ b/languages/zh-Hans/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TiddlyWiki 5 复合条目 +name: text/vnd.tiddlywiki-multiple +group: 开发者 +group-sort: 2 diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index b45b88f79..c17974998 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -80,6 +80,7 @@ NewMarkdown/Caption: 新增 Markdown 條目 NewMarkdown/Hint: 建立一個新的 Markdown 條目 NewTiddler/Caption: 新增條目 NewTiddler/Hint: 建立一個新的條目 +OpenControlPanel/Hint: 開啟控制台 OpenWindow/Caption: 開啟於新視窗 OpenWindow/Hint: 在新視窗中開啟條目 Palette/Caption: 調色盤 diff --git a/languages/zh-Hant/Snippets/FunctionDefinition.tid b/languages/zh-Hant/Snippets/FunctionDefinition.tid new file mode 100644 index 000000000..c42ed096a --- /dev/null +++ b/languages/zh-Hant/Snippets/FunctionDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/FunctionDefinition +tags: $:/tags/TextEditor/Snippet +caption: 函數定義 + +\function f.name(param1,param2:"預設值") [!is[blank]else] + +<> diff --git a/languages/zh-Hant/Snippets/ProcedureDefinition.tid b/languages/zh-Hant/Snippets/ProcedureDefinition.tid new file mode 100644 index 000000000..8a92ae666 --- /dev/null +++ b/languages/zh-Hant/Snippets/ProcedureDefinition.tid @@ -0,0 +1,7 @@ +title: $:/language/Snippets/ProcedureDefinition +tags: $:/tags/TextEditor/Snippet +caption: 程序定義 + +\procedure procName(param1:"預設值",param2) +這裡就是您的文字了。 +\end diff --git a/languages/zh-Hant/Types/image_x-icon.tid b/languages/zh-Hant/Types/image_x-icon.tid deleted file mode 100644 index 5dd06b877..000000000 --- a/languages/zh-Hant/Types/image_x-icon.tid +++ /dev/null @@ -1,4 +0,0 @@ -title: $:/language/Docs/Types/image/x-icon -description: ICO 圖示 -name: image/x-icon -group: 圖片 diff --git a/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid b/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid new file mode 100644 index 000000000..745734788 --- /dev/null +++ b/languages/zh-Hant/Types/text_vnd.tiddlywiki_multiple.tid @@ -0,0 +1,5 @@ +title: $:/language/Docs/Types/text/vnd.tiddlywiki-multiple +description: TiddlyWiki 5 複合條目 +name: text/vnd.tiddlywiki-multiple +group: 開發者 +group-sort: 2 diff --git a/licenses/cla-entity.md b/licenses/cla-entity.md index a42687687..5642ed8f2 100644 --- a/licenses/cla-entity.md +++ b/licenses/cla-entity.md @@ -102,7 +102,7 @@ List of Contributors The below-signed are contributors to a code repository that is part of the project named "TiddlyWiki5". Each below-signed contributor has read, understand and agrees to the terms above in the section within this document entitled "TiddlyWiki5 Entity Contributor License Agreement" as of **the date** beside his or her **real name**, **GitHub account name** and **Entity name**. -eg: Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22 +eg: Jeremy Ruston, @Jermolene for Intertwingled Innovations Limited, 2011/11/22 ## Contributors @@ -111,3 +111,5 @@ Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22 Google Inc, 2015/12/21 Brooks Boyd, @MidnightLightning for MidnightDesign, LLC 2019/03/21 + +Jeremy Ruston, @Jermolene for Intertwingled Innovations Limited, 2024/07/26 diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 8e7c22a91..c05d5906f 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -583,3 +583,5 @@ Andrei Rybak, @rybak, 2024/06/09 Michael McDermott, @michaeljmcd, 2024-07-09 @webplusai, 2024/07/23 + +Val Packett, @valpackett, 2024/07/26 diff --git a/languages/ca-ES/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ca-ES/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ca-ES/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ca-ES/types/text_Fx-tiddlywiki.tid diff --git a/languages/cs-CZ/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/cs-CZ/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/cs-CZ/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/cs-CZ/types/text_Fx-tiddlywiki.tid diff --git a/languages/da-DK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/da-DK/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/da-DK/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/da-DK/types/text_Fx-tiddlywiki.tid diff --git a/languages/de-DE/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/de-DE/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/de-DE/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/de-DE/types/text_x-tiddlywiki.tid diff --git a/languages/el-GR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/el-Gr/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/el-GR/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/el-Gr/types/text_Fx-tiddlywiki.tid diff --git a/core/language/en-GB/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid similarity index 100% rename from core/language/en-GB/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/en-GB/types/text_x-tiddlywiki.tid diff --git a/languages/es-ES/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/es-ES/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/es-ES/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/es-ES/types/text_x-tiddlywiki.tid diff --git a/languages/fr-FR/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/fr-FR/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/fr-FR/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/fr-FR/types/text_x-tiddlywiki.tid diff --git a/languages/he-IL/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/he-IL/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/he-IL/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/he-IL/types/text_Fx-tiddlywiki.tid diff --git a/languages/hi-IN/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/hi-IN/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/hi-IN/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/hi-IN/types/text_Fx-tiddlywiki.tid diff --git a/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid new file mode 100644 index 000000000..802e23ce2 --- /dev/null +++ b/plugins/tiddlywiki/classictools/languages/ia-IA/types/text_Fx-tiddlywiki.tid @@ -0,0 +1,4 @@ +title: $:/language/Docs/Types/text/x-tiddlywiki +description: TiddlyWiki Classic +name: text/x-tiddlywiki +group: Texto diff --git a/languages/it-IT/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/it-IT/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/it-IT/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/it-IT/types/text_x-tiddlywiki.tid diff --git a/languages/ja-JP/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ja-JP/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ja-JP/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ja-JP/types/text_Fx-tiddlywiki.tid diff --git a/languages/ko-KR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ko-KR/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ko-KR/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ko-KR/types/text_Fx-tiddlywiki.tid diff --git a/languages/mk-MK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/mk-MK/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/mk-MK/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/mk-MK/types/text_Fx-tiddlywiki.tid diff --git a/languages/nl-NL/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/nl-NL/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/nl-NL/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/nl-NL/types/text_Fx-tiddlywiki.tid diff --git a/languages/pa-IN/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pa-IN/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/pa-IN/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pa-IN/types/text_Fx-tiddlywiki.tid diff --git a/languages/pl-PL/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pl-PL/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/pl-PL/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pl-PL/types/text_x-tiddlywiki.tid diff --git a/languages/pt-BR/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pt-BR/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/pt-BR/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pt-BR/types/text_Fx-tiddlywiki.tid diff --git a/languages/pt-PT/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/pt-PT/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/pt-PT/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/pt-PT/types/text_Fx-tiddlywiki.tid diff --git a/languages/ru-RU/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/ru-RU/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/ru-RU/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/ru-RU/types/text_Fx-tiddlywiki.tid diff --git a/languages/sk-SK/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sk-SK/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/sk-SK/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/sk-SK/types/text_Fx-tiddlywiki.tid diff --git a/languages/sl-SI/Types/text%2Fx-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sl-SI/types/text_Fx-tiddlywiki.tid similarity index 100% rename from languages/sl-SI/Types/text%2Fx-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/sl-SI/types/text_Fx-tiddlywiki.tid diff --git a/languages/sv-SE/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid old mode 100755 new mode 100644 similarity index 96% rename from languages/sv-SE/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid index c62e54531..145da212d --- a/languages/sv-SE/Types/text_x-tiddlywiki.tid +++ b/plugins/tiddlywiki/classictools/languages/sv-SE/types/text_x-tiddlywiki.tid @@ -1,4 +1,4 @@ -title: $:/language/Docs/Types/text/x-tiddlywiki -description: TiddlyWiki klassisk -name: text/x-tiddlywiki -group: Text +title: $:/language/Docs/Types/text/x-tiddlywiki +description: TiddlyWiki klassisk +name: text/x-tiddlywiki +group: Text diff --git a/languages/zh-Hans/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/zh-Hans/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/zh-Hans/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/zh-Hans/types/text_x-tiddlywiki.tid diff --git a/languages/zh-Hant/Types/text_x-tiddlywiki.tid b/plugins/tiddlywiki/classictools/languages/zh-Hant/types/text_x-tiddlywiki.tid similarity index 100% rename from languages/zh-Hant/Types/text_x-tiddlywiki.tid rename to plugins/tiddlywiki/classictools/languages/zh-Hant/types/text_x-tiddlywiki.tid diff --git a/plugins/tiddlywiki/geospatial/operators/helper.js b/plugins/tiddlywiki/geospatial/operators/helper.js index 744632414..164b1dc86 100644 --- a/plugins/tiddlywiki/geospatial/operators/helper.js +++ b/plugins/tiddlywiki/geospatial/operators/helper.js @@ -18,7 +18,7 @@ exports.geopoint = function(source,operator,options) { var lat = $tw.utils.parseNumber(operator.operands[0] || "0"), long = $tw.utils.parseNumber(operator.operands[1] || "0"), alt = $tw.utils.parseNumber(operator.operands[2] || "0"); - return [JSON.stringify(turf.point([lat,long,alt]))]; + return [JSON.stringify(turf.point([long,lat,alt]))]; }; })(); diff --git a/plugins/tiddlywiki/geospatial/operators/olc.js b/plugins/tiddlywiki/geospatial/operators/olc.js index 93962572f..ee8c34fa5 100644 --- a/plugins/tiddlywiki/geospatial/operators/olc.js +++ b/plugins/tiddlywiki/geospatial/operators/olc.js @@ -27,14 +27,14 @@ exports["olc-decode"] = function(source,operator,options) { obj; if(suffixes.indexOf("bounds") !== -1) { obj = turf.polygon([[ - [olc.latitudeLo, olc.longitudeLo], - [olc.latitudeHi, olc.longitudeLo], - [olc.latitudeHi, olc.longitudeHi], - [olc.latitudeLo, olc.longitudeHi], - [olc.latitudeLo, olc.longitudeLo] + [olc.longitudeLo, olc.latitudeLo], + [olc.longitudeLo, olc.latitudeHi], + [olc.longitudeHi, olc.latitudeHi], + [olc.longitudeHi, olc.latitudeLo], + [olc.longitudeLo, olc.latitudeLo] ]]); } else { - obj = turf.point([olc.latitudeCenter,olc.longitudeCenter]); + obj = turf.point([olc.longitudeCenter,olc.latitudeCenter]); } return [JSON.stringify(obj)]; }; diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geodistance.tid b/plugins/tiddlywiki/geospatial/tests/operators/geodistance.tid index 5ce1f9a50..75d1e9259 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geodistance.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geodistance.tid @@ -27,4 +27,4 @@ title: Output + title: ExpectedResult -

      5042.67688063485,5042.67688063485,8115.401781788412,72.89828683394038,1.2738016908387275,5042.67688063485

      \ No newline at end of file +

      3406.2115173004354,3406.2115173004354,5481.766068098352,49.241105484826875,0.8604235593111019,3406.2115173004354

      \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geolookup.tid b/plugins/tiddlywiki/geospatial/tests/operators/geolookup.tid index 0a3f709fd..b363a48a2 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geolookup.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geolookup.tid @@ -22,7 +22,7 @@ type: application/json "type": "Feature", "geometry": { "type": "Point", - "coordinates": [102.0,0.5] + "coordinates": [0.5,102.0] }, "properties": { "animal": "amoeba" @@ -33,7 +33,7 @@ type: application/json "geometry": { "type": "LineString", "coordinates": [ - [102.0,0.0],[103.0,1.0],[104.0,0.0],[105.0,1.0] + [0.0,102.0],[1.0,103.0],[0.0,104.0],[1.0,105.0] ] }, "properties": { @@ -46,7 +46,7 @@ type: application/json "geometry": { "type": "Polygon", "coordinates": [ - [[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]] + [[0.0,100.0],[0.0,101.0],[1.0,101.0],[1.0,100.0],[0.0,100.0]] ] }, "properties": { diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid b/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid index e5ada0162..08fc3e023 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid @@ -17,7 +17,7 @@ title: Output > <$text text={{{ =[] =[] +[geonearestpointjsonget[id]] }}}/>, -<$text text={{{ =[] =[[Not a point]] +[geonearestpointjsonget[id]] }}}/>, +<$text text={{{ =[] =[[Not a point]] +[geonearestpointjsonget[id]] }}}/>, <$text text={{{ =[[Not a point]] +[geonearestpointjsonget[id]] }}}/> @@ -25,4 +25,4 @@ title: Output + title: ExpectedResult -

      Winchester,Oxford,

      \ No newline at end of file +

      Oxford,Winchester,

      \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint2.tid b/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint2.tid index ef20e830b..9cb509ad0 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint2.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint2.tid @@ -22,14 +22,14 @@ title: Output "id": "Oxford", "geometry": { "type": "Point", - "coordinates": [51.751944, -1.257778] + "coordinates": [-1.257778, 51.751944] } },{ "type": "Feature", "id": "Winchester", "geometry": { "type": "Point", - "coordinates": [51.0632, -1.308] + "coordinates": [-1.308, 51.0632] } } ] @@ -42,4 +42,4 @@ title: Output + title: ExpectedResult -

      Winchester

      \ No newline at end of file +

      Oxford

      \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geopoint.tid b/plugins/tiddlywiki/geospatial/tests/operators/geopoint.tid index 1aa00c238..a4096e3c4 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geopoint.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geopoint.tid @@ -18,4 +18,4 @@ title: Output + title: ExpectedResult -{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.751944,-1.257778,0]}}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.751944,-1.257778,0]},"id":"Oxford"}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.751944,-1.257778,2]}} \ No newline at end of file +{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257778,51.751944,0]}}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257778,51.751944,0]},"id":"Oxford"}{"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257778,51.751944,2]}} \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/olc-decode.tid b/plugins/tiddlywiki/geospatial/tests/operators/olc-decode.tid index 7d2d4c027..c13c60855 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/olc-decode.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/olc-decode.tid @@ -15,6 +15,6 @@ title: Output + title: ExpectedResult -

      ({"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[51.751875,-1.257875],[51.752,-1.257875],[51.752,-1.25775],[51.751875,-1.25775],[51.751875,-1.257875]]]}}) -({"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[51.7519375,-1.257765625]}}) +

      ({"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-1.257875,51.751875],[-1.257875,51.752],[-1.25775,51.752],[-1.25775,51.751875],[-1.257875,51.751875]]]}}) +({"type":"Feature","properties":{},"geometry":{"type":"Point","coordinates":[-1.257765625,51.7519375]}})

      \ No newline at end of file diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid b/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid new file mode 100644 index 000000000..966c991fd --- /dev/null +++ b/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown.tid @@ -0,0 +1,24 @@ +title: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown + +\define replacement-text() +![](<#$(escaped-text)$>) +\end + +\define escapetitle() [()<>\\] + +''{{$:/language/Buttons/Picture/Hint}}'' + +<$macrocall $name="image-picker" actions=""" + +<$let escaped-text={{{ [search-replace:g:regexp,[\$&]] }}}> +<$action-sendmessage + $message="tm-edit-text-operation" + $param="replace-selection" + text=<> +/> + +<$action-deletetiddler + $tiddler=<> +/> + +"""/> diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/picture.tid b/plugins/tiddlywiki/markdown/EditorToolbar/picture.tid new file mode 100644 index 000000000..27e108c81 --- /dev/null +++ b/plugins/tiddlywiki/markdown/EditorToolbar/picture.tid @@ -0,0 +1,10 @@ +title: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture +list-after: $:/core/ui/EditorToolbar/picture +tags: $:/tags/EditorToolbar +icon: $:/core/images/picture +caption: {{$:/language/Buttons/Picture/Caption}} (Markdown) +description: {{$:/language/Buttons/Picture/Hint}} +condition: [type[text/x-markdown]] [type[text/markdown]] +shortcuts: ((picture)) +dropdown: $:/plugins/tiddlywiki/markdown/EditorToolbar/picture-dropdown +