diff --git a/editions/de-AT/tiddlers/beispiele/TaskManagement.tid b/editions/de-AT/tiddlers/beispiele/TaskManagement.tid index 2bc4bd0c0..159676eae 100644 --- a/editions/de-AT/tiddlers/beispiele/TaskManagement.tid +++ b/editions/de-AT/tiddlers/beispiele/TaskManagement.tid @@ -1,11 +1,11 @@ created: 20140923173639039 creator: pmario -modified: 20140924155046340 +modified: 20230307080008193 modifier: pmario title: TaskManagement type: text/vnd.tiddlywiki -In dieser Edition sind folgende Task Management Varianten beschreiben: +In dieser Edition sind folgende Task Management Varianten beschrieben: <> diff --git a/editions/de-AT/tiddlers/beispiele/done.tid b/editions/de-AT/tiddlers/beispiele/done.tid index 9972856b7..626fa3f33 100644 --- a/editions/de-AT/tiddlers/beispiele/done.tid +++ b/editions/de-AT/tiddlers/beispiele/done.tid @@ -2,7 +2,7 @@ color: #37d011 created: 20140923104300415 creator: pmario icon: $:/core/images/done-button -modified: 20140923105208878 +modified: 20230307080039831 modifier: ChrisK tags: done title: done @@ -12,5 +12,5 @@ Diese Tag wird verwendet um "Tasks" als erledigt zu markieren. Siehe auch: -* [[Task Management]] .. Beispiel +* [[Task Management|TaskManagement]] .. Beispiel * [[Tag Manager|$:/TagManager]] .. Zuweisung der Farben und Symbole \ No newline at end of file diff --git a/editions/de-AT/tiddlers/howto/Importieren von Tiddlern.tid b/editions/de-AT/tiddlers/howto/Importieren von Tiddlern.tid new file mode 100644 index 000000000..e9ea480b4 --- /dev/null +++ b/editions/de-AT/tiddlers/howto/Importieren von Tiddlern.tid @@ -0,0 +1,6 @@ +created: 20230307080413903 +modified: 20230307080417122 +title: Importieren von Tiddlern +type: text/vnd.tiddlywiki + +https://tiddlywiki.com/#Importing%20Tiddlers \ No newline at end of file diff --git a/editions/de-AT/tiddlers/howto/Liste aller HowTo's.tid b/editions/de-AT/tiddlers/howto/Liste aller HowTo's.tid index 9dcc7e62a..0c88f3e1e 100644 --- a/editions/de-AT/tiddlers/howto/Liste aller HowTo's.tid +++ b/editions/de-AT/tiddlers/howto/Liste aller HowTo's.tid @@ -1,11 +1,11 @@ created: 20140918094051245 creator: pmario -modified: 20140918094948642 +modified: 20230307080301079 modifier: pmario tags: Referenz title: Liste aller HowTo's type: text/vnd.tiddlywiki -Hier finden Sie eine Auflistung aller HowTo's +Hier finden Sie eine Auflistung aller ~HowTo's <> \ No newline at end of file diff --git a/editions/de-AT/tiddlers/konzept/Tagging.tid b/editions/de-AT/tiddlers/konzept/Tagging.tid new file mode 100644 index 000000000..fa28765ba --- /dev/null +++ b/editions/de-AT/tiddlers/konzept/Tagging.tid @@ -0,0 +1,6 @@ +created: 20230307081437974 +modified: 20230307081439303 +title: Tagging +type: text/vnd.tiddlywiki + +https://tiddlywiki.com/#Tagging \ No newline at end of file diff --git a/editions/de-AT/tiddlers/system/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid b/editions/de-AT/tiddlers/system/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid new file mode 100644 index 000000000..66a4cbad8 --- /dev/null +++ b/editions/de-AT/tiddlers/system/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid @@ -0,0 +1,6 @@ +created: 20230307080103029 +modified: 20230307080103029 +title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout +type: text/vnd.tiddlywiki + +fluid-fixed \ No newline at end of file diff --git a/editions/de-AT/tiddlers/widgets/ListWidget.tid b/editions/de-AT/tiddlers/widgets/ListWidget.tid new file mode 100644 index 000000000..44430e62c --- /dev/null +++ b/editions/de-AT/tiddlers/widgets/ListWidget.tid @@ -0,0 +1,7 @@ +created: 20230307081923415 +modified: 20230307081953759 +tags: Widgets +title: ListWidget +type: text/vnd.tiddlywiki + +https://tiddlywiki.com/#ListWidget \ No newline at end of file diff --git a/editions/de-AT/tiddlers/widgets/TranscludeWidget.tid b/editions/de-AT/tiddlers/widgets/TranscludeWidget.tid new file mode 100644 index 000000000..e2e0cbdaf --- /dev/null +++ b/editions/de-AT/tiddlers/widgets/TranscludeWidget.tid @@ -0,0 +1,7 @@ +created: 20230307082002353 +modified: 20230307082023207 +tags: Widgets +title: TranscludeWidget +type: text/vnd.tiddlywiki + +https://tiddlywiki.com/#TranscludeWidget \ No newline at end of file diff --git a/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid index 1a2407ad8..53ffd37d1 100644 --- a/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Bilder in WikiText.tid @@ -1,7 +1,7 @@ caption: Bilder created: 20131205160221762 creator: pmario -modified: 20140921170652909 +modified: 20230307081713229 modifier: pmario tags: WikiText title: Bilder in WikiText @@ -25,7 +25,7 @@ oder Wenn die Bildquelle der Titel eines existierenden Tiddlers ist, dann wird dieser direkt angezeigt. Ansonsten wird die Quelle als URL angesehen und ein HTML `` Element wird erzeugt. Das `src` Attribut wird auf die [[URL]] gesetzt. -Ein [[Tooltip]] kann ebenfalls angegeben werden: +Ein Tooltip kann ebenfalls angegeben werden: ``` [img[Ich bin der Tooltip text|Motovun Jack.jpg]] @@ -33,7 +33,7 @@ Ein [[Tooltip]] kann ebenfalls angegeben werden: [img width=100 [Ich bin der Tooltip text|Motovun Jack.jpg]] -Attribute wie zB: CSS Klassen oder die Höhe und Breite können ebenfalls angegeben werden. +Attribute wie z.B: CSS Klassen oder die Höhe und Breite können ebenfalls angegeben werden. ``` [img width=64 [Motovun Jack.jpg]] diff --git a/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid index dd336588e..c2141999a 100644 --- a/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid +++ b/editions/de-AT/tiddlers/wikitext/Makros in WikiText.tid @@ -1,7 +1,7 @@ caption: Makros created: 20131205160746466 creator: pmario -modified: 20140922124415476 +modified: 20230307080132949 modifier: ChrisK tags: WikiText title: Makros in WikiText @@ -15,7 +15,7 @@ Hallo, Ich bin $name$ und lebe in $adresse$ Hallo, Ich bin $name$ und würde gerne mal wieder nach $adresse$ fahren:) \end -!! Makros Definieren +!! Makros definieren !!! Für die Ungeduldigen @@ -76,7 +76,7 @@ Für einzeilige Makros kann die `\end` Markierung entfallen! * Makros können mit dem ImportVariablesWidget importiert werden. (Für geübte Anwender) -!! Makros Verwenden +!! Makros verwenden ``` <> diff --git a/editions/de-AT/tiddlers/wikitext/Transclusion in WikiText.tid b/editions/de-AT/tiddlers/wikitext/Transclusion in WikiText.tid new file mode 100644 index 000000000..bb8798ebf --- /dev/null +++ b/editions/de-AT/tiddlers/wikitext/Transclusion in WikiText.tid @@ -0,0 +1,7 @@ +created: 20230307081757660 +modified: 20230307081814992 +tags: WikiText +title: Transclusion in WikiText +type: text/vnd.tiddlywiki + +https://tiddlywiki.com/#Transclusion%20in%20WikiText \ No newline at end of file diff --git a/editions/prerelease/tiddlers/Release 5.2.6.tid b/editions/prerelease/tiddlers/Release 5.2.6.tid index 3a6ee78fb..3e4410a6a 100644 --- a/editions/prerelease/tiddlers/Release 5.2.6.tid +++ b/editions/prerelease/tiddlers/Release 5.2.6.tid @@ -9,6 +9,16 @@ type: text/vnd.tiddlywiki ! Major Improvements +!! Improved Markdown Plugin + +* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6528">> the [[Markdown Plugin]] to use the newer and better maintained [[markdown-it|https://github.com/markdown-it/markdown-it]] library. The previous Markdown plugin remains available as "markdown-legacy" + +!! Better Handling of Loss of Network Connectivity with Client Server Configuration + +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7169">> integration between the [[BrowserStorage Plugin]] and the client-server configuration to allow changes to be made while offline and then later resynchronised with the server + +!! New Diff-Match-Patch Primitives + * <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7290">> three new operators exposing previously hidden features of the [[Diff-Match-Patch|https://neil.fraser.name/software/diff_match_patch]] library that is integrated with TiddlyWiki: ** new [[levenshtein Operator]] to calculate the similarity of two strings as the number of characters that need to be inserted, deleted or modified in order to turn one into the other ** new [[makepatches Operator]] and [[applypatches Operator]] that can be used to make and apply patches that represent the difference between two different texts. See the [[examples|makepatches and applypatches Operator (Examples)]] @@ -23,8 +33,6 @@ Improvements to the following translations: ! Plugin Improvements -* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7169">> integration between the [[BrowserStorage Plugin]] and the client-server configuration to allow changes to be made while offline and then later resynchronised with the server -* <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/6528">> the [[Markdown Plugin]] to use the newer and better maintained [[markdown-it|https://github.com/markdown-it/markdown-it]] library. The previous Markdown plugin remains available as "markdown-legacy" * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7176">> [[Innerwiki Plugin]] to allow the `<$data>` widget to override existing tiddler fields * <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7207">>, <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/commit/c39ef398bffae12c0ed7324d9b6d9d29f0f2f9ff">> and <<.link-badge-here "https://github.com/Jermolene/TiddlyWiki5/commit/8f7441f296351a4dd0852c3c782f8874d398e052">> problem preventing [[Share Plugin]] from working properly * <<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/commit/524cee1489f260375cac8cfe878fdc5942a4596e">> [[XLSX Plugin|XLSX Utilities Edition]] to handle importing numeric fields diff --git a/plugins/tiddlywiki/railroad/doc/example-transclusion.tid b/plugins/tiddlywiki/railroad/doc/example-transclusion.tid new file mode 100644 index 000000000..f8d1144b1 --- /dev/null +++ b/plugins/tiddlywiki/railroad/doc/example-transclusion.tid @@ -0,0 +1,3 @@ +title: $:/plugins/tiddlywiki/railroad/example-transclusion + +"railroad transclusion example" text \ No newline at end of file diff --git a/plugins/tiddlywiki/railroad/doc/syntax.tid b/plugins/tiddlywiki/railroad/doc/syntax.tid index fc0d8d87f..0e6e809dd 100644 --- a/plugins/tiddlywiki/railroad/doc/syntax.tid +++ b/plugins/tiddlywiki/railroad/doc/syntax.tid @@ -2,6 +2,7 @@ created: 20150103184022184 modified: 20150119220342000 title: $:/plugins/tiddlywiki/railroad/syntax + The railroad widget uses a special notation to construct the components defined below. `x` and `y` here stand for any component. @@ -12,9 +13,28 @@ Names (as opposed to quoted strings) are available when a value starts with a le ; sequence : <$railroad text=""" ["<-"] {x} ["->"] """/> + * A sequence of components * The `<-` and `->` delimiters allow you to force a single component to be treated as a sequence. This is occasionally useful for spacing a diagram out +examples + +<<< + +``` +x y z sequence +``` +<$railroad text=""" x y z """/> + +``` +<-x y z-> explicit sequence +``` + +<$railroad text=""" <- x y z -> """/> + +<<< + + --- ; optional @@ -22,6 +42,24 @@ Names (as opposed to quoted strings) are available when a value starts with a le * A component that can be omitted * The colon makes `x` appear straight ahead +examples + +<<< + +``` +[:x] optional, normally included +``` +<$railroad text=""" [:x] """/> + +``` +[x] optional, normally omitted +``` + +<$railroad text=""" [x] """/> + +<<< + + --- ; repeated @@ -29,12 +67,62 @@ Names (as opposed to quoted strings) are available when a value starts with a le * A list of one or more `x` * The `+` suffix adds `y` as a separator between each `x` and the next +examples + +<<< + +``` +{x} one or more +``` +<$railroad text=""" {x} """/> + +``` +{x +","} one or more, comma-separated +``` + +<$railroad text=""" {x +","} """/> + +<<< + + --- ; optional repeated : <$railroad text=""" "[{" [":"] x [:"+" y] "}]" """/> * An optional list of `x`, i.e. a list of zero or more `x` +examples + +<<< + +``` +[{:x}] zero or more, normally included +``` + +<$railroad text=""" [{:x}] """/> + +``` +[{:x +","}] zero or more, comma-separated, normally included +``` + +<$railroad text=""" [{:x +","}] """/> + +``` +[{x}] zero or more, normally omitted +``` + +<$railroad text=""" [{x}] """/> + +``` +[{x +","}] zero or more, comma-separated, normally omitted +``` + +<$railroad text=""" [{x +","}] """/> + +<<< + + + --- ; choice @@ -42,6 +130,25 @@ Names (as opposed to quoted strings) are available when a value starts with a le * A set of alternatives * The colon indicates which branch appears straight ahead. By default, it's the first branch +examples + +<<< + +``` +(x|y|z) alternatives +``` + +<$railroad text=""" (x|y|z) """/> + +``` +(x|:y|z) alternatives, normally y +``` + +<$railroad text=""" (x|:y|z) """/> + +<<< + + --- ; string / terminal @@ -49,36 +156,117 @@ Names (as opposed to quoted strings) are available when a value starts with a le * A literal or terminal component * This follows the normal ~TiddlyWiki rules for quoted strings +examples + +<<< + +``` +"x" terminal +``` + +<$railroad text=""" "x" """/> + +<<< + + --- ; nonterminal : <$railroad text=""" (name | "<" string ">") """/> * A nonterminal component, i.e. the name of another diagram +examples + +<<< + +``` +<"x"> nonterminal +``` + +<$railroad text=""" <"x"> """/> + +<<< + + --- ; comment : <$railroad text=""" "/" string "/" """/> * A comment +examples + +<<< + +``` +/ "comment" / comment +``` + +<$railroad text=""" / "comment" / """/> + +<<< + + --- ; dummy : <$railroad text=""" "-" """/> * The absence of a component +examples + +<<< + +``` +- dummy +``` + +<$railroad text=""" - """/> + +<<< + + --- ; link : <$railroad text=""" "[[" x "|" (name|string) "]]" """/> * A link to the tiddler title or URI given by the string or name +examples + +<<< + +``` +[[x|"tiddler"]] link +``` + +<$railroad text=""" [[x|"tiddler"]] """/> + +<<< + + --- ; transclusion : <$railroad text=""" "{{" (name|string) "}}" """/> * Treats the content of another tiddler as diagram syntax and transcludes it into the current diagram +examples + +<<< + +``` +{{"$:/plugins/tiddlywiki/railroad/example-transclusion"}} transclusion + +// "railroad transclusion example" text <- text in the tidlder + +``` + +<$railroad text=""" {{ "$:/plugins/tiddlywiki/railroad/example-transclusion" }} """/> + +<<< + + --- ; arrow pragma @@ -86,14 +274,76 @@ Names (as opposed to quoted strings) are available when a value starts with a le * Controls whether repeat paths have an arrow on them * Can be toggled on and off in mid-diagram, if desired +examples + +<<< +``` +<$railroad text=""" +\arrow yes +[{:x}] +"""/> + +``` + +<$railroad text="""\arrow yes [{:x}] """/> + +``` +<$railroad text=""" +\arrow no +[{:x}] +"""/> +``` + +<$railroad text="""\arrow no [{:x}] """/> + +<<< + + --- ; debug pragma : <$railroad text=""" "\debug" """/> * Causes the diagram to display its parse tree +examples + +<<< + +``` +\debug +x +``` + +<$railroad text="""\debug x """/> + +<<< + + --- ; start/end pragma : <$railroad text=""" ("\start" |: "\end") ("none" |: "single" | "double") """/> * Controls the style of the diagram's startpoint or endpoint +examples + +<<< + +``` +\start none x +``` + +<$railroad text=""" \start none x """/> + +``` +\start double +\end double + x +``` + +<$railroad text=""" \start double +\end double +x +"""/> + +<<< + diff --git a/plugins/tiddlywiki/railroad/parser.js b/plugins/tiddlywiki/railroad/parser.js index bb55b57b8..013d898d7 100644 --- a/plugins/tiddlywiki/railroad/parser.js +++ b/plugins/tiddlywiki/railroad/parser.js @@ -5,6 +5,8 @@ module-type: library Parser for the source of a railroad diagram. +x y z sequence +<-x y z-> explicit sequence [:x] optional, normally included [x] optional, normally omitted {x} one or more @@ -13,8 +15,6 @@ Parser for the source of a railroad diagram. [{:x +","}] zero or more, comma-separated, normally included [{x}] zero or more, normally omitted [{x +","}] zero or more, comma-separated, normally omitted -x y z sequence -<-x y z-> explicit sequence (x|y|z) alternatives (x|:y|z) alternatives, normally y "x" terminal