Skip to content

Render multi‑paragraph footnotes inline and restore nested list indentation #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+110 −28
Draft

Render multi‑paragraph footnotes inline and restore nested list indentation #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f04598f
Fix footnote rendering and list indentation
Copilot May 16, 2026
f60a691
Align footnote indentation parsing
Copilot May 16, 2026
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
55 changes: 41 additions & 14 deletions desktop-app/resources/js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,22 @@ document.addEventListener("DOMContentLoaded", function () {
.replace(/>/g, ">");
}

function renderDefinitionContent(content) {
return content
.split(/\n{2,}/)
function renderDefinitionContent(content, options = {}) {
const { appendHtml = "" } = options;
const paragraphs = content
.split(/\n\s*\n/)
.map((paragraph) => paragraph.trim())
.filter(Boolean)
.filter(Boolean);

if (appendHtml) {
if (paragraphs.length === 0) {
paragraphs.push(appendHtml);
} else {
paragraphs[paragraphs.length - 1] = `${paragraphs[paragraphs.length - 1]}${appendHtml}`;
}
}

return paragraphs
.map((paragraph) => {
const renderedParagraph = marked.parseInline(paragraph);
const safeParagraph = typeof DOMPurify !== "undefined"
Expand All @@ -339,30 +350,42 @@ document.addEventListener("DOMContentLoaded", function () {
let index = 0;

while (index < lines.length) {
const match = /^\[\^([^\]\n]+)\]:[ \t]*(.*)$/.exec(lines[index]);
const match = /^([ \t]{0,3})\[\^([^\]\n]+)\]:[ \t]*(.*)$/.exec(lines[index]);
if (!match) {
preservedLines.push(lines[index]);
index += 1;
continue;
}

const id = match[1].trim();
const definitionLines = [match[2] || ""];
const baseIndent = match[1] || "";
const id = match[2].trim();
const definitionLines = [match[3] || ""];
index += 1;

while (index < lines.length) {
const line = lines[index];
const indentedMatch = /^(?: {4}|\t)(.*)$/.exec(line);
if (!line.startsWith(baseIndent)) {
break;
}

const lineAfterBase = line.slice(baseIndent.length);
const indentedMatch = /^(?: {4}|\t)(.*)$/.exec(lineAfterBase);
if (indentedMatch) {
definitionLines.push(indentedMatch[1]);
index += 1;
continue;
}

if (line === "" && /^(?: {4}|\t)/.test(lines[index + 1] || "")) {
definitionLines.push("");
index += 1;
continue;
if (lineAfterBase.trim() === "") {
const nextLine = lines[index + 1] || "";
const nextAfterBase = nextLine.startsWith(baseIndent)
? nextLine.slice(baseIndent.length)
: "";
if (/^(?: {4}|\t)/.test(nextAfterBase)) {
definitionLines.push("");
index += 1;
continue;
}
}

break;
Expand Down Expand Up @@ -404,11 +427,15 @@ document.addEventListener("DOMContentLoaded", function () {
.filter((id) => footnoteDefinitions.has(id))
.map((id) => {
const normalizedId = normalizeFootnoteId(id);
const noteHtml = renderDefinitionContent(footnoteDefinitions.get(id) || "");
const backRefId = footnoteFirstRefId.get(id) || `fnref-${normalizedId}`;
const safeNormalizedId = escapeHtmlAttribute(normalizedId);
const safeBackRefId = escapeHtmlAttribute(backRefId);
return `<li id="fn-${safeNormalizedId}">${noteHtml}<a href="#${safeBackRefId}" class="footnote-backref" aria-label="Back to content">↩</a></li>`;
const backRefHtml = `<a href="#${safeBackRefId}" class="footnote-backref" aria-label="Back to content">↩</a>`;
const noteHtml = renderDefinitionContent(
footnoteDefinitions.get(id) || "",
{ appendHtml: backRefHtml }
);
return `<li id="fn-${safeNormalizedId}">${noteHtml}</li>`;
})
.join("");

Expand Down
14 changes: 14 additions & 0 deletions desktop-app/resources/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,20 @@ body {
vertical-align: -0.1em;
}

.markdown-body ul,
.markdown-body ol {
padding-left: 2em;
margin: 0.4em 0;
}

.markdown-body ul ul,
.markdown-body ul ol,
.markdown-body ol ul,
.markdown-body ol ol {
margin-top: 0.2em;
margin-bottom: 0.2em;
}

.markdown-body ul.contains-task-list,
.markdown-body li.task-list-item {
list-style: none;
Expand Down
55 changes: 41 additions & 14 deletions script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,22 @@ document.addEventListener("DOMContentLoaded", function () {
.replace(/>/g, "&gt;");
}

function renderDefinitionContent(content) {
return content
.split(/\n{2,}/)
function renderDefinitionContent(content, options = {}) {
const { appendHtml = "" } = options;
const paragraphs = content
.split(/\n\s*\n/)
.map((paragraph) => paragraph.trim())
.filter(Boolean)
.filter(Boolean);

if (appendHtml) {
if (paragraphs.length === 0) {
paragraphs.push(appendHtml);
} else {
paragraphs[paragraphs.length - 1] = `${paragraphs[paragraphs.length - 1]}${appendHtml}`;
}
}

return paragraphs
.map((paragraph) => {
const renderedParagraph = marked.parseInline(paragraph);
const safeParagraph = typeof DOMPurify !== "undefined"
Expand All @@ -339,30 +350,42 @@ document.addEventListener("DOMContentLoaded", function () {
let index = 0;

while (index < lines.length) {
const match = /^\[\^([^\]\n]+)\]:[ \t]*(.*)$/.exec(lines[index]);
const match = /^([ \t]{0,3})\[\^([^\]\n]+)\]:[ \t]*(.*)$/.exec(lines[index]);
if (!match) {
preservedLines.push(lines[index]);
index += 1;
continue;
}

const id = match[1].trim();
const definitionLines = [match[2] || ""];
const baseIndent = match[1] || "";
const id = match[2].trim();
const definitionLines = [match[3] || ""];
index += 1;

while (index < lines.length) {
const line = lines[index];
const indentedMatch = /^(?: {4}|\t)(.*)$/.exec(line);
if (!line.startsWith(baseIndent)) {
break;
}

const lineAfterBase = line.slice(baseIndent.length);
const indentedMatch = /^(?: {4}|\t)(.*)$/.exec(lineAfterBase);
if (indentedMatch) {
definitionLines.push(indentedMatch[1]);
index += 1;
continue;
}

if (line === "" && /^(?: {4}|\t)/.test(lines[index + 1] || "")) {
definitionLines.push("");
index += 1;
continue;
if (lineAfterBase.trim() === "") {
const nextLine = lines[index + 1] || "";
const nextAfterBase = nextLine.startsWith(baseIndent)
? nextLine.slice(baseIndent.length)
: "";
if (/^(?: {4}|\t)/.test(nextAfterBase)) {
definitionLines.push("");
index += 1;
continue;
}
}

break;
Expand Down Expand Up @@ -404,11 +427,15 @@ document.addEventListener("DOMContentLoaded", function () {
.filter((id) => footnoteDefinitions.has(id))
.map((id) => {
const normalizedId = normalizeFootnoteId(id);
const noteHtml = renderDefinitionContent(footnoteDefinitions.get(id) || "");
const backRefId = footnoteFirstRefId.get(id) || `fnref-${normalizedId}`;
const safeNormalizedId = escapeHtmlAttribute(normalizedId);
const safeBackRefId = escapeHtmlAttribute(backRefId);
return `<li id="fn-${safeNormalizedId}">${noteHtml}<a href="#${safeBackRefId}" class="footnote-backref" aria-label="Back to content">↩</a></li>`;
const backRefHtml = `<a href="#${safeBackRefId}" class="footnote-backref" aria-label="Back to content">↩</a>`;
const noteHtml = renderDefinitionContent(
footnoteDefinitions.get(id) || "",
{ appendHtml: backRefHtml }
);
return `<li id="fn-${safeNormalizedId}">${noteHtml}</li>`;
})
.join("");

Expand Down
14 changes: 14 additions & 0 deletions styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,20 @@ body {
vertical-align: -0.1em;
}

.markdown-body ul,
.markdown-body ol {
padding-left: 2em;
margin: 0.4em 0;
}

.markdown-body ul ul,
.markdown-body ul ol,
.markdown-body ol ul,
.markdown-body ol ol {
margin-top: 0.2em;
margin-bottom: 0.2em;
}

.markdown-body ul.contains-task-list,
.markdown-body li.task-list-item {
list-style: none;
Expand Down