gutterpress 0.11.23-beta.1 → 0.11.23-beta.3

package/dist/{cli-e31jshz6.js → cli-5zbdb6mt.js}

@@ -1,4 +1,5 @@
 import {
+  BUNDLED_EXTENSION_DETAILS,
   EXTENSION_MANIFEST_FILENAME,
   TWO_VERSIONS_OPEN,
   bundledExtension,
@@ -11,10 +12,10 @@ import {
   prettify,
   readExtensionMeta,
   slugify
-} from "./cli-ttj95aex.js";
+} from "./cli-7mt0dftw.js";
 import {
   log
-} from "./cli-1fy1pm9d.js";
+} from "./cli-fh685nqs.js";
 import {
   UsageError
 } from "./cli-d8xjns66.js";
@@ -37,7 +38,7 @@ import {
   vendoredNpmPluginRoot,
   vendoredNpmPluginRoots,
   windowsPathKey
-} from "./cli-y28j019d.js";
+} from "./cli-1dha1nxk.js";
 import {
   __require
 } from "./cli-37x76zdn.js";
@@ -79,10 +80,10 @@ async function withFetchTimeout(options, run) {
 }
 
 // src/lib/extension-manager.ts
-import { readdir, readFile as readFile5, rm as rm3, stat } from "node:fs/promises";
+import { mkdir as mkdir3, readdir, readFile as readFile5, rm as rm3, stat, writeFile as writeFile2 } from "node:fs/promises";
 import { existsSync as existsSync3 } from "node:fs";
 import path4 from "node:path";
-import { isSeq as isSeq2, isMap, isScalar, YAMLMap, Scalar } from "yaml";
+import { isSeq as isSeq2, isMap as isMap3, isScalar, YAMLMap, Scalar } from "yaml";
 
 // src/lib/manifest-doc.ts
 import { existsSync as existsSync2 } from "node:fs";
@@ -145,7 +146,8 @@ var DTRPG_PRESET = {
   },
   validate: {
     assets: {
-      maxImageSize: 1e7
+      maxImageSize: 1e7,
+      approvedFontFiles: []
     },
     pdf: {
       minImageResolution: 300,
@@ -202,7 +204,8 @@ var BOOK_PRESET = {
   },
   validate: {
     assets: {
-      maxImageSize: 1e7
+      maxImageSize: 1e7,
+      approvedFontFiles: []
     },
     pdf: {
       minImageResolution: 300,
@@ -362,6 +365,124 @@ function applyDefaultPdfStrictChecks(config) {
   return next;
 }
 
+// src/lib/manifest-old-spellings.ts
+import { isMap as isMap2 } from "yaml";
+
+// src/lib/check-options.ts
+import { isMap } from "yaml";
+var CHECK_OPTIONS = {
+  "pdf.print.ink-coverage": {
+    maxTac: { at: "ink.maxTac", kind: "number" },
+    tacTolerance: { at: "ink.tacTolerance", kind: "number" }
+  },
+  "pdf.print.page-size": {
+    tolerance: { at: "page.tolerance", kind: "number" }
+  },
+  "pdf.print.image-resolution": {
+    minImageResolution: { at: "validate.pdf.minImageResolution", kind: "number" }
+  },
+  "pdf.print.bleed": {
+    bleedSize: { at: "validate.pdf.bleedSize", kind: "number" }
+  },
+  "asset.image.file-size": {
+    maxImageSize: { at: "validate.assets.maxImageSize", kind: "number" }
+  },
+  "asset.font.approved-files": {
+    approvedFontFiles: { at: "validate.assets.approvedFontFiles", kind: "patterns" }
+  },
+  "heuristic.decoration.layer-count": {
+    maxDecorativeLayers: { at: "validate.heuristics.maxDecorativeLayers", kind: "number" }
+  },
+  "heuristic.whitespace.text-density": {
+    textDensityRange: { at: "validate.heuristics.textDensityRange", kind: "range" }
+  },
+  "heuristic.chunking.section-density": {
+    maxParagraphsPerSection: { at: "validate.heuristics.maxParagraphsPerSection", kind: "number" }
+  }
+};
+function optionForOldSpelling(at) {
+  for (const [id, options] of Object.entries(CHECK_OPTIONS)) {
+    for (const [option, spec] of Object.entries(options)) {
+      if (spec.at === at)
+        return { id, option };
+    }
+  }
+  return;
+}
+function isPlainObject(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+var isAmount = (v) => typeof v === "number" && Number.isFinite(v) && v >= 0;
+var isRangeEnd = ([k, v]) => (k === "min" || k === "max") && isAmount(v);
+var MUST_BE = {
+  number: "a number, 0 or more",
+  range: "`{ min, max }` (numbers, 0 or more)",
+  patterns: "a list of file patterns"
+};
+function fits(kind, value) {
+  if (kind === "number")
+    return isAmount(value);
+  if (kind === "range")
+    return isPlainObject(value) && Object.entries(value).every(isRangeEnd);
+  return Array.isArray(value) && value.every((p) => typeof p === "string");
+}
+function checked(id, option, kind, value) {
+  if (fits(kind, value))
+    return value;
+  throw new UsageError(`Manifest field \`checks.${id}.${option}\` must be ${MUST_BE[kind]}, got ${JSON.stringify(value)}.`);
+}
+function isCheckLevelInput(value) {
+  return typeof value === "boolean" || ["off", "on", "info", "warn", "warning", "error"].includes(value);
+}
+function readOldThreshold(at, value) {
+  const moved = optionForOldSpelling(at);
+  if (!moved)
+    return;
+  const { kind } = CHECK_OPTIONS[moved.id][moved.option];
+  if (fits(kind, value))
+    return { ...moved, value };
+  const kept = kind === "range" && isPlainObject(value) ? Object.entries(value).filter(isRangeEnd) : [];
+  return { ...moved, ...kept.length > 0 ? { value: Object.fromEntries(kept) } : {}, mustBe: MUST_BE[kind] };
+}
+function readCheckOptions(id, entry) {
+  const known = CHECK_OPTIONS[id] ?? {};
+  const out = {};
+  for (const [option, value] of Object.entries(entry)) {
+    if (option === "level" || value === null || value === undefined)
+      continue;
+    const spec = known[option];
+    if (!spec) {
+      const takes = Object.keys(known);
+      throw new UsageError(`Manifest field \`checks.${id}\` has no option \`${option}\`. ` + (takes.length > 0 ? `It takes \`level\` and ${takes.map((o) => `\`${o}\``).join(", ")}.` : "It takes only `level` (off, on, info, warn or error)."));
+    }
+    out[option] = checked(id, option, spec.kind, value);
+  }
+  return out;
+}
+function applyCheckOptions(config, options) {
+  for (const [id, values] of Object.entries(options)) {
+    for (const [option, value] of Object.entries(values)) {
+      const spec = CHECK_OPTIONS[id][option];
+      const keys = spec.at.split(".");
+      const leaf = keys.pop();
+      let node = config;
+      for (const key of keys)
+        node = node[key];
+      node[leaf] = spec.kind === "range" ? { ...node[leaf], ...value } : value;
+    }
+  }
+}
+function setCheckOption(doc, id, option, value) {
+  if (!isMap(doc.get("checks", true)))
+    doc.set("checks", doc.createNode({}));
+  const current = doc.getIn(["checks", id], true);
+  if (!isMap(current)) {
+    const level = doc.getIn(["checks", id]);
+    doc.setIn(["checks", id], doc.createNode(level === undefined || level === null ? {} : { level }));
+  }
+  doc.setIn(["checks", id, option], value);
+}
+
 // src/lib/manifest-old-spellings.ts
 var SOURCE_TOOL_CHECKS = {
   markdownlint: "source.markdownlint",
@@ -380,6 +501,7 @@ var FLAG_CHECKS = {
 function isObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
+var optionSpelling = (id, option, value) => `checks: { ${id}: { ${option}: ${JSON.stringify(value)} } }`;
 function readOldSpellings(raw) {
   const { source, lint, validate, ink, ...manifest } = raw;
   const tolerance = isObject(raw.page) && "tolerance" in raw.page;
@@ -391,7 +513,32 @@ function readOldSpellings(raw) {
   }
   const renamed = [];
   const dropped = [];
-  const checks = {};
+  const unusable = [];
+  const levels = {};
+  const options = {};
+  const threshold = (at, value) => {
+    const read = readOldThreshold(at, value);
+    if (!read) {
+      dropped.push(at);
+      return;
+    }
+    if (value === null || value === undefined)
+      return;
+    if (read.value !== undefined) {
+      (options[read.id] ??= {})[read.option] = read.value;
+      renamed.push(`${at} -> ${optionSpelling(read.id, read.option, read.value)}`);
+    }
+    if (read.mustBe) {
+      const kept = read.value !== undefined ? `kept ${Object.keys(read.value).join(" and ")}, ignored the rest` : "ignored";
+      unusable.push(`${at}: ${JSON.stringify(value)} is not ${read.mustBe} — ${kept}`);
+    }
+  };
+  const level = (at, value) => {
+    if (isCheckLevelInput(value))
+      return value;
+    unusable.push(`${at}: ${JSON.stringify(value)} is not off, on, info, warn or error — ignored`);
+    return;
+  };
   if (isObject(source) && "files" in source) {
     renamed.push("source.files -> chapters");
     if (manifest.chapters === undefined)
@@ -400,18 +547,37 @@ function readOldSpellings(raw) {
   if (isObject(validate)) {
     for (const [id, entry] of Object.entries(validate.checks ?? {})) {
       if (entry === false || isObject(entry) && entry.enabled === false)
-        checks[id] = "off";
-      else if (isObject(entry) && typeof entry.severity === "string")
-        checks[id] = entry.severity;
-      else
-        checks[id] = "on";
+        levels[id] = "off";
+      else if (isObject(entry) && entry.severity !== undefined && entry.severity !== null) {
+        levels[id] = level(`validate.checks.${id}.severity`, entry.severity) ?? "on";
+      } else
+        levels[id] = "on";
     }
     if (validate.checks !== undefined)
       renamed.push("validate.checks -> checks");
+  }
+  if (isObject(lint)) {
+    for (const [id, value] of Object.entries(lint.rules ?? {})) {
+      const read = level(`lint.rules.${id}`, value);
+      if (read !== undefined)
+        levels[id] = read;
+    }
+    if (lint.rules !== undefined)
+      renamed.push("lint.rules -> checks");
+    if (lint.enabled === false) {
+      levels["source.stylelint"] = "off";
+      renamed.push("lint.enabled: false -> checks: { source.stylelint: off }");
+    } else if (lint.enabled !== undefined) {
+      dropped.push("lint.enabled");
+    }
+    if (lint.configPath !== undefined)
+      dropped.push("lint.configPath");
+  }
+  if (isObject(validate)) {
     for (const [tool, value] of Object.entries(validate.source ?? {})) {
       const id = SOURCE_TOOL_CHECKS[tool];
       if (id && value === false) {
-        checks[id] = "off";
+        levels[id] = "off";
         renamed.push(`validate.source.${tool}: false -> checks: { ${id}: off }`);
       } else if (id && tool !== "stylelint" && typeof value === "string") {
         dropped.push(`validate.source.${tool} (the config file is found by its usual name in the book's folder or a folder above it)`);
@@ -423,11 +589,14 @@ function readOldSpellings(raw) {
       for (const [key, value] of Object.entries(validate[block] ?? {})) {
         const flag = FLAG_CHECKS[`${block}.${key}`];
         if (flag && typeof value === "boolean") {
-          const level = value === flag.trueMeansOn ? "on" : "off";
-          checks[flag.check] = level;
-          renamed.push(`validate.${block}.${key}: ${value} -> checks: { ${flag.check}: ${level} }`);
+          const on = value === flag.trueMeansOn;
+          if (!on)
+            levels[flag.check] = "off";
+          else
+            levels[flag.check] ??= "on";
+          renamed.push(`validate.${block}.${key}: ${value} -> checks: { ${flag.check}: ${String(levels[flag.check])} }`);
         } else {
-          dropped.push(`validate.${block}.${key} (the preset and the publish target set it)`);
+          threshold(`validate.${block}.${key}`, value);
         }
       }
     }
@@ -435,32 +604,28 @@ function readOldSpellings(raw) {
       dropped.push("validate.enabled (`gutterpress build --skip-pre-validate --skip-post-validate` skips validation for one build)");
     }
   }
-  if (isObject(lint)) {
-    for (const [id, level] of Object.entries(lint.rules ?? {}))
-      checks[id] = level;
-    if (lint.rules !== undefined)
-      renamed.push("lint.rules -> checks");
-    if (lint.enabled === false) {
-      checks["source.stylelint"] = "off";
-      renamed.push("lint.enabled: false -> checks: { source.stylelint: off }");
-    } else if (lint.enabled !== undefined) {
-      dropped.push("lint.enabled");
-    }
-    if (lint.configPath !== undefined)
-      dropped.push("lint.configPath");
+  if (isObject(ink)) {
+    for (const [key, value] of Object.entries(ink))
+      threshold(`ink.${key}`, value);
+  } else if (ink !== undefined && ink !== null) {
+    dropped.push("ink");
   }
-  if (ink !== undefined)
-    dropped.push("ink (the preset and the publish target set it)");
   if (tolerance) {
-    const { tolerance: _, ...page } = raw.page;
+    const { tolerance: value, ...page } = raw.page;
     manifest.page = page;
-    dropped.push("page.tolerance (the preset sets it)");
+    threshold("page.tolerance", value);
+  }
+  const ids = new Set([...Object.keys(levels), ...Object.keys(options)]);
+  if (ids.size > 0) {
+    const checks = { ...manifest.checks };
+    for (const id of ids)
+      checks[id] = mergeEntry(levels[id], options[id], manifest.checks?.[id]);
+    manifest.checks = checks;
   }
-  if (Object.keys(checks).length > 0)
-    manifest.checks = { ...checks, ...manifest.checks };
   const lines = [
     ...renamed.map((r) => `  ${r}`),
-    ...dropped.map((d) => `  ${d} — no longer a setting, ignored`)
+    ...dropped.map((d) => `  ${d} — no longer a setting, ignored`),
+    ...unusable.map((u) => `  ${u}`)
   ];
   if (lines.length > 0) {
     warnOnce(`old-manifest-spellings:${lines.join("|")}`, "[gutterpress] manifest.yaml uses spellings 0.11.23 replaced. They still work in this " + `release; rewrite them before the next one:
@@ -469,6 +634,18 @@ function readOldSpellings(raw) {
   }
   return manifest;
 }
+function mergeEntry(level, options, own) {
+  const ownEntry = isObject(own) ? own : own === undefined ? {} : { level: own };
+  const merged = {
+    ...level !== undefined ? { level } : {},
+    ...options,
+    ...ownEntry
+  };
+  if (ownEntry.level === undefined && level !== undefined)
+    merged.level = level;
+  const keys = Object.keys(merged);
+  return keys.length === 1 && keys[0] === "level" ? merged.level : merged;
+}
 
 // src/lib/manifest.ts
 var MANIFEST_FILENAMES = [
@@ -577,7 +754,7 @@ function pluginsRemovedMessage(raw) {
 ` + (lines.length > 0 ? lines.join(`
 `) : "  - ./plugins/my-plugin.js");
 }
-function isPlainObject(v) {
+function isPlainObject2(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function mergeShape(cli, manifest, preset) {
@@ -586,7 +763,7 @@ function mergeShape(cli, manifest, preset) {
     const presetValue = preset[key];
     const manifestValue = manifest ? manifest[key] : undefined;
     const cliValue = cli ? cli[key] : undefined;
-    out[key] = isPlainObject(presetValue) ? mergeShape(cliValue, manifestValue, presetValue) : cliValue ?? manifestValue ?? presetValue;
+    out[key] = isPlainObject2(presetValue) ? mergeShape(cliValue, manifestValue, presetValue) : cliValue ?? manifestValue ?? presetValue;
   }
   return out;
 }
@@ -634,7 +811,7 @@ function resolveCustomPage(c, m) {
 }
 var MARGIN_EDGES = ["top", "bottom", "inside", "outside"];
 function validatePageMargin(margin, size) {
-  const edges = isPlainObject(margin) && Object.keys(margin).every((k) => MARGIN_EDGES.includes(k)) && MARGIN_EDGES.every((e) => isNonNegativePoints(margin[e]));
+  const edges = isPlainObject2(margin) && Object.keys(margin).every((k) => MARGIN_EDGES.includes(k)) && MARGIN_EDGES.every((e) => isNonNegativePoints(margin[e]));
   if (!edges) {
     throw new UsageError("Manifest field `page.margin` must set all four edges in points (72pt = 1in), for example\n" + `  page:
     margin:
@@ -691,7 +868,9 @@ function resolveWithPreset(cliOverrides, manifest, preset) {
   const page = preset.page ? mergeShape(c.page, m.page, preset.page) : resolveCustomPage(c, m);
   if (page.margin !== undefined && page.margin !== null)
     validatePageMargin(page.margin, page);
-  return {
+  const manifestChecks = resolveChecks(m.checks);
+  const cliChecks = resolveChecks(c.checks);
+  const config = {
     title: c.title ?? m.title ?? "Document",
     authors: c.authors ?? m.authors ?? [],
     language: resolveLanguage(c.language ?? m.language),
@@ -701,35 +880,47 @@ function resolveWithPreset(cliOverrides, manifest, preset) {
     extensions,
     targets: resolveTargets(c.targets ?? m.targets, preset.defaultTargets),
     chapters: c.chapters ?? m.chapters ?? preset.chapters,
-    checks: { ...preset.checks, ...resolveCheckLevels(m.checks), ...resolveCheckLevels(c.checks) },
+    checks: { ...preset.checks, ...manifestChecks.levels, ...cliChecks.levels },
     pdfx: mergeShape(c.pdfx, m.pdfx, preset.pdfx),
     print: mergeShape(c.print, m.print, preset.print),
     page,
     ink: structuredClone(preset.ink),
     validate: structuredClone(preset.validate)
   };
-}
-function resolveCheckLevels(input) {
+  applyCheckOptions(config, manifestChecks.options);
+  applyCheckOptions(config, cliChecks.options);
+  return config;
+}
+function checkLevel(id, value) {
+  if (!isCheckLevelInput(value)) {
+    throw new UsageError(`Manifest field \`checks.${id}\` must be off, on, info, warn or error, got ${JSON.stringify(value)}.`);
+  }
+  if (value === false || value === "off")
+    return "off";
+  if (value === true || value === "on")
+    return "on";
+  return value === "warn" || value === "warning" ? "warning" : value;
+}
+function resolveChecks(input) {
+  const levels = {};
+  const options = {};
   if (input === undefined || input === null)
-    return {};
-  if (!isPlainObject(input)) {
+    return { levels, options };
+  if (!isPlainObject2(input)) {
     throw new UsageError("Manifest field `checks` must map check ids to off, on, info, warn or error.");
   }
-  const out = {};
   for (const [id, value] of Object.entries(input)) {
-    if (value === false || value === "off")
-      out[id] = "off";
-    else if (value === true || value === "on")
-      out[id] = "on";
-    else if (value === "warn" || value === "warning")
-      out[id] = "warning";
-    else if (value === "info" || value === "error")
-      out[id] = value;
-    else {
-      throw new UsageError(`Manifest field \`checks.${id}\` must be off, on, info, warn or error, got ${JSON.stringify(value)}.`);
+    if (!isPlainObject2(value)) {
+      levels[id] = checkLevel(id, value);
+      continue;
     }
+    if (value.level !== undefined && value.level !== null)
+      levels[id] = checkLevel(`${id}.level`, value.level);
+    const own = readCheckOptions(id, value);
+    if (Object.keys(own).length > 0)
+      options[id] = own;
   }
-  return out;
+  return { levels, options };
 }
 
 // src/lib/manifest-doc.ts
@@ -1502,7 +1693,7 @@ function withMutationLock(projectDir, mutation) {
 function entryUse(item) {
   if (isScalar(item))
     return typeof item.value === "string" ? item.value.trim() : null;
-  if (isMap(item)) {
+  if (isMap3(item)) {
     const u = item.get("use");
     return typeof u === "string" ? u.trim() : null;
   }
@@ -1512,7 +1703,7 @@ function rawEntry(item) {
   const use = entryUse(item);
   if (!use)
     return null;
-  if (!isMap(item))
+  if (!isMap3(item))
     return { use, enabled: true };
   const x = item.get("export");
   return {
@@ -1685,13 +1876,13 @@ async function setExtensionEnabled(projectDir, use, enabled) {
       throw new Error(`Extension "${use}" is not in the manifest.`);
     const item = seq.items[idx];
     if (enabled) {
-      if (isMap(item)) {
+      if (isMap3(item)) {
         item.delete("enabled");
         if (item.items.length === 1 && typeof item.get("use") === "string") {
           seq.items[idx] = new Scalar(item.get("use"));
         }
       }
-    } else if (isMap(item)) {
+    } else if (isMap3(item)) {
       item.set("enabled", false);
     } else {
       const map = new YAMLMap(doc.schema);
@@ -1734,7 +1925,7 @@ async function upsertEntry(projectDir, use, exportName) {
   const idx = indexOfUse(seq, use);
   if (idx >= 0) {
     const item = seq.items[idx];
-    if (isMap(item)) {
+    if (isMap3(item)) {
       item.set("use", use);
       if (exportName)
         item.set("export", exportName);
@@ -1991,6 +2182,46 @@ async function updateExtensions(projectDir, options = {}) {
   }
   return updated;
 }
+var BUILT_IN_LOOKS = BUNDLED_EXTENSION_DETAILS.filter((b) => b.css !== undefined).map((b) => b.name);
+async function addBuiltInStyleSet(projectDir, id) {
+  const look = bundledExtension(id);
+  if (look?.css === undefined) {
+    throw new Error(`Unknown built-in look "${id}" (one of: ${BUILT_IN_LOOKS.join(", ")}).`);
+  }
+  const css = look.css;
+  return withMutationLock(projectDir, async () => {
+    const dest = path4.join(projectDir, EXTENSIONS_DIR, id);
+    if (!existsSync3(dest)) {
+      await mkdir3(dest, { recursive: true });
+      const pkg = {
+        name: id,
+        description: look.description,
+        author: "gutterpress",
+        keywords: ["gutterpress", "gutterpress-look"],
+        gutterpress: { styles: ["theme.css"] }
+      };
+      await writeFile2(path4.join(dest, EXTENSION_MANIFEST_FILENAME), `${JSON.stringify(pkg, null, 2)}
+`, "utf8");
+      await writeFile2(path4.join(dest, "theme.css"), css, "utf8");
+    }
+    const use = `./${EXTENSIONS_DIR}/${id}`;
+    await loadPlugin(extensionConfigFor({ use, kind: "path", name: use }), projectDir);
+    const { doc, file } = await loadManifestDoc(projectDir);
+    const seq = ensureSeq(doc, "extensions");
+    if (indexOfUse(seq, use) < 0) {
+      const at = indexOfUse(seq, id);
+      const item = at < 0 ? undefined : seq.items[at];
+      if (isMap3(item))
+        item.set("use", use);
+      else if (at >= 0)
+        seq.items[at] = new Scalar(use);
+      else
+        seq.add(new Scalar(use));
+      await writeManifestDoc(file, doc);
+    }
+    return await describeExtension(projectDir, use);
+  });
+}
 async function uniqueExtensionId(projectDir, base) {
   const slug = slugify(base) || "extension";
   let candidate = slug;
@@ -2117,4 +2348,4 @@ async function restoreForCommand(dir, options) {
     log.warn(problem);
 }
 
-export { PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, resolveTargets, applyDefaultPdfStrictChecks, MANIFEST_FILENAMES, loadManifest, loadManifestWithPath, resolveConfig, resolveConfigForTarget, FriendlyHttpError, withFetchTimeout, loadManifestDoc, writeManifestDoc, npmRegistryUrl, ensureProjectGitignore, listProjectExtensions, setExtensionEnabled, removeExtension, addExtension, checkExtensionUpdates, updateExtensions, uniqueExtensionId, restorePinnedExtensions, restoreFailureMessage, restoreOfflineMessage, restoreForCommand };
+export { PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, resolveTargets, applyDefaultPdfStrictChecks, setCheckOption, MANIFEST_FILENAMES, loadManifest, loadManifestWithPath, resolveConfig, resolveConfigForTarget, FriendlyHttpError, withFetchTimeout, loadManifestDoc, writeManifestDoc, npmRegistryUrl, ensureProjectGitignore, listProjectExtensions, setExtensionEnabled, removeExtension, addExtension, checkExtensionUpdates, updateExtensions, BUILT_IN_LOOKS, addBuiltInStyleSet, uniqueExtensionId, restorePinnedExtensions, restoreFailureMessage, restoreOfflineMessage, restoreForCommand };

package/dist/{cli-ttj95aex.js → cli-7mt0dftw.js}

@@ -1,7 +1,7 @@
 import {
   PACKAGE_VERSION,
   debug
-} from "./cli-1fy1pm9d.js";
+} from "./cli-fh685nqs.js";
 import {
   isExactNpmVersion,
   isValidNpmPackageName,
@@ -11,7 +11,7 @@ import {
   resolveVendoredPluginInstallRoot,
   safePackageTarget,
   vendoredNpmPluginPackageDir
-} from "./cli-y28j019d.js";
+} from "./cli-1dha1nxk.js";
 
 // src/lib/markdown/plugins.ts
 import { existsSync as existsSync2, readFileSync, statSync, unlinkSync } from "node:fs";
@@ -292,7 +292,7 @@ th, td { padding: 0.2em 0.8em; }
 `;
 
 // src/lib/extension-specifier.ts
-var BUNDLED_EXTENSIONS = [
+var BUNDLED_EXTENSION_DETAILS = [
   {
     name: "markdown-it-mark",
     label: "Highlight",
@@ -348,8 +348,9 @@ var BUNDLED_EXTENSIONS = [
     css: theme_default4
   }
 ];
+var BUNDLED_EXTENSIONS = BUNDLED_EXTENSION_DETAILS.map((e) => e.name);
 function bundledExtension(name) {
-  return BUNDLED_EXTENSIONS.find((e) => e.name === name);
+  return BUNDLED_EXTENSION_DETAILS.find((e) => e.name === name);
 }
 function isBundledExtension(name) {
   return bundledExtension(name) !== undefined;
@@ -1950,8 +1951,9 @@ img.gp-shape {
 
 /* Math (the bundled gutterpress-math feature, math.ts): MathJax's own rules
    for the <mjx-container> SVG output it emits, from its SVG output jax's
-   stylesheet, less the ones for its interactive menu and tooltips. Inert in
-   a book without formulas. */
+   stylesheet, less the ones for its interactive menu and tooltips, plus one
+   bound of ours on the hidden MathML copy (#469, below). Inert in a book
+   without formulas. */
 mjx-container[jax="SVG"] { direction: ltr; }
 mjx-container[jax="SVG"] > svg { overflow: visible; min-height: 1px; min-width: 1px; }
 mjx-container[jax="SVG"] > svg a { fill: blue; stroke: blue; }
@@ -1968,6 +1970,15 @@ mjx-assistive-mml {
   border: 0px !important;
   display: block !important;
   width: auto !important;
+  /* Ours (#469). The browser lays the copy out in whatever math font it has,
+     so it can be wider than the formula's SVG; ending a line, it crossed the
+     column edge and Chromium shrank the whole print to fit. MathJax makes the
+     container position: relative with the copy at its top left, so 100% is
+     the formula's width. Clip and overflow still hide the copy and its MathML
+     still reaches screen readers; only its box changes. Not the 1px
+     visually-hidden box MathJax 2 used: its docs note VoiceOver on iOS could
+     not reach a formula by touch in it. */
+  max-width: 100% !important;
   overflow: hidden !important;
   user-select: none;
 }
@@ -2538,22 +2549,39 @@ th[data-align="right"], td[data-align="right"] { text-align: right; }
 `;
 
 // src/lib/markdown/typography.ts
+var SCOPED = /\((c|tm|r)\)/gi;
+var SYMBOLS = { c: "©", r: "®", tm: "™" };
+var LABEL_BEFORE = { c: "(b)", C: "(B)", r: "(q)", R: "(Q)" };
+var LABELS = /\((b|q)\)/gi;
+var RARE = /\+-|\.\.|\?\?\?\?|!!!!|,,|--/;
 var EM_DASH = /(^|[^-])---(?=[^-]|$)/gm;
 var EN_DASH_SPACED = /(^|\s)--(?=\s|$)/gm;
 var EN_DASH = /(^|[^-\s])--(?=[^-\s]|$)/gm;
-var ELLIPSIS = /\.\.\./g;
-var CANDIDATE = /--|\.\.\./;
-function replaceInText(children) {
+var CANDIDATE = /\((?:c|tm|r|b|q)\)|\+-|\.\.|\?\?\?\?|!!!!|,,|--/i;
+function replaceRare(text) {
+  return text.replace(/\+-/g, "±").replace(/\.{2,}/g, "…").replace(/([?!])…/g, "$1..").replace(/([?!]){4,}/g, "$1$1$1").replace(/,{2,}/g, ",").replace(EM_DASH, "$1—").replace(EN_DASH_SPACED, "$1–").replace(EN_DASH, "$1–");
+}
+function replaceInText(children, seen) {
   let insideAutolink = 0;
-  for (let i = children.length - 1;i >= 0; i--) {
-    const token = children[i];
-    if (token.type === "text" && !insideAutolink && CANDIDATE.test(token.content)) {
-      token.content = token.content.replace(ELLIPSIS, "…").replace(EM_DASH, "$1—").replace(EN_DASH_SPACED, "$1–").replace(EN_DASH, "$1–");
-    }
-    if (token.type === "link_close" && token.info === "auto")
-      insideAutolink++;
+  for (const token of children) {
     if (token.type === "link_open" && token.info === "auto")
+      insideAutolink++;
+    if (token.type === "link_close" && token.info === "auto")
       insideAutolink--;
+    if (token.type !== "text")
+      continue;
+    const typed = token.content;
+    if (!insideAutolink) {
+      let text = typed.replace(SCOPED, (match, name, offset) => {
+        const label = LABEL_BEFORE[name];
+        return label && (seen.has(label) || typed.slice(0, offset).includes(label)) ? match : SYMBOLS[name.toLowerCase()];
+      });
+      if (RARE.test(text))
+        text = replaceRare(text);
+      token.content = text;
+    }
+    for (const [label] of typed.matchAll(LABELS))
+      seen.add(label);
   }
 }
 var QUOTES = {
@@ -2580,10 +2608,11 @@ function quotesFor(language) {
 function gpTypography(md) {
   md.disable("replacements");
   md.core.ruler.after("linkify", "gp_typography", (state) => {
+    const seen = new Set;
     for (const token of state.tokens) {
       if (token.type !== "inline" || !token.children || !CANDIDATE.test(token.content))
         continue;
-      replaceInText(token.children);
+      replaceInText(token.children, seen);
     }
   });
 }
@@ -3897,4 +3926,4 @@ async function loadPluginsWithCss(configs, baseDir, onError) {
   };
 }
 
-export { bundledExtension, isPathSpecifier, parseExtensionSpecifier, pinnedNpmSpecifier, TWO_VERSIONS_OPEN, TWO_VERSIONS_CLOSE, MARKER_CSS, GUTTERPRESS_CSS, TWO_VERSIONS_CSS, TABLE_ALIGN_CSS, slugify, prettify, parseSrcsetUrlCandidates, collectHtmlImageRefs, createMarkdownRenderer, applyPlugins, collectPluginCss, collectPluginStylePaths, collectPluginStyleGroups, resolveDeclaredStyles, EXTENSION_MANIFEST_FILENAME, readExtensionMeta, extensionStyleList, extensionEntry, extensionCarries, assertExtensionContained, __resetPathPluginCacheForTests, loadPlugin, loadPublishFunction, loadPlugins, loadPluginsWithCss };
+export { BUNDLED_EXTENSION_DETAILS, bundledExtension, isPathSpecifier, parseExtensionSpecifier, pinnedNpmSpecifier, TWO_VERSIONS_OPEN, TWO_VERSIONS_CLOSE, MARKER_CSS, GUTTERPRESS_CSS, TWO_VERSIONS_CSS, TABLE_ALIGN_CSS, slugify, prettify, parseSrcsetUrlCandidates, collectHtmlImageRefs, createMarkdownRenderer, applyPlugins, collectPluginCss, collectPluginStylePaths, collectPluginStyleGroups, resolveDeclaredStyles, EXTENSION_MANIFEST_FILENAME, readExtensionMeta, extensionStyleList, extensionEntry, extensionCarries, assertExtensionContained, __resetPathPluginCacheForTests, loadPlugin, loadPublishFunction, loadPlugins, loadPluginsWithCss };