mystmd 1.3.15__tar.gz → 1.3.16__tar.gz

{mystmd-1.3.15 → mystmd-1.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mystmd
-Version: 1.3.15
+Version: 1.3.16
 Summary: Command line tools for MyST Markdown
 Project-URL: Homepage, https://github.com/jupyter-book/mystmd
 Project-URL: Bug Tracker, https://github.com/jupyter-book/mystmd/issues

{mystmd-1.3.15 → mystmd-1.3.16}/_package.json

@@ -1,6 +1,6 @@
 {
   "name": "mystmd",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "description": "Command line tools for MyST Markdown",
   "author": "Rowan Cockett <rowan@curvenote.com>",
   "license": "MIT",
@@ -45,6 +45,6 @@
     "commander": "^10.0.1",
     "core-js": "^3.31.1",
     "js-yaml": "^4.1.0",
-    "myst-cli": "^1.3.15"
+    "myst-cli": "^1.3.16"
   }
 }

{mystmd-1.3.15 → mystmd-1.3.16}/src/mystmd_py/myst.cjs

@@ -77868,7 +77868,7 @@ var require_blockquote = __commonJS({
   "../myst-parser/node_modules/markdown-it/lib/rules_block/blockquote.js"(exports2, module2) {
     "use strict";
     var isSpace = require_utils5().isSpace;
-    module2.exports = function blockquote6(state, startLine, endLine, silent) {
+    module2.exports = function blockquote5(state, startLine, endLine, silent) {
       var adjustTab, ch, i2, initial, l, lastLineEmpty, lines, nextLine, offset, oldBMarks, oldBSCount, oldIndent, oldParentType, oldSCount, oldTShift, spaceAfterMarker, terminate, terminatorRules, token, isOutdented, oldLineMax = state.lineMax, pos = state.bMarks[startLine] + state.tShift[startLine], max = state.eMarks[startLine];
       if (state.sCount[startLine] - state.blkIndent >= 4) {
         return false;
@@ -193891,7 +193891,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.3.15";
+var version = "1.3.16";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -205348,8 +205348,8 @@ function transformGitHubBracketedAdmonition(node3) {
   return true;
 }
 function admonitionBlockquoteTransform(tree) {
-  const blockquote6 = selectAll("blockquote", tree);
-  blockquote6.forEach((node3) => {
+  const blockquote5 = selectAll("blockquote", tree);
+  blockquote5.forEach((node3) => {
     [transformGitHubBracketedAdmonition, transformGitHubBoldTitle].reduce((complete, fn) => complete || fn(node3), false);
   });
 }
@@ -278455,24 +278455,24 @@ var ALGORITHM_HANDLERS = {
     state.openNode("proof", { kind: "algorithm" });
     state.renderChildren(node3);
     state.closeParagraph();
-    const proof = state.top();
-    const caption3 = select("caption", proof);
+    const proof2 = state.top();
+    const caption3 = select("caption", proof2);
     if (caption3) {
       caption3.type = "admonitionTitle";
       caption3.children = (_a6 = caption3.children) === null || _a6 === void 0 ? void 0 : _a6[0].children;
     }
     if (caption3 === null || caption3 === void 0 ? void 0 : caption3.label) {
-      proof.label = caption3.label;
+      proof2.label = caption3.label;
       delete caption3.label;
       delete caption3.identifier;
     }
-    if (proof.label) {
-      const { label, identifier } = (_b = normalizeLabel(proof.label)) !== null && _b !== void 0 ? _b : {};
-      proof.label = label;
-      proof.identifier = identifier;
-      proof.enumerated = true;
+    if (proof2.label) {
+      const { label, identifier } = (_b = normalizeLabel(proof2.label)) !== null && _b !== void 0 ? _b : {};
+      proof2.label = label;
+      proof2.identifier = identifier;
+      proof2.enumerated = true;
     }
-    numberParagraphsAsLines(proof);
+    numberParagraphsAsLines(proof2);
     state.closeNode();
   },
   env_algorithmic(node3, state) {
@@ -278884,9 +278884,16 @@ var FIGURE_HANDLERS = {
   },
   macro_centering: centering,
   macro_includegraphics(node3, state) {
+    var _a6;
     state.closeParagraph();
     const url = texToText(getArguments(node3, "group"));
-    state.pushNode(u2("image", { url }));
+    const args = (_a6 = getArguments(node3, "argument")) === null || _a6 === void 0 ? void 0 : _a6[0].content;
+    if (args.length === 4 && args[0].content === "width" && args[1].content === "=" && Number.isFinite(Number.parseFloat(args[2].content))) {
+      const width = `${Math.round(Number.parseFloat(args[2].content) * 100)}%`;
+      state.pushNode(u2("image", { url, width }));
+    } else {
+      state.pushNode(u2("image", { url }));
+    }
   },
   macro_caption: renderCaption,
   macro_captionof: renderCaption,
@@ -282087,26 +282094,43 @@ var iframeDirective = {
     align: {
       type: String,
       doc: "The alignment of the iframe in the page. Choose one of `left`, `center` or `right`"
+    },
+    placeholder: {
+      type: String,
+      doc: "A placeholder image for the iframe in static exports."
     }
   },
   body: { type: "myst", doc: "If provided, this will be the iframe caption." },
   run(data) {
-    var _a6, _b, _c, _d2;
+    var _a6, _b, _c, _d2, _e, _f, _g, _h, _j;
     const iframe3 = {
       type: "iframe",
       src: data.arg,
       width: (_a6 = data.options) === null || _a6 === void 0 ? void 0 : _a6.width,
       align: (_b = data.options) === null || _b === void 0 ? void 0 : _b.align
     };
+    if ((_c = data.options) === null || _c === void 0 ? void 0 : _c.placeholder) {
+      iframe3.children = [
+        {
+          type: "image",
+          placeholder: true,
+          url: data.options.placeholder,
+          alt: (_d2 = data.options) === null || _d2 === void 0 ? void 0 : _d2.alt,
+          width: (_e = data.options) === null || _e === void 0 ? void 0 : _e.width,
+          height: (_f = data.options) === null || _f === void 0 ? void 0 : _f.height,
+          align: (_g = data.options) === null || _g === void 0 ? void 0 : _g.align
+        }
+      ];
+    }
     if (!data.body) {
-      iframe3.class = (_c = data.options) === null || _c === void 0 ? void 0 : _c.class;
+      iframe3.class = (_h = data.options) === null || _h === void 0 ? void 0 : _h.class;
       addCommonDirectiveOptions(data, iframe3);
       return [iframe3];
     }
     const container4 = {
       type: "container",
       kind: "figure",
-      class: (_d2 = data.options) === null || _d2 === void 0 ? void 0 : _d2.class,
+      class: (_j = data.options) === null || _j === void 0 ? void 0 : _j.class,
       children: [iframe3, { type: "caption", children: data.body }]
     };
     addCommonDirectiveOptions(data, container4);
@@ -289095,7 +289119,7 @@ var proofDirective = {
     const nonumber = (_b = (_a6 = data.options) === null || _a6 === void 0 ? void 0 : _a6.nonumber) !== null && _b !== void 0 ? _b : false;
     const rawLabel = (_c = data.options) === null || _c === void 0 ? void 0 : _c.label;
     const { label, identifier } = normalizeLabel(rawLabel) || {};
-    const proof = {
+    const proof2 = {
       type: "proof",
       kind: data.name !== "proof" ? data.name.replace("prf:", "") : void 0,
       label,
@@ -289104,7 +289128,7 @@ var proofDirective = {
       enumerated: !nonumber,
       children
     };
-    return [proof];
+    return [proof2];
   }
 };
 
@@ -289380,7 +289404,7 @@ var import_node_path15 = __toESM(require("path"), 1);
 var import_nbtx = __toESM(require_cjs2(), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.3.15";
+var version2 = "1.3.16";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -306771,18 +306795,35 @@ var containerHandler2 = (node3, state) => {
       source: "myst-to-typst"
     });
   }
+  const flatCaptions = captions.map((cap2) => cap2.children).filter(Boolean).flat();
+  if (node3.kind === "quote") {
+    const prevIsInBlockquote = state.data.isInBlockquote;
+    state.data.isInBlockquote = true;
+    state.write("#quote(block: true");
+    if (flatCaptions.length > 0) {
+      state.write(", attribution: [");
+      state.renderChildren(flatCaptions);
+      state.write("])[");
+    } else {
+      state.write(")[");
+    }
+    state.renderChildren(nonCaptions);
+    state.write("]");
+    state.data.isInBlockquote = prevIsInBlockquote;
+    return;
+  }
   if (nonCaptions && nonCaptions.length > 1) {
     const allSubFigs = nonCaptions.filter((item) => item.type === "container").length === nonCaptions.length;
     state.useMacro('#import "@preview/subpar:0.1.1"');
     state.write(`#show figure: set block(breakable: ${allSubFigs ? "false" : "true"})
 `);
     state.write("#subpar.grid(");
-    let columns = 2;
+    let columns = nonCaptions.length <= 3 ? nonCaptions.length : 2;
     nonCaptions.forEach((item) => {
       if (item.type === "container") {
         state.write("figure(\n");
         state.renderChildren(item);
-        state.write("\n),");
+        state.write("\n, caption: []),");
         if (item.identifier) {
           state.write(` <${item.identifier}>,`);
         }
@@ -306793,7 +306834,7 @@ var containerHandler2 = (node3, state) => {
         columns = 1;
       }
     });
-    state.write(`columns: (${Array(columns).fill("1fr")}),
+    state.write(`columns: ${columns},
 `);
     if (label) {
       state.write(`label: <${label}>,`);
@@ -306812,9 +306853,7 @@ var containerHandler2 = (node3, state) => {
   }
   if (captions === null || captions === void 0 ? void 0 : captions.length) {
     state.write("\n  caption: [\n");
-    state.renderChildren({
-      children: captions.map((cap2) => cap2.children).filter(Boolean).flat()
-    });
+    state.renderChildren(flatCaptions);
     state.write("\n],");
   }
   if (kind) {
@@ -307082,7 +307121,8 @@ var typstStrings = {
   ",": (state) => state.data.inFunction ? "comma" : ",",
   "&": (state) => state.data.inArray ? "," : "&",
   "/": "\\/",
-  ";": "\\;"
+  ";": "\\;",
+  "~": "med"
 };
 function splitStrings(node3) {
   var _a6, _b, _c;
@@ -307173,6 +307213,9 @@ var typstMacros = {
     return "\\\n";
   },
   sim: "tilde",
+  cong: "tilde.equiv",
+  simeq: "tilde.eq",
+  ne: "!=",
   phi: "phi.alt",
   varepsilon: "epsilon",
   propto: "prop",
@@ -307182,7 +307225,6 @@ var typstMacros = {
   le: "lt.eq",
   leq: "lt.eq",
   neq: "eq.not",
-  simeq: "tilde.eq",
   otimes: "times.circle",
   dot: "dot",
   ddot: "dot.double",
@@ -307203,6 +307245,8 @@ var typstMacros = {
   quad: "quad",
   qquad: "wide",
   prod: "product",
+  biggl: "",
+  biggr: "",
   mathbb: (state, node3) => {
     var _a6, _b, _c, _d2, _e;
     const text7 = (_e = (_d2 = (_c = (_b = (_a6 = node3.args) === null || _a6 === void 0 ? void 0 : _a6.slice(-1)[0]) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c[0]) === null || _d2 === void 0 ? void 0 : _d2.content) !== null && _e !== void 0 ? _e : "";
@@ -307210,6 +307254,10 @@ var typstMacros = {
     node3.args = [];
     return letters2;
   },
+  mathscr: (state) => {
+    state.useMacro(`#let scr(it) = text(features: ("ss01",), box($cal(it)$))`);
+    return "scr";
+  },
   overset: (state, node3) => {
     var _a6;
     state.useMacro('#import "@preview/ouset:0.2.0": *');
@@ -307245,6 +307293,7 @@ function parseLatex2(value) {
       dot: { signature: "m" },
       ddot: { signature: "m" },
       hat: { signature: "m" },
+      tilde: { signature: "m" },
       widehat: { signature: "m" },
       overset: { signature: "m m" },
       underset: { signature: "m m" }
@@ -307425,7 +307474,7 @@ function writeTypst(node3, state = new State4()) {
   return state;
 }
 function postProcess(typst) {
-  return typst.replace(/^(_|\^)/, '""$1').replace(/"([^"]*)"=/g, '"$1" =');
+  return typst.replace(/^(_|\^)/, '""$1').replace(/"([^"]*)"=/g, '"$1" =').replace(/(\d+)(?:\s+)(?=\d)/g, "$1");
 }
 function texToTypst(value) {
   const tree = parseLatex2(value);
@@ -307589,10 +307638,39 @@ var admonitionMacros = {
   tip: "#let tipBlock(body, heading: [Tip]) = admonition(body, heading: heading, color: green)",
   warning: "#let warningBlock(body, heading: [Warning]) = admonition(body, heading: heading, color: yellow)"
 };
-var blockquote3 = `#let blockquote(node, color: gray) = {
-  let stroke = (left: 2pt + color.darken(20%))
-  set text(fill: black.lighten(40%), style: "oblique")
-  block(width: 100%, inset: 8pt, stroke: stroke)[#node]
+var tabSet = `
+#let tabSet(body) = {
+  block(width: 100%, stroke: luma(240), [#body])
+}`;
+var tabItem = `
+#let tabItem(body, heading: none) = {
+  let title
+  if heading != none {
+    title = block(width: 100%, inset: (x: 8pt, y: 4pt), fill: luma(250))[#text(9pt, weight: "bold")[#heading]]
+  }
+  block(width: 100%, [
+    #title
+    #block(width: 100%, inset: (x: 8pt, bottom: 8pt))[#body]
+  ])
+}`;
+var proof = `
+#let proof(body, heading: [], kind: "proof", supplement: "Proof", labelName: none, color: blue, float: true) = {
+  let stroke = 1pt + color.lighten(90%)
+  let fill = color.lighten(90%)
+  let title
+  set figure.caption(position: top)
+  set figure(placement: none)
+  show figure.caption.where(body: heading): (it) => {
+    block(width: 100%, stroke: stroke, fill: fill, inset: 8pt, it)
+  }
+  place(auto, float: float, block(width: 100%, [
+    #figure(kind: kind, supplement: supplement, gap: 0pt, [
+      #set align(left);
+      #set figure.caption(position: bottom)
+      #block(width: 100%, fill: luma(253), stroke: stroke, inset: 8pt)[#body]
+    ], caption: heading)
+    #if(labelName != none){label(labelName)}
+  ]))
 }`;
 var INDENT = "  ";
 var linkHandler = (node3, state) => {
@@ -307646,8 +307724,13 @@ var handlers4 = {
     state.renderChildren(node3, 2);
   },
   blockquote(node3, state) {
-    state.useMacro(blockquote3);
-    state.renderEnvironment(node3, "blockquote");
+    if (state.data.isInBlockquote) {
+      state.renderChildren(node3);
+      return;
+    }
+    state.write("#quote(block: true)[");
+    state.renderChildren(node3);
+    state.write("]");
   },
   definitionList(node3, state) {
     let dedent = false;
@@ -307811,7 +307894,7 @@ ${node3.value}
     }
     state.useMacro(admonitionMacros[node3.kind]);
     state.write(`#${node3.kind}Block`);
-    if (title && toText(title).toLowerCase().replace(" ", "") !== node3.kind) {
+    if (title && toText(title).toLowerCase().replaceAll(" ", "") !== node3.kind) {
       state.write("(heading: [");
       state.renderChildren(title);
       state.write("])");
@@ -307837,6 +307920,20 @@ ${node3.value}
     }
     state.write(")\n\n");
   },
+  iframe(node3, state) {
+    var _a6;
+    const image6 = (_a6 = node3.children) === null || _a6 === void 0 ? void 0 : _a6[0];
+    if (!image6 || image6.placeholder !== true)
+      return;
+    const { width: nodeWidth, url: nodeSrc, align } = image6;
+    const src = nodeSrc;
+    const width = getLatexImageWidth2(nodeWidth);
+    state.write(`#image("${src}"`);
+    if (!state.data.isInTable) {
+      state.write(`, width: ${width}`);
+    }
+    state.write(")\n\n");
+  },
   container: containerHandler2,
   caption: captionHandler2,
   legend: captionHandler2,
@@ -307911,6 +308008,38 @@ ${node3.value}
     } else if ((_a6 = node3.children) === null || _a6 === void 0 ? void 0 : _a6.length) {
       state.renderChildren(node3, void 0, { trimEnd: false });
     }
+  },
+  tabSet(node3, state) {
+    state.useMacro(tabSet);
+    state.write("#tabSet[\n");
+    state.renderChildren(node3);
+    state.write("\n]\n\n");
+  },
+  tabItem(node3, state) {
+    state.useMacro(tabItem);
+    state.ensureNewLine();
+    const title = node3.title;
+    state.write(`#tabItem(heading: [${title}])[
+`);
+    state.renderChildren(node3);
+    state.write("\n]\n\n");
+  },
+  proof(node3, state) {
+    state.useMacro(proof);
+    const title = select("admonitionTitle", node3);
+    const kind = node3.kind || "proof";
+    const supplement = getDefaultCaptionSupplement(kind);
+    state.write(`#proof(kind: "${kind}", supplement: "${supplement}", labelName: ${node3.identifier ? `"${node3.identifier}"` : "none"}`);
+    if (title) {
+      state.write(", heading: [");
+      state.renderChildren(title);
+      state.write("])[");
+    } else {
+      state.write(")[");
+    }
+    state.renderChildren(node3);
+    state.write("]");
+    state.ensureNewLine();
   }
 };
 var TypstSerializer = class {
@@ -307956,8 +308085,13 @@ var TypstSerializer = class {
       return;
     this.addNewLine();
   }
-  renderChildren(node3, trailingNewLines = 0, { delim = "", trimEnd: trimEnd2 = true } = {}) {
+  renderChildren(node3, trailingNewLines = 0, opts = {}) {
     var _a6, _b, _c;
+    if (Array.isArray(node3)) {
+      this.renderChildren({ children: node3 }, trailingNewLines, opts);
+      return;
+    }
+    const { delim = "", trimEnd: trimEnd2 = true } = opts;
     const numChildren = (_b = (_a6 = node3.children) === null || _a6 === void 0 ? void 0 : _a6.length) !== null && _b !== void 0 ? _b : 0;
     (_c = node3.children) === null || _c === void 0 ? void 0 : _c.forEach((child, index4) => {
       if (!child)
@@ -308553,7 +308687,7 @@ var smallcaps = (state, node3) => {
   state.addRunOptions({ smallCaps: true });
   state.renderChildren(node3);
 };
-var blockquote4 = (state, node3) => {
+var blockquote3 = (state, node3) => {
   state.renderChildren(node3, { style: "IntenseQuote" });
 };
 var code4 = (state, node3) => {
@@ -308850,7 +308984,7 @@ var defaultHandlers = {
   delete: _delete,
   underline,
   smallcaps,
-  blockquote: blockquote4,
+  blockquote: blockquote3,
   code: code4,
   image: image3,
   block: block3,
@@ -310322,11 +310456,11 @@ function containerTransform(mdast2) {
     liftCaptionNumber(container4);
     if (container4.kind === "quote") {
       const caption4 = select("caption > paragraph", container4);
-      const blockquote6 = select("blockquote", container4);
-      if (blockquote6 && caption4) {
+      const blockquote5 = select("blockquote", container4);
+      if (blockquote5 && caption4) {
         const newContainer = container4;
         newContainer.type = "blockquote";
-        newContainer.children = blockquote6.children;
+        newContainer.children = blockquote5.children;
         caption4.type = "attrib";
         newContainer.children.push(caption4);
       }
@@ -314941,7 +315075,7 @@ function configure(base5, extension) {
 }
 
 // ../../node_modules/mdast-util-to-markdown/lib/handle/blockquote.js
-function blockquote5(node3, _3, state, info) {
+function blockquote4(node3, _3, state, info) {
   const exit = state.enter("blockquote");
   const tracker = state.createTracker(info);
   tracker.move("> ");
@@ -315695,7 +315829,7 @@ function thematicBreak3(_3, _1, state) {
 
 // ../../node_modules/mdast-util-to-markdown/lib/handle/index.js
 var handle5 = {
-  blockquote: blockquote5,
+  blockquote: blockquote4,
   break: hardBreak2,
   code: code5,
   definition,
@@ -316291,7 +316425,7 @@ function tabSetValidator(node3, file) {
     }
   });
 }
-function tabItem(node3, _3, state, info) {
+function tabItem2(node3, _3, state, info) {
   const handler = writeFlowDirective("tab-item", node3.title, { keys: ["sync", "selected"] });
   return handler(node3, _3, state, info);
 }
@@ -316307,7 +316441,7 @@ var directiveHandlers2 = {
     transforms: { columns: (val) => val.join(" ") }
   }),
   tabSet: writeFlowDirective("tab-set"),
-  tabItem,
+  tabItem: tabItem2,
   math: writeStaticDirective("math", { keys: ["label"] }),
   embed: writeStaticDirective("embed", { argsKey: "label" }),
   include: writeStaticDirective("include", { argsKey: "file" }),