mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-11-03 17:13:05 +00:00
Code Issues Releases Wiki Activity

Merge branch 'parameterised-transclusions' into geospatial-plugin

Browse Source
This commit is contained in:
jeremy@jermolene.com
2023-04-02 14:01:20 +01:00
parent 594069836f 7ba666bd53
commit 3a42c86385
14 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/parsers/wikiparser/rules/macrodef.js
View File

@@ -58,7 +58,7 @@ exports.parse = function() {
var reEnd;
if(this.match[3]) {
// If so, the end of the body is marked with \end
reEnd = new RegExp("(\\r?\\n\\s*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
} else {
// Otherwise, the end of the definition is marked by the end of the line
reEnd = /($|\r?\n)/mg;