clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-02-01 23:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Markdown: Fix missing inline support and macrocall args parsing error (#9295)

Browse Source 
* Rewrote tw_macrocallinline() parser so macrocall args containing ">"
will be parsed properly.

* Use $tw.log.MARKDOWN flag to print debug messages.

* Fix markdown parser to respect parseAsInline option. (#8917)
This commit is contained in:
cdruan
2025-10-10 05:31:11 -07:00
committed by GitHub
parent 5143da9cce
commit 91871d2ced
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/tiddlywiki/markdown/markdown-it-tiddlywiki.js
View File

@@ -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);
token.content = state.src.slice(pos,ruleinfo.rule.nextCall.end);
}
state.pos = MacroCallRegEx.lastIndex;
state.pos = ruleinfo.rule.nextCall.end;
return true;
}
@@ -520,8 +515,10 @@ module.exports = function tiddlyWikiPlugin(markdown,options) {
if(pluginOpts.inlineRules.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' ]

3
plugins/tiddlywiki/markdown/styles.tid
View File

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

17
plugins/tiddlywiki/markdown/wrapper.js
View File

@@ -213,11 +213,20 @@ MarkdownParser.prototype.md = createMarkdownEngine(markdownOpts,pluginOpts);
function MarkdownParser(type,text,options) {
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;
//console.log(JSON.stringify(mdTree,null,2));
//console.log("\n----------------\n" + 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>';
}
if($tw.log.MARKDOWN) {
console.log(JSON.stringify(mdTree,null,2));
console.log("\n----------------\n" + textToParse);
}
var wikiParser;