md2gost 1.3.2 → 1.4.1

package/dist/index.mjs

@@ -19,6 +19,7 @@ var Doc = class {
   ctime;
   mtime;
   hyphenation = false;
+  totalPagesOffset = 0;
   headings = {
     h1: { size: 14, spacing: { before: 18, after: 4 }, indent_full: false, uppercase: false },
     h3: { size: 14, spacing: { before: 8, after: 4 }, indent_full: false, uppercase: false },
@@ -242,9 +243,17 @@ async function parseMD(file, logwarn = console.warn) {
     return node;
   }
   function parseSection(text) {
+    text = text.toLowerCase();
     const match = /from\s+(\d+)/.exec(text);
     const num = match ? parseInt(match[1] || "") : NaN;
-    return { type: "sectionBreak", pageStart: isFinite(num) ? num : null };
+    const unpaged = text.includes("unpaged");
+    const portrait = text.includes("portrait");
+    const landscape = text.includes("landscape");
+    return {
+      type: "sectionBreak",
+      pageStart: unpaged ? -1 : isFinite(num) ? num : null,
+      orientation: portrait ? "portrait" : landscape ? "landscape" : null
+    };
   }
   class RuleError extends Error {
   }
@@ -741,7 +750,7 @@ function replaceAmpCodes(text) {
 
 // src/serializer.ts
 import * as fs3 from "fs";
-import { AlignmentType, Document, Footer, convertMillimetersToTwip, Packer, PageBreak, PageNumber, Paragraph, TableOfContents, TextRun, LevelFormat, Table, TableRow, TableCell, ImageRun, ExternalHyperlink, InternalHyperlink, Bookmark } from "docx";
+import { AlignmentType, Document, Footer, convertMillimetersToTwip, Packer, PageBreak, PageNumber, Paragraph, TableOfContents, TextRun, LevelFormat, Table, TableRow, TableCell, ImageRun, ExternalHyperlink, InternalHyperlink, Bookmark, XmlComponent, LineRuleType, PageOrientation } from "docx";
 import { imageSize } from "image-size";
 import path2 from "path";
 import Prism from "prismjs";
@@ -771,23 +780,44 @@ import "prismjs/components/prism-yaml";
 import "prismjs/components/prism-markdown";
 import "prismjs/components/prism-docker";
 import "prismjs/components/prism-nginx";
+
+// src/errors.ts
+var UserInputError = class extends Error {
+  constructor(message) {
+    super(message);
+  }
+};
+
+// src/serializer.ts
 var STYLE_list = "afc";
 var STYLE_table_title = "TableCaption";
 var STYLE_code_title = "ListingCaption";
 var STYLE_code = "ListingCode";
-async function serializeDocx(doc, fout, workdir, assets) {
+async function serializeDocx(doc, fout, workdir, assets, allowExternalFiles) {
   const getPath = (fname) => {
+    if (process.platform != "win32") fname = fname.replaceAll("\\", "/");
     if (process.platform == "win32" && fname[0] == "/") fname = "." + fname;
-    return path2.isAbsolute(fname) ? fname : path2.join(workdir, fname);
+    const targetPath = path2.isAbsolute(fname) ? path2.resolve(fname) : path2.resolve(workdir, fname);
+    if (!allowExternalFiles) {
+      const relative = path2.relative(workdir, targetPath);
+      const isOutside = relative.startsWith("..") || path2.isAbsolute(relative);
+      if (isOutside) throw new UserInputError(`Access denied: "${fname}" resolves outside the working directory.`);
+    }
+    return targetPath;
   };
   const sections = [];
   const numbering = [];
   const docSections = (function splitSections() {
-    const sections2 = [{ pageStart: 1, nodes: [] }];
+    const sections2 = [{ displayPageNum: true, orientation: "portrait", pageStart: 1, nodes: [] }];
     for (let j = 0; j < doc.nodes.length; j++) {
       const node = doc.nodes[j];
       if (node.type == "sectionBreak")
-        sections2.push({ pageStart: node.pageStart, nodes: [] });
+        sections2.push({
+          displayPageNum: node.pageStart == null ? sections2.at(-1)?.displayPageNum || true : node.pageStart >= 0,
+          orientation: node.orientation || sections2.at(-1)?.orientation || "portrait",
+          pageStart: node.pageStart,
+          nodes: []
+        });
       else
         sections2.at(-1)?.nodes.push(node);
     }
@@ -905,13 +935,13 @@ async function serializeDocx(doc, fout, workdir, assets) {
         case "image":
           const type = node.src.split(".").at(-1) || "";
           if (!["jpg", "png", "gif", "bmp", "svg"].includes(type))
-            throw new Error(`Unsupported image format: "${type}", file: ${node.src}`);
+            throw new UserInputError(`Unsupported image format: "${type}", file: ${node.src}`);
           const img_path = getPath(node.src);
           if (!fs3.existsSync(img_path))
-            throw new Error(`File not exist: ${node.src}`);
+            throw new UserInputError(`File not exist: ${node.src}`);
           const data = fs3.readFileSync(img_path);
           const dimensions = imageSize(data);
-          const [MaxW, MaxH] = [600, 800];
+          const [MaxW, MaxH] = section.orientation == "landscape" ? [950, 600] : [600, 900];
           let [width, height] = [dimensions.width, dimensions.height];
           if (node.width && node.height) [width, height] = [node.width, node.height];
           if (node.width) [width, height] = [node.width, height / width * node.width];
@@ -924,6 +954,8 @@ async function serializeDocx(doc, fout, workdir, assets) {
               indent: { firstLine: 0 },
               spacing: {
                 line: 240,
+                lineRule: LineRuleType.AT_LEAST,
+                // For LibreOffice to not shrink image
                 ...!node.text && doc.img.spacing.after !== void 0 ? { after: doc.img.spacing.after * 20 } : {},
                 ...doc.img.spacing.before !== void 0 ? { before: doc.img.spacing.before * 20 } : {}
               },
@@ -969,10 +1001,10 @@ async function serializeDocx(doc, fout, workdir, assets) {
         case "externalDoc":
           const doc_path = getPath(node.path);
           if (!fs3.existsSync(doc_path))
-            throw new Error(`File not exist: ${node.path}`);
+            throw new UserInputError(`File not exist: ${node.path}`);
           const ext = path2.extname(doc_path);
           if (ext != ".docx" && ext != ".pdf")
-            throw new Error(`File not .docx or .pdf: ${node.path}`);
+            throw new UserInputError(`File not .docx or .pdf: ${node.path}`);
           return new Paragraph({
             text: `!!(${doc_path})${JSON.stringify(node.dict)}`,
             indent: { firstLine: 0 },
@@ -995,6 +1027,18 @@ async function serializeDocx(doc, fout, workdir, assets) {
       children,
       properties: {
         page: {
+          // size: section.orientation == "landscape" ? {
+          // 	orientation: PageOrientation.LANDSCAPE,
+          // 	width: convertMillimetersToTwip(297),
+          // 	height: convertMillimetersToTwip(210),
+          // } : {
+          // 	orientation: PageOrientation.PORTRAIT,
+          // 	width: convertMillimetersToTwip(210),
+          // 	height: convertMillimetersToTwip(297),
+          // },
+          size: {
+            orientation: section.orientation == "landscape" ? PageOrientation.LANDSCAPE : PageOrientation.PORTRAIT
+          },
           pageNumbers: !section.pageStart ? {} : {
             start: section.pageStart
           },
@@ -1012,7 +1056,7 @@ async function serializeDocx(doc, fout, workdir, assets) {
             new Paragraph({
               alignment: AlignmentType.CENTER,
               children: [new TextRun({
-                children: section.pageStart ? [PageNumber.CURRENT] : []
+                children: section.displayPageNum ? [PageNumber.CURRENT] : []
               })],
               indent: { firstLine: 0 },
               spacing: { line: 240 }
@@ -1068,7 +1112,26 @@ async function serializeDocx(doc, fout, workdir, assets) {
       let children = null;
       if (rune.type == "val" && rune.text == "pages") {
         rune.type = "text";
-        children = [PageNumber.TOTAL_PAGES];
+        children = doc.totalPagesOffset == 0 ? [PageNumber.TOTAL_PAGES] : [
+          // Complex Formula Field: { = { NUMPAGES } + 1 }
+          // Outer field start: "="
+          new RawXml("w:fldChar", { "w:fldCharType": "begin" }),
+          new RawXml("w:instrText", { "xml:space": "preserve" }, " = "),
+          // Inner field start: "NUMPAGES"
+          new RawXml("w:fldChar", { "w:fldCharType": "begin" }),
+          new RawXml("w:instrText", { "xml:space": "preserve" }, " NUMPAGES "),
+          new RawXml("w:fldChar", { "w:fldCharType": "separate" }),
+          new RawXml("w:fldChar", { "w:fldCharType": "end" }),
+          // Operator
+          new RawXml(
+            "w:instrText",
+            { "xml:space": "preserve" },
+            doc.totalPagesOffset > 0 ? ` + ${doc.totalPagesOffset}` : ` - ${-doc.totalPagesOffset}`
+          ),
+          // Outer field close
+          new RawXml("w:fldChar", { "w:fldCharType": "separate" }),
+          new RawXml("w:fldChar", { "w:fldCharType": "end" })
+        ];
       }
       return new TextRun({
         ...children ? { children } : { text: rune.text },
@@ -1145,7 +1208,6 @@ function addListItemLevel(levels, level, startIndex, itemCount, ordered, alterna
   }
   const longList = startIndex + itemCount > 10;
   const left = alternativeStyle ? 0 : longList ? 20.5 : 17.5;
-  const hanging = longList && !alternativeStyle ? convertMillimetersToTwip(8) : null;
   const text = ordered ? alternativeStyle ? `%${level + 1}.` : mark == "." ? `%${level + 1}.` : `%${level + 1})` : (
     // mark == "*" ? "\u2022" : "\u2012";
     mark == "*" ? "\xB7" : "\u2012"
@@ -1164,13 +1226,22 @@ function addListItemLevel(levels, level, startIndex, itemCount, ordered, alterna
       paragraph: {
         indent: {
           left: convertMillimetersToTwip(left + 5 * indent),
-          ...alternativeStyle ? { firstLine: convertMillimetersToTwip(12.5) } : {},
-          ...hanging ? { hanging } : {}
+          hanging: convertMillimetersToTwip(longList && !alternativeStyle ? 8 : 5),
+          ...alternativeStyle ? { firstLine: convertMillimetersToTwip(12.5) } : {}
         }
       }
     }
   });
 }
+var RawXml = class extends XmlComponent {
+  constructor(tag, attributes = {}, text = null) {
+    super(tag);
+    if (Object.keys(attributes).length > 0)
+      this.root.push({ _attr: attributes });
+    if (text)
+      this.root.push(text);
+  }
+};
 function renderCodeHighlighting(code, lang) {
   const grammar = Prism.languages[lang.trim().toLowerCase()];
   if (!grammar) return null;
@@ -1509,7 +1580,7 @@ function enrichDoc(doc, logwarn = console.warn) {
 }
 
 // src/main.ts
-import { spawn } from "child_process";
+import { exec, spawn } from "child_process";
 import fs4 from "fs/promises";
 import { existsSync as existsSync2 } from "fs";
 import { PDFDocument } from "pdf-lib";
@@ -1791,14 +1862,22 @@ async function render({
   renderPDF = false,
   removeIntermediateDocx = false,
   disableMacros = false,
+  useLibreOffice = false,
+  allowExternalFiles = false,
   logwarn = console.warn,
+  loginfo = console.info,
   logPS = (msg) => console.log(`PS: ${msg}`),
-  logPSError = (msg) => console.error(`PS: ${msg}`)
+  logPSError = (msg) => console.error(`PS ERROR: ${msg}`),
+  signal = null
 }) {
-  progress(10, "\u041F\u044B\u0442\u0430\u0435\u043C\u0441\u044F \u043F\u043E\u043D\u044F\u0442\u044C, \u0447\u0442\u043E \u0432\u044B \u0442\u0443\u0442 \u043D\u0430\u043F\u0438\u0441\u0430\u043B\u0438...");
+  signal?.throwIfAborted();
   const fin = path3.resolve(file);
+  progress(10, "\u041F\u044B\u0442\u0430\u0435\u043C\u0441\u044F \u043F\u043E\u043D\u044F\u0442\u044C, \u0447\u0442\u043E \u0432\u044B \u0442\u0443\u0442 \u043D\u0430\u043F\u0438\u0441\u0430\u043B\u0438...");
+  loginfo(`[!1] Parsing file ${fin}`);
   const doc = await parseMD(fin, logwarn);
+  signal?.throwIfAborted();
   progress(10, "\u041A\u043E\u043B\u0434\u0443\u0435\u043C \u043D\u0430\u0434 \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441\u043E\u043C...");
+  loginfo("[!2] Processing document");
   enrichDoc(doc, logwarn);
   const runicDoc = runifyDoc(doc);
   alchemist(runicDoc, logwarn);
@@ -1813,64 +1892,107 @@ async function render({
     throw new Error(`\u0417\u0430\u043A\u0440\u043E\u0439\u0442\u0435 docx \u0444\u0430\u0439\u043B. Output file is busy or locked: ${ftmp}`);
   if (await checkIfFileIsBlocked(fout))
     throw new Error(`\u0417\u0430\u043A\u0440\u043E\u0439\u0442\u0435 docx \u0444\u0430\u0439\u043B. Output file is busy or locked: ${fout}`);
+  signal?.throwIfAborted();
   progress(10, phrase_renderDocx());
-  await serializeDocx(runicDoc, ftmp, fdir, assets);
+  loginfo("[!3] Serializing to docx");
+  await serializeDocx(runicDoc, ftmp, fdir, assets, allowExternalFiles);
   let willRunMacros = !disableMacros && (renderPDF || hasReasonForRunningMacros(runicDoc));
   let limitedRender = false;
-  if (process.platform != "win32" && willRunMacros) {
+  if (process.platform != "win32" && willRunMacros && !useLibreOffice) {
     limitedRender = true;
     willRunMacros = false;
   }
   if (willRunMacros) {
+    signal?.throwIfAborted();
     progress(20, phrase_runMacros());
+    loginfo("[!4] Starting macros");
     const tmpfolder = path3.join(pout ? pout.dir : fdir, ".md2gost_out");
     await fs4.rm(tmpfolder, { recursive: true, force: true });
     try {
-      const ok = await runDocxMacro(progress, logPS, logPSError, assets, fdir, ftmp, fout, renderPDF);
+      const macroRunner = useLibreOffice ? runUnoScript : runDocxMacro;
+      const ok = await macroRunner(progress, logPS, logPSError, assets, fdir, ftmp, fout, renderPDF, signal);
       if (!ok) {
         await fs4.rename(ftmp, fout);
         return { fout, err: "inPS" };
       }
     } catch (x) {
+      if (signal?.aborted) {
+        await fs4.unlink(ftmp).catch(() => {
+        });
+        throw x;
+      }
       await fs4.rename(ftmp, fout);
       return { fout, err: "noPS", errS: x };
     }
-    await fs4.unlink(ftmp);
+    if (existsSync2(ftmp))
+      await fs4.unlink(ftmp);
+    signal?.throwIfAborted();
     const errorTxt = path3.join(tmpfolder, "error.txt");
     if (existsSync2(errorTxt)) {
       const err = await fs4.readFile(errorTxt);
       await fs4.rm(tmpfolder, { recursive: true, force: true });
       return { fout, err: "vba", errS: `${err}` };
     }
+    loginfo("[!5] Updating metadata");
     await updateMetadata(fout, doc);
     if (renderPDF) {
+      signal?.throwIfAborted();
       progress(10, phrase_combine());
+      loginfo("[!6] Merging pdfs");
       if (!existsSync2(tmpfolder))
         return { fout, err: "pdf" };
       try {
         const files = (await fs4.readdir(tmpfolder)).sort().map((f) => path3.join(tmpfolder, f));
         const pdf = pout ? path3.join(pout.dir, pout.base) : path3.join(fdir, fname + ".pdf");
-        await mergePDFs(files, pdf, doc);
+        await mergePDFs(files, pdf, doc, signal || void 0);
         await fs4.rm(tmpfolder, { recursive: true, force: true });
         if (removeIntermediateDocx && existsSync2(fout)) await fs4.unlink(fout);
         return { fout: pdf };
       } catch (err) {
+        if (signal?.aborted) throw err;
         return { fout, err: "pdf", errS: err };
       }
     }
   } else {
     await fs4.rename(ftmp, fout);
   }
+  loginfo(`[!7] Rendered to ${fout}`);
   return { fout, err: limitedRender ? "noWin" : void 0 };
 }
 function hasReasonForRunningMacros(doc) {
   if (DISABLE_MACRO) return false;
   return doc.nodes.some((n) => n.type == "code" || n.type == "table");
 }
-function runDocxMacro(progress, log, logError, assets, cwd, fin, fout, renderPDF) {
+function killProcessTree(child, wordPid) {
+  if (!child.pid) return;
+  if (process.platform === "win32") {
+    if (wordPid) {
+      exec(`taskkill /pid ${wordPid}`, () => {
+        setTimeout(() => {
+          exec(`taskkill /pid ${wordPid} /F`, () => {
+          });
+          setTimeout(() => {
+            killProcessTree(child);
+          }, 2e3);
+        }, 2e3);
+      });
+    } else {
+      exec(`taskkill /pid ${child.pid} /T /F`, () => {
+      });
+    }
+  } else {
+    try {
+      process.kill(-child.pid, "SIGKILL");
+    } catch {
+    }
+  }
+}
+function runDocxMacro(progress, log, logError, assets, cwd, fin, fout, renderPDF, signal) {
   const script = path3.join(assets, "run.ps1");
   const templateMacro = path3.join(assets, "template.dotm");
   return new Promise((res, rej) => {
+    if (signal?.aborted)
+      return rej(signal.reason ?? new Error("Aborted before execution started"));
     const child = spawn("powershell", [
       "-NoProfile",
       "-ExecutionPolicy",
@@ -1884,10 +2006,28 @@ function runDocxMacro(progress, log, logError, assets, cwd, fin, fout, renderPDF
       "-MacroTemplate",
       templateMacro,
       ...renderPDF ? ["-RenderPDF"] : []
-    ], { cwd });
+    ], {
+      cwd,
+      detached: process.platform !== "win32"
+      // Enables PGID on POSIX
+      // detached: true,
+      // shell: true,
+    });
+    let wordPid = null;
+    let onAbort;
+    if (signal) {
+      onAbort = () => {
+        logError("Operation aborted. Terminating process tree...");
+        killProcessTree(child, wordPid);
+        rej(signal.reason ?? new Error("Job timed out or aborted"));
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
     child.stdout.on("data", (data) => {
-      data = `${data}`;
-      const m = /\[\*(\d)\]/.exec(data);
+      const raw = `${data}`;
+      const pidMatch = /\[WordPID:(\d+)\]/.exec(raw);
+      if (pidMatch) wordPid = parseInt(pidMatch[1], 10);
+      const m = /\[\*(\d)\]/.exec(raw);
       if (m) progress(12, {
         // "1": "Fixing breaks (listings)",
         "1": render_fixingBreaks(),
@@ -1896,31 +2036,115 @@ function runDocxMacro(progress, log, logError, assets, cwd, fin, fout, renderPDF
         // "3": "Rendering to PDF",
         "3": render_renderPDF()
       }[m[1]] || "Make some work");
-      log(data);
+      log(raw);
     });
     let ok = true;
     child.stderr.on("data", (data) => {
       ok = false;
       logError(`${data}`);
     });
-    child.on("close", () => res(ok));
-    child.on("error", rej);
+    child.on("close", (code) => {
+      if (signal && onAbort) {
+        signal.removeEventListener("abort", onAbort);
+      }
+      res(ok && code === 0);
+    });
+    child.on("error", (err) => {
+      if (signal && onAbort) {
+        signal.removeEventListener("abort", onAbort);
+      }
+      rej(err);
+    });
   });
 }
-async function mergePDFs(files, fout, doc) {
+function getPythonExecutable() {
+  if (process.platform === "win32") {
+    const loPython = "C:\\Program Files\\LibreOffice\\program\\python.exe";
+    if (existsSync2(loPython)) return loPython;
+  }
+  return process.env.UNO_PYTHON_PATH || "python3";
+}
+function runUnoScript(progress, log, logError, assets, cwd, fin, fout, renderPDF, signal) {
+  const script = process.env.MACRO_ENGINE_PATH || path3.join(assets, "macro_engine.py");
+  const pythonExec = getPythonExecutable();
+  return new Promise((res, rej) => {
+    if (signal?.aborted) {
+      return rej(signal.reason ?? new Error("Aborted before execution started"));
+    }
+    const args = [
+      script,
+      "--input",
+      fin,
+      "--output",
+      fout
+    ];
+    if (renderPDF) args.push("--render-pdf");
+    const child = spawn(pythonExec, args, {
+      cwd,
+      detached: process.platform !== "win32"
+      // Enables PGID on POSIX
+    });
+    let onAbort;
+    if (signal) {
+      onAbort = () => {
+        logError("Operation aborted. Terminating process tree...");
+        killProcessTree(child);
+        rej(signal.reason ?? new Error("Job timed out or aborted"));
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+    child.stdout.on("data", (data) => {
+      const lines = `${data}`.split("\n");
+      for (const line of lines) {
+        log(line.trimEnd());
+        if (!line.trimEnd()) continue;
+        const m = /\[\*(\d)\]/.exec(line);
+        if (m) {
+          const msg = {
+            "1": render_fixingBreaks(),
+            "2": render_fixingBreaks(),
+            "3": render_renderPDF()
+          }[m[1]] || "Processing document...";
+          progress(12, msg);
+        }
+      }
+    });
+    let ok = true;
+    child.stderr.on("data", (data) => {
+      ok = false;
+      logError(`${data}`);
+    });
+    child.on("close", (code) => {
+      if (signal && onAbort) {
+        signal.removeEventListener("abort", onAbort);
+      }
+      res(ok && code === 0);
+    });
+    child.on("error", (err) => {
+      if (signal && onAbort) {
+        signal.removeEventListener("abort", onAbort);
+      }
+      rej(err);
+    });
+  });
+}
+async function mergePDFs(files, fout, doc, signal) {
   const mergedPdf = await PDFDocument.create();
   if (doc?.title) mergedPdf.setTitle(doc.title, { showInWindowTitleBar: true });
   if (doc?.author) mergedPdf.setAuthor(doc.author);
   if (doc?.ctime) mergedPdf.setCreationDate(doc.ctime);
   if (doc?.mtime) mergedPdf.setModificationDate(doc.mtime);
   for (const file of files) {
-    const bytes = await fs4.readFile(file);
+    if (!file.endsWith(".pdf")) continue;
+    const bytes = await fs4.readFile(file, { signal });
     const pdf = await PDFDocument.load(bytes);
+    signal?.throwIfAborted();
     const pages = await mergedPdf.copyPages(pdf, pdf.getPageIndices());
     pages.forEach((page) => mergedPdf.addPage(page));
+    signal?.throwIfAborted();
   }
   const pdfBytes = await mergedPdf.save();
-  await fs4.writeFile(fout, pdfBytes);
+  await fs4.writeFile(fout, pdfBytes, { signal });
 }
 async function updateMetadata(docfile, doc) {
   const content = await fs4.readFile(docfile);
@@ -2012,17 +2236,32 @@ async function renderMarkdown(config) {
   assert(config.format == "docx" || config.format == "pdf" || typeof config.format == "undefined", "Format must be either 'docx' or 'pdf', or undefined.");
   assert(typeof config.keepIntermediateDocx == "boolean" || typeof config.keepIntermediateDocx == "undefined", "keepIntermediateDocx must be a boolean or undefined.");
   assert(typeof config.disableMacros == "boolean" || typeof config.disableMacros == "undefined", "disableMacros must be a boolean or undefined.");
+  assert(typeof config.useLibreOffice == "boolean" || typeof config.useLibreOffice == "undefined", "useLibreOffice must be a boolean or undefined.");
+  assert(typeof config.allowExternalFiles == "boolean" || typeof config.allowExternalFiles == "undefined", "allowExternalFiles must be a boolean or undefined.");
   assert(typeof config.progress == "function" || typeof config.progress == "undefined", "Progress callback must be a function or undefined.");
+  assert(config.abortSignal instanceof AbortSignal || typeof config.abortSignal == "undefined", "abortSignal must be an AbortSignal or undefined.");
   {
     const extraProps = getExtraProperties(
       config,
-      ["input", "output", "format", "keepIntermediateDocx", "disableMacros", "progress"]
+      ["input", "output", "format", "keepIntermediateDocx", "disableMacros", "useLibreOffice", "progress", "logger", "abortSignal", "allowExternalFiles"]
     );
     assert(extraProps.length == 0, `Found unknown properties in config: ${extraProps.join(", ")}`);
   }
+  assert(typeof config.logger == "object" && config.logger || typeof config.logger == "undefined", "Logger must be a object or undefined.");
+  const logger = config.logger;
+  if (logger) {
+    const props = ["info", "warn", "error"];
+    const extraProps = getExtraProperties(logger, props);
+    assert(extraProps.length == 0, `Found unknown properties in config.logger: ${extraProps.join(", ")}`);
+    props.forEach(
+      (p) => assert(typeof logger[p] == "function", `config.logger.${p} must be a function.`)
+    );
+  }
   const renderPDF = config.format === "pdf" || !config.format && !!config.output?.endsWith(".pdf");
   const removeIntermediateDocx = !config.keepIntermediateDocx;
   const disableMacros = !!config.disableMacros;
+  const useLibreOffice = !!config.useLibreOffice;
+  const allowExternalFiles = !!config.allowExternalFiles;
   assert(!(disableMacros && renderPDF), "Macros must be enabled to render PDF output.");
   const pin = path4.parse(path4.resolve(config.input));
   const fname = pin.name.endsWith(".g") ? pin.name.slice(0, -2) : pin.name;
@@ -2037,10 +2276,10 @@ async function renderMarkdown(config) {
   const warnings = [];
   const logPS = [];
   let totalPercent = 0;
-  const handleProgress = config.progress ? (increment, message) => {
+  const handleProgress = (increment, message) => {
     totalPercent = Math.min(totalPercent + increment, 99);
-    config.progress(totalPercent, message);
-  } : void 0;
+    config.progress?.(totalPercent, message);
+  };
   try {
     let throwMDE2 = function(code, msg) {
       throw new MDRenderError(code, msg, fout, warnings, logPS, errS ? { cause: errS } : void 0);
@@ -2054,13 +2293,31 @@ async function renderMarkdown(config) {
       renderPDF,
       removeIntermediateDocx,
       disableMacros,
-      logwarn: (msg) => warnings.push(msg),
-      logPS: (msg) => logPS.push(msg),
-      logPSError: (msg) => logPS.push(msg)
+      useLibreOffice,
+      allowExternalFiles,
+      loginfo: logger?.info,
+      logwarn: (msg) => {
+        logger?.warn(msg);
+        warnings.push(msg);
+      },
+      logPS: (msg) => {
+        logger?.info(msg);
+        logPS.push(msg);
+      },
+      logPSError: (msg) => {
+        logger?.error(msg);
+        logPS.push(msg);
+      },
+      signal: config.abortSignal
     });
     config.progress?.(100, "Done!");
-    if (err == "noPS") throwMDE2("noPS", `Failed to initialize PowerShell. Ensure PowerShell is installed and explicitly added to your system's PATH environment variable.`);
-    if (err == "inPS") throwMDE2("inPS", `An unexpected error occurred executing commands inside PowerShell. Verify that Microsoft Word is properly installed and licensed.`);
+    if (useLibreOffice) {
+      if (err == "noPS") throwMDE2("noPS", `Failed to run the LibreOffice binary (soffice). Ensure LibreOffice is installed and added to your system's PATH environment variable.`);
+      if (err == "inPS") throwMDE2("inPS", `An unexpected error occurred executing the LibreOffice conversion command. Verify that LibreOffice is properly installed, up to date, and has permission to access the target files.`);
+    } else {
+      if (err == "noPS") throwMDE2("noPS", `Failed to initialize PowerShell. Ensure PowerShell is installed and explicitly added to your system's PATH environment variable.`);
+      if (err == "inPS") throwMDE2("inPS", `An unexpected error occurred executing commands inside PowerShell. Verify that Microsoft Word is properly installed and licensed.`);
+    }
     if (err == "vba") throwMDE2("vba", `Microsoft Word VBA Macro execution failed: ${errS}`);
     if (err == "pdf") throwMDE2("pdf", `Failed to export document to PDF.`);
     if (err == "noWin") throwMDE2("noWin", `Platform restriction: Extended formatting macros and PDF rendering are only supported natively on Windows systems.`);
@@ -2076,6 +2333,7 @@ async function renderMarkdown(config) {
     };
   } catch (x) {
     if (x instanceof MDRenderError) throw x;
+    if (x instanceof UserInputError) throw new MDRenderError("userInput", x.message, null, warnings, logPS, { cause: x });
     const message = x instanceof Error ? x.message : String(x);
     throw new MDRenderError("unknown", `An unhandled internal error occurred during rendering: ${message}`, null, warnings, logPS, { cause: x });
   }
@@ -2088,6 +2346,7 @@ var MDRenderError = class _MDRenderError extends Error {
   /**
    * Code indicating the underlying cause of the failure:
    * - `unknown`: An unhandled or unexpected internal runtime error.
+   * - `userInput`: Invalid user input or Markdown document structure.
    * - `noPS`: PowerShell could not be started or found in the system PATH.
    * - `inPS`: A failure occurred inside PowerShell; MS Word may be missing or corrupt.
    * - `vba`: An error occurred during the execution of internal Word VBA macros.