Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions desktop-app/prepare.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,21 @@ async function prepareOfflineDependencies() {
dest: path.join(LIBS_DIR, "mermaid.min.js"),
hash: null
},
{
url: "https://cdn.jsdelivr.net/npm/d3@7/dist/d3.min.js",
dest: path.join(LIBS_DIR, "d3.min.js"),
hash: null
},
{
url: "https://cdn.jsdelivr.net/npm/markmap-lib@0.18.12/dist/browser/index.iife.js",
dest: path.join(LIBS_DIR, "markmap-lib.iife.js"),
hash: null
},
{
url: "https://cdn.jsdelivr.net/npm/markmap-view@0.18.12/dist/browser/index.js",
dest: path.join(LIBS_DIR, "markmap-view.js"),
hash: null
},
{
url: "https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.min.js",
dest: path.join(LIBS_DIR, "tex-mml-chtml.min.js"),
Expand Down
76 changes: 73 additions & 3 deletions desktop-app/resources/js/preview-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,17 @@ function configureMarked() {
const krokiLanguages = {
'vega-lite': ['vegalite', 'Vega-Lite'],
vegalite: ['vegalite', 'Vega-Lite'],
wavedrom: ['wavedrom', 'WaveDrom'],
markmap: ['markmap', 'Markmap']
wavedrom: ['wavedrom', 'WaveDrom']
};
if (krokiLanguages[language]) {
const [engine, label] = krokiLanguages[language];
const uniqueId = `${engine}-diagram-worker-${krokiIdCounter++}`;
return renderDiagramShell(engine, 'kroki-container', 'kroki-diagram', uniqueId, code, label);
}
if (language === 'markmap') {
const uniqueId = `markmap-diagram-worker-${krokiIdCounter++}`;
return renderDiagramShell('markmap', 'markmap-container', 'markmap-diagram', uniqueId, code, 'Markmap');
}

if (language === "math") {
return `<div class="math-block">$$\n${code}\n$$</div>\n`;
Expand All @@ -400,6 +403,72 @@ function configureMarked() {
return `<h${level} id="${id}">${text}</h${level}>`;
};

function normalizeMarkmapFences(markdown) {
const lines = String(markdown || '').split(/\r?\n/);
const output = [];
let index = 0;

while (index < lines.length) {
const opening = lines[index].match(/^([ \t]{0,3})(`{3,}|~{3,})([ \t]*)(.*)$/);
const info = opening ? opening[4].trim() : '';
if (!opening || !/^markmap(?:\s|$)/i.test(info)) {
output.push(lines[index]);
index += 1;
continue;
}

const indent = opening[1];
const fence = opening[2];
const marker = fence[0];
const content = [];
let nestedFence = null;
let maxInnerFenceLength = fence.length;
let closeIndex = -1;

for (let scan = index + 1; scan < lines.length; scan += 1) {
const line = lines[scan];
const fenceMatch = line.match(/^[ \t]{0,3}(`{3,}|~{3,})([ \t]*.*)$/);
if (fenceMatch) {
const currentFence = fenceMatch[1];
const currentMarker = currentFence[0];
const tail = fenceMatch[2].trim();
if (currentMarker === marker) {
maxInnerFenceLength = Math.max(maxInnerFenceLength, currentFence.length);
}

if (nestedFence) {
if (currentMarker === nestedFence.marker && currentFence.length >= nestedFence.length && tail === '') {
nestedFence = null;
}
} else if (currentMarker === marker && currentFence.length >= fence.length && tail === '') {
closeIndex = scan;
break;
} else if (tail !== '') {
nestedFence = {
marker: currentMarker,
length: currentFence.length
};
}
}
content.push(line);
}

if (closeIndex === -1) {
output.push(lines[index]);
index += 1;
continue;
}

const normalizedFence = marker.repeat(maxInnerFenceLength + 1);
output.push(`${indent}${normalizedFence}${opening[3]}${opening[4]}`);
output.push(...content);
output.push(`${indent}${normalizedFence}`);
index = closeIndex + 1;
}

return output.join('\n');
}

marked.use({
extensions: [
blockMathExtension,
Expand All @@ -412,7 +481,8 @@ function configureMarked() {
preprocess(markdown) {
if (suppressFootnotePreprocess) return markdown;
resetExtendedMarkdownState();
const protectedMarkdown = markdown.replace(/\\\$/g, "&#36;");
const normalizedMarkdown = normalizeMarkmapFences(markdown);
const protectedMarkdown = normalizedMarkdown.replace(/\\\$/g, "&#36;");
return applyFootnotes(extractFootnoteDefinitions(protectedMarkdown));
},
},
Expand Down
Loading
Loading