From 6cc99fcbe33da47cfcb1335d0742b16ea1b9ce03 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Wed, 25 May 2022 15:15:17 +0100 Subject: [PATCH] WIP --- .../system/TiddlyWiki Pre-release.tid | 2 ++ .../tiddlers/tests/data/transclude/Mario.tid | 28 +++++++++++++++++++ .../tiddlers/hellothere/HelloThere.tid | 4 +++ .../internals/state-editpreviewtype.tid | 2 ++ .../internals/state-showeditpreview.tid | 2 ++ 5 files changed, 38 insertions(+) create mode 100644 editions/test/tiddlers/tests/data/transclude/Mario.tid create mode 100644 plugins/tiddlywiki/internals/state-editpreviewtype.tid create mode 100644 plugins/tiddlywiki/internals/state-showeditpreview.tid diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index a1fa201dc..35d6665bd 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -1,6 +1,8 @@ title: TiddlyWiki Pre-release modified: 20150428204930183 +{{HelloThere||$:/plugins/tiddlywiki/internals/EditTemplate/body/preview/parse-tree}} + This is a pre-release build of TiddlyWiki, [[also available in empty form|https://tiddlywiki.com/prerelease/empty.html]]. It is provided for testing purposes. ''Please don't try to use it for anything important'' -- you should use the latest official release from https://tiddlywiki.com. <$list filter="[tag[ReleaseNotes]!has[released]!sort[created]]"> diff --git a/editions/test/tiddlers/tests/data/transclude/Mario.tid b/editions/test/tiddlers/tests/data/transclude/Mario.tid new file mode 100644 index 000000000..6bb6b7543 --- /dev/null +++ b/editions/test/tiddlers/tests/data/transclude/Mario.tid @@ -0,0 +1,28 @@ +title: UnwantedParagraphs +description: Unwanted paragraph elements when using slot/fill +type: text/vnd.tiddlywiki-multiple +tags: [[$:/tags/wiki-test-spec]] + +title: Output + +\whitespace trim +\procedure hello +\whitespace trim +
+<$slot $name="greeting"/> +
+\end + +
+<$transclude $variable="hello" mode="inline"> +<$fill $name="greeting"> +

A heading

+

A paragraph

+ + +
+ ++ +title: ExpectedResult + +

A heading

A paragraph

\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index 7a464c7db..21cf7f110 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -5,6 +5,10 @@ tags: TableOfContents title: HelloThere type: text/vnd.tiddlywiki +
>> +This +
+ ''Have you ever had the feeling that your head is not quite big enough to hold everything you need to remember?'' Welcome to TiddlyWiki, a unique [[non-linear|Philosophy of Tiddlers]] notebook for [[capturing|Creating and editing tiddlers]], [[organising|Structuring TiddlyWiki]] and [[sharing|Sharing your tiddlers with others]] complex information. diff --git a/plugins/tiddlywiki/internals/state-editpreviewtype.tid b/plugins/tiddlywiki/internals/state-editpreviewtype.tid new file mode 100644 index 000000000..3879f1fde --- /dev/null +++ b/plugins/tiddlywiki/internals/state-editpreviewtype.tid @@ -0,0 +1,2 @@ +title: $:/state/editpreviewtype +text: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/parse-tree \ No newline at end of file diff --git a/plugins/tiddlywiki/internals/state-showeditpreview.tid b/plugins/tiddlywiki/internals/state-showeditpreview.tid new file mode 100644 index 000000000..9a458102a --- /dev/null +++ b/plugins/tiddlywiki/internals/state-showeditpreview.tid @@ -0,0 +1,2 @@ +title: $:/state/showeditpreview +text: yes \ No newline at end of file