tiddlywiki 5.3.8 → 5.4.1

package/plugins/tiddlywiki/markdown/markdown-it-tiddlywiki.js

@@ -32,10 +32,10 @@ function escapeTWMarks(s) {
 
 // escape anything that could be interpreted as transclusion or syslink
 function render_code_inline(tokens,idx,options,env,slf) {
-	tokens[idx].attrJoin('class','_codified_');
-	return  '<code' + slf.renderAttrs(tokens[idx]) + '>'
+	tokens[idx].attrJoin("class","_codified_");
+	return  "<code" + slf.renderAttrs(tokens[idx]) + ">"
 		+ escapeTWMarks(md.utils.escapeHtml(tokens[idx].content))
-		+ '</code>';
+		+ "</code>";
 }
 
 function render_code_block(tokens,idx) {
@@ -43,17 +43,17 @@ function render_code_block(tokens,idx) {
 }
 
 function render_fence(tokens,idx) {
-	var info = tokens[idx].info ? md.utils.unescapeAll(tokens[idx].info).trim() : '';
+	var info = tokens[idx].info ? md.utils.unescapeAll(tokens[idx].info).trim() : "";
 	return '<$codeblock code=e"' + md.utils.escapeHtml(tokens[idx].content) + '" language="' + info.split(/(\s+)/g)[0] + '"/>\n';
 }
 
 // add a blank line after opening tag to activate TW block parsing
 function render_paragraph_open(tokens,idx) {
-	return tokens[idx].hidden ? '' : '<p>\n\n';
+	return tokens[idx].hidden ? "" : "<p>\n\n";
 }
 
 function render_paragraph_close(tokens,idx) {
-	return tokens[idx].hidden ? '' : '\n</p>\n';
+	return tokens[idx].hidden ? "" : "\n</p>\n";
 }
 
 // Replace footnote links with "qualified" internal links
@@ -63,16 +63,16 @@ function render_footnote_ref(tokens,idx,options,env,slf) {
 	var refid   = id;
 
 	if(tokens[idx].meta.subId > 0) {
-		refid += ':' + tokens[idx].meta.subId;
+		refid += ":" + tokens[idx].meta.subId;
 	}
-	return '<a class="footnote-ref" href=<<qualify "##fn' + id + '">> id=<<qualify "#fnref' + refid + '">>>' + caption + '</a>';
+	return '<a class="footnote-ref" href=<<qualify "##fn' + id + '">> id=<<qualify "#fnref' + refid + '">>>' + caption + "</a>";
 }
 
 function render_footnote_open(tokens,idx,options,env,slf) {
 	var id = slf.rules.footnote_anchor_name(tokens,idx,options,env,slf);
 
 	if(tokens[idx].meta.subId > 0) {
-		id += ':' + tokens[idx].meta.subId;
+		id += ":" + tokens[idx].meta.subId;
 	}
 	return '<li id=<<qualify "#fn' + id + '">>  class="footnote-item">';
 }
@@ -81,7 +81,7 @@ function render_footnote_anchor(tokens,idx,options,env,slf) {
 	var id = slf.rules.footnote_anchor_name(tokens,idx,options,env,slf);
 
 	if(tokens[idx].meta.subId > 0) {
-		id += ':' + tokens[idx].meta.subId;
+		id += ":" + tokens[idx].meta.subId;
 	}
 
 	// append variation selector to prevent display as Apple Emoji on iOS
@@ -90,7 +90,7 @@ function render_footnote_anchor(tokens,idx,options,env,slf) {
 
 // do not un-escape html entities and escape characters
 function render_text_special(tokens,idx) {
-	if(tokens[idx].info === 'entity') {
+	if(tokens[idx].info === "entity") {
 		return tokens[idx].markup;
 	}
 	return escapeTWMarks(md.utils.escapeHtml(tokens[idx].content));
@@ -106,15 +106,15 @@ function render_tw_expr(tokens,idx) {
 function render_token_attrs(token) {
 	var i, l, result;
 
-	if(!token.attrs) { return ''; }
+	if(!token.attrs) { return ""; }
 
-	result = '';
+	result = "";
 
 	for(i=0, l=token.attrs.length; i<l; i++) {
 		if(typeof token.attrs[i][1] === "object" && token.attrs[i][1] !== null) {
-			result += ' ' + md.utils.escapeHtml(token.attrs[i][0]) + '=' + token.attrs[i][1].value;
+			result += " " + md.utils.escapeHtml(token.attrs[i][0]) + "=" + token.attrs[i][1].value;
 		} else {
-			result += ' ' + md.utils.escapeHtml(token.attrs[i][0]) + '=e"' + md.utils.escapeHtml(token.attrs[i][1]) + '"';
+			result += " " + md.utils.escapeHtml(token.attrs[i][0]) + '=e"' + md.utils.escapeHtml(token.attrs[i][1]) + '"';
 		}
 	}
 
@@ -133,25 +133,20 @@ function findNextMatch(ruleinfo,pos) {
 }
 
 // Add inline rule "macrocall" to parse <<macroname ...>>
-var MacroCallRegEx = /<<([^\s>"'=]+)[^>]*>>/g;
 function tw_macrocallinline(state,silent) {
-	var match, max, pos = state.pos;
+	var ruleinfo = pluginOpts.inlineRules.macrocallinline;
 
-	// Check start
-	max = state.posMax;
-	if(state.src.charCodeAt(pos) !== 0x3C || state.src.charCodeAt(pos+1) !== 0x3C /* << */|| pos + 3 >= max) {
+	var pos = state.pos;
+	var matchIndex = findNextMatch(ruleinfo,pos);
+	if(matchIndex === undefined || matchIndex !== pos) {
 		return false;
 	}
 
-	MacroCallRegEx.lastIndex = pos;
-	match = MacroCallRegEx.exec(state.src);
-	if(!match || match.index !== pos) { return false; }
-
 	if(!silent) {
-		var token = state.push('tw_expr','',0);
-		token.content = state.src.slice(pos,pos+match[0].length);
+		var token = state.push("tw_expr","",0);
+		token.content = state.src.slice(pos,ruleinfo.rule.nextCall.end);
 	}
-	state.pos = MacroCallRegEx.lastIndex;
+	state.pos = ruleinfo.rule.nextCall.end;
 	return true;
 }
 
@@ -166,7 +161,7 @@ function tw_transcludeinline(state,silent) {
 	}
 
 	if(!silent) {
-		var token = state.push('tw_expr','',0);
+		var token = state.push("tw_expr","",0);
 		token.content = state.src.slice(pos,pos+ruleinfo.rule.match[0].length);
 	}
 	state.pos += ruleinfo.rule.match[0].length;
@@ -184,10 +179,10 @@ function tw_filteredtranscludeinline(state,silent) {
 	}
 
 	if(!silent) {
-		var token = state.push('tw_expr','',0);
+		var token = state.push("tw_expr","",0);
 		if(state.linkLevel > 0) {
 			var filter = ruleinfo.rule.match[1];
-			token.content = '<$text text={{{' + filter + '}}}/>';
+			token.content = "<$text text={{{" + filter + "}}}/>";
 		} else {
 			token.content = state.src.slice(pos,pos+ruleinfo.rule.match[0].length);
 		}
@@ -199,7 +194,7 @@ function tw_filteredtranscludeinline(state,silent) {
 // based on markdown-it html_block()
 var WidgetTagRegEx = [/^<\/?\$[a-zA-Z0-9\-\$\.]+(?=(\s|\/?>|$))/, /^$/];
 function tw_block(state,startLine,endLine,silent) {
-	var i, nextLine, token, lineText,
+	var nextLine, token, lineText,
 		pos = state.bMarks[startLine] + state.tShift[startLine],
 		max = state.eMarks[startLine];
 
@@ -240,7 +235,7 @@ function tw_block(state,startLine,endLine,silent) {
 
 	state.line = nextLine;
 
-	token         = state.push('html_block','',0);
+	token         = state.push("html_block","",0);
 	token.map     = [ startLine, nextLine ];
 	token.content = state.getLines(startLine,nextLine,state.blkIndent,true);
 
@@ -264,7 +259,7 @@ function tw_image(state,silent) {
 
 	if(!silent) {
 		var twNode = ruleinfo.rule.parse()[0];
-		var token = state.push('$image','$image',0);
+		var token = state.push("$image","$image",0);
 		$tw.utils.each(twNode.attributes,function(attr,id) {
 			switch(attr.type) {
 				case "filtered":
@@ -280,7 +275,7 @@ function tw_image(state,silent) {
 					token.attrSet(id,attr.value);
 			}
 		});
-		token.markup = 'tw_image';
+		token.markup = "tw_image";
 	}
 	state.pos = ruleinfo.rule.parser.pos;
 	return true;
@@ -303,23 +298,23 @@ function tw_prettylink(state,silent) {
 
 	if(!silent) {
 		var twNode = ruleinfo.rule.parse()[0];
-		var tag = (twNode.type==='link' ? '$link' : 'a');
+		var tag = (twNode.type==="link" ? "$link" : "a");
 		// push a link_open token so markdown's core.linkify will ignore
-		var token = state.push('link_open',tag,1);
+		var token = state.push("link_open",tag,1);
 
 		$tw.utils.each(twNode.attributes,function(attr,id) {
 			token.attrSet(id,attr.value);
 		});
-		token.attrJoin('class','_codified_');
-		token.markup = 'tw_prettylink';
+		token.attrJoin("class","_codified_");
+		token.markup = "tw_prettylink";
 
 		state.linkLevel++;
-		token = state.push('text','',0);
+		token = state.push("text","",0);
 		token.content = twNode.children[0].text;
 		state.linkLevel--;
 
-		token = state.push('link_close',tag,-1);
-		token.markup = 'tw_prettylink';
+		token = state.push("link_close",tag,-1);
+		token.markup = "tw_prettylink";
 	}
 	state.pos = ruleinfo.rule.parser.pos;
 	return true;
@@ -341,21 +336,21 @@ function tw_prettyextlink(state,silent) {
 
 	if(!silent) {
 		var twNode = ruleinfo.rule.parse()[0];
-		var token = state.push('link_open','a',1);
+		var token = state.push("link_open","a",1);
 
 		$tw.utils.each(twNode.attributes,function(attr,id) {
 			token.attrSet(id,attr.value);
 		});
-		token.attrJoin('class','_codified_');
-		token.markup = 'tw_prettyextlink';
+		token.attrJoin("class","_codified_");
+		token.markup = "tw_prettyextlink";
 
 		state.linkLevel++;
-		token = state.push('text','',0);
+		token = state.push("text","",0);
 		token.content = twNode.children[0].text;
 		state.linkLevel--;
 
-		token = state.push('link_close','a',-1);
-		token.markup = 'tw_prettyextlink';
+		token = state.push("link_close","a",-1);
+		token.markup = "tw_prettyextlink";
 	}
 	state.pos = ruleinfo.rule.parser.pos;
 	return true;
@@ -369,11 +364,11 @@ function extendHtmlInline(origRule) {
 		}
 
 		var token, pos = state.pos;
-		var parseTag = $tw.Wiki.parsers['text/vnd.tiddlywiki'].prototype.inlineRuleClasses.html.prototype.parseTag;
+		var parseTag = $tw.Wiki.parsers["text/vnd.tiddlywiki"].prototype.inlineRuleClasses.html.prototype.parseTag;
 		var tag = parseTag(state.src,pos,{});
 		if(tag) {
 			if(!silent) {
-				token = state.push('html_inline','',0);
+				token = state.push("html_inline","",0);
 				token.content = state.src.slice(pos,tag.end);
 			}
 			state.pos = tag.end;
@@ -387,7 +382,7 @@ function extendHtmlInline(origRule) {
 		}
 
 		if(!silent) {
-			token = state.push('html_inline','',0);
+			token = state.push("html_inline","",0);
 			token.content = state.src.slice(pos,pos + match[0].length);
 		}
 		state.pos = TWCloseTagRegEx.lastIndex;
@@ -410,7 +405,7 @@ function extendParseLinkLabel(origFunc) {
 // reset each tw inline rule to initial inline state
 function extendInlineParse(thisArg,origFunc,twInlineRules) {
 	return function(str,md,env,outTokens) {
-		var i, ruleinfo, key;
+		var ruleinfo, key;
 		for(key in twInlineRules) {
 			ruleinfo = twInlineRules[key];
 			ruleinfo.rule.parser.source = str;
@@ -419,7 +414,7 @@ function extendInlineParse(thisArg,origFunc,twInlineRules) {
 			ruleinfo.matchIndex = -1;
 		}
 		origFunc.call(thisArg,str,md,env,outTokens);
-	}
+	};
 }
 
 /// post processing ///
@@ -429,51 +424,52 @@ function wikify(state) {
 	var tagStack = [];
 
 	state.tokens.forEach(function(blockToken) {
-		if(blockToken.type === 'inline' && blockToken.children) {
+		if(blockToken.type === "inline" && blockToken.children) {
 			blockToken.children.forEach(function(token) {
 				switch(token.type) {
-				case 'link_open':
-					if(token.markup === 'tw_prettylink' || token.markup === 'tw_prettyextlink') {
-						return;
-					}
-					href = token.attrGet('href');
-					if(href[0] === '#') {
-						token.tag = '$link';
-						href = $tw.utils.decodeURIComponentSafe(href.substring(1));
-						title = token.attrGet('title');
-						token.attrs = [['to', href], ['class', '_codified_']];
+					case "link_open":
+						if(token.markup === "tw_prettylink" || token.markup === "tw_prettyextlink") {
+							return;
+						}
+						href = token.attrGet("href");
+						if(href[0] === "#") {
+							token.tag = "$link";
+							href = $tw.utils.decodeURIComponentSafe(href.substring(1));
+							title = token.attrGet("title");
+							token.attrs = [["to", href], ["class", "_codified_"]];
+							if(title) {
+								token.attrSet("tooltip",title);
+							}
+						} else {
+							token.attrSet("target","_blank");
+							token.attrJoin("class","tc-tiddlylink-external");
+							token.attrJoin("class","_codified_");
+							token.attrSet("rel","noopener noreferrer");
+						}
+						tagStack.push(token.tag);
+						break;
+					case "link_close":
+						if(token.markup === "tw_prettylink" || token.markup === "tw_prettyextlink") {
+							return;
+						}
+						token.tag = tagStack.pop();
+						break;
+					case "image":
+						token.tag = "$image";
+						src = token.attrGet("src");
+						alt = token.attrGet("alt");
+						token.attrSet("alt",alt);
+						title = token.attrGet("title");
+
+						token.attrs[token.attrIndex("src")][0] = "source";
+						if(src[0] === "#") {
+							src = $tw.utils.decodeURIComponentSafe(src.substring(1));
+							token.attrSet("source",src);
+						}
 						if(title) {
-							token.attrSet('tooltip',title);
+							token.attrs[token.attrIndex("title")][0] = "tooltip";
 						}
-					} else {
-						token.attrSet('target','_blank');
-						token.attrJoin('class','tc-tiddlylink-external');
-						token.attrJoin('class','_codified_');
-						token.attrSet('rel','noopener noreferrer');
-					}
-					tagStack.push(token.tag);
-					break;
-				case 'link_close':
-					if(token.markup === 'tw_prettylink' || token.markup === 'tw_prettyextlink') {
-						return;
-					}
-					token.tag = tagStack.pop();
-					break;
-				case 'image':
-					token.tag = '$image';
-					src = token.attrGet('src');
-					alt = token.attrGet('alt');
-					title = token.attrGet('title');
-
-					token.attrs[token.attrIndex('src')][0] = 'source';
-					if(src[0] === '#') {
-						src = $tw.utils.decodeURIComponentSafe(src.substring(1));
-						token.attrSet('source',src);
-					}
-					if(title) {
-						token.attrs[token.attrIndex('title')][0] = 'tooltip';
-					}
-					break;
+						break;
 				}
 			});
 		}
@@ -506,29 +502,31 @@ module.exports = function tiddlyWikiPlugin(markdown,options) {
 		md.helpers.parseLinkLabel = extendParseLinkLabel(md.helpers.parseLinkLabel);
 
 		if(pluginOpts.inlineRules.image) {
-			md.inline.ruler.after('link','tw_image',tw_image);
+			md.inline.ruler.after("link","tw_image",tw_image);
 		}
 		if(pluginOpts.inlineRules.prettyextlink) {
-			md.inline.ruler.after('link','tw_prettyextlink',tw_prettyextlink);
+			md.inline.ruler.after("link","tw_prettyextlink",tw_prettyextlink);
 		}
 		if(pluginOpts.inlineRules.prettylink) {
-			md.inline.ruler.after('link','tw_prettylink',tw_prettylink);
+			md.inline.ruler.after("link","tw_prettylink",tw_prettylink);
 		}
 		if(pluginOpts.inlineRules.filteredtranscludeinline) {
-			md.inline.ruler.before('html_inline','tw_filteredtranscludeinline',tw_filteredtranscludeinline);
+			md.inline.ruler.before("html_inline","tw_filteredtranscludeinline",tw_filteredtranscludeinline);
 		}
 		if(pluginOpts.inlineRules.transcludeinline) {
-			md.inline.ruler.before('html_inline','tw_transcludeinline',tw_transcludeinline);
+			md.inline.ruler.before("html_inline","tw_transcludeinline",tw_transcludeinline);
+		}
+		if(pluginOpts.inlineRules.macrocallinline) {
+			md.inline.ruler.before("html_inline","tw_macrocallinline",tw_macrocallinline);
 		}
 
-		md.inline.ruler.before('html_inline','tw_macrocallinline',tw_macrocallinline);
-		md.inline.ruler.at('html_inline',extendHtmlInline(md.inline.ruler.__rules__[md.inline.ruler.__find__('html_inline')].fn));
-		md.block.ruler.after('html_block','tw_block',tw_block,{
-			alt: [ 'paragraph', 'reference', 'blockquote' ]
+		md.inline.ruler.at("html_inline",extendHtmlInline(md.inline.ruler.__rules__[md.inline.ruler.__find__("html_inline")].fn));
+		md.block.ruler.after("html_block","tw_block",tw_block,{
+			alt: [ "paragraph", "reference", "blockquote" ]
 		});
 		md.inline.parse = extendInlineParse(md.inline,md.inline.parse,options.inlineRules);
 	}
 
-	md.core.ruler.disable('text_join');
-	md.core.ruler.push('wikify',wikify);
+	md.core.ruler.disable("text_join");
+	md.core.ruler.push("wikify",wikify);
 };

package/plugins/tiddlywiki/markdown/styles.tid

@@ -6,6 +6,9 @@ code-body: yes
 	display: block;
 	margin: 0px;
 }
+span.markdown {
+	display: inline;
+}
 .markdown hr {
   margin-top: 20px;
   margin-bottom: 20px;

package/plugins/tiddlywiki/markdown/wrapper.js

@@ -57,16 +57,16 @@ function setupWikiRules(pluginOptions) {
 	var WikiParser = require("$:/core/modules/parsers/wikiparser/wikiparser.js")["text/vnd.tiddlywiki"];
 
 	// first pass: get all rule classes
-	var wikiParser = new WikiParser(null, '', {parseAsInline: true, wiki: $tw.wiki});
+	var wikiParser = new WikiParser(null, "", {parseAsInline: true, wiki: $tw.wiki});
 
 	// restore all possible rules from each rule class
-	wikiParser.pragmaRules = collectAllRules(wikiParser.pragmaRuleClasses,'pragma');
-	wikiParser.blockRules = collectAllRules(wikiParser.blockRuleClasses,'block');
-	wikiParser.inlineRules = collectAllRules(wikiParser.inlineRuleClasses,'inline');
+	wikiParser.pragmaRules = collectAllRules(wikiParser.pragmaRuleClasses,"pragma");
+	wikiParser.blockRules = collectAllRules(wikiParser.blockRuleClasses,"block");
+	wikiParser.inlineRules = collectAllRules(wikiParser.inlineRuleClasses,"inline");
 
 	var pragma = pluginOptions.renderWikiText
-			? "\\rules except latex-parser extlink\n" + pluginOptions.renderWikiTextPragma
-			: "\\rules only html entity commentinline commentblock";
+		? "\\rules except latex-parser extlink\n" + pluginOptions.renderWikiTextPragma
+		: "\\rules only html entity commentinline commentblock";
 
 	wikiParser.pos = 0;
 	wikiParser.source = pragma;
@@ -76,7 +76,7 @@ function setupWikiRules(pluginOptions) {
 	wikiParser.parsePragmas();
 
 	results.blockRules = {};
-	results.inlineRules = {}
+	results.inlineRules = {};
 	results.blockRuleClasses = {};
 	results.inlineRuleClasses = {};
 
@@ -95,12 +95,12 @@ function setupWikiRules(pluginOptions) {
 // Creates markdown-it parser
 function createMarkdownEngine(markdownItOptions, pluginOptions) {
 	var md = new MarkdownIt(markdownItOptions)
-				.use(require("./markdown-it-sub"))
-				.use(require("./markdown-it-sup"))
-				.use(require("./markdown-it-ins"))
-				.use(require("./markdown-it-mark"))
-				.use(require("./markdown-it-footnote"))
-				.use(require("./markdown-it-deflist"));
+		.use(require("./markdown-it-sub"))
+		.use(require("./markdown-it-sup"))
+		.use(require("./markdown-it-ins"))
+		.use(require("./markdown-it-mark"))
+		.use(require("./markdown-it-footnote"))
+		.use(require("./markdown-it-deflist"));
 
 	var results = setupWikiRules(pluginOptions);
 
@@ -115,12 +115,12 @@ function createMarkdownEngine(markdownItOptions, pluginOptions) {
 	}
 
 	md.use(require("./markdown-it-tiddlywiki"),{
-			renderWikiText: pluginOptions.renderWikiText,
-			blockRules: results.blockRules,
-			inlineRules: results.inlineRules
-		});
+		renderWikiText: pluginOptions.renderWikiText,
+		blockRules: results.blockRules,
+		inlineRules: results.inlineRules
+	});
 
-	$tw.utils.each(['image','prettylink','prettyextlink'], function(rule) {
+	$tw.utils.each(["image","prettylink","prettyextlink"], function(rule) {
 		if(MarkdownParser.prototype.inlineRules[rule]) {
 			// delegate to md; ignore the rule class in WikiParser
 			delete MarkdownParser.prototype.inlineRuleClasses[rule];
@@ -211,13 +211,22 @@ function processWikiTree(tree,hasWikiLinkRule) {
 MarkdownParser.prototype.md = createMarkdownEngine(markdownOpts,pluginOpts);
 
 function MarkdownParser(type,text,options) {
-	var env = {}
+	var env = {};
 	var md = this.md;
-	var mdTree = md.parse(text,env);
-	var textToParse = '<div class="markdown">\n' + md.renderer.render(mdTree,md.options,env) + '</div>';
+	var mdTree, textToParse;
+
+	if(options.parseAsInline) {
+		mdTree = md.parseInline(text,env);
+		textToParse = '<span class="markdown">' + md.renderer.render(mdTree,md.options,env) + "</span>";
+	} else {
+		mdTree = md.parse(text,env);
+		textToParse = '<div class="markdown">\n' + md.renderer.render(mdTree,md.options,env) + "</div>";
+	}
 
-	//console.log(JSON.stringify(mdTree,null,2));
-	//console.log("\n----------------\n" + textToParse);
+	if($tw.log.MARKDOWN) {
+		console.log(JSON.stringify(mdTree,null,2));
+		console.log("\n----------------\n" + textToParse);
+	}
 
 	var wikiParser;