slidemind 0.3.17 → 0.3.19

package/src/lib/text-fit.mjs

@@ -0,0 +1,94 @@
+// How much room does this text actually need? — the cheap half of a fit check.
+//
+// Converted slides (`slidemind adopt`) keep PowerPoint's fixed text boxes:
+// `autofit: "noAutofit"` means the box does NOT grow and PowerPoint does NOT
+// shrink the text — an over-long line simply spills out of the shape and ships
+// that way. Nothing in the local toolchain measured it, so 12pt bold overflow
+// reached a delivered deck.
+//
+// Real measurement needs a browser; this is Arial's advance-width table
+// instead (1000 units/em, the AFM metrics Arial shares with Helvetica), which
+// is exact for the master's Arial runs and close enough elsewhere to catch a
+// line that is 30% too long. ponytail: regular-weight table × a flat bold
+// factor; swap in per-face metrics if a non-Arial brand ever adopts.
+
+const PT_TO_PX = 96 / 72;
+
+// prettier-ignore
+const W = {
+  " ": 278, "!": 278, '"': 355, "#": 556, $: 556, "%": 889, "&": 667, "'": 191,
+  "(": 333, ")": 333, "*": 389, "+": 584, ",": 278, "-": 333, ".": 278, "/": 278,
+  0: 556, 1: 556, 2: 556, 3: 556, 4: 556, 5: 556, 6: 556, 7: 556, 8: 556, 9: 556,
+  ":": 278, ";": 278, "<": 584, "=": 584, ">": 584, "?": 556, "@": 1015,
+  A: 667, B: 667, C: 722, D: 722, E: 667, F: 611, G: 778, H: 722, I: 278, J: 500,
+  K: 667, L: 556, M: 833, N: 722, O: 778, P: 667, Q: 778, R: 722, S: 667, T: 611,
+  U: 722, V: 667, W: 944, X: 667, Y: 667, Z: 611,
+  "[": 278, "\\": 278, "]": 278, "^": 469, _: 556, "`": 333,
+  a: 556, b: 556, c: 500, d: 556, e: 556, f: 278, g: 556, h: 556, i: 222, j: 222,
+  k: 500, l: 222, m: 833, n: 556, o: 556, p: 556, q: 556, r: 333, s: 500, t: 278,
+  u: 556, v: 500, w: 722, x: 500, y: 500, z: 500,
+  "{": 334, "|": 260, "}": 334, "~": 584,
+  // Latin-1 / typographic characters the master's German and English copy uses.
+  "\u00A0": 278, "«": 556, "»": 556, "°": 400, "·": 278,
+  "×": 584, "÷": 584, "©": 737, "®": 737, "–": 556,
+  "—": 1000, "‘": 222, "’": 222, "‚": 222, "“": 333,
+  "”": 333, "„": 333, "…": 1000, "€": 556, "ß": 556,
+  "£": 556, "§": 556, "•": 350, "−": 584, "\u00AD": 333,
+};
+
+// Accented letters carry their base letter's advance in Arial (the diacritic
+// sits above the glyph box), so strip the combining marks and reuse the table.
+function widthOf(ch) {
+  const w = W[ch];
+  if (w !== undefined) return w;
+  const base = ch.normalize("NFD")[0];
+  return W[base] ?? 556;
+}
+
+/** Rendered width of `text` in px at `pt`, Arial metrics. */
+export function textWidth(text, pt, { bold = false } = {}) {
+  let units = 0;
+  for (const ch of String(text ?? "")) units += widthOf(ch);
+  return (units / 1000) * pt * PT_TO_PX * (bold ? 1.07 : 1);
+}
+
+/**
+ * How many lines `text` takes in a box `widthPx` wide — greedy word wrap, the
+ * way PowerPoint breaks (on spaces, and inside a word that cannot fit alone).
+ * Always at least 1.
+ */
+export function estimateLines(text, pt, widthPx, { bold = false } = {}) {
+  const str = String(text ?? "");
+  if (!str.trim()) return 1;
+  if (!(widthPx > 0)) return 1;
+  const opts = { bold };
+  let lines = 1;
+  let used = 0;
+  for (const word of str.split(/(\s+)/)) {
+    if (!word) continue;
+    const w = textWidth(word, pt, opts);
+    if (/^\s+$/.test(word)) {
+      // Trailing whitespace never pushes a wrap on its own.
+      used += w;
+      continue;
+    }
+    if (used > 0 && used + w > widthPx) {
+      lines++;
+      used = 0;
+    }
+    if (w > widthPx) {
+      // A single word wider than the box breaks mid-word.
+      for (const ch of word) {
+        const cw = textWidth(ch, pt, opts);
+        if (used > 0 && used + cw > widthPx) {
+          lines++;
+          used = 0;
+        }
+        used += cw;
+      }
+      continue;
+    }
+    used += w;
+  }
+  return lines;
+}

package/src/pptx/app-props.mjs

@@ -20,7 +20,6 @@ import { unzip, zip, readText } from "./zip.mjs";
 import { slideOrderPaths, decodeXmlEntities } from "./ooxml.mjs";
 import { slideText } from "./read-local.mjs";
 import { stripHiddenOleGraphicFrames } from "./hidden-ole.mjs";
-import { stripRiskyImageExtensions } from "./image-extensions.mjs";
 
 const APP_PROPS = "docProps/app.xml";
 
@@ -61,9 +60,6 @@ export function normalizePptxAppProperties(buffer) {
   if (stripHiddenOleGraphicFrames(entries)) {
     changed = true;
   }
-  if (stripRiskyImageExtensions(entries)) {
-    changed = true;
-  }
 
   return {
     bytes: changed ? zip(entries) : buffer,

package/src/pptx/slide-swap.mjs

@@ -30,7 +30,6 @@ import {
   resolvePartPath,
 } from "./ooxml.mjs";
 import { stripHiddenOleGraphicFrames } from "./hidden-ole.mjs";
-import { stripRiskyImageExtensions } from "./image-extensions.mjs";
 import {
   slideHasForeignTags,
   slideReferencesEmbeddedWorkbook,
@@ -112,7 +111,6 @@ export function foldPickedSlides(buffer, picks, { sourceName = "reused" } = {})
           part === lowest ? picked : part === picked ? lowest : part,
         ) ?? false,
     });
-    const riskyImagesStripped = stripRiskyImageExtensions(copy);
 
     // Prune to the lowest slide's dependency closure + trimmed skeleton.
     const { entries: pruned, changed } = pruneToLowest(copy);
@@ -123,7 +121,6 @@ export function foldPickedSlides(buffer, picks, { sourceName = "reused" } = {})
       !swapped &&
       !notesStripped &&
       !hiddenOleStripped &&
-      !riskyImagesStripped &&
       !changed
     ) {
       return { selection: n, slideId, bytes: buffer };

package/src/pptx/image-extensions.mjs

@@ -1,190 +0,0 @@
-import { readText } from "./zip.mjs";
-import { relsFor, relsPathFor, resolvePartPath } from "./ooxml.mjs";
-
-const CONTENT_TYPES = "[Content_Types].xml";
-
-export function stripRiskyImageExtensions(files) {
-  let changed = false;
-  const removedTargets = new Set();
-  const candidates = Object.keys(files).filter((part) =>
-    /^ppt\/(?:slides|slideMasters|slideLayouts)\/[^/]+\.xml$/.test(part),
-  );
-
-  for (const part of candidates) {
-    const before = readText(files, part);
-    if (!before) continue;
-
-    const removedIds = new Set();
-    const relsById = new Map(relsFor(files, part).map((rel) => [rel.id, rel]));
-    const partDir = part.includes("/") ? part.slice(0, part.lastIndexOf("/")) : "";
-    let after = before.replace(
-      /<a:ext\b[\s\S]*?<\/a:ext>/g,
-      (ext) => {
-        if (!/<(?:asvg:svgBlip|a14:imgLayer)\b/.test(ext)) return ext;
-        for (const id of relationshipIdsIn(ext)) removedIds.add(id);
-        return "";
-      },
-    );
-    after = after.replace(/<a:extLst\b[^>]*>\s*<\/a:extLst>/g, "");
-    after = after.replace(
-      /<p:pic\b[\s\S]*?<\/p:pic>/g,
-      (pic) => {
-        if (!/<a:blip\b(?![^>]*\br:(?:embed|link)=)[^>]*>\s*<\/a:blip>/.test(pic)) {
-          return pic;
-        }
-        for (const id of relationshipIdsIn(pic)) removedIds.add(id);
-        return "";
-      },
-    );
-    after = after.replace(
-      /<p:pic\b[\s\S]*?<\/p:pic>/g,
-      (pic) => {
-        for (const id of relationshipIdsIn(pic)) {
-          const rel = relsById.get(id);
-          if (
-            rel &&
-            rel.targetMode !== "External" &&
-            /\.svg(?:$|[?#])/i.test(rel.target ?? "")
-          ) {
-            removedIds.add(id);
-            return "";
-          }
-        }
-        return pic;
-      },
-    );
-    const relsPath = relsPathFor(part);
-    const relsXml = readText(files, relsPath);
-    const remainingIds = relationshipIdsIn(after);
-    if (relsXml) {
-      for (const rel of relsById.values()) {
-        if (
-          rel.targetMode !== "External" &&
-          !remainingIds.has(rel.id) &&
-          /\.(?:svg|wdp)(?:$|[?#])/i.test(rel.target ?? "")
-        ) {
-          removedIds.add(rel.id);
-        }
-      }
-    }
-
-    if (after === before && removedIds.size === 0) continue;
-
-    if (after !== before) {
-      files[part] = new TextEncoder().encode(after);
-      changed = true;
-    }
-    if (!relsXml) continue;
-
-    let nextRels = relsXml;
-    for (const id of removedIds) {
-      if (remainingIds.has(id)) continue;
-      nextRels = removeRelationshipById(nextRels, id);
-      const rel = relsById.get(id);
-      if (rel && rel.targetMode !== "External") {
-        removedTargets.add(resolvePartPath(partDir, rel.target));
-      }
-    }
-    if (nextRels !== relsXml) {
-      files[relsPath] = new TextEncoder().encode(nextRels);
-    }
-  }
-
-  const deleted = deleteUnreferencedTargets(files, removedTargets);
-  if (deleted.size > 0) {
-    removeContentTypeOverrides(files, deleted);
-    changed = true;
-  }
-  if (removeUnusedMediaDefaults(files, ["svg", "wdp"])) {
-    changed = true;
-  }
-
-  return changed;
-}
-
-function deleteUnreferencedTargets(files, removedTargets) {
-  const remainingRefs = referencedInternalTargets(files);
-  const deleted = new Set();
-  for (const part of removedTargets) {
-    if (!part || remainingRefs.has(part) || files[part] === undefined) continue;
-    delete files[part];
-    const sidecar = relsPathFor(part);
-    if (files[sidecar] !== undefined) delete files[sidecar];
-    deleted.add(part);
-  }
-  return deleted;
-}
-
-function referencedInternalTargets(files) {
-  const refs = new Set();
-  for (const relsPath of Object.keys(files)) {
-    if (!relsPath.endsWith(".rels")) continue;
-    const dir = relsPath.replace(/\/?_rels\/[^/]+$/, "");
-    const owner =
-      dir === ""
-        ? relsPath.replace(/^_rels\/(.*)\.rels$/, "$1")
-        : `${dir}/${relsPath.replace(/^.*_rels\/(.*)\.rels$/, "$1")}`;
-    for (const rel of relsFor(files, owner)) {
-      if (rel.targetMode === "External") continue;
-      refs.add(resolvePartPath(dir, rel.target));
-    }
-  }
-  return refs;
-}
-
-function removeContentTypeOverrides(files, deletedParts) {
-  const before = readText(files, CONTENT_TYPES);
-  if (!before) return;
-  let after = before;
-  for (const part of deletedParts) {
-    after = after.replace(
-      new RegExp(
-        `<Override\\b(?=[^>]*\\bPartName="/${escapeRe(part)}")[^>]*?/>`,
-        "g",
-      ),
-      "",
-    );
-  }
-  if (after !== before) files[CONTENT_TYPES] = new TextEncoder().encode(after);
-}
-
-function removeUnusedMediaDefaults(files, exts) {
-  const before = readText(files, CONTENT_TYPES);
-  if (!before) return false;
-  let after = before;
-  for (const ext of exts) {
-    const hasPart = Object.keys(files).some((part) =>
-      part.toLowerCase().endsWith(`.${ext}`),
-    );
-    if (hasPart) continue;
-    after = after.replace(
-      new RegExp(`<Default\\b(?=[^>]*\\bExtension="${escapeRe(ext)}")[^>]*?/>`, "g"),
-      "",
-    );
-  }
-  if (after !== before) {
-    files[CONTENT_TYPES] = new TextEncoder().encode(after);
-    return true;
-  }
-  return false;
-}
-
-function relationshipIdsIn(xml) {
-  const ids = new Set();
-  for (const m of String(xml).matchAll(/\br:(?:id|embed|link)\s*=\s*"([^"]+)"/g)) {
-    ids.add(m[1]);
-  }
-  return ids;
-}
-
-function removeRelationshipById(xml, id) {
-  return xml.replace(
-    new RegExp(
-      `<Relationship\\b(?=[^>]*\\bId="${escapeRe(id)}")[^>]*?(?:/>|>[\\s\\S]*?</Relationship>)`,
-      "g",
-    ),
-    "",
-  );
-}
-
-const escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");