From 7fe9a31917c7c6dd1b895db9199364921a46f28d Mon Sep 17 00:00:00 2001
From: Jeremy Ruston tags
And fix 182 test files!
---
core/modules/parsers/wikiparser/wikiparser.js | 2 +-
core/modules/widgets/transclude.js | 3 +
.../tests/data/conditionals/Basic.tid | 4 +-
.../tiddlers/tests/data/conditionals/Else.tid | 4 +-
.../tests/data/conditionals/Elseif.tid | 6 +-
.../tests/data/conditionals/MissingEndIf.tid | 4 +-
.../data/conditionals/MultipleResults.tid | 2 +-
.../tests/data/conditionals/NestedElseif.tid | 10 +--
.../custom-operators/NestedParameterised.tid | 2 +-
.../data/custom-operators/Parameterised.tid | 2 +-
.../tests/data/custom-operators/Simple.tid | 2 +-
.../tests/data/data-widget/ImportCompound.tid | 2 +-
.../data/data-widget/ImportCustomTitle.tid | 2 +-
.../tests/data/data-widget/ImportFilter.tid | 2 +-
.../tests/data/data-widget/ImportTiddler.tid | 2 +-
.../tests/data/data-widget/Simple.tid | 2 +-
.../tiddlers/tests/data/filters/Base64.tid | 2 +-
.../tests/data/filters/DiffMergePatch1.tid | 2 +-
.../tiddlers/tests/data/filters/Recursion.tid | 2 +-
.../tests/data/filters/fake-variables.tid | 10 +--
.../tests/data/filters/substitute.tid | 2 +-
.../data/functions/FunctionAttributes.tid | 2 +-
.../functions/FunctionFilterrunVariables.tid | 2 +-
.../tests/data/functions/FunctionOperator.tid | 2 +-
.../data/functions/IndentedFunctions.tid | 2 +-
.../functions/RunawayRecursiveFunctions.tid | 2 +-
.../data/functions/UndefinedParameters.tid | 2 +-
.../data/functions/WikifiedFunctions.tid | 2 +-
.../tests/data/genesis-widget/Block.tid | 2 +-
.../tests/data/genesis-widget/DollarSigns.tid | 2 +-
.../tests/data/genesis-widget/EmptyType.tid | 2 +-
.../genesis-widget/MultipleAttributes.tid | 2 +-
.../tests/data/genesis-widget/RedefineLet.tid | 2 +-
.../tests/data/genesis-widget/Simple.tid | 2 +-
.../data/importvariables/WithSetWidgets.tid | 2 +-
.../data/importvariables/WithSetWidgets2.tid | 2 +-
.../WithSetWidgetsAndMacros.tid | 2 +-
.../WithEmptyParagraphTemplate.tid | 2 +-
.../list-widget/WithExplicitTemplates.tid | 2 +-
...xplicitTemplatesOverriddenByAttributes.tid | 2 +-
.../data/list-widget/WithJoinTemplate.tid | 2 +-
.../WithJoinTemplateInBlockMode.tid | 2 +-
.../tests/data/list-widget/WithLimit.tid | 2 +-
.../data/list-widget/WithMissingTemplate.tid | 2 +-
.../tiddlers/tests/data/macros/EndInBody.tid | 2 +-
.../tests/data/macros/IndentedEnd.tid | 2 +-
.../tests/data/macros/MismatchedNamedEnd.tid | 2 +-
.../data/macros/WhitespaceOnlyWithEnd.tid | 4 +-
.../data/macros/WhitespaceOnlyWithEnd2.tid | 2 +-
.../nested-macros/NestedMacros-indented.tid | 2 +-
.../nested-macros/NestedMacros-indented2.tid | 2 +-
.../macros/nested-macros/NestedMacros.tid | 2 +-
.../trailing-newlines/TrailingNewlines.tid | 2 +-
.../unusedtitle/basic-params-draft-exists.tid | 2 +-
.../basic-params-empty-tiddler-exists.tid | 2 +-
.../macros/unusedtitle/basic-params-empty.tid | 2 +-
.../basic-params-tiddlers-exist.tid | 2 +-
.../data/macros/unusedtitle/basic-params.tid | 2 +-
.../template-empty-params-tiddler-exist.tid | 2 +-
.../unusedtitle/template-empty-params.tid | 2 +-
.../unusedtitle/template-startCount.tid | 2 +-
.../data/macros/unusedtitle/template.tid | 2 +-
.../tm-import-tiddler/CustomTitle.tid | 2 +-
.../messages/tm-import-tiddler/NoAutoOpen.tid | 2 +-
.../tm-import-tiddler/NoAutoOpenViaVar.tid | 2 +-
.../messages/tm-import-tiddler/default.tid | 2 +-
.../create-a-new-tiddler-with-a-tag.tid | 2 +-
.../data/messages/tm-new-tiddler/default.tid | 2 +-
.../new-from-template-with-tag.tid | 2 +-
.../new-from-template-without-tag.tid | 2 +-
.../messages/tm-new-tiddler/new-with-tag.tid | 2 +-
.../data/pragmas/Parsermode-indented.tid | 4 +-
.../tests/data/pragmas/Parsermode.tid | 4 +-
.../data/pragmas/WhitespaceAfterPragma.tid | 2 +-
.../tests/data/pragmas/WhitespaceNoPragma.tid | 2 +-
.../tests/data/procedures/EndInBody.tid | 2 +-
.../tests/data/procedures/IndentedEnd.tid | 2 +-
.../data/procedures/MismatchedNamedEnd.tid | 2 +-
.../tests/data/procedures/Nested-indented.tid | 2 +-
.../tiddlers/tests/data/procedures/Nested.tid | 2 +-
.../data/procedures/TrailingNewlines.tid | 2 +-
.../data/procedures/WhitespaceOnlyWithEnd.tid | 4 +-
.../procedures/WhitespaceOnlyWithEnd2.tid | 2 +-
.../reserved-wikitext/ReservedWikiText.tid | 2 +-
.../expected-test-tabs-horizontal-a.tid | 2 +-
.../expected-test-tabs-horizontal-all.tid | 2 +-
.../expected-test-tabs-vertical.tid | 2 +-
.../tests/data/this-tiddler/Simple.tid | 2 +-
.../transclude/CustomWidget-ActionWidget.tid | 2 +-
...tomWidget-CodeblockOverride-TextParser.tid | 2 +-
.../data/transclude/CustomWidget-Fail.tid | 2 +-
.../CustomWidget-Override-Codeblock.tid | 2 +-
.../CustomWidget-OverrideTransclude.tid | 2 +-
.../CustomWidget-Simple-Indented.tid | 2 +-
.../data/transclude/CustomWidget-Simple.tid | 2 +-
.../data/transclude/CustomWidget-Slotted.tid | 2 +-
.../CustomWidget-TextWidgetOverride.tid | 2 +-
...ustomWidget-TextWidgetOverrideWithSlot.tid | 2 +-
.../CustomWidget-Unoverride-Codeblock.tid | 2 +-
.../CustomWidget-VariableAttribute.tid | 2 +-
.../data/transclude/JavaScript-Macro.tid | 2 +-
.../tests/data/transclude/Macro-Missing.tid | 2 +-
.../tests/data/transclude/Macro-Plain.tid | 2 +-
.../tests/data/transclude/Macro-Simple.tid | 2 +-
.../tests/data/transclude/MissingTarget.tid | 2 +-
.../data/transclude/Parameterised-Depth.tid | 2 +-
.../data/transclude/Parameterised-Mode.tid | 2 +-
.../transclude/Parameterised-Name-Values.tid | 2 +-
.../Parameterised-ParseTreeNodes.tid | 2 +-
...terised-Positional-Shortcut-Parameters.tid | 2 +-
.../Parameterised-Positional-Shortcut.tid | 2 +-
.../Parameterised-Positional-Variables.tid | 2 +-
.../transclude/Parameterised-Positional.tid | 2 +-
.../Parameterised-Shortcut-Parameters.tid | 2 +-
...ameterised-Shortcut-ParametersIndented.tid | 2 +-
.../transclude/Parameterised-Shortcut.tid | 2 +-
.../data/transclude/Parameterised-Simple.tid | 2 +-
.../Parameterised-SlotFillParseTreeNodes.tid | 2 +-
.../Parameterised-Slotted-Missing.tid | 2 +-
.../data/transclude/Parameterised-Slotted.tid | 2 +-
.../Procedures-Double-Underscore.tid | 2 +-
.../data/transclude/Procedures-Whitespace.tid | 2 +-
.../transclude/Procedures-Whitespace2.tid | 2 +-
.../transclude/Procedures-Whitespace3.tid | 2 +-
.../tiddlers/tests/data/transclude/Typed.tid | 6 +-
.../data/transclude/Variable-Refreshing.tid | 2 +-
.../tests/data/transclude/Variable-Static.tid | 2 +-
.../ButtonWidget-DataAttributes.tid | 2 +-
.../CheckboxWidget-DataAttributes.tid | 2 +-
.../DraggableWidget-DataAttributes.tid | 2 +-
.../DroppableWidget-DataAttributes.tid | 2 +-
.../LinkWidget-DataAttributes.tid | 2 +-
.../DataAttributes/OrderedStyleAttributes.tid | 2 +-
.../SelectWidget-DataAttributes.tid | 2 +-
.../widgets/ElementWidgetEventAttributes.tid | 2 +-
.../widgets/ElementWidgetStyleAttributes.tid | 2 +-
.../widgets/ElementWidgetStyleAttributes2.tid | 2 +-
.../data/widgets/LetWidgetSelfReferences.tid | 2 +-
.../widgets/LetWidgetUndefinedVariable.tid | 2 +-
.../data/widgets/SubstitutedAttributes.tid | 2 +-
...get-field-format-text-doubleurlencoded.tid | 2 +-
...iewWidget-field-format-text-urlencoded.tid | 2 +-
.../view/ViewWidget-field-format-text.tid | 2 +-
.../widgets/view/ViewWidget-field-index.tid | 2 +-
.../widgets/view/ViewWidget-field-text.tid | 2 +-
.../view/ViewWidget-format-date-template.tid | 2 +-
editions/test/tiddlers/tests/test-widget.js | 76 +++++++++----------
.../tiddlers/tests/test-wikitext-parser.js | 60 +++++++--------
editions/test/tiddlers/tests/test-wikitext.js | 26 +++----
.../DataWidget/FilterMissingTiddler.tid | 2 +-
.../testcases/DataWidget/ImportCompound.tid | 2 +-
.../DataWidget/ImportCustomTitle.tid | 2 +-
.../testcases/DataWidget/ImportedFilter.tid | 2 +-
.../testcases/DataWidget/ImportedTiddler.tid | 2 +-
.../testcases/DataWidget/Refreshing.tid | 2 +-
.../testcases/DataWidget/SimpleTiddler.tid | 2 +-
.../testcases/HTML/BlockModeInHTMLTable.tid | 2 +-
.../HTML/OpenTagBlankLineInBoldSyntax.tid | 2 +-
.../HTML/OpenTagBlankLineInTableSyntax.tid | 2 +-
.../testcases/HTML/OpenTagNoBlankLine.tid | 2 +-
.../RevealWidget/AccordionSlider.tid | 2 +-
.../tiddlers/testcases/RevealWidget/Popup.tid | 2 +-
.../testcases/RevealWidget/SimpleReveal.tid | 2 +-
.../testcases/RevealWidget/TextReference.tid | 2 +-
.../testcases/TestCaseWidget/FailingTest.tid | 2 +-
.../TestCaseWidget/currentTiddler.tid | 2 +-
.../TranscludeWidget/SimpleTransclusion.tid | 2 +-
.../operators/geodifference-interactive.tid | 2 +-
.../tests/operators/geodifference.tid | 2 +-
.../tests/operators/geodistance.tid | 2 +-
.../operators/geointersect-interactive.tid | 2 +-
.../tests/operators/geointersect.tid | 2 +-
.../geospatial/tests/operators/geolookup.tid | 2 +-
.../tests/operators/geonearestpoint.tid | 2 +-
.../tests/operators/geonearestpoint2.tid | 2 +-
.../tests/operators/geounion-interactive.tid | 2 +-
.../geospatial/tests/operators/geounion.tid | 2 +-
.../geospatial/tests/operators/olc-decode.tid | 2 +-
.../geospatial/tests/operators/olc-encode.tid | 2 +-
.../tests/widgets/geomap-draggable-marker.tid | 2 +-
.../tests/widgets/geomap-empty-layer.tid | 2 +-
.../tests/widgets/geomap-refresh.tid | 4 +-
.../geospatial/tests/widgets/geomap.tid | 2 +-
183 files changed, 283 insertions(+), 280 deletions(-)
diff --git a/core/modules/parsers/wikiparser/wikiparser.js b/core/modules/parsers/wikiparser/wikiparser.js
index e1793fb89..7468ba3bb 100644
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@@ -260,7 +260,7 @@ WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
var start = this.pos;
var children = this.parseInlineRun(terminatorRegExp);
var end = this.pos;
- return [{type: "element", tag: "p", children: children, start: start, end: end }];
+ return [{type: "element", tag: "p", attributes: {dir: {type: "string", value: "auto"}}, children: children, start: start, end: end }];
};
/*
diff --git a/core/modules/widgets/transclude.js b/core/modules/widgets/transclude.js
index 16561eab6..e5c0112f2 100755
--- a/core/modules/widgets/transclude.js
+++ b/core/modules/widgets/transclude.js
@@ -270,6 +270,9 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
parser.tree[0] = {
type: "element",
tag: "p",
+ attributes: {
+ dir: {type: "string", value: "auto"}
+ },
children: [{
type: "text",
text: this.transcludeFunctionResult
diff --git a/editions/test/tiddlers/tests/data/conditionals/Basic.tid b/editions/test/tiddlers/tests/data/conditionals/Basic.tid
index 6e5046f56..75aeaca94 100644
--- a/editions/test/tiddlers/tests/data/conditionals/Basic.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/Basic.tid
@@ -19,8 +19,8 @@ title: Output
+
title: ExpectedResult
-
+
This is a Elephant, I think.
-
+
This is a , I think.
+
This is a Elephant, I think.
-
+
This is a Crocodile, I think.
+
This is a Elephant, I think.
-
+
This is a Antelope, I think.
-
+
This is a Crocodile, I think.
+
This is a Elephant
-
+
This is a
This is a Elephant, I think. This is a Elephant, I think.
+
This is a Indian Elephant, I think.
-
+
This is a African Elephant, I think.
-
+
This is a Unknown Elephant, I think.
-
+
This is a Antelope, I think.
-
+
This is a Crocodile, I think.
246-492 246-492 492-984|492-984 492-984|492-984 246|246 246|246
(SmVyZW15MTIzNA==) +
(SmVyZW15MTIzNA==) () (Jeremy1234) ()
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/filters/DiffMergePatch1.tid b/editions/test/tiddlers/tests/data/filters/DiffMergePatch1.tid index e6e519df5..115cba4fa 100644 --- a/editions/test/tiddlers/tests/data/filters/DiffMergePatch1.tid +++ b/editions/test/tiddlers/tests/data/filters/DiffMergePatch1.tid @@ -18,7 +18,7 @@ the hat saw in every category + title: ExpectedResult -@@ -1,22 +1,29 @@ +
@@ -1,22 +1,29 @@ the -c +h diff --git a/editions/test/tiddlers/tests/data/filters/Recursion.tid b/editions/test/tiddlers/tests/data/filters/Recursion.tid index 13d80e521..18aa19f6a 100644 --- a/editions/test/tiddlers/tests/data/filters/Recursion.tid +++ b/editions/test/tiddlers/tests/data/filters/Recursion.tid @@ -12,4 +12,4 @@ title: Output + title: ExpectedResult -
/**-- Excessive filter recursion --**/
\ No newline at end of file +/**-- Excessive filter recursion --**/
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/filters/fake-variables.tid b/editions/test/tiddlers/tests/data/filters/fake-variables.tid index 4bd31e007..edc985340 100644 --- a/editions/test/tiddlers/tests/data/filters/fake-variables.tid +++ b/editions/test/tiddlers/tests/data/filters/fake-variables.tid @@ -7,21 +7,21 @@ title: Output \whitespace trim <$list variable="var" filter="[[existing variable should have output]] :filter[[..currentTiddler]is[variable]]"> -<>
+<>
$list> <$list variable="var" filter="[[non-existing variable should not have output]] :filter[[nonExistingVariable]is[variable]]"> -<>
+<>
$list> <$list variable="var" filter="[[existing variable negated should not have output]] :filter[[..currentTiddler]!is[variable]]"> -<>
+<>
$list> <$list variable="var" filter="[[non-existing variable negated should have output]] :filter[[nonExistingVariable]!is[variable]]"> -<>
+<>
$list> + title: ExpectedResult -existing variable should have output
non-existing variable negated should have output
\ No newline at end of file +existing variable should have output
non-existing variable negated should have output
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/filters/substitute.tid b/editions/test/tiddlers/tests/data/filters/substitute.tid index 873d8e0ba..87b41a547 100644 --- a/editions/test/tiddlers/tests/data/filters/substitute.tid +++ b/editions/test/tiddlers/tests/data/filters/substitute.tid @@ -31,7 +31,7 @@ title: Output + title: ExpectedResult -() +
() (Hello There, welcome to $TiddlyWiki$) (Welcome to TiddlyWiki) (Welcome to TiddlyWiki today) diff --git a/editions/test/tiddlers/tests/data/functions/FunctionAttributes.tid b/editions/test/tiddlers/tests/data/functions/FunctionAttributes.tid index 2deb49bdc..6847dd280 100644 --- a/editions/test/tiddlers/tests/data/functions/FunctionAttributes.tid +++ b/editions/test/tiddlers/tests/data/functions/FunctionAttributes.tid @@ -21,4 +21,4 @@ title: Output + title: ExpectedResult -
16|32
\ No newline at end of file +16|32
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables.tid b/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables.tid index 5226e9f05..ecae0537c 100644 --- a/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables.tid +++ b/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables.tid @@ -21,4 +21,4 @@ title: Output + title: ExpectedResult -Idiosyncrasy Caption Field,Idiosyncrasy Caption Field
\ No newline at end of file +Idiosyncrasy Caption Field,Idiosyncrasy Caption Field
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/functions/FunctionOperator.tid b/editions/test/tiddlers/tests/data/functions/FunctionOperator.tid index e2a0038dc..10608d95e 100644 --- a/editions/test/tiddlers/tests/data/functions/FunctionOperator.tid +++ b/editions/test/tiddlers/tests/data/functions/FunctionOperator.tid @@ -21,4 +21,4 @@ title: Output + title: ExpectedResult -64|192
\ No newline at end of file +64|192
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/functions/IndentedFunctions.tid b/editions/test/tiddlers/tests/data/functions/IndentedFunctions.tid index 206a8958e..837801d86 100644 --- a/editions/test/tiddlers/tests/data/functions/IndentedFunctions.tid +++ b/editions/test/tiddlers/tests/data/functions/IndentedFunctions.tid @@ -21,4 +21,4 @@ title: Output + title: ExpectedResult -64|192
\ No newline at end of file +64|192
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/functions/RunawayRecursiveFunctions.tid b/editions/test/tiddlers/tests/data/functions/RunawayRecursiveFunctions.tid index 81be22f16..36d356be5 100644 --- a/editions/test/tiddlers/tests/data/functions/RunawayRecursiveFunctions.tid +++ b/editions/test/tiddlers/tests/data/functions/RunawayRecursiveFunctions.tid @@ -7,7 +7,7 @@ title: Output \whitespace trim \function .buffalo(p) -[.buffalo] +[.buffalo
] \end <$text text=<<.buffalo 8>>/> diff --git a/editions/test/tiddlers/tests/data/functions/UndefinedParameters.tid b/editions/test/tiddlers/tests/data/functions/UndefinedParameters.tid index 8a2b0a91a..905c7b626 100644 --- a/editions/test/tiddlers/tests/data/functions/UndefinedParameters.tid +++ b/editions/test/tiddlers/tests/data/functions/UndefinedParameters.tid @@ -19,4 +19,4 @@ title: Output + title: ExpectedResult -hello world
hello world
hellohello
\ No newline at end of file +hello worldhello world
hellohello
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/functions/WikifiedFunctions.tid b/editions/test/tiddlers/tests/data/functions/WikifiedFunctions.tid index 36b64e4a3..e23ab395a 100644 --- a/editions/test/tiddlers/tests/data/functions/WikifiedFunctions.tid +++ b/editions/test/tiddlers/tests/data/functions/WikifiedFunctions.tid @@ -33,4 +33,4 @@ $param$ with a ''buffalo'' + title: ExpectedResult -Going to lunch with a ''buffalo''
Going to breakfastwith abuffalo
Going to dinner with a buffalo
Going to lunch with a ''buffalo''Going to breakfastwith abuffaloGoing to dinner with a buffalo \ No newline at end of file +Going to lunch with a ''buffalo''
Going to breakfastwith abuffalo
Going to dinner with a buffalo
Going to lunch with a ''buffalo''Going to breakfastwith abuffaloGoing to dinner with a buffalo \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/genesis-widget/Block.tid b/editions/test/tiddlers/tests/data/genesis-widget/Block.tid index dfa5dacaf..6ed50fd07 100644 --- a/editions/test/tiddlers/tests/data/genesis-widget/Block.tid +++ b/editions/test/tiddlers/tests/data/genesis-widget/Block.tid @@ -27,4 +27,4 @@ Block forced inline + title: ExpectedResult -Block
Block forced block
Block forced inline
Inline
Block
Block forced block
Block forced inline
Inline
(Kitten)(Kitten)
\ No newline at end of file +(Kitten)(Kitten)
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/genesis-widget/EmptyType.tid b/editions/test/tiddlers/tests/data/genesis-widget/EmptyType.tid index 59768aa0c..bf3aff918 100644 --- a/editions/test/tiddlers/tests/data/genesis-widget/EmptyType.tid +++ b/editions/test/tiddlers/tests/data/genesis-widget/EmptyType.tid @@ -11,4 +11,4 @@ title: Output + title: ExpectedResult -Mouse
Mouse
\ No newline at end of file +Mouse
Mouse
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid b/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid index a93fa2e06..91a11bd20 100644 --- a/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid +++ b/editions/test/tiddlers/tests/data/genesis-widget/MultipleAttributes.tid @@ -11,4 +11,4 @@ title: Output + title: ExpectedResult -(Shark|Donkey)(Shark|Donkey)
\ No newline at end of file +(Shark|Donkey)(Shark|Donkey)
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid b/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid index f6834998d..9c4f4ca23 100644 --- a/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid +++ b/editions/test/tiddlers/tests/data/genesis-widget/RedefineLet.tid @@ -26,6 +26,6 @@ title: Output + title: ExpectedResult -(--Elephant--) +
(--Elephant--) (--Kangaroo--) (--Giraffe--)
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid b/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid index d9ec67c00..23e72c7b7 100644 --- a/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid +++ b/editions/test/tiddlers/tests/data/genesis-widget/Simple.tid @@ -11,4 +11,4 @@ title: Output + title: ExpectedResult -elephant,giraffe
\ No newline at end of file +elephant,giraffe
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/importvariables/WithSetWidgets2.tid b/editions/test/tiddlers/tests/data/importvariables/WithSetWidgets2.tid index b3ef64d7d..85689246e 100644 --- a/editions/test/tiddlers/tests/data/importvariables/WithSetWidgets2.tid +++ b/editions/test/tiddlers/tests/data/importvariables/WithSetWidgets2.tid @@ -20,4 +20,4 @@ title: Definitions + title: ExpectedResult -elephant,giraffe
\ No newline at end of file +elephant,giraffe
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/importvariables/WithSetWidgetsAndMacros.tid b/editions/test/tiddlers/tests/data/importvariables/WithSetWidgetsAndMacros.tid index 282896c88..a357bd165 100644 --- a/editions/test/tiddlers/tests/data/importvariables/WithSetWidgetsAndMacros.tid +++ b/editions/test/tiddlers/tests/data/importvariables/WithSetWidgetsAndMacros.tid @@ -27,4 +27,4 @@ Bunny Hill + title: ExpectedResult -Bugs Bunny,Bunny Hill,elephant,giraffe
\ No newline at end of file +Bugs Bunny,Bunny Hill,elephant,giraffe
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid b/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid index 7730f525a..f21916ce3 100644 --- a/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid +++ b/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid @@ -10,4 +10,4 @@ title: Output + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplates.tid b/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplates.tid index aad322f54..ca775dba2 100644 --- a/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplates.tid +++ b/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplates.tid @@ -26,4 +26,4 @@ title: Output + title: ExpectedResult -123
None!
\ No newline at end of file +123
None!
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplatesOverriddenByAttributes.tid b/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplatesOverriddenByAttributes.tid index 0ce5780af..0fe456d81 100644 --- a/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplatesOverriddenByAttributes.tid +++ b/editions/test/tiddlers/tests/data/list-widget/WithExplicitTemplatesOverriddenByAttributes.tid @@ -30,4 +30,4 @@ title: Template + title: ExpectedResult -112233
Zero
\ No newline at end of file +112233
Zero
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplate.tid b/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplate.tid index f1b6f25e9..ea53e551d 100644 --- a/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplate.tid +++ b/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplate.tid @@ -27,4 +27,4 @@ title: Output + title: ExpectedResult -Item:1,Item:2,Item:3
None!
\ No newline at end of file +Item:1,Item:2,Item:3
None!
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplateInBlockMode.tid b/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplateInBlockMode.tid index c12f4c801..b04dd5dd0 100644 --- a/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplateInBlockMode.tid +++ b/editions/test/tiddlers/tests/data/list-widget/WithJoinTemplateInBlockMode.tid @@ -29,4 +29,4 @@ title: Output title: ExpectedResult comment: I wish there was a good way to get rid of these extraneous paragraph elements -Item:1
Item:2
Item:3
None! \ No newline at end of file +Item:1
Item:2
Item:3
None! \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/list-widget/WithLimit.tid b/editions/test/tiddlers/tests/data/list-widget/WithLimit.tid index 2f630a1dc..360849cf7 100644 --- a/editions/test/tiddlers/tests/data/list-widget/WithLimit.tid +++ b/editions/test/tiddlers/tests/data/list-widget/WithLimit.tid @@ -21,5 +21,5 @@ title: Template + title: ExpectedResult -Zero:
One: 1
Two: 12
Minus Two: 34 +
Zero:
One: 1
Two: 12
Minus Two: 34
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/list-widget/WithMissingTemplate.tid b/editions/test/tiddlers/tests/data/list-widget/WithMissingTemplate.tid index 40fb2f07b..898db6a1b 100644 --- a/editions/test/tiddlers/tests/data/list-widget/WithMissingTemplate.tid +++ b/editions/test/tiddlers/tests/data/list-widget/WithMissingTemplate.tid @@ -23,4 +23,4 @@ title: Output + title: ExpectedResult -None!
\ No newline at end of file +None!
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/EndInBody.tid b/editions/test/tiddlers/tests/data/macros/EndInBody.tid index e93a0917d..3e88b1e1f 100644 --- a/editions/test/tiddlers/tests/data/macros/EndInBody.tid +++ b/editions/test/tiddlers/tests/data/macros/EndInBody.tid @@ -13,4 +13,4 @@ Out: <Out: hello \end
\ No newline at end of file +Out: hello \end
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/IndentedEnd.tid b/editions/test/tiddlers/tests/data/macros/IndentedEnd.tid index 97f2c4197..d4a42598d 100644 --- a/editions/test/tiddlers/tests/data/macros/IndentedEnd.tid +++ b/editions/test/tiddlers/tests/data/macros/IndentedEnd.tid @@ -13,4 +13,4 @@ Out: <Out: hello \end
\ No newline at end of file +Out: hello \end
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/MismatchedNamedEnd.tid b/editions/test/tiddlers/tests/data/macros/MismatchedNamedEnd.tid index b66821753..c7844390b 100644 --- a/editions/test/tiddlers/tests/data/macros/MismatchedNamedEnd.tid +++ b/editions/test/tiddlers/tests/data/macros/MismatchedNamedEnd.tid @@ -13,4 +13,4 @@ Out: <Out: \end goodbye
\ No newline at end of file +Out: \end goodbye
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd.tid b/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd.tid index 6998672ba..4018402ab 100644 --- a/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd.tid +++ b/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd.tid @@ -14,5 +14,5 @@ Out: <Nothing -\end
Out:
\ No newline at end of file +Nothing +\end
Out:
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd2.tid b/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd2.tid index 60db278d6..ec2ce6c0a 100644 --- a/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd2.tid +++ b/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd2.tid @@ -12,4 +12,4 @@ Out: <Out:
\ No newline at end of file +Out:
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid index e040deaf7..d33b11bfc 100644 --- a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid +++ b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid @@ -33,4 +33,4 @@ title: Output + title: ExpectedResult -Jaguar
\ No newline at end of file +Jaguar
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid index 36a3cc8a3..8bfa63342 100644 --- a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid +++ b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid @@ -33,4 +33,4 @@ title: Output + title: ExpectedResult -Jaguar
\ No newline at end of file +Jaguar
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros.tid b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros.tid index d5f854d0c..4ecd6445c 100644 --- a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros.tid +++ b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros.tid @@ -33,4 +33,4 @@ Jaguar + title: ExpectedResult -Jaguar
\ No newline at end of file +Jaguar
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/trailing-newlines/TrailingNewlines.tid b/editions/test/tiddlers/tests/data/macros/trailing-newlines/TrailingNewlines.tid index 18037fac2..9e3a78585 100644 --- a/editions/test/tiddlers/tests/data/macros/trailing-newlines/TrailingNewlines.tid +++ b/editions/test/tiddlers/tests/data/macros/trailing-newlines/TrailingNewlines.tid @@ -19,4 +19,4 @@ Paragraph 2 + title: ExpectedResult -Paragraph 1
Paragraph 2
\ No newline at end of file +Paragraph 1
Paragraph 2
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-draft-exists.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-draft-exists.tid index 10cff1ef9..585958097 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-draft-exists.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-draft-exists.tid @@ -24,4 +24,4 @@ title: Output + title: ExpectedResult -test 1
asdf 1
\ No newline at end of file +test 1
asdf 1
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty-tiddler-exists.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty-tiddler-exists.tid index 7cf80fd20..f34688c64 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty-tiddler-exists.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty-tiddler-exists.tid @@ -20,4 +20,4 @@ title: Output + title: ExpectedResult -New Tiddler 1
New Tiddler 1
New Tiddler 1
\ No newline at end of file +New Tiddler 1
New Tiddler 1
New Tiddler 1
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty.tid index 990f88623..72c520246 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-empty.tid @@ -17,4 +17,4 @@ title: Output + title: ExpectedResult -New Tiddler
New Tiddler
New Tiddler
\ No newline at end of file +New Tiddler
New Tiddler
New Tiddler
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-tiddlers-exist.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-tiddlers-exist.tid index a01f1262d..0d0df1576 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-tiddlers-exist.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params-tiddlers-exist.tid @@ -25,4 +25,4 @@ title: Output + title: ExpectedResult -New Tiddler 1
New Tiddler-1
anotherBase 1
About-1
\ No newline at end of file +New Tiddler 1
New Tiddler-1
anotherBase 1
About-1
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid index c0ec65ec0..98f8992ec 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid @@ -25,4 +25,4 @@ title: Output + title: ExpectedResult -New Tiddler
New Tiddler
anotherBase
About
New Tiddler 3
invalid start
invalid count
\ No newline at end of file +New Tiddler
New Tiddler
anotherBase
About
New Tiddler 3
invalid start
invalid count
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params-tiddler-exist.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params-tiddler-exist.tid index 66ff810b1..b1f69de62 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params-tiddler-exist.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params-tiddler-exist.tid @@ -47,4 +47,4 @@ title: Output + title: ExpectedResult -New Tiddler 1
xxx-y-1
01-New Tiddler
0002 asdf
0001 abc
\ No newline at end of file +New Tiddler 1
xxx-y-1
01-New Tiddler
0002 asdf
0001 abc
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params.tid index bdde68a98..c21383b4e 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-empty-params.tid @@ -21,4 +21,4 @@ title: Output + title: ExpectedResult -New Tiddler
xxx
00-New Tiddler
0000 asdf
\ No newline at end of file +New Tiddler
xxx
00-New Tiddler
0000 asdf
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/template-startCount.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-startCount.tid index 83fc1686b..f3d20d076 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/template-startCount.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-startCount.tid @@ -24,4 +24,4 @@ title: Output + title: ExpectedResult -New Tiddler 0xx
New Tiddler 4xx
New Tiddler 11xx
emptyCount 00xx
invalid start 0xx
invalid count 0xx
\ No newline at end of file +New Tiddler 0xx
New Tiddler 4xx
New Tiddler 11xx
emptyCount 00xx
invalid start 0xx
invalid count 0xx
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid index 183ad42da..e432cb72c 100644 --- a/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid +++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid @@ -25,4 +25,4 @@ title: Output + title: ExpectedResult -New Tiddler
count-missing0
00-new
00-base
00-New Tiddler
00-asdf
00 asdf
\ No newline at end of file +New Tiddler
count-missing0
00-new
00-base
00-New Tiddler
00-asdf
00 asdf
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/CustomTitle.tid b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/CustomTitle.tid index 2c7b8ba05..f0509e949 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/CustomTitle.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/CustomTitle.tid @@ -21,7 +21,7 @@ title: Actions + title: ExpectedResult -text: { +
text: { "tiddlers": { "Elephants": { "title": "Elephants" diff --git a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpen.tid b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpen.tid index cc2c3673a..004e8693e 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpen.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpen.tid @@ -21,7 +21,7 @@ title: Actions + title: ExpectedResult -
text: { +
text: { "tiddlers": { "Elephants": { "title": "Elephants" diff --git a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpenViaVar.tid b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpenViaVar.tid index 6970131f1..ce6f37d60 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpenViaVar.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/NoAutoOpenViaVar.tid @@ -22,7 +22,7 @@ title: Actions + title: ExpectedResult -
text: { +
text: { "tiddlers": { "Elephants": { "title": "Elephants" diff --git a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/default.tid b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/default.tid index 715a763f4..75a4abf9c 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/default.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-import-tiddler/default.tid @@ -20,7 +20,7 @@ title: Actions + title: ExpectedResult -
text: { +
text: { "tiddlers": { "Elephants": { "title": "Elephants" diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/create-a-new-tiddler-with-a-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/create-a-new-tiddler-with-a-tag.tid index 3f9204da8..79fc55e51 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/create-a-new-tiddler-with-a-tag.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/create-a-new-tiddler-with-a-tag.tid @@ -29,7 +29,7 @@ title: output-template + title: ExpectedResult -
draft.of: New Tiddler +draft.of: New Tiddler draft.title: New Tiddler tags: test [[with spaces]] title: Draft of 'New Tiddler' diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/default.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/default.tid index cba16f261..960176d91 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/default.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/default.tid @@ -31,7 +31,7 @@ title: output-template + title: ExpectedResult -draft.of: New Tiddler +draft.of: New Tiddler draft.title: New Tiddler title: Draft of 'New Tiddler' z-field: a diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-with-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-with-tag.tid index aceeffdde..5c470f38d 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-with-tag.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-with-tag.tid @@ -34,7 +34,7 @@ title: output-template + title: ExpectedResult -asdf: asdf +asdf: asdf draft.of: new-tiddler-template 1 draft.title: new-tiddler-template 1 tags: diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-without-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-without-tag.tid index dfb815f09..b7258686c 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-without-tag.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-without-tag.tid @@ -48,7 +48,7 @@ title: output-template + title: ExpectedResult -asdf: asdf +asdf: asdf draft.of: new-tiddler-template 1 draft.title: new-tiddler-template 1 title: Draft of 'new-tiddler-template 1' diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-with-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-with-tag.tid index 9b52e7de1..32e9f4359 100644 --- a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-with-tag.tid +++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-with-tag.tid @@ -31,7 +31,7 @@ title: output-template + title: ExpectedResult -draft.of: New Tiddler +draft.of: New Tiddler draft.title: New Tiddler tag: title: Draft of 'New Tiddler' diff --git a/editions/test/tiddlers/tests/data/pragmas/Parsermode-indented.tid b/editions/test/tiddlers/tests/data/pragmas/Parsermode-indented.tid index 10747735f..a8ead9921 100644 --- a/editions/test/tiddlers/tests/data/pragmas/Parsermode-indented.tid +++ b/editions/test/tiddlers/tests/data/pragmas/Parsermode-indented.tid @@ -30,7 +30,7 @@ title: ExpectedResult ! Not Heading -Text with boldHeading
Text with bold
! Not Heading +Text with bold
Heading
Text with bold
! Not Heading -Text with bold
Heading
Text with bold
+Text with boldHeading
Text with bold
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/pragmas/Parsermode.tid b/editions/test/tiddlers/tests/data/pragmas/Parsermode.tid index 57869e37a..5e13312be 100644 --- a/editions/test/tiddlers/tests/data/pragmas/Parsermode.tid +++ b/editions/test/tiddlers/tests/data/pragmas/Parsermode.tid @@ -30,7 +30,7 @@ title: ExpectedResult ! Not Heading -Text with boldHeading
Text with bold
! Not Heading +Text with bold
Heading
Text with bold
! Not Heading -Text with bold
Heading
Text with bold
+Text with boldHeading
Text with bold
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid b/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid index 9eb6089ff..713e30552 100644 --- a/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid +++ b/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid @@ -21,7 +21,7 @@ Now! + title: ExpectedResult -+
[ { "type": "set", diff --git a/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid b/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid index 2a7041750..ec01711a0 100644 --- a/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid +++ b/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid @@ -20,7 +20,7 @@ Now! + title: ExpectedResult -
+
[ { "type": "text", diff --git a/editions/test/tiddlers/tests/data/procedures/EndInBody.tid b/editions/test/tiddlers/tests/data/procedures/EndInBody.tid index 3aa13fad5..72e27f312 100644 --- a/editions/test/tiddlers/tests/data/procedures/EndInBody.tid +++ b/editions/test/tiddlers/tests/data/procedures/EndInBody.tid @@ -13,4 +13,4 @@ Out: <
\ No newline at end of file +> + title: ExpectedResult - Out: hello \end
\ No newline at end of file +Out: hello \end
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/procedures/IndentedEnd.tid b/editions/test/tiddlers/tests/data/procedures/IndentedEnd.tid index 664be3446..597cd1573 100644 --- a/editions/test/tiddlers/tests/data/procedures/IndentedEnd.tid +++ b/editions/test/tiddlers/tests/data/procedures/IndentedEnd.tid @@ -13,4 +13,4 @@ Out: <> + title: ExpectedResult - Out: hello \end
\ No newline at end of file +Out: hello \end
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/procedures/MismatchedNamedEnd.tid b/editions/test/tiddlers/tests/data/procedures/MismatchedNamedEnd.tid index 0b5385c6e..81cc4e1e1 100644 --- a/editions/test/tiddlers/tests/data/procedures/MismatchedNamedEnd.tid +++ b/editions/test/tiddlers/tests/data/procedures/MismatchedNamedEnd.tid @@ -13,4 +13,4 @@ Out: <> + title: ExpectedResult - Out: \end goodbye
\ No newline at end of file +Out: \end goodbye
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/procedures/Nested-indented.tid b/editions/test/tiddlers/tests/data/procedures/Nested-indented.tid index 75aaadb4c..70a2edd0c 100644 --- a/editions/test/tiddlers/tests/data/procedures/Nested-indented.tid +++ b/editions/test/tiddlers/tests/data/procedures/Nested-indented.tid @@ -17,4 +17,4 @@ title: Output + title: ExpectedResult -ElephantElephant
\ No newline at end of file +ElephantElephant
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/procedures/Nested.tid b/editions/test/tiddlers/tests/data/procedures/Nested.tid index f63c634af..51288c3f3 100644 --- a/editions/test/tiddlers/tests/data/procedures/Nested.tid +++ b/editions/test/tiddlers/tests/data/procedures/Nested.tid @@ -17,4 +17,4 @@ title: Output + title: ExpectedResult -ElephantElephant
\ No newline at end of file +ElephantElephant
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/procedures/TrailingNewlines.tid b/editions/test/tiddlers/tests/data/procedures/TrailingNewlines.tid index 467235876..6b78ead31 100644 --- a/editions/test/tiddlers/tests/data/procedures/TrailingNewlines.tid +++ b/editions/test/tiddlers/tests/data/procedures/TrailingNewlines.tid @@ -19,4 +19,4 @@ Paragraph 2 + title: ExpectedResult -Paragraph 1
Paragraph 2
\ No newline at end of file +Paragraph 1
Paragraph 2
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd.tid b/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd.tid index 51f0b87df..61f72e9cd 100644 --- a/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd.tid +++ b/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd.tid @@ -14,5 +14,5 @@ Out: <> + title: ExpectedResult - Nothing -\end
Out:
\ No newline at end of file +Nothing +\end
Out:
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd2.tid b/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd2.tid index 54d3ebbf6..6e8439289 100644 --- a/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd2.tid +++ b/editions/test/tiddlers/tests/data/procedures/WhitespaceOnlyWithEnd2.tid @@ -12,4 +12,4 @@ Out: <> + title: ExpectedResult - Out:
\ No newline at end of file +Out:
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid b/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid index b9b77f160..267618c45 100644 --- a/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid +++ b/editions/test/tiddlers/tests/data/reserved-wikitext/ReservedWikiText.tid @@ -34,7 +34,7 @@ title: Output + title: ExpectedResult -+
{%%} (==) {% %} diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-a.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-a.tid index 1cb356182..4a2c4348d 100644 --- a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-a.tid +++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-a.tid @@ -2,4 +2,4 @@ title: expected-test-tabs-horizontal-a type: text/html description: Horizontal tabs test - This is the expected HTML output from a test in test-wikitext-tabs-macro.js -
Text tab 2
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-all.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-all.tid index 418510172..c589ec559 100644 --- a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-all.tid +++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-all.tid @@ -2,4 +2,4 @@ title: expected-test-tabs-horizontal-all type: text/html description: Horizontal tabs with all parameters active. This is the expected HTML output from a test in test-wikitext-tabs-macro.js -Text tab 2
\ No newline at end of file +TabTwo
Text tab 2
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-vertical.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-vertical.tid index 3f1f344f9..479498eaa 100644 --- a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-vertical.tid +++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-vertical.tid @@ -2,4 +2,4 @@ title: expected-test-tabs-vertical type: text/html description: Vertical tabs test -- This is the expected HTML output from the test in test-wikitext-tabs-macro.js -TabTwo
Text tab 2
\ No newline at end of file +Text tab 2
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/this-tiddler/Simple.tid b/editions/test/tiddlers/tests/data/this-tiddler/Simple.tid index 4aad83c98..897c603f3 100644 --- a/editions/test/tiddlers/tests/data/this-tiddler/Simple.tid +++ b/editions/test/tiddlers/tests/data/this-tiddler/Simple.tid @@ -26,4 +26,4 @@ title: Macro + title: ExpectedResult -Text tab 2
(Output)
(Output)
(Output)
\ No newline at end of file +(Output)
(Output)
(Output)
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid index 296aa6931..e19d5b5c2 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid @@ -24,4 +24,4 @@ title: Actions + title: ExpectedResult -Dingo
\ No newline at end of file +Dingo
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-CodeblockOverride-TextParser.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-CodeblockOverride-TextParser.tid index 484f0c4a3..f4f55182a 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-CodeblockOverride-TextParser.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-CodeblockOverride-TextParser.tid @@ -17,4 +17,4 @@ title: Output + title: ExpectedResult -hello
\ No newline at end of file +hello
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Fail.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Fail.tid index 3d0759013..76ed36b6a 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Fail.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Fail.tid @@ -23,4 +23,4 @@ title: Output + title: ExpectedResult -Undefined widget 'non-existent-widget'Undefined widget 'non-existent-widget'
\ No newline at end of file +Undefined widget 'non-existent-widget'Undefined widget 'non-existent-widget'
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid index c4730622b..6bacb96f4 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Override-Codeblock.tid @@ -26,4 +26,4 @@ Python + title: ExpectedResult -£Kangaroo@
£Python@
\ No newline at end of file +£Tiger@
£Kangaroo@
£Python@
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid index c57e4a9a1..03edfe6fa 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-OverrideTransclude.tid @@ -30,4 +30,4 @@ title: TiddlerOne + title: ExpectedResult -£Tiger@
Antelope
\ No newline at end of file +Antelope
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple-Indented.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple-Indented.tid index 19945e6ea..d414586f9 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple-Indented.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple-Indented.tid @@ -30,4 +30,4 @@ title: TiddlerOne + title: ExpectedResult -DingoCrocodileBumbleBeeSquirrelJaguarWhale
\ No newline at end of file +DingoCrocodileBumbleBeeSquirrelJaguarWhale
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid index ccb590d4f..36389a929 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid @@ -30,4 +30,4 @@ title: TiddlerOne + title: ExpectedResult -DingoCrocodileBumbleBeeSquirrelJaguarWhale
\ No newline at end of file +DingoCrocodileBumbleBeeSquirrelJaguarWhale
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid index eb7d61756..adcfa3382 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid @@ -24,4 +24,4 @@ title: Output + title: ExpectedResult -DingoCrocodileBumbleBeeWhale
\ No newline at end of file +DingoCrocodileBumbleBeeWhale
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid index d0a3cc82c..0e7ad1433 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverride.tid @@ -24,4 +24,4 @@ Crocodile + title: ExpectedResult -≤Dingo≥≤Jaguar≥
\ No newline at end of file +≤Dingo≥≤Jaguar≥
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverrideWithSlot.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverrideWithSlot.tid index c84c5ae9a..86b99b15c 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverrideWithSlot.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-TextWidgetOverrideWithSlot.tid @@ -28,4 +28,4 @@ title: TiddlerOne + title: ExpectedResult -DingoCrocodile
\ No newline at end of file +DingoCrocodile
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Unoverride-Codeblock.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Unoverride-Codeblock.tid index c6a834205..8bfc30103 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Unoverride-Codeblock.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Unoverride-Codeblock.tid @@ -28,4 +28,4 @@ Python + title: ExpectedResult -Kangaroo
Python
\ No newline at end of file +Tiger
Kangaroo
Python
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid index e4e7dbaaf..80dd7129c 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid @@ -26,4 +26,4 @@ title: TiddlerOne + title: ExpectedResult -Tiger
DingoCrocodile
\ No newline at end of file +DingoCrocodile
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/JavaScript-Macro.tid b/editions/test/tiddlers/tests/data/transclude/JavaScript-Macro.tid index 216a89dc8..c5fbe3831 100644 --- a/editions/test/tiddlers/tests/data/transclude/JavaScript-Macro.tid +++ b/editions/test/tiddlers/tests/data/transclude/JavaScript-Macro.tid @@ -14,4 +14,4 @@ title: Output + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Macro-Missing.tid b/editions/test/tiddlers/tests/data/transclude/Macro-Missing.tid index 8a1a837e5..3d2c611f7 100644 --- a/editions/test/tiddlers/tests/data/transclude/Macro-Missing.tid +++ b/editions/test/tiddlers/tests/data/transclude/Macro-Missing.tid @@ -37,4 +37,4 @@ Fallback content + title: ExpectedResult -Fallback content
Fallback content
Fallback content
Fallback content
Fallback content
Fallback content
\ No newline at end of file +Fallback content
Fallback content
Fallback content
Fallback content
Fallback content
Fallback content
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Macro-Plain.tid b/editions/test/tiddlers/tests/data/transclude/Macro-Plain.tid index 410144153..86de5bdc5 100644 --- a/editions/test/tiddlers/tests/data/transclude/Macro-Plain.tid +++ b/editions/test/tiddlers/tests/data/transclude/Macro-Plain.tid @@ -14,4 +14,4 @@ title: Output + title: ExpectedResult -Jeremy|Jeremy
\ No newline at end of file +Jeremy|Jeremy
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Macro-Simple.tid b/editions/test/tiddlers/tests/data/transclude/Macro-Simple.tid index 71db5efe4..b7b718959 100644 --- a/editions/test/tiddlers/tests/data/transclude/Macro-Simple.tid +++ b/editions/test/tiddlers/tests/data/transclude/Macro-Simple.tid @@ -23,4 +23,4 @@ It is $one$ and $two$ or <<__one__>> and <<__two__>>. + title: ExpectedResult -It is red and green or red and green.
It is red and green or red and green.
It is orange and green or orange and green.
It is pink and green or pink and green.
It is purple and pink or purple and pink.
\ No newline at end of file +It is red and green or red and green.
It is red and green or red and green.
It is orange and green or orange and green.
It is pink and green or pink and green.
It is purple and pink or purple and pink.
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid b/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid index 8bdc86eaa..5f9892ed4 100644 --- a/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid +++ b/editions/test/tiddlers/tests/data/transclude/MissingTarget.tid @@ -45,4 +45,4 @@ title: TiddlerOne + title: ExpectedResult -PiranhaFerretPiranhaFerretBadgerFerretBadgerFerret
\ No newline at end of file +PiranhaFerretPiranhaFerretBadgerFerretBadgerFerret
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Depth.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Depth.tid index 064e225c8..b2460727e 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Depth.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Depth.tid @@ -31,4 +31,4 @@ title: TiddlerTwo + title: ExpectedResult -Ferret:Piranha(Leopard|Coelacanth)|Jaguar:Piranha(Leopard|Coelacanth)|Ferret:Osprey(Leopard|Coelacanth)|Jaguar:Falcon(Leopard|Coelacanth)
\ No newline at end of file +Ferret:Piranha(Leopard|Coelacanth)|Jaguar:Piranha(Leopard|Coelacanth)|Ferret:Osprey(Leopard|Coelacanth)|Jaguar:Falcon(Leopard|Coelacanth)
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Mode.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Mode.tid index 04f5bbb04..4605223a7 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Mode.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Mode.tid @@ -26,4 +26,4 @@ title: TiddlerOne + title: ExpectedResult -block
inline
\ No newline at end of file +block
inline
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid index 9d62a7897..33eb3d505 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Name-Values.tid @@ -31,4 +31,4 @@ title: TiddlerTwo + title: ExpectedResult -{0:}{1:}{2:}
{0:Ferret}
{0:Butterfly}{1:Moth}
{0:Beetle}{1:Scorpion}{2:Snake}
({$one:Scorpion}{two:Snake}{zero:Beetle})
\ No newline at end of file +{0:}{1:}{2:}
{0:Ferret}
{0:Butterfly}{1:Moth}
{0:Beetle}{1:Scorpion}{2:Snake}
({$one:Scorpion}{two:Snake}{zero:Beetle})
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid index 916e2abfb..5638838da 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-ParseTreeNodes.tid @@ -26,4 +26,4 @@ title: TiddlerOne + title: ExpectedResult -[{"type":"element","tag":"p","children":[{"type":"text","text":"This is a block","start":68,"end":83}],"start":68,"end":83}]
[{"type":"text","text":"This is inline","start":136,"end":152}]
\ No newline at end of file +[{"type":"element","tag":"p","attributes":{"dir":{"type":"string","value":"auto"}},"children":[{"type":"text","text":"This is a block","start":68,"end":83}],"start":68,"end":83}]
[{"type":"text","text":"This is inline","start":136,"end":152}]
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid index abf444adb..49e82cbc1 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut-Parameters.tid @@ -26,4 +26,4 @@ title: TiddlerTwo + title: ExpectedResult -[{Jaguar}{Lizard}{Mole}]
[{Ferret}{Lizard}{Mole}]
[{Butterfly}{Moth}{Mole}]
[{Beetle}{Scorpion}{Snake}]
([{Beetle}{Scorpion}{Snake}])
\ No newline at end of file +[{Jaguar}{Lizard}{Mole}]
[{Ferret}{Lizard}{Mole}]
[{Butterfly}{Moth}{Mole}]
[{Beetle}{Scorpion}{Snake}]
([{Beetle}{Scorpion}{Snake}])
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid index 7792e6c66..a7dbc45a9 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Shortcut.tid @@ -26,4 +26,4 @@ title: TiddlerTwo + title: ExpectedResult -[{Jaguar}{Lizard}{Mole}]
[{Ferret}{Lizard}{Mole}]
[{Butterfly}{Moth}{Mole}]
[{Beetle}{Scorpion}{Snake}]
([{Beetle}{Scorpion}{Snake}])
\ No newline at end of file +[{Jaguar}{Lizard}{Mole}]
[{Ferret}{Lizard}{Mole}]
[{Butterfly}{Moth}{Mole}]
[{Beetle}{Scorpion}{Snake}]
([{Beetle}{Scorpion}{Snake}])
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid index ad2b7be52..3da5aa606 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional-Variables.tid @@ -27,4 +27,4 @@ title: Output + title: ExpectedResult -(Functions:f1,f1,f1)(Macros:banana,banana,banana)
\ No newline at end of file +(Functions:f1,f1,f1)(Macros:banana,banana,banana)
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid index d7eb9090e..5a9453826 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Positional.tid @@ -23,4 +23,4 @@ title: TiddlerOne + title: ExpectedResult -FerretFerretPigeonPigeonFerretFerretJaguar
\ No newline at end of file +FerretFerretPigeonPigeonFerretFerretJaguar
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid index 375964199..361c0a125 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-Parameters.tid @@ -17,4 +17,4 @@ title: TiddlerOne + title: ExpectedResult -FerretJaguar
\ No newline at end of file +FerretJaguar
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-ParametersIndented.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-ParametersIndented.tid index 90e9a90aa..8eec2c181 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-ParametersIndented.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut-ParametersIndented.tid @@ -17,4 +17,4 @@ title: TiddlerOne + title: ExpectedResult -FerretJaguar
\ No newline at end of file +FerretJaguar
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid index 0499cf2d6..61c61a4dc 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Shortcut.tid @@ -18,4 +18,4 @@ title: Output + title: ExpectedResult -{Ferret}{Jaguar}{Rat}{Mouse}
\ No newline at end of file +{Ferret}{Jaguar}{Rat}{Mouse}
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid index 0268f9e59..464be6d3c 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Simple.tid @@ -23,4 +23,4 @@ title: TiddlerOne + title: ExpectedResult -Ferret:Piranha|Jaguar:Piranha|Ferret:Osprey|Jaguar:Falcon
\ No newline at end of file +Ferret:Piranha|Jaguar:Piranha|Ferret:Osprey|Jaguar:Falcon
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-SlotFillParseTreeNodes.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-SlotFillParseTreeNodes.tid index 679748375..6b5fa2f45 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-SlotFillParseTreeNodes.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-SlotFillParseTreeNodes.tid @@ -26,4 +26,4 @@ title: TiddlerOne + title: ExpectedResult -one,ts-raw,two
one,ts-raw
\ No newline at end of file +one,ts-raw,two
one,ts-raw
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid index fe399d572..8ce4f7b26 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted-Missing.tid @@ -21,4 +21,4 @@ title: TiddlerOne + title: ExpectedResult -FerretWhale
\ No newline at end of file +FerretWhale
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid index c795621ef..1e79fd793 100644 --- a/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid +++ b/editions/test/tiddlers/tests/data/transclude/Parameterised-Slotted.tid @@ -24,4 +24,4 @@ title: TiddlerOne + title: ExpectedResult -FerretHippopotamus
\ No newline at end of file +FerretHippopotamus
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Procedures-Double-Underscore.tid b/editions/test/tiddlers/tests/data/transclude/Procedures-Double-Underscore.tid index f22efb4f6..e56078807 100644 --- a/editions/test/tiddlers/tests/data/transclude/Procedures-Double-Underscore.tid +++ b/editions/test/tiddlers/tests/data/transclude/Procedures-Double-Underscore.tid @@ -23,4 +23,4 @@ It is $one$ and $two$<<__one__>><<__two__>>. + title: ExpectedResult -It is $one$ and $two$.
It is $one$ and $two$.
It is $one$ and $two$.
It is $one$ and $two$.
It is $one$ and $two$.
\ No newline at end of file +It is $one$ and $two$.
It is $one$ and $two$.
It is $one$ and $two$.
It is $one$ and $two$.
It is $one$ and $two$.
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace.tid b/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace.tid index d2bded70c..9edd03a9e 100644 --- a/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace.tid +++ b/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace.tid @@ -20,6 +20,6 @@ This is a sentence + title: ExpectedResult -This is a sentence +
This is a sentence [This is a sentence] [This is a sentence ]
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace2.tid b/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace2.tid index e6cd673bc..4af356b2e 100644 --- a/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace2.tid +++ b/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace2.tid @@ -19,7 +19,7 @@ This is a sentence + title: ExpectedResult -This is a sentence +
This is a sentence [This is a sentence ] [This is a sentence ]
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace3.tid b/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace3.tid index b043bceda..ef99d5ad4 100644 --- a/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace3.tid +++ b/editions/test/tiddlers/tests/data/transclude/Procedures-Whitespace3.tid @@ -24,7 +24,7 @@ This is a sentence + title: ExpectedResult -This is a sentence +
This is a sentence [This is a sentence ] [This is a sentence ]
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Typed.tid b/editions/test/tiddlers/tests/data/transclude/Typed.tid index c99664b59..cf3c62daa 100644 --- a/editions/test/tiddlers/tests/data/transclude/Typed.tid +++ b/editions/test/tiddlers/tests/data/transclude/Typed.tid @@ -29,10 +29,10 @@ testindex: This is ''wikitext'' + title: ExpectedResult -This is wikitext +
This is wikitext - -
This is ''wikitext''
This is wikitext +
This is ''wikitext''
This is wikitext - -
This is ''wikitext''
This is wikitext +
This is ''wikitext''
This is wikitext -
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Variable-Refreshing.tid b/editions/test/tiddlers/tests/data/transclude/Variable-Refreshing.tid index c1867c2fc..48ab3a871 100644 --- a/editions/test/tiddlers/tests/data/transclude/Variable-Refreshing.tid +++ b/editions/test/tiddlers/tests/data/transclude/Variable-Refreshing.tid @@ -24,4 +24,4 @@ title: Actions + title: ExpectedResult -This is ''wikitext''
1, 2, 3, 4, 5, 6, 7, 8, 9, 10
\ No newline at end of file +1, 2, 3, 4, 5, 6, 7, 8, 9, 10
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/Variable-Static.tid b/editions/test/tiddlers/tests/data/transclude/Variable-Static.tid index 4158569c6..2a71de7e6 100644 --- a/editions/test/tiddlers/tests/data/transclude/Variable-Static.tid +++ b/editions/test/tiddlers/tests/data/transclude/Variable-Static.tid @@ -12,4 +12,4 @@ items: 1 2 3 4 5 6 7 8 9 10 + title: ExpectedResult -1, 2, 3, 4, 5, 6, 7, 8, 9, 10
\ No newline at end of file +1, 2, 3, 4, 5, 6, 7, 8, 9, 10
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/DataAttributes/ButtonWidget-DataAttributes.tid b/editions/test/tiddlers/tests/data/widgets/DataAttributes/ButtonWidget-DataAttributes.tid index da3d7080a..e291533d8 100644 --- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/ButtonWidget-DataAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/ButtonWidget-DataAttributes.tid @@ -24,4 +24,4 @@ Title1 + title: ExpectedResult -my tiddlerhello\ No newline at end of file +my tiddlerhello\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/DataAttributes/CheckboxWidget-DataAttributes.tid b/editions/test/tiddlers/tests/data/widgets/DataAttributes/CheckboxWidget-DataAttributes.tid index 521fa3a13..0bb862e79 100644 --- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/CheckboxWidget-DataAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/CheckboxWidget-DataAttributes.tid @@ -19,4 +19,4 @@ Title1 + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/DataAttributes/DraggableWidget-DataAttributes.tid b/editions/test/tiddlers/tests/data/widgets/DataAttributes/DraggableWidget-DataAttributes.tid index feeb89ded..cc801f1a0 100644 --- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/DraggableWidget-DataAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/DraggableWidget-DataAttributes.tid @@ -24,4 +24,4 @@ Title1 + title: ExpectedResult -my tiddlerhello\ No newline at end of file +my tiddlerhello\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/DataAttributes/DroppableWidget-DataAttributes.tid b/editions/test/tiddlers/tests/data/widgets/DataAttributes/DroppableWidget-DataAttributes.tid index 3c7284eb1..165c18a61 100644 --- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/DroppableWidget-DataAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/DroppableWidget-DataAttributes.tid @@ -24,4 +24,4 @@ Title1 + title: ExpectedResult -my tiddlerhello\ No newline at end of file +my tiddlerhello\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/DataAttributes/LinkWidget-DataAttributes.tid b/editions/test/tiddlers/tests/data/widgets/DataAttributes/LinkWidget-DataAttributes.tid index e99e265bb..2c243fa66 100644 --- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/LinkWidget-DataAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/LinkWidget-DataAttributes.tid @@ -24,4 +24,4 @@ Title1 + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/DataAttributes/OrderedStyleAttributes.tid b/editions/test/tiddlers/tests/data/widgets/DataAttributes/OrderedStyleAttributes.tid index 2f6d2cb1a..0eb7e91db 100644 --- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/OrderedStyleAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/OrderedStyleAttributes.tid @@ -12,4 +12,4 @@ hello + title: ExpectedResult -hello\ No newline at end of file +hello\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid b/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid index e2006312b..7dc5c73d6 100644 --- a/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/DataAttributes/SelectWidget-DataAttributes.tid @@ -24,4 +24,4 @@ Title1 + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/ElementWidgetEventAttributes.tid b/editions/test/tiddlers/tests/data/widgets/ElementWidgetEventAttributes.tid index 4c2f6eb04..356ff6010 100644 --- a/editions/test/tiddlers/tests/data/widgets/ElementWidgetEventAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/ElementWidgetEventAttributes.tid @@ -12,4 +12,4 @@ TiddlyWiki + title: ExpectedResult -TiddlyWiki\ No newline at end of file +TiddlyWiki\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes.tid b/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes.tid index a36a51323..f2424465c 100644 --- a/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes.tid @@ -12,4 +12,4 @@ TiddlyWiki + title: ExpectedResult -TiddlyWiki\ No newline at end of file +TiddlyWiki\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes2.tid b/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes2.tid index 6b6a2f953..a60ef99f6 100644 --- a/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes2.tid +++ b/editions/test/tiddlers/tests/data/widgets/ElementWidgetStyleAttributes2.tid @@ -12,4 +12,4 @@ TiddlyWiki + title: ExpectedResult -TiddlyWiki\ No newline at end of file +TiddlyWiki\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/LetWidgetSelfReferences.tid b/editions/test/tiddlers/tests/data/widgets/LetWidgetSelfReferences.tid index b81fc7d75..fcea51f0e 100644 --- a/editions/test/tiddlers/tests/data/widgets/LetWidgetSelfReferences.tid +++ b/editions/test/tiddlers/tests/data/widgets/LetWidgetSelfReferences.tid @@ -12,4 +12,4 @@ title: Output + title: ExpectedResult -bb
\ No newline at end of file +bb
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/LetWidgetUndefinedVariable.tid b/editions/test/tiddlers/tests/data/widgets/LetWidgetUndefinedVariable.tid index e6163d915..c5469af57 100644 --- a/editions/test/tiddlers/tests/data/widgets/LetWidgetUndefinedVariable.tid +++ b/editions/test/tiddlers/tests/data/widgets/LetWidgetUndefinedVariable.tid @@ -12,4 +12,4 @@ title: Output + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid b/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid index 9d5538573..1cd48f8ae 100644 --- a/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid +++ b/editions/test/tiddlers/tests/data/widgets/SubstitutedAttributes.tid @@ -17,5 +17,5 @@ ${ [[Hello]addsuffix[There]] }$` attrib=`myvalue` otherattrib=`$(1)$` blankattri + title: ExpectedResult -\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-doubleurlencoded.tid b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-doubleurlencoded.tid index 3cb11f6eb..818b76501 100644 --- a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-doubleurlencoded.tid +++ b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-doubleurlencoded.tid @@ -16,7 +16,7 @@ title: Output + title: ExpectedResult -', start : 47, end : 71 } ] } ] } ] } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 71, children : [ { type : 'element', start : 0, end: 71, openTagStart: 0, openTagEnd: 5, closeTagStart: 71, closeTagEnd: 71, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 71, openTagStart: 5, openTagEnd: 44, closeTagStart: 71, closeTagEnd: 71, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'h1', start: 46, end: 71, rule: 'heading', attributes : { class : { type : 'string', value : '', start: 47, end: 47 } }, children : [ { type : 'text', text : 'some heading', start : 47, end : 71 } ] } ] } ] } ] } ] ); expect(parse("Some%2520text%2520%253E%2520%2522aaa%2522 +
Some%2520text%2520%253E%2520%2522aaa%2522 — Some text > "aaa"
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-urlencoded.tid b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-urlencoded.tid index f0e5eb948..48834ca7c 100644 --- a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-urlencoded.tid +++ b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text-urlencoded.tid @@ -16,7 +16,7 @@ title: Output + title: ExpectedResult -Some%20text%20%3E%20%22aaa%22 +
Some%20text%20%3E%20%22aaa%22 — Some text > "aaa"
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text.tid b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text.tid index 8dafbdb03..ffe5933ec 100644 --- a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text.tid +++ b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-format-text.tid @@ -16,4 +16,4 @@ title: Output + title: ExpectedResult -[[HelloThere]][[HelloThere]]
\ No newline at end of file +[[HelloThere]][[HelloThere]]
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-index.tid b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-index.tid index 2d7073728..767cf2915 100644 --- a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-index.tid +++ b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-index.tid @@ -25,4 +25,4 @@ title: Output + title: ExpectedResult -value 01value 02
\ No newline at end of file +value 01value 02
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-text.tid b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-text.tid index b7ebd59a6..b2435f4a4 100644 --- a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-text.tid +++ b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-field-text.tid @@ -15,4 +15,4 @@ title: Output + title: ExpectedResult -Some textSome text
\ No newline at end of file +Some textSome text
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-format-date-template.tid b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-format-date-template.tid index 493876362..09815ed6d 100644 --- a/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-format-date-template.tid +++ b/editions/test/tiddlers/tests/data/widgets/view/ViewWidget-format-date-template.tid @@ -17,4 +17,4 @@ title: Output + title: ExpectedResult -20th September 2024 at 4:22pm
\ No newline at end of file +20th September 2024 at 4:22pm
\ No newline at end of file diff --git a/editions/test/tiddlers/tests/test-widget.js b/editions/test/tiddlers/tests/test-widget.js index 637104c0b..e8fbf5e51 100755 --- a/editions/test/tiddlers/tests/test-widget.js +++ b/editions/test/tiddlers/tests/test-widget.js @@ -227,7 +227,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("My Jolly Old World is Jolly
"); + expect(wrapper.innerHTML).toBe("My Jolly Old World is Jolly
"); }); it("should render the view widget", function() { @@ -242,7 +242,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("Jolly Old World
"); + expect(wrapper.innerHTML).toBe("Jolly Old World
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -252,7 +252,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerOne"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("World-wide Jelly
"); + expect(wrapper.innerHTML).toBe("World-wide Jelly
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -274,13 +274,13 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("My Jolly Old World is Jolly
"); + expect(wrapper.innerHTML).toBe("My Jolly Old World is Jolly
"); // Change the transcluded tiddler wiki.addTiddler({title: "TiddlerFour", text: "TiddlerOne"}); // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerFour"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("My Jolly Old World is Jolly
"); + expect(wrapper.innerHTML).toBe("My Jolly Old World is Jolly
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -306,7 +306,7 @@ describe("Widget module", function() { "<$transclude field=<>/>$let>"; var widgetNode = createWidgetNode(parseText(text,wiki),wiki); var wrapper = renderWidgetNode(widgetNode); - expect(wrapper.innerHTML).toBe(" Happy Result
"); + expect(wrapper.innerHTML).toBe("Happy Result
"); // This is important. $Let needs to be aware enough not to let its // own variables interfere with its ability to recognise no change. @@ -331,7 +331,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("Content"); + expect(wrapper.innerHTML).toBe("Content"); }); it("should deal with built-in macros", function() { @@ -346,7 +346,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe(""); + expect(wrapper.innerHTML).toBe(""); }); /* This test reproduces issue #4693. */ @@ -382,13 +382,13 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("TiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); + expect(wrapper.innerHTML).toBe("TiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); // Add another tiddler wiki.addTiddler({title: "TiddlerFive", text: "Jalapeno Peppers"}); // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerFive"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); + expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -402,7 +402,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerThree"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerTwo
"); + expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerTwo
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -415,7 +415,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerThree"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); + expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -442,7 +442,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("Lemon Squash1yesnoJolly Old World2nonoGolly Gosh3nonoWorldly Old Jelly4noyes
"); + expect(wrapper.innerHTML).toBe("Lemon Squash1yesnoJolly Old World2nonoGolly Gosh3nonoWorldly Old Jelly4noyes
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -467,7 +467,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerFive"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoGolly Gosh4nonoWorldly Old Jelly5noyes
"); + expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoGolly Gosh4nonoWorldly Old Jelly5noyes
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -496,7 +496,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerThree"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoWorldly Old Jelly4noyes
"); + expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoWorldly Old Jelly4noyes
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -521,7 +521,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerThree"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoSomething4nonoWorldly Old Jelly5noyes
"); + expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoSomething4nonoWorldly Old Jelly5noyes
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -546,7 +546,7 @@ describe("Widget module", function() { //Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerTwo"]); //Test the refreshing - expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoSomething4noyes
"); + expect(wrapper.innerHTML).toBe("Jalapeno Peppers1yesnoLemon Squash2nonoJolly Old World3nonoSomething4noyes
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -578,11 +578,11 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("" + oldList.split(' ').join(', ') + "
"); + expect(wrapper.innerHTML).toBe("" + oldList.split(' ').join(', ') + "
"); // Change the list and ensure new rendering is still right wiki.addTiddler({title: "Numbers", text: "", list: newList}); refreshWidgetNode(widgetNode,wrapper,["Numbers"]); - expect(wrapper.innerHTML).toBe("" + newList.split(' ').join(', ') + "
"); + expect(wrapper.innerHTML).toBe("" + newList.split(' ').join(', ') + "
"); } } @@ -617,11 +617,11 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("" + oldList.split(' ').join(', ') + "
"); + expect(wrapper.innerHTML).toBe("" + oldList.split(' ').join(', ') + "
"); // Append a number wiki.addTiddler({title: "Numbers", text: "", list: newList}); refreshWidgetNode(widgetNode,wrapper,["Numbers"]); - expect(wrapper.innerHTML).toBe("" + newList.split(' ').join(', ') + "
"); + expect(wrapper.innerHTML).toBe("" + newList.split(' ').join(', ') + "
"); } } @@ -645,7 +645,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("TiddlerFourTiddlerOneTiddlerThreeTiddlerTwoSomething
"); + expect(wrapper.innerHTML).toBe("TiddlerFourTiddlerOneTiddlerThreeTiddlerTwoSomething
"); // Check the next siblings of each of the list elements var listWidget = widgetNode.children[0].children[0]; // Add another tiddler @@ -653,7 +653,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerFive"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwoSomething
"); + expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwoSomething
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -667,7 +667,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerThree"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerTwoSomething
"); + expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerTwoSomething
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -680,7 +680,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerThree"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwoSomething
"); + expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwoSomething
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -694,7 +694,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["YetAnotherTiddler"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwoYetAnotherTiddlerSomething
"); + expect(wrapper.innerHTML).toBe("TiddlerFiveTiddlerFourTiddlerOneTiddlerThreeTiddlerTwoYetAnotherTiddlerSomething
"); // Test the sequence numbers in the DOM expect(wrapper.sequenceNumber).toBe(0); expect(wrapper.children[0].sequenceNumber).toBe(1); @@ -722,7 +722,7 @@ describe("Widget module", function() { var wrapper = renderWidgetNode(widgetNode); //console.log(require("util").inspect(widgetNode,{depth:8,colors:true})); // Test the rendering - expect(wrapper.innerHTML).toBe("(TiddlerFour)(TiddlerOne)(TiddlerThree)(TiddlerTwo)
"); + expect(wrapper.innerHTML).toBe("(TiddlerFour)(TiddlerOne)(TiddlerThree)(TiddlerTwo)
"); }); it("should deal with the list widget and empty lists", function() { @@ -733,7 +733,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("nothing
"); + expect(wrapper.innerHTML).toBe("nothing
"); }); it("should refresh lists that become empty", function() { @@ -751,7 +751,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("TiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); + expect(wrapper.innerHTML).toBe("TiddlerFourTiddlerOneTiddlerThreeTiddlerTwo
"); // Get rid of the tiddlers wiki.deleteTiddler("TiddlerOne"); wiki.deleteTiddler("TiddlerTwo"); @@ -760,7 +760,7 @@ describe("Widget module", function() { // Refresh refreshWidgetNode(widgetNode,wrapper,["TiddlerOne","TiddlerTwo","TiddlerThree","TiddlerFour"]); // Test the refreshing - expect(wrapper.innerHTML).toBe("nothing
"); + expect(wrapper.innerHTML).toBe("nothing
"); }); /**This test confirms that imported set variables properly refresh @@ -779,11 +779,11 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("Initial value
"); + expect(wrapper.innerHTML).toBe("Initial value
"); wiki.addTiddler({title: "Raw", text: "New value"}); // Refresh refreshWidgetNode(widgetNode,wrapper,["Raw"]); - expect(wrapper.innerHTML).toBe("New value
"); + expect(wrapper.innerHTML).toBe("New value
"); }); it("should support mixed setWidgets and macros when importing", function() { @@ -799,7 +799,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("Aval Bval Cval
"); + expect(wrapper.innerHTML).toBe("Aval Bval Cval
"); }); it("should skip parameters widgets when importing", function() { @@ -813,7 +813,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("Bval
"); + expect(wrapper.innerHTML).toBe("Bval
"); }); it("should use default $parameters if directly rendered", function() { @@ -823,7 +823,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // nothing = true in this attribute form because valueless attributes always equal true. - expect(wrapper.innerHTML).toBe("bee=default, $dollar=bill, nothing=true, empty=
"); + expect(wrapper.innerHTML).toBe("bee=default, $dollar=bill, nothing=true, empty=
"); }); it("should use default \\parameters if directly rendered", function() { @@ -833,7 +833,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // nothing = true in this attribute form because valueless attributes always equal true. - expect(wrapper.innerHTML).toBe("bee=default, $$dollar=bill, nothing=
"); + expect(wrapper.innerHTML).toBe("bee=default, $$dollar=bill, nothing=
"); }); it("can have more than one macroDef variable imported", function() { @@ -847,7 +847,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("A B C D
"); + expect(wrapper.innerHTML).toBe("A B C D
"); }); it("import doesn't hold onto dead variables", function() { @@ -896,7 +896,7 @@ describe("Widget module", function() { // Render the widget node to the DOM var wrapper = renderWidgetNode(widgetNode); // Test the rendering - expect(wrapper.innerHTML).toBe("Don't forget me.
"); + expect(wrapper.innerHTML).toBe("Don't forget me.
"); }); /** Special case. \import should parse correctly, even if it's diff --git a/editions/test/tiddlers/tests/test-wikitext-parser.js b/editions/test/tiddlers/tests/test-wikitext-parser.js index a488ff030..269ade507 100644 --- a/editions/test/tiddlers/tests/test-wikitext-parser.js +++ b/editions/test/tiddlers/tests/test-wikitext-parser.js @@ -26,87 +26,87 @@ describe("WikiText parser tests", function() { it("should parse tags", function() { expect(parse("
")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 4, children : [ { type : 'element', tag : 'br', start : 0, end : 4, openTagStart: 0, openTagEnd: 4, rule: 'html', isBlock : false, attributes : { }, orderedAttributes: [ ] } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 4, children : [ { type : 'element', tag : 'br', start : 0, end : 4, openTagStart: 0, openTagEnd: 4, rule: 'html', isBlock : false, attributes : { }, orderedAttributes: [ ] } ] } ] ); expect(parse("")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'text', text : '', start : 0, end : 5 } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 5, children : [ { type : 'text', text : '', start : 0, end : 5 } ] } ] ); expect(parse("")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 5, children : [ { type : 'element', tag : 'div', start : 0, end : 5, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 5, rule: 'html', isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ ] } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 5, children : [ { type : 'element', tag : 'div', start : 0, end : 5, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 5, rule: 'html', isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ ] } ] } ] ); expect(parse("")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 6, children : [ { type : 'element', tag : 'div', isSelfClosing : true, isBlock : false, attributes : { }, orderedAttributes: [ ], start : 0, end : 6, rule: 'html' } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 6, children : [ { type : 'element', tag : 'div', isSelfClosing : true, isBlock : false, attributes : { }, orderedAttributes: [ ], start : 0, end : 6, rule: 'html' } ] } ] ); expect(parse("")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 11, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ ], start : 0, end : 11, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 11, rule: 'html' } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 11, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ ], start : 0, end : 11, openTagStart: 0, openTagEnd: 5, closeTagStart: 5, closeTagEnd: 11, rule: 'html' } ] } ] ); expect(parse("some text")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 20, children : [ { type : 'element', tag : 'div', openTagStart: 0, openTagEnd: 5, closeTagStart: 14, closeTagEnd: 20, rule: 'html', isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ { type : 'text', text : 'some text', start : 5, end : 14 } ], start : 0, end : 20 } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 20, children : [ { type : 'element', tag : 'div', openTagStart: 0, openTagEnd: 5, closeTagStart: 14, closeTagEnd: 20, rule: 'html', isBlock : false, attributes : { }, orderedAttributes: [ ], children : [ { type : 'text', text : 'some text', start : 5, end : 14 } ], start : 0, end : 20 } ] } ] ); expect(parse("some text")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 30, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } }, orderedAttributes: [ { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } ], children : [ { type : 'text', text : 'some text', start : 15, end : 24 } ], start : 0, end : 30, openTagStart: 0, openTagEnd: 15, closeTagStart: 24, closeTagEnd: 30, rule: 'html' } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 30, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } }, orderedAttributes: [ { type : 'string', value : 'true', start : 4, end : 14, name: 'attribute' } ], children : [ { type : 'text', text : 'some text', start : 15, end : 24 } ], start : 0, end : 30, openTagStart: 0, openTagEnd: 15, closeTagStart: 24, closeTagEnd: 30, rule: 'html' } ] } ] ); expect(parse("some text")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 38, children : [ { type : 'element', tag : 'div', openTagStart: 0, openTagEnd: 23, closeTagStart: 32, closeTagEnd: 38, rule: 'html', isBlock : false, attributes : { attribute : { type : 'string', name: 'attribute', value : 'value', start: 4, end: 22 } }, orderedAttributes: [ { type: 'string', name: 'attribute', value : 'value', start: 4, end: 22 } ], children : [ { type : 'text', text : 'some text', start : 23, end : 32 } ], start : 0, end : 38 } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 38, children : [ { type : 'element', tag : 'div', openTagStart: 0, openTagEnd: 23, closeTagStart: 32, closeTagEnd: 38, rule: 'html', isBlock : false, attributes : { attribute : { type : 'string', name: 'attribute', value : 'value', start: 4, end: 22 } }, orderedAttributes: [ { type: 'string', name: 'attribute', value : 'value', start: 4, end: 22 } ], children : [ { type : 'text', text : 'some text', start : 23, end : 32 } ], start : 0, end : 38 } ] } ] ); expect(parse("some text")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 47, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } }, orderedAttributes: [ { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } ], children : [ { type : 'text', text : 'some text', start : 32, end : 41 } ], start : 0, end : 47, openTagStart: 0, openTagEnd: 32, closeTagStart: 41, closeTagEnd: 47, rule: 'html' } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 47, children : [ { type : 'element', tag : 'div', isBlock : false, attributes : { attribute : { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } }, orderedAttributes: [ { type : 'indirect', name: 'attribute', textReference : 'TiddlerTitle', start : 4, end : 31 } ], children : [ { type : 'text', text : 'some text', start : 32, end : 41 } ], start : 0, end : 47, openTagStart: 0, openTagEnd: 32, closeTagStart: 41, closeTagEnd: 47, rule: 'html' } ] } ] ); expect(parse("<$reveal state='$:/temp/search' type='nomatch' text=''>")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'reveal', tag: '$reveal', rule: 'html', attributes : { state : { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, type : { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, text : { start : 46, name : 'text', type : 'string', value : '', end : 54 } }, orderedAttributes: [ { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, { start : 46, name : 'text', type : 'string', value : '', end : 54 } ], start: 0, end : 55, openTagStart: 0, openTagEnd: 55, closeTagStart: 55, closeTagEnd: 55, isBlock : false, children : [ ] } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 55, children : [ { type : 'reveal', tag: '$reveal', rule: 'html', attributes : { state : { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, type : { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, text : { start : 46, name : 'text', type : 'string', value : '', end : 54 } }, orderedAttributes: [ { start : 8, name : 'state', type : 'string', value : '$:/temp/search', end : 31 }, { start : 31, name : 'type', type : 'string', value : 'nomatch', end : 46 }, { start : 46, name : 'text', type : 'string', value : '', end : 54 } ], start: 0, end : 55, openTagStart: 0, openTagEnd: 55, closeTagStart: 55, closeTagEnd: 55, isBlock : false, children : [ ] } ] } ] ); expect(parse("some text")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 54, children : [ { type : 'element', tag : 'div', rule: 'html', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } ], children : [ { type : 'text', text : 'some text', start : 39, end : 48 } ], start : 0, end : 54, openTagStart: 0, openTagEnd: 39, closeTagStart: 48, closeTagEnd: 54 } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 54, children : [ { type : 'element', tag : 'div', rule: 'html', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'TiddlerTitle!!field', start : 4, end : 38 } ], children : [ { type : 'text', text : 'some text', start : 39, end : 48 } ], start : 0, end : 54, openTagStart: 0, openTagEnd: 39, closeTagStart: 48, closeTagEnd: 54 } ] } ] ); expect(parse("some text")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 55, children : [ { type : 'element', tag : 'div', rule: 'html', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } ], children : [ { type : 'text', text : 'some text', start : 40, end : 49 } ], start : 0, end : 55, openTagStart: 0, openTagEnd: 40, closeTagStart: 49, closeTagEnd: 55 } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 55, children : [ { type : 'element', tag : 'div', rule: 'html', isBlock : false, attributes : { attribute : { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } }, orderedAttributes: [ { type : 'indirect', name : 'attribute', textReference : 'Tiddler Title!!field', start : 4, end : 39 } ], children : [ { type : 'text', text : 'some text', start : 40, end : 49 } ], start : 0, end : 55, openTagStart: 0, openTagEnd: 40, closeTagStart: 49, closeTagEnd: 55 } ] } ] ); expect(parse("\n\nsome text")).toEqual( - [ { type : 'element', start : 0, attributes : { attribute : { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } }, orderedAttributes: [ { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } ], tag : 'div', rule: 'html', end : 56, openTagStart: 0, openTagEnd: 39, closeTagStart: 50, closeTagEnd: 56, isBlock : true, children : [ { type : 'element', tag : 'p', start : 41, end : 50, children : [ { type : 'text', text : 'some text', start : 41, end : 50 } ] } ] } ] + [ { type : 'element', start : 0, attributes : { attribute : { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } }, orderedAttributes: [ { start : 4, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 38 } ], tag : 'div', rule: 'html', end : 56, openTagStart: 0, openTagEnd: 39, closeTagStart: 50, closeTagEnd: 56, isBlock : true, children : [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 41, end : 50, children : [ { type : 'text', text : 'some text', start : 41, end : 50 } ] } ] } ] ); expect(parse("")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 67, children : [ { type : 'element', start : 0, end: 67, openTagStart: 0, openTagEnd: 5, closeTagStart: 61, closeTagEnd: 67, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 61, openTagStart: 5, openTagEnd: 44, closeTagStart: 55, closeTagEnd: 61, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'p', start : 46, end : 55, children : [ { type : 'text', text : 'some text', start : 46, end : 55 } ] } ] } ] } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 67, children : [ { type : 'element', start : 0, end: 67, openTagStart: 0, openTagEnd: 5, closeTagStart: 61, closeTagEnd: 67, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 61, openTagStart: 5, openTagEnd: 44, closeTagStart: 55, closeTagEnd: 61, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 46, end : 55, children : [ { type : 'text', text : 'some text', start : 46, end : 55 } ] } ] } ] } ] } ] ); expect(parse("\n\nsome text")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 71, children : [ { type : 'element', start : 0, end: 71, openTagStart: 0, openTagEnd: 5, closeTagStart: 71, closeTagEnd: 71, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 71, openTagStart: 5, openTagEnd: 44, closeTagStart: 71, closeTagEnd: 71, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'h1', start: 46, end: 71, rule: 'heading', attributes : { class : { type : 'string', value : '', start: 47, end: 47 } }, children : [ { type : 'text', text : 'some heading\n\n!some heading")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 70, children : [ { type : 'element', start : 0, end: 70, openTagStart: 0, openTagEnd: 5, closeTagStart: 64, closeTagEnd: 70, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 64, openTagStart: 5, openTagEnd: 44, closeTagStart: 58, closeTagEnd: 64, rule: 'html', isBlock : false, children : [ { type : 'text', text : '\n!some heading', start : 44, end : 58 } ] } ] } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 70, children : [ { type : 'element', start : 0, end: 70, openTagStart: 0, openTagEnd: 5, closeTagStart: 64, closeTagEnd: 70, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { attribute : { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } }, orderedAttributes: [ { start : 9, name : 'attribute', type : 'indirect', textReference : 'TiddlerTitle!!field', end : 43 } ], tag : 'div', end : 64, openTagStart: 5, openTagEnd: 44, closeTagStart: 58, closeTagEnd: 64, rule: 'html', isBlock : false, children : [ { type : 'text', text : '\n!some heading', start : 44, end : 58 } ] } ] } ] } ] ); // Regression test for issue (#3306) expect(parse("\n!some heading\n\nSome text")).toEqual( - [ { type : 'element', tag : 'p', start: 0, end: 48, children : [ { type : 'element', start : 0, end: 48, openTagStart: 0, openTagEnd: 5, closeTagStart: 42, closeTagEnd: 48, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { }, orderedAttributes: [ ], tag : 'span', end : 42, openTagStart: 5, openTagEnd: 11, closeTagStart: 35, closeTagEnd: 42, rule: 'html', isBlock : false, children : [ { type : 'element', start : 11, attributes : { }, orderedAttributes: [ ], tag : 'span', end : 35, openTagStart: 11, openTagEnd: 17, closeTagStart: 28, closeTagEnd: 35, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'p', start : 19, end : 28, children : [ { type : 'text', text : 'Some text', start : 19, end : 28 } ] } ] } ] } ] } ] } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 0, end: 48, children : [ { type : 'element', start : 0, end: 48, openTagStart: 0, openTagEnd: 5, closeTagStart: 42, closeTagEnd: 48, attributes : { }, orderedAttributes: [ ], tag : 'div', rule: 'html', isBlock : false, children : [ { type : 'element', start : 5, attributes : { }, orderedAttributes: [ ], tag : 'span', end : 42, openTagStart: 5, openTagEnd: 11, closeTagStart: 35, closeTagEnd: 42, rule: 'html', isBlock : false, children : [ { type : 'element', start : 11, attributes : { }, orderedAttributes: [ ], tag : 'span', end : 35, openTagStart: 11, openTagEnd: 17, closeTagStart: 28, closeTagEnd: 35, rule: 'html', isBlock : true, children : [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 19, end : 28, children : [ { type : 'text', text : 'Some text', start : 19, end : 28 } ] } ] } ] } ] } ] } ] ); }); @@ -206,38 +206,38 @@ describe("WikiText parser tests", function() { it("should parse inline macro calls", function() { expect(parse("<>< >< >< >")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"transclude","start":8,"end":16,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"paul"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"paul"}]},{"type":"transclude","start":16,"end":26,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"george"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"george"}]},{"type":"transclude","start":26,"end":35,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"ringo"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"ringo"}]}],"start":0,"end":35}] + [{"type":"element","tag":"p", attributes : { dir : { type : 'string', value : 'auto' } },"children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"transclude","start":8,"end":16,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"paul"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"paul"}]},{"type":"transclude","start":16,"end":26,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"george"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"george"}]},{"type":"transclude","start":26,"end":35,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"ringo"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"ringo"}]}],"start":0,"end":35}] ); expect(parse("text < >")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":92,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"},"one":{"name":"one","type":"string","value":"val1","start":11,"end":20},"two":{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},"three":{"name":"three","type":"string","value":"val '3'","start":35,"end":52},"four":{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},"five":{"name":"five","type":"string","value":"val 5","start":73,"end":89}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"one","type":"string","value":"val1","start":11,"end":20},{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},{"name":"three","type":"string","value":"val '3'","start":35,"end":52},{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},{"name":"five","type":"string","value":"val 5","start":73,"end":89}]}],"start":0,"end":92}] + [{"type":"element","tag":"p", attributes : { dir : { type : 'string', value : 'auto' } },"children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":92,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"},"one":{"name":"one","type":"string","value":"val1","start":11,"end":20},"two":{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},"three":{"name":"three","type":"string","value":"val '3'","start":35,"end":52},"four":{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},"five":{"name":"five","type":"string","value":"val 5","start":73,"end":89}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"one","type":"string","value":"val1","start":11,"end":20},{"name":"two","type":"string","value":"val \"2\"","start":20,"end":35},{"name":"three","type":"string","value":"val '3'","start":35,"end":52},{"name":"four","type":"string","value":"val 4\"5'","start":52,"end":73},{"name":"five","type":"string","value":"val 5","start":73,"end":89}]}],"start":0,"end":92}] ); expect(parse("ignored << carrots < >")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"text","text":"ignored << carrots ","start":0,"end":19},{"type":"transclude","start":19,"end":27,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":27}] + [{"type":"element","tag":"p", attributes : { dir : { type : 'string', value : 'auto' } },"children":[{"type":"text","text":"ignored << carrots ","start":0,"end":19},{"type":"transclude","start":19,"end":27,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":27}] ); expect(parse("text << >")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":14,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":" >")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"text","text":"before\n","start":0,"end":7},{"type":"transclude","start":7,"end":15,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":15}] + [{"type":"element","tag":"p", attributes : { dir : { type : 'string', value : 'auto' } },"children":[{"type":"text","text":"before\n","start":0,"end":7},{"type":"transclude","start":7,"end":15,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]}],"start":0,"end":15}] ); // A single space will cause it to be inline expect(parse("< > ")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"text","text":" ","start":8,"end":9}],"start":0,"end":9}] + [{"type":"element","tag":"p", attributes : { dir : { type : 'string', value : 'auto' } },"children":[{"type":"transclude","start":0,"end":8,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"}]},{"type":"text","text":" ","start":8,"end":9}],"start":0,"end":9}] ); expect(parse("text < >' >>")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":34,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"outie"},"one":{"name":"one","type":"string","value":"my < >","start":12,"end":31}},"orderedAttributes":[{"name":"$variable","type":"string","value":"outie"},{"name":"one","type":"string","value":"my < >","start":12,"end":31}]}],"start":0,"end":34}] + [{"type":"element","tag":"p", attributes : { dir : { type : 'string', value : 'auto' } },"children":[{"type":"text","text":"text ","start":0,"end":5},{"type":"transclude","start":5,"end":34,"rule":"macrocallinline","attributes":{"$variable":{"name":"$variable","type":"string","value":"outie"},"one":{"name":"one","type":"string","value":"my < >","start":12,"end":31}},"orderedAttributes":[{"name":"$variable","type":"string","value":"outie"},{"name":"one","type":"string","value":"my < >","start":12,"end":31}]}],"start":0,"end":34}] ); @@ -256,17 +256,17 @@ describe("WikiText parser tests", function() { ); expect(parse("<< carrots\n\n< >")).toEqual( - [ { type: 'element', tag: 'p', start : 0, end : 10, children: [ { type: 'text', text: '<< carrots', start : 0, end : 10 } ] }, { type: 'transclude', start: 12, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 20, isBlock: true } ] + [ { type: 'element', tag: 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 10, children: [ { type: 'text', text: '<< carrots', start : 0, end : 10 } ] }, { type: 'transclude', start: 12, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 20, isBlock: true } ] ); expect(parse("before\n\n< >")).toEqual( - [ { type: 'element', tag: 'p', start : 0, end : 6, children: [ { type: 'text', text: 'before', start : 0, end : 6 } ] }, { type: 'transclude', start: 8, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 16, isBlock: true } ] + [ { type: 'element', tag: 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 6, children: [ { type: 'text', text: 'before', start : 0, end : 6 } ] }, { type: 'transclude', start: 8, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 16, isBlock: true } ] ); expect(parse("< >\nafter")).toEqual( - [ { type: 'transclude', start: 0, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 8, isBlock: true }, { type: 'element', tag: 'p', start: 9, end: 14, children: [ { type: 'text', text: 'after', start: 9, end: 14 } ] } ] + [ { type: 'transclude', start: 0, rule: 'macrocallblock', attributes: { $variable: {name: "$variable", type:"string", value: "john"} }, orderedAttributes: [ {name: "$variable", type:"string", value: "john"} ], end: 8, isBlock: true }, { type: 'element', tag: 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start: 9, end: 14, children: [ { type: 'text', text: 'after', start: 9, end: 14 } ] } ] ); expect(parse("< >")).toEqual( @@ -294,7 +294,7 @@ describe("WikiText parser tests", function() { ); expect(parse("< >>")).toEqual( - [{"type":"element","tag":"p","children":[{"type":"transclude","start":0,"end":14,"rule":"macrocallinline","attributes":{"0":{"name":"0","type":"string","value":"param","start":6,"end":12},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"param","start":6,"end":12}]},{"type":"text","text":">","start":14,"end":15}],"start":0,"end":15}] + [{"type":"element","tag":"p","attributes":{"dir":{type:"string",value:"auto"}},"children":[{"type":"transclude","start":0,"end":14,"rule":"macrocallinline","attributes":{"0":{"name":"0","type":"string","value":"param","start":6,"end":12},"$variable":{"name":"$variable","type":"string","value":"john"}},"orderedAttributes":[{"name":"$variable","type":"string","value":"john"},{"name":"0","type":"string","value":"param","start":6,"end":12}]},{"type":"text","text":">","start":14,"end":15}],"start":0,"end":15}] ); // equals signs should be allowed @@ -309,7 +309,7 @@ describe("WikiText parser tests", function() { it("should parse horizontal rules", function() { expect(parse("---Not a rule\n\n----\n\nBetween\n\n---")).toEqual( - [ { type : 'element', tag : 'p', start : 0, end : 13, children : [ { type : 'entity', entity : '—', start: 0, end: 3, rule: 'dash' }, { type : 'text', text : 'Not a rule', start : 3, end : 13 } ] }, { type : 'element', tag : 'hr', start: 15, end: 20, rule: 'horizrule' }, { type : 'element', tag : 'p', start : 21, end : 28, children : [ { type : 'text', text : 'Between', start : 21, end : 28 } ] }, { type : 'element', tag : 'hr', start: 30, end: 33, rule: 'horizrule' } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 0, end : 13, children : [ { type : 'entity', entity : '—', start: 0, end: 3, rule: 'dash' }, { type : 'text', text : 'Not a rule', start : 3, end : 13 } ] }, { type : 'element', tag : 'hr', start: 15, end: 20, rule: 'horizrule' }, { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, start : 21, end : 28, children : [ { type : 'text', text : 'Between', start : 21, end : 28 } ] }, { type : 'element', tag : 'hr', start: 30, end: 33, rule: 'horizrule' } ] ); @@ -318,7 +318,7 @@ describe("WikiText parser tests", function() { it("should parse hard linebreak areas", function() { expect(parse("\"\"\"Something\nin the\nway she moves\n\"\"\"\n\n")).toEqual( - [ { type : 'element', tag : 'p', children : [ { type : 'text', text : 'Something', start : 3, end : 12, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 12, end: 13 }, { type : 'text', text : 'in the', start : 13, end : 19, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 19, end: 20 }, { type : 'text', text : 'way she moves', start : 20, end : 33, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 33, end: 34 } ], start : 0, end : 37 } ] + [ { type : 'element', tag : 'p', attributes : { dir : { type : 'string', value : 'auto' } }, children : [ { type : 'text', text : 'Something', start : 3, end : 12, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 12, end: 13 }, { type : 'text', text : 'in the', start : 13, end : 19, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 19, end: 20 }, { type : 'text', text : 'way she moves', start : 20, end : 33, rule: 'hardlinebreaks' }, { type : 'element', tag : 'br', rule: 'hardlinebreaks', start: 33, end: 34 } ], start : 0, end : 37 } ] ); diff --git a/editions/test/tiddlers/tests/test-wikitext.js b/editions/test/tiddlers/tests/test-wikitext.js index eddef73f7..0f17ec0fc 100644 --- a/editions/test/tiddlers/tests/test-wikitext.js +++ b/editions/test/tiddlers/tests/test-wikitext.js @@ -34,40 +34,40 @@ describe("WikiText tests", function() { }); it("should render plain text tiddlers as a paragraph", function() { - expect(wiki.renderTiddler("text/html","TiddlerOne")).toBe(" The quick brown fox
"); + expect(wiki.renderTiddler("text/html","TiddlerOne")).toBe("The quick brown fox
"); }); it("should preserve single new lines", function() { - expect(wiki.renderTiddler("text/html","TiddlerTwo")).toBe("The rain in Spain\nfalls mainly on the plain
"); + expect(wiki.renderTiddler("text/html","TiddlerTwo")).toBe("The rain in Spain\nfalls mainly on the plain
"); }); it("should use double new lines to create paragraphs", function() { - expect(wiki.renderTiddler("text/html","TiddlerThree")).toBe("The speed of sound
The light of speed
"); + expect(wiki.renderTiddler("text/html","TiddlerThree")).toBe("The speed of sound
The light of speed
"); }); it("should support attributes specified as macro invocations", function() { - expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe(""); + expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe(""); }); it("handles style wikitext notation", function() { expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@.myclass\n!header\n@@")).toBe("header
"); - expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@.myclass\n\n\nContent\n@@")).toBe(""); + expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@.myclass\nContent
\n\nContent\n@@")).toBe(""); expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@.myclass\n---\n@@")).toBe("Content
"); // Test styles can be added too - expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@color:red;\n\n\nContent\n@@")).toBe(""); + expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@color:red;\nContent
\n\nContent\n@@")).toBe(""); expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@color:red;\n---\n@@")).toBe("Content
"); }); it("handles inline style wikitext notation", function() { expect(wiki.renderText("text/html","text/vnd-tiddlywiki", - "some @@highlighted@@ text")).toBe('some highlighted text
'); + "some @@highlighted@@ text")).toBe('some highlighted text
'); expect(wiki.renderText("text/html","text/vnd-tiddlywiki", - "some @@color:green;.tc-inline-style 1 style and 1 class@@ text")).toBe('some 1 style and 1 class text
'); + "some @@color:green;.tc-inline-style 1 style and 1 class@@ text")).toBe('some 1 style and 1 class text
'); expect(wiki.renderText("text/html","text/vnd-tiddlywiki", - "some @@background-color:red;red@@ text")).toBe('some red text
'); + "some @@background-color:red;red@@ text")).toBe('some red text
'); expect(wiki.renderText("text/html","text/vnd-tiddlywiki", - "some @@.myClass class@@ text")).toBe('some class text
'); + "some @@.myClass class@@ text")).toBe('some class text
'); expect(wiki.renderText("text/html","text/vnd-tiddlywiki", - "some @@.myClass.secondClass 2 classes@@ text")).toBe('some 2 classes text
'); + "some @@.myClass.secondClass 2 classes@@ text")).toBe('some 2 classes text
'); expect(wiki.renderText("text/html","text/vnd-tiddlywiki", - "some @@background:red;.myClass style and class@@ text")).toBe('some style and class text
'); + "some @@background:red;.myClass style and class@@ text")).toBe('some style and class text
'); expect(wiki.renderText("text/html","text/vnd-tiddlywiki", - "some @@background:red;color:white;.myClass 2 style and 1 class@@ text")).toBe('some 2 style and 1 class text
'); + "some @@background:red;color:white;.myClass 2 style and 1 class@@ text")).toBe('some 2 style and 1 class text
'); }); }); diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/FilterMissingTiddler.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/FilterMissingTiddler.tid index 5c8f242fc..add04d9a2 100644 --- a/editions/tw5.com/tiddlers/testcases/DataWidget/FilterMissingTiddler.tid +++ b/editions/tw5.com/tiddlers/testcases/DataWidget/FilterMissingTiddler.tid @@ -14,4 +14,4 @@ title: Output + title: ExpectedResult -[]
\ No newline at end of file +[]
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCompound.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCompound.tid index 20e967316..950e4b007 100644 --- a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCompound.tid +++ b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCompound.tid @@ -23,7 +23,7 @@ This is a payload tiddler from a compound tiddler + title: ExpectedResult -[ +
[ { "title": "Payload Tiddler", "tags": "Alpha Beta Gamma", diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCustomTitle.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCustomTitle.tid index 5eb48cde4..3e6a67d72 100644 --- a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCustomTitle.tid +++ b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCustomTitle.tid @@ -20,7 +20,7 @@ This is the tiddler HelloThere + title: ExpectedResult -
[ +
[ { "title": "RealTitle", "tags": "Definitions", diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedFilter.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedFilter.tid index 3e7416fe3..0781d920f 100644 --- a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedFilter.tid +++ b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedFilter.tid @@ -35,7 +35,7 @@ text: Today is Sunday + title: ExpectedResult -
[ +
[ { "title": "Day: Thursday", "text": "Today is Thursday", diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedTiddler.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedTiddler.tid index 02b89726c..5b89fc267 100644 --- a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedTiddler.tid +++ b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportedTiddler.tid @@ -19,7 +19,7 @@ This is the Hello tiddler + title: ExpectedResult -
[ +
[ { "title": "Hello", "modifier": "JoeBloggs", diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/Refreshing.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/Refreshing.tid index 92fc32090..99969ee14 100644 --- a/editions/tw5.com/tiddlers/testcases/DataWidget/Refreshing.tid +++ b/editions/tw5.com/tiddlers/testcases/DataWidget/Refreshing.tid @@ -22,7 +22,7 @@ title: Actions + title: ExpectedResult -
[ +
[ { "title": "Epsilon", "text": "Theta" diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/SimpleTiddler.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/SimpleTiddler.tid index 633ecb0b8..85c57ef21 100644 --- a/editions/tw5.com/tiddlers/testcases/DataWidget/SimpleTiddler.tid +++ b/editions/tw5.com/tiddlers/testcases/DataWidget/SimpleTiddler.tid @@ -14,7 +14,7 @@ title: Output + title: ExpectedResult -
[ +
[ { "title": "Epsilon", "text": "Theta" diff --git a/editions/tw5.com/tiddlers/testcases/HTML/BlockModeInHTMLTable.tid b/editions/tw5.com/tiddlers/testcases/HTML/BlockModeInHTMLTable.tid index f7050de7d..5f39b47c6 100644 --- a/editions/tw5.com/tiddlers/testcases/HTML/BlockModeInHTMLTable.tid +++ b/editions/tw5.com/tiddlers/testcases/HTML/BlockModeInHTMLTable.tid @@ -25,6 +25,6 @@ title: Output + title: ExpectedResult -
+
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInBoldSyntax.tid b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInBoldSyntax.tid index f6072bca4..c421e1d9b 100644 --- a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInBoldSyntax.tid +++ b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInBoldSyntax.tid @@ -19,4 +19,4 @@ title: Output + title: ExpectedResult -
- list item one
- list item two
nested table \ No newline at end of file +
- list item one
- list item two
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInTableSyntax.tid b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInTableSyntax.tid index 0835c47bc..852f8dfc4 100644 --- a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInTableSyntax.tid +++ b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInTableSyntax.tid @@ -19,4 +19,4 @@ title: Output + title: ExpectedResult -
- list item one
- list item two
|For a blank line after open tag|
| \ No newline at end of file +
- list is recognised
- but the surrounding table row is not
|For a blank line after open tag|
| \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagNoBlankLine.tid b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagNoBlankLine.tid index e49fcabfb..2f98f0268 100644 --- a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagNoBlankLine.tid +++ b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagNoBlankLine.tid @@ -23,7 +23,7 @@ This also is not a new paragraph. + title: ExpectedResult -
- list is recognised
- but the surrounding table row is not
+* Open tag without a blank line means * block mode punctuation (i.e. this list) will * NOT be recognised. diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid index 27361b335..f1d0a0410 100644 --- a/editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/AccordionSlider.tid @@ -27,4 +27,4 @@ And this is some text + title: ExpectedResult -\ No newline at end of file +\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid index 3defafd48..f542a89b1 100644 --- a/editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/Popup.tid @@ -24,4 +24,4 @@ And this is some text + title: ExpectedResult -\ No newline at end of file +
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid index b73eaa83f..2d32c2ad3 100644 --- a/editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/SimpleReveal.tid @@ -23,5 +23,5 @@ And this is some text + title: ExpectedResult -
+
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid b/editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid index e21230033..f698b586a 100644 --- a/editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid +++ b/editions/tw5.com/tiddlers/testcases/RevealWidget/TextReference.tid @@ -18,6 +18,6 @@ jeremy: tiddlywiki + title: ExpectedResult -
+
\ No newline at end of file + \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geodifference.tid b/plugins/tiddlywiki/geospatial/tests/operators/geodifference.tid index 5f525cebc..0775cbfbe 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geodifference.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geodifference.tid @@ -51,4 +51,4 @@ type: application/json + title: ExpectedResult -TiddlyWiki!
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/TestCaseWidget/FailingTest.tid b/editions/tw5.com/tiddlers/testcases/TestCaseWidget/FailingTest.tid index bad3e1395..dce1892c7 100644 --- a/editions/tw5.com/tiddlers/testcases/TestCaseWidget/FailingTest.tid +++ b/editions/tw5.com/tiddlers/testcases/TestCaseWidget/FailingTest.tid @@ -12,4 +12,4 @@ title: Output The sum is <$text text={{{ [[2]add[2]] }}}/>. + title: ExpectedResult -text:The sum is not 8.
+text:The sum is not 8.
diff --git a/editions/tw5.com/tiddlers/testcases/TestCaseWidget/currentTiddler.tid b/editions/tw5.com/tiddlers/testcases/TestCaseWidget/currentTiddler.tid index 824a2b17f..3851e9986 100644 --- a/editions/tw5.com/tiddlers/testcases/TestCaseWidget/currentTiddler.tid +++ b/editions/tw5.com/tiddlers/testcases/TestCaseWidget/currentTiddler.tid @@ -13,4 +13,4 @@ title: Output + title: ExpectedResult -Output
\ No newline at end of file +Output
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/testcases/TranscludeWidget/SimpleTransclusion.tid b/editions/tw5.com/tiddlers/testcases/TranscludeWidget/SimpleTransclusion.tid index 0e5be222c..62f17d464 100644 --- a/editions/tw5.com/tiddlers/testcases/TranscludeWidget/SimpleTransclusion.tid +++ b/editions/tw5.com/tiddlers/testcases/TranscludeWidget/SimpleTransclusion.tid @@ -20,4 +20,4 @@ title: Address 14 Carrot Street, Vegetabletown + title: ExpectedResult -text:Good morning, my name is Robert Rabbit and I live in 14 Carrot Street, Vegetabletown
\ No newline at end of file +text:Good morning, my name is Robert Rabbit and I live in 14 Carrot Street, Vegetabletown
\ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geodifference-interactive.tid b/plugins/tiddlywiki/geospatial/tests/operators/geodifference-interactive.tid index ca9d8a954..dc9751c08 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geodifference-interactive.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geodifference-interactive.tid @@ -60,4 +60,4 @@ type: application/json + title: ExpectedResult -{"type":"FeatureCollection","features":[]}
\ No newline at end of file +{"type":"FeatureCollection","features":[]}
\ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geodistance.tid b/plugins/tiddlywiki/geospatial/tests/operators/geodistance.tid index 75d1e9259..803cda28b 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 -3406.2115173004354,3406.2115173004354,5481.766068098352,49.241105484826875,0.8604235593111019,3406.2115173004354
\ 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/geointersect-interactive.tid b/plugins/tiddlywiki/geospatial/tests/operators/geointersect-interactive.tid index 05a7f9759..c8dba521b 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geointersect-interactive.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geointersect-interactive.tid @@ -60,4 +60,4 @@ type: application/json + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geointersect.tid b/plugins/tiddlywiki/geospatial/tests/operators/geointersect.tid index 3a205df97..3a9e4312a 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geointersect.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geointersect.tid @@ -51,4 +51,4 @@ type: application/json + title: ExpectedResult -{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[101,1],[102,1],[102,2],[101,2],[101,1]]]}}]}
\ No newline at end of file +{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[101,1],[102,1],[102,2],[101,2],[101,1]]]}}]}
\ 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 b363a48a2..200047133 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geolookup.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geolookup.tid @@ -61,4 +61,4 @@ type: application/json + title: ExpectedResult -boxfish
\ No newline at end of file +boxfish
\ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid b/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid index 08fc3e023..c425fdf56 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint.tid @@ -25,4 +25,4 @@ title: Output + title: ExpectedResult -Oxford,Winchester,
\ 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 9cb509ad0..b30b57844 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint2.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geonearestpoint2.tid @@ -42,4 +42,4 @@ title: Output + title: ExpectedResult -Oxford
\ No newline at end of file +Oxford
\ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geounion-interactive.tid b/plugins/tiddlywiki/geospatial/tests/operators/geounion-interactive.tid index 86998a7c8..c797c66ff 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geounion-interactive.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geounion-interactive.tid @@ -60,4 +60,4 @@ type: application/json + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/operators/geounion.tid b/plugins/tiddlywiki/geospatial/tests/operators/geounion.tid index faa63cccd..3552c1997 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/geounion.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/geounion.tid @@ -51,4 +51,4 @@ type: application/json + title: ExpectedResult -{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[100,0],[102,0],[102,1],[103,1],[103,3],[101,3],[101,2],[100,2],[100,0]]]}}]}
\ No newline at end of file +{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[100,0],[102,0],[102,1],[103,1],[103,3],[101,3],[101,2],[100,2],[100,0]]]}}]}
\ 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 c13c60855..3c490d15f 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":[[[-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":"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/geospatial/tests/operators/olc-encode.tid b/plugins/tiddlywiki/geospatial/tests/operators/olc-encode.tid index e507b6004..d18d6ec4b 100644 --- a/plugins/tiddlywiki/geospatial/tests/operators/olc-encode.tid +++ b/plugins/tiddlywiki/geospatial/tests/operators/olc-encode.tid @@ -15,6 +15,6 @@ title: Output + title: ExpectedResult -(9C3WQP2R+QV) +
(9C3WQP2R+QV) (9C3WQP2R+QVH)
\ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/widgets/geomap-draggable-marker.tid b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-draggable-marker.tid index f79ea8441..023932c59 100644 --- a/plugins/tiddlywiki/geospatial/tests/widgets/geomap-draggable-marker.tid +++ b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-draggable-marker.tid @@ -37,4 +37,4 @@ title: Output + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid index 1a8cdb686..7d2f012ee 100644 --- a/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid +++ b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid @@ -16,4 +16,4 @@ title: Output + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/widgets/geomap-refresh.tid b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-refresh.tid index 3a0e61fda..f1a4157d1 100644 --- a/plugins/tiddlywiki/geospatial/tests/widgets/geomap-refresh.tid +++ b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-refresh.tid @@ -56,7 +56,7 @@ Click here to enable the layer + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file diff --git a/plugins/tiddlywiki/geospatial/tests/widgets/geomap.tid b/plugins/tiddlywiki/geospatial/tests/widgets/geomap.tid index 44737ea8a..40343b668 100644 --- a/plugins/tiddlywiki/geospatial/tests/widgets/geomap.tid +++ b/plugins/tiddlywiki/geospatial/tests/widgets/geomap.tid @@ -51,4 +51,4 @@ title: Output + title: ExpectedResult - \ No newline at end of file + \ No newline at end of file