@doenet/doenetml-iframe 0.7.25-dev.509 → 0.7.25-dev.512

package/index.js

@@ -28959,8 +28959,19 @@ function getMediaLicenseDisplay(code, version2) {
   return { kind: info.kind, label, url: info.url(resolvedVersion) };
 }
 const mathjaxConfig$1 = {
+  loader: {
+    // The `units` package is neither bundled into the combined component
+    // we load nor reachable through `autoload`, so it has to be requested
+    // by name. MathJax fetches it during startup, from the same place it
+    // gets the rest of its components.
+    load: ["[tex]/units"]
+  },
   tex: {
     tags: "ams",
+    // `[+]` adds to MathJax's default package list rather than replacing
+    // it. `units` supplies `\units`, `\unitfrac`, and `\nicefrac`, so that
+    // units can be typeset semantically instead of hand-spaced.
+    packages: { "[+]": ["units"] },
     macros: {
       lt: "<",
       gt: ">",
@@ -42018,7 +42029,8 @@ function waitForExistingMathJax(timeoutMs) {
 }
 function injectMathJax(src, config2, { force = false } = {}) {
   return new Promise((resolve, reject2) => {
-    if (config2 && (force || window.MathJax == null)) {
+    const bootsOnOurConfig = !config2 || force || window.MathJax == null;
+    if (config2 && bootsOnOurConfig) {
       window.MathJax = config2;
     }
     const script = document.createElement("script");
@@ -42027,7 +42039,10 @@ function injectMathJax(src, config2, { force = false } = {}) {
     script.async = true;
     script.setAttribute(DOENET_MATHJAX_SCRIPT_ATTR, "true");
     script.addEventListener("load", () => {
-      resolve(window.MathJax);
+      const engine = window.MathJax;
+      resolve(
+        bootsOnOurConfig ? engine : primeUnconfiguredEngine(engine, config2)
+      );
     });
     script.addEventListener("error", () => {
       reject2(
@@ -42037,6 +42052,83 @@ function injectMathJax(src, config2, { force = false } = {}) {
     document.head.appendChild(script);
   });
 }
+function texConfig(config2) {
+  const tex2 = config2?.tex;
+  return tex2 && typeof tex2 === "object" ? tex2 : void 0;
+}
+function texDefsFromConfig(config2) {
+  const macros = texConfig(config2)?.macros;
+  if (!macros || typeof macros !== "object") {
+    return "";
+  }
+  const defs = [];
+  for (const [name2, value] of Object.entries(
+    macros
+  )) {
+    if (!/^[A-Za-z]+$/.test(name2)) {
+      continue;
+    }
+    let replacement;
+    let argCount = 0;
+    if (typeof value === "string") {
+      replacement = value;
+    } else if (Array.isArray(value) && value.length <= 2 && typeof value[0] === "string") {
+      replacement = value[0];
+      argCount = typeof value[1] === "number" ? value[1] : 0;
+    } else {
+      continue;
+    }
+    if (!Number.isInteger(argCount) || argCount < 0 || argCount > 9) {
+      continue;
+    }
+    const parameters = Array.from(
+      { length: argCount },
+      (_unused, index2) => `#${index2 + 1}`
+    ).join("");
+    defs.push(`\\def\\${name2}${parameters}{${replacement}}`);
+  }
+  return defs.join("");
+}
+function texPackagesFromConfig(config2) {
+  const packages = texConfig(config2)?.packages;
+  if (!packages || typeof packages !== "object" || Array.isArray(packages)) {
+    return [];
+  }
+  const added = packages["[+]"];
+  if (!Array.isArray(added)) {
+    return [];
+  }
+  return added.filter(
+    (name2) => typeof name2 === "string" && /^[\w-]+$/.test(name2)
+  );
+}
+async function convertForSideEffect(engine, tex2) {
+  if (typeof engine.tex2mmlPromise !== "function") {
+    return;
+  }
+  try {
+    await engine.tex2mmlPromise(tex2);
+  } catch (reason) {
+    console.warn(
+      `DoenetViewer: could not prime MathJax with "${tex2}"; math relying on it may not render as it does on doenet.org.`,
+      reason
+    );
+  }
+}
+async function primeUnconfiguredEngine(engine, config2) {
+  try {
+    await engine.startup?.promise;
+  } catch {
+  }
+  const defs = texDefsFromConfig(config2);
+  if (defs) {
+    await convertForSideEffect(engine, defs);
+  }
+  for (const packageName of texPackagesFromConfig(config2)) {
+    await convertForSideEffect(engine, `\\require{${packageName}}`);
+  }
+  return engine;
+}
 function createMathJaxPromise(options) {
   const {
     config: config2,
@@ -42045,16 +42137,25 @@ function createMathJaxPromise(options) {
     timeoutMs = DEFAULT_TIMEOUT_MS
   } = options;
   if (isMathJaxEngine(window.MathJax)) {
-    return Promise.resolve(window.MathJax);
+    return primeUnconfiguredEngine(window.MathJax, config2);
   }
   if (useExistingMathJax || findMathJaxScript()) {
-    return waitForExistingMathJax(timeoutMs).catch((reason) => {
-      console.warn(
-        "DoenetViewer: a host-provided MathJax did not become usable in time; falling back to loading Doenet's own copy.",
-        reason
-      );
-      return injectMathJax(src, config2, { force: true });
-    });
+    return waitForExistingMathJax(timeoutMs).then(
+      // The host's engine: ours to use, not ours to have configured.
+      (engine) => primeUnconfiguredEngine(engine, config2),
+      // The takeover copy is one we load and stage `config` on ourselves,
+      // so it needs no priming. Handling the rejection here rather than in
+      // a trailing `.catch` also keeps a priming failure above — which is
+      // never fatal — from being mistaken for a host that never loaded,
+      // and answered by injecting a second engine over the host's.
+      (reason) => {
+        console.warn(
+          "DoenetViewer: a host-provided MathJax did not become usable in time; falling back to loading Doenet's own copy.",
+          reason
+        );
+        return injectMathJax(src, config2, { force: true });
+      }
+    );
   }
   return injectMathJax(src, config2);
 }
@@ -68183,8 +68284,19 @@ Object.fromEntries(
   mediaLicenses.map((info) => [info.code.toLowerCase(), info])
 );
 const mathjaxConfig = {
+  loader: {
+    // The `units` package is neither bundled into the combined component
+    // we load nor reachable through `autoload`, so it has to be requested
+    // by name. MathJax fetches it during startup, from the same place it
+    // gets the rest of its components.
+    load: ["[tex]/units"]
+  },
   tex: {
     tags: "ams",
+    // `[+]` adds to MathJax's default package list rather than replacing
+    // it. `units` supplies `\units`, `\unitfrac`, and `\nicefrac`, so that
+    // units can be typeset semantically instead of hand-spaced.
+    packages: { "[+]": ["units"] },
     macros: {
       lt: "<",
       gt: ">",
@@ -68594,7 +68706,7 @@ function ExternalVirtualKeyboard({
     }
   );
 }
-const version = "0.7.25-dev.509";
+const version = "0.7.25-dev.512";
 const latestDoenetmlVersion = version;
 function subscribeToPinnedTheme() {
   return () => {