Make sure the parser rules have unique names

core/modules/parsers/wikiparser/rules/filteredtranscludeblock.js

@@ -20,7 +20,7 @@ Wiki text rule for block-level filtered transclusion. For example:
 /*global $tw: false */
 "use strict";
 
-exports.name = "filteredtransclude";
+exports.name = "filteredtranscludeblock";
 exports.types = {block: true};
 
 exports.init = function(parser) {
@@ -35,7 +35,7 @@ exports.parse = function() {
 	// Get the match details
 	var filter = this.match[1],
 		tooltip = this.match[2],
-		template = this.match[3],
+		template = $tw.utils.trim(this.match[3]),
 		style = this.match[4],
 		classes = this.match[5];
 	// Return the list widget

core/modules/parsers/wikiparser/rules/filteredtranscludeinline.js

@@ -20,7 +20,7 @@ Wiki text rule for inline filtered transclusion. For example:
 /*global $tw: false */
 "use strict";
 
-exports.name = "filteredtransclude";
+exports.name = "filteredtranscludeinline";
 exports.types = {inline: true};
 
 exports.init = function(parser) {
@@ -35,7 +35,7 @@ exports.parse = function() {
 	// Get the match details
 	var filter = this.match[1],
 		tooltip = this.match[2],
-		template = this.match[3],
+		template = $tw.utils.trim(this.match[3]),
 		style = this.match[4],
 		classes = this.match[5];
 	// Return the list widget

core/modules/parsers/wikiparser/rules/macrocallblock.js

@@ -16,7 +16,7 @@ Wiki rule for block macro calls
 /*global $tw: false */
 "use strict";
 
-exports.name = "macrocall";
+exports.name = "macrocallblock";
 exports.types = {block: true};
 
 exports.init = function(parser) {

core/modules/parsers/wikiparser/rules/macrocallinline.js

@@ -16,7 +16,7 @@ Wiki rule for macro calls
 /*global $tw: false */
 "use strict";
 
-exports.name = "macrocall";
+exports.name = "macrocallinline";
 exports.types = {inline: true};
 
 exports.init = function(parser) {

core/modules/parsers/wikiparser/rules/transcludeblock.js

@@ -20,7 +20,7 @@ Wiki text rule for block-level transclusion. For example:
 /*global $tw: false */
 "use strict";
 
-exports.name = "transclude";
+exports.name = "transcludeblock";
 exports.types = {block: true};
 
 exports.init = function(parser) {
@@ -33,9 +33,9 @@ exports.parse = function() {
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
-	var targetTitle = this.match[1],
+	var targetTitle = $tw.utils.trim(this.match[1]),
 		tooltip = this.match[2],
-		template = this.match[3],
+		template = $tw.utils.trim(this.match[3]),
 		style = this.match[4],
 		classes = this.match[5];
 	// Return the transclude widget

core/modules/parsers/wikiparser/rules/transcludeinline.js

@@ -20,7 +20,7 @@ Wiki text rule for inline-level transclusion. For example:
 /*global $tw: false */
 "use strict";
 
-exports.name = "transclude";
+exports.name = "transcludeinline";
 exports.types = {inline: true};
 
 exports.init = function(parser) {
@@ -33,9 +33,9 @@ exports.parse = function() {
 	// Move past the match
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Get the match details
-	var targetTitle = this.match[1],
+	var targetTitle = $tw.utils.trim(this.match[1]),
 		tooltip = this.match[2],
-		template = this.match[3],
+		template = $tw.utils.trim(this.match[3]),
 		style = this.match[4],
 		classes = this.match[5];
 	// Return the transclude widget