mirror of
https://github.com/TiddlyWiki/TiddlyWiki5.git
synced 2026-05-01 07:36:49 +00:00
Markdown: Fix missing inline support and macrocall args parsing error (#9295)
* 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:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user