From 5d413d3e2d8202b80ef44d450d1de79bc3133cac Mon Sep 17 00:00:00 2001
From: "jeremy@jermolene.com" <jeremy@jermolene.com>
Date: Sat, 28 May 2022 13:49:02 +0100
Subject: [PATCH] Change to `?` for conditional definitions

---
 core/modules/parsers/wikiparser/rules/fnprocdef.js        | 4 ++--
 core/modules/parsers/wikiparser/rules/macrodef.js         | 4 ++--
 core/wiki/macros/tabs.tid                                 | 8 ++++----
 .../data/globals/ProceduresWithConditionalDefinitions.tid | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/modules/parsers/wikiparser/rules/fnprocdef.js b/core/modules/parsers/wikiparser/rules/fnprocdef.js
index 17e069397..c67915bf9 100644
--- a/core/modules/parsers/wikiparser/rules/fnprocdef.js
+++ b/core/modules/parsers/wikiparser/rules/fnprocdef.js
@@ -35,7 +35,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\(\+?)(function|procedure|widget)\s+([^(\s]+)(\(\s*([^)]*)\))?(\s*\r?\n)?/mg;
+	this.matchRegExp = /^\\(\??)(function|procedure|widget)\s+([^(\s]+)(\(\s*([^)]*)\))?(\s*\r?\n)?/mg;
 };
 
 /*
@@ -91,7 +91,7 @@ exports.parse = function() {
 	if(this.parser.configTrimWhiteSpace) {
 		parseTreeNodes[0].configTrimWhiteSpace = true;
 	}
-	if(this.match[1] === "+") {
+	if(this.match[1] === "?") {
 		$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"conditional","yes");
 	}
 	return parseTreeNodes;
diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js
index c8e88f740..5fac676b6 100644
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@@ -27,7 +27,7 @@ Instantiate parse rule
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /^\\(\+?)define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
+	this.matchRegExp = /^\\(\??)define\s+([^(\s]+)\(\s*([^)]*)\)(\s*\r?\n)?/mg;
 };
 
 /*
@@ -89,7 +89,7 @@ exports.parse = function() {
 	}];
 	$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"name",this.match[2]);
 	$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"value",text);
-	if(this.match[1] === "+") {
+	if(this.match[1] === "?") {
 		$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],"conditional","yes");
 	}
 	return parseTreeNodes;
diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid
index 934a97e24..6c11ce38c 100644
--- a/core/wiki/macros/tabs.tid
+++ b/core/wiki/macros/tabs.tid
@@ -3,7 +3,7 @@ code_body: yes
 parameters: (tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
 is-macro: yes
 
-\+define tabs-button()
+\?define tabs-button()
 \whitespace trim
 <$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}}>
 	<$tiddler tiddler=<<save-currentTiddler>>>
@@ -19,7 +19,7 @@ is-macro: yes
 </$button>
 \end
 
-\+define tabs-tab()
+\?define tabs-tab()
 \whitespace trim
 <$set name="save-currentTiddler" value=<<currentTiddler>>>
 	<$tiddler tiddler=<<currentTab>>>
@@ -28,14 +28,14 @@ is-macro: yes
 </$set>
 \end
 
-\+define tabs-tab-list()
+\?define tabs-tab-list()
 \whitespace trim
 <$list filter=<<__tabsList__>> variable="currentTab" storyview="pop">
 	<<tabs-tab>>
 </$list>
 \end
 
-\+define tabs-tab-body()
+\?define tabs-tab-body()
 \whitespace trim
 <$list filter=<<__tabsList__>> variable="currentTab">
 	<$reveal type="match" state=<<tabsState>> text=<<currentTab>> default=<<__default__>> retain=<<__retain__>> tag="div">
diff --git a/editions/test/tiddlers/tests/data/globals/ProceduresWithConditionalDefinitions.tid b/editions/test/tiddlers/tests/data/globals/ProceduresWithConditionalDefinitions.tid
index 330b042d3..8e6da42c6 100644
--- a/editions/test/tiddlers/tests/data/globals/ProceduresWithConditionalDefinitions.tid
+++ b/editions/test/tiddlers/tests/data/globals/ProceduresWithConditionalDefinitions.tid
@@ -14,7 +14,7 @@ title: $:/global/this-is-one
 
 \whitespace trim
 
-\+procedure example()
+\?procedure example()
 ONE
 \end