mystmd 1.1.48__py3-none-any.whl → 1.1.50__py3-none-any.whl

mystmd_py/myst.cjs

@@ -129890,7 +129890,7 @@ var require_environment = __commonJS({
         }
         return this.tests[name3];
       };
-      _proto.resolveTemplate = function resolveTemplate(loader2, parentName, filename) {
+      _proto.resolveTemplate = function resolveTemplate2(loader2, parentName, filename) {
         var isRelative = loader2.isRelative && parentName ? loader2.isRelative(filename) : false;
         return isRelative && loader2.resolve ? loader2.resolve(parentName, filename) : filename;
       };
@@ -195964,7 +195964,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.1.48";
+var version = "1.1.50";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -196746,7 +196746,13 @@ function stashPlaceholder(value) {
   return { id: value, name: value };
 }
 function isStashPlaceholder(object) {
-  return Object.keys(object).length === 2 && object.name && object.id && object.name === object.id;
+  var _a6;
+  if (!object.name || !object.id || object.name !== object.id)
+    return false;
+  const nKeys = Object.keys(object).length;
+  if (nKeys === 2)
+    return true;
+  return nKeys === 3 && ((_a6 = object.nameParsed) === null || _a6 === void 0 ? void 0 : _a6.literal) === object.id;
 }
 function validateAndStashObject(input3, stash, kind, validateFn, opts) {
   var _a6, _b, _c;
@@ -196967,12 +196973,17 @@ function validateAffiliation(input3, opts) {
   const value = validateObjectKeys(input3, { optional: AFFILIATION_KEYS, alias: AFFILIATION_ALIASES }, opts);
   if (value === void 0)
     return void 0;
+  if (Object.keys(value).length === 1 && value.id) {
+    value.name = value.id;
+  }
   const output2 = {};
   if (defined(value.id)) {
     output2.id = validateString(value.id, incrementOptions("id", opts));
   }
   if (defined(value.name)) {
     output2.name = validateString(value.name, incrementOptions("name", opts));
+  } else {
+    validationWarning("affiliation should include name/institution", opts);
   }
   if (defined(value.department)) {
     output2.department = validateString(value.department, incrementOptions("department", opts));
@@ -197026,11 +197037,6 @@ function validateAffiliation(input3, opts) {
   if (defined(value.fax)) {
     output2.fax = validateString(value.fax, incrementOptions("fax", opts));
   }
-  if (Object.keys(output2).length === 1 && output2.id) {
-    return stashPlaceholder(output2.id);
-  } else if (!output2.name) {
-    validationWarning("affiliation should include name/institution", opts);
-  }
   return output2;
 }
 
@@ -197140,6 +197146,33 @@ var credit = {
   buildUrl: buildUrl2
 };
 
+// ../../node_modules/orcid/dist/index.js
+var ORCID_URL = "https://orcid.org";
+var ORCID_REGEX_STRICT = "^([0-9]{4}-){3}[0-9]{3}[0-9X]$";
+var ORCID_REGEX = "^((http(s)?://)?(www.)?orcid.org/)?([0-9]{4}-){3}[0-9]{3}[0-9X]$";
+function validate3(value, opts) {
+  const match3 = value === null || value === void 0 ? void 0 : value.match((opts === null || opts === void 0 ? void 0 : opts.strict) ? ORCID_REGEX_STRICT : ORCID_REGEX);
+  if (!match3)
+    return false;
+  return true;
+}
+function normalize3(value, opts) {
+  if (!value || !validate3(value, opts))
+    return void 0;
+  return value.replace(/^(https?:\/\/)?(www\.)?orcid\.org\//, "");
+}
+function buildUrl3(value, opts) {
+  const orcid2 = normalize3(value, opts);
+  if (!orcid2)
+    return void 0;
+  return `${ORCID_URL}/${orcid2}`;
+}
+var orcid = {
+  validate: validate3,
+  normalize: normalize3,
+  buildUrl: buildUrl3
+};
+
 // ../myst-frontmatter/dist/utils/parseName.js
 function startsWithUpperCase(word) {
   for (const letter of word) {
@@ -197248,35 +197281,8 @@ function formatName(name3, alwaysReversed = false) {
   return output2;
 }
 
-// ../../node_modules/orcid/dist/index.js
-var ORCID_URL = "https://orcid.org";
-var ORCID_REGEX_STRICT = "^([0-9]{4}-){3}[0-9]{3}[0-9X]$";
-var ORCID_REGEX = "^((http(s)?://)?(www.)?orcid.org/)?([0-9]{4}-){3}[0-9]{3}[0-9X]$";
-function validate3(value, opts) {
-  const match3 = value === null || value === void 0 ? void 0 : value.match((opts === null || opts === void 0 ? void 0 : opts.strict) ? ORCID_REGEX_STRICT : ORCID_REGEX);
-  if (!match3)
-    return false;
-  return true;
-}
-function normalize3(value, opts) {
-  if (!value || !validate3(value, opts))
-    return void 0;
-  return value.replace(/^(https?:\/\/)?(www\.)?orcid\.org\//, "");
-}
-function buildUrl3(value, opts) {
-  const orcid2 = normalize3(value, opts);
-  if (!orcid2)
-    return void 0;
-  return `${ORCID_URL}/${orcid2}`;
-}
-var orcid = {
-  validate: validate3,
-  normalize: normalize3,
-  buildUrl: buildUrl3
-};
-
 // ../myst-frontmatter/dist/contributors/validators.js
-var CONTRIBUTOR_KEYS = [
+var PERSON_KEYS = [
   "id",
   "userId",
   "name",
@@ -197296,7 +197302,8 @@ var CONTRIBUTOR_KEYS = [
   "phone",
   "fax"
 ];
-var CONTRIBUTOR_ALIASES = {
+var PERSON_ALIASES = {
+  ref: "id",
   role: "roles",
   "equal-contributor": "equal_contributor",
   affiliation: "affiliations",
@@ -197321,8 +197328,10 @@ var NAME_ALIASES = {
 };
 function validateName(input3, opts) {
   let output2;
+  let raiseCommaWarnings = false;
   if (typeof input3 === "string") {
     output2 = parseName(input3);
+    raiseCommaWarnings = true;
   } else {
     const value = validateObjectKeys(input3, { optional: NAME_KEYS, alias: NAME_ALIASES }, opts);
     if (value === void 0)
@@ -197348,36 +197357,50 @@ function validateName(input3, opts) {
     }
     if (Object.keys(output2).length === 1 && output2.literal) {
       output2 = { ...output2, ...parseName(output2.literal) };
+      raiseCommaWarnings = true;
     } else if (!output2.literal) {
       output2.literal = formatName(output2);
+      if (output2.literal.startsWith(",")) {
+        validationWarning(`unexpected comma at beginning of name: ${output2.literal} - you may need to define 'name.literal' explicitly`, opts);
+      }
     }
   }
-  const warnOnComma = (part, o) => {
-    if (part && part.includes(",")) {
-      validationWarning(`unexpected comma in name part: ${part}`, o);
-    }
-  };
-  warnOnComma(output2.given, incrementOptions("given", opts));
-  warnOnComma(output2.family, incrementOptions("family", opts));
-  warnOnComma(output2.non_dropping_particle, incrementOptions("non_dropping_particle", opts));
-  warnOnComma(output2.dropping_particle, incrementOptions("dropping_particle", opts));
-  warnOnComma(output2.suffix, incrementOptions("suffix", opts));
-  if (!output2.family) {
-    validationWarning(`No family name for name '${output2.literal}'`, opts);
-  }
-  if (!output2.given) {
-    validationWarning(`No given name for name '${output2.literal}'`, opts);
+  if (raiseCommaWarnings) {
+    const warnOnComma = (part, o) => {
+      if (part && part.includes(",")) {
+        validationWarning(`unexpected comma in name part: ${part} - you may need to define 'name' explicitly as an object`, o);
+      }
+    };
+    warnOnComma(output2.given, incrementOptions("given", opts));
+    warnOnComma(output2.family, incrementOptions("family", opts));
+    warnOnComma(output2.non_dropping_particle, incrementOptions("non_dropping_particle", opts));
+    warnOnComma(output2.dropping_particle, incrementOptions("dropping_particle", opts));
+    warnOnComma(output2.suffix, incrementOptions("suffix", opts));
   }
   return output2;
 }
 function validateContributor(input3, stash, opts) {
   var _a6, _b, _c;
+  const inputAff = validateObjectKeys(input3, { optional: AFFILIATION_KEYS, alias: AFFILIATION_ALIASES }, {
+    ...opts,
+    suppressErrors: true,
+    suppressWarnings: true
+  });
+  if ((inputAff === null || inputAff === void 0 ? void 0 : inputAff.collaboration) === true) {
+    return validateAffiliation(input3, opts);
+  }
   if (typeof input3 === "string") {
-    input3 = { id: input3, name: input3 };
+    input3 = stashPlaceholder(input3);
   }
-  const value = validateObjectKeys(input3, { optional: CONTRIBUTOR_KEYS, alias: CONTRIBUTOR_ALIASES }, opts);
+  const value = validateObjectKeys(input3, { optional: PERSON_KEYS, alias: PERSON_ALIASES }, opts);
   if (value === void 0)
     return void 0;
+  if (inputAff && Object.keys(inputAff).length > Object.keys(value).length) {
+    validationWarning('contributor may be a collaboration, not a person - if so, add "collaboration: true"', opts);
+  }
+  if (Object.keys(value).length === 1 && value.id) {
+    value.name = value.id;
+  }
   const output2 = {};
   if (defined(value.id)) {
     output2.id = validateString(value.id, incrementOptions("id", opts));
@@ -197475,6 +197498,17 @@ function validateContributor(input3, stash, opts) {
   if (defined(value.note)) {
     output2.note = validateString(value.note, incrementOptions("note", opts));
   }
+  if (isStashPlaceholder(output2) || !output2.nameParsed)
+    return output2;
+  if (value.nameParsed || value.name && typeof value.name !== "string")
+    return output2;
+  const suffix = " - if this is intended, you may define 'name' explicitly as an object";
+  if (!output2.nameParsed.given) {
+    validationWarning(`No given name for name '${output2.nameParsed.literal}'${suffix}`, opts);
+  }
+  if (!output2.nameParsed.family) {
+    validationWarning(`No family name for name '${output2.nameParsed.literal}'${suffix}`, opts);
+  }
   return output2;
 }
 
@@ -197599,16 +197633,21 @@ var SITE_FRONTMATTER_KEYS = [
   "banner",
   "bannerOptimized",
   "authors",
+  "reviewers",
+  "editors",
   "contributors",
   "venue",
   "github",
   "keywords",
   "affiliations",
   "funding",
+  "copyright",
   "options"
 ];
 var FRONTMATTER_ALIASES = {
   author: "authors",
+  reviewer: "reviewers",
+  editor: "editors",
   contributor: "contributors",
   affiliation: "affiliations",
   export: "exports",
@@ -197674,6 +197713,16 @@ function validateSiteFrontmatterKeys(value, opts) {
       return validateAndStashObject(contributor, stash, "contributors", (v, o) => validateContributor(v, stash, o), incrementOptions(`contributors.${index4}`, opts));
     });
   }
+  if (defined(value.reviewers)) {
+    output2.reviewers = validateList(value.reviewers, { coerce: true, ...incrementOptions("reviewers", opts) }, (reviewer, ind) => {
+      return validateAndStashObject(reviewer, stash, "contributors", (v, o) => validateContributor(v, stash, o), incrementOptions(`reviewers.${ind}`, opts));
+    });
+  }
+  if (defined(value.editors)) {
+    output2.editors = validateList(value.editors, { coerce: true, ...incrementOptions("editors", opts) }, (editor, ind) => {
+      return validateAndStashObject(editor, stash, "contributors", (v, o) => validateContributor(v, stash, o), incrementOptions(`editors.${ind}`, opts));
+    });
+  }
   if (defined(value.venue)) {
     output2.venue = validateVenue(value.venue, incrementOptions("venue", opts));
   }
@@ -197694,6 +197743,9 @@ function validateSiteFrontmatterKeys(value, opts) {
       return validateFunding(fund, stash, incrementOptions(`funding.${index4}`, opts));
     });
   }
+  if (defined(value.copyright)) {
+    output2.copyright = validateString(value.copyright, incrementOptions("copyright", opts));
+  }
   if (defined(value.options)) {
     const optionsOptions = incrementOptions("options", opts);
     const options = validateObject(value.options, optionsOptions);
@@ -197718,10 +197770,10 @@ function validateSiteFrontmatterKeys(value, opts) {
   });
   if (stashContribAuthors === null || stashContribAuthors === void 0 ? void 0 : stashContribAuthors.length) {
     output2.authors = stashContribAuthors;
-    const corresponding = (_c = output2.authors) === null || _c === void 0 ? void 0 : _c.find((a2) => a2.corresponding !== void 0);
-    const email = (_d2 = output2.authors) === null || _d2 === void 0 ? void 0 : _d2.find((a2) => a2.email);
-    if (!corresponding && email) {
-      email.corresponding = true;
+    const correspondingAuthor = (_c = output2.authors) === null || _c === void 0 ? void 0 : _c.find((a2) => a2.corresponding);
+    const personWithEmail = (_d2 = output2.authors) === null || _d2 === void 0 ? void 0 : _d2.find((a2) => a2.email && !a2.collaboration && a2.corresponding === void 0);
+    if (!correspondingAuthor && personWithEmail) {
+      personWithEmail.corresponding = true;
     }
   }
   if (stashContribNonAuthors === null || stashContribNonAuthors === void 0 ? void 0 : stashContribNonAuthors.length) {
@@ -197789,7 +197841,17 @@ var PAGE_FRONTMATTER_KEYS = [
 // ../myst-frontmatter/dist/exports/validators.js
 var EXPORT_KEY_OBJECT = {
   required: [],
-  optional: ["format", "template", "output", "id", "name", "renderer", "articles", "sub_articles"],
+  optional: [
+    "format",
+    "template",
+    "output",
+    "zip",
+    "id",
+    "name",
+    "renderer",
+    "articles",
+    "sub_articles"
+  ],
   alias: {
     article: "articles",
     sub_article: "sub_articles"
@@ -197890,17 +197952,13 @@ function validateExport(input3, opts) {
   if (typeof input3 === "string") {
     let format2;
     let output3;
-    if (input3.includes(".")) {
+    if (input3.startsWith(".")) {
       Object.entries(EXT_TO_FORMAT).forEach(([ext2, fmt]) => {
-        if (input3 === ext2) {
+        if (input3 === ext2)
           format2 = fmt;
-        } else if (input3.endsWith(ext2)) {
-          output3 = input3;
-        }
       });
-      if (!format2 && !output3) {
-        output3 = input3;
-      }
+    } else if (input3.includes(".")) {
+      output3 = input3;
     }
     if (!format2 && !output3) {
       format2 = validateExportFormat(input3, opts);
@@ -197925,26 +197983,33 @@ function validateExport(input3, opts) {
     template = validateString(value.template, incrementOptions("template", opts));
   }
   if (defined(value.output)) {
-    output2 = validateString(value.output, incrementOptions("output", opts));
+    const outputOpts = incrementOptions("output", opts);
+    const outputString = validateString(value.output, outputOpts);
+    if (outputString) {
+      Object.keys(EXT_TO_FORMAT).forEach((ext2) => {
+        if (outputString.endsWith(ext2))
+          output2 = outputString;
+      });
+      if (!outputString.slice(1).includes(".")) {
+        output2 = outputString;
+      }
+      if (!output2) {
+        return validationError(`unknown export output extension: ${outputString}`, outputOpts);
+      }
+    }
   }
   if (defined(value.format)) {
     format = validateExportFormat(value.format, incrementOptions("format", opts));
     if (!format)
       return void 0;
-  } else if (output2) {
-    Object.entries(EXT_TO_FORMAT).forEach(([ext2, fmt]) => {
-      if (output2 === null || output2 === void 0 ? void 0 : output2.endsWith(ext2))
-        format = fmt;
-    });
-    if (!format) {
-      return validationError(`unable to infer export format from export: ${output2}`, opts);
-    }
-  } else {
-    return validationError("unable to determine export format", opts);
   }
-  if (format === void 0 && template === void 0)
-    return void 0;
+  if (!format && !template && !output2) {
+    return validationError("export must specify one of: format, template, or output", opts);
+  }
   const validExport = { ...value, format, output: output2, template };
+  if (defined(value.zip)) {
+    validExport.zip = validateBoolean(value.zip, incrementOptions("zip", opts));
+  }
   if (defined(value.articles)) {
     const articles = validateList(value.articles, { coerce: true, ...incrementOptions("articles", opts) }, (item, ind) => validateExportArticle(item, incrementOptions(`articles.${ind}`, opts)));
     const singleArticle = singleArticleWithFile(articles);
@@ -200785,6 +200850,8 @@ function validateProjectFrontmatter(input3, opts) {
 // ../myst-frontmatter/dist/page/validators.js
 var USE_PROJECT_FALLBACK = [
   "authors",
+  "reviewers",
+  "editors",
   "date",
   "doi",
   "arxiv",
@@ -200799,6 +200866,7 @@ var USE_PROJECT_FALLBACK = [
   "numbering",
   "keywords",
   "funding",
+  "copyright",
   "affiliations"
 ];
 function validatePageFrontmatterKeys(value, opts) {
@@ -200857,7 +200925,7 @@ function validatePageFrontmatter(input3, opts) {
 
 // ../myst-frontmatter/dist/utils/fillPageFrontmatter.js
 function fillPageFrontmatter(pageFrontmatter, projectFrontmatter, opts) {
-  var _a6, _b, _c, _d2, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+  var _a6, _b, _c, _d2, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x2;
   const frontmatter = fillMissingKeys(pageFrontmatter, projectFrontmatter, USE_PROJECT_FALLBACK);
   if (pageFrontmatter.numbering || projectFrontmatter.numbering) {
     frontmatter.numbering = fillNumbering(pageFrontmatter.numbering, projectFrontmatter.numbering);
@@ -200900,12 +200968,18 @@ function fillPageFrontmatter(pageFrontmatter, projectFrontmatter, opts) {
       });
     });
   });
-  if (((_k = frontmatter.authors) === null || _k === void 0 ? void 0 : _k.length) || contributorIds.size) {
+  (_k = frontmatter.reviewers) === null || _k === void 0 ? void 0 : _k.forEach((reviewer) => {
+    contributorIds.add(reviewer);
+  });
+  (_l = frontmatter.editors) === null || _l === void 0 ? void 0 : _l.forEach((editor) => {
+    contributorIds.add(editor);
+  });
+  if (((_m = frontmatter.authors) === null || _m === void 0 ? void 0 : _m.length) || contributorIds.size) {
     const people = [
-      ...(_l = pageFrontmatter.authors) !== null && _l !== void 0 ? _l : [],
-      ...(_m = projectFrontmatter.authors) !== null && _m !== void 0 ? _m : [],
-      ...(_o = pageFrontmatter.contributors) !== null && _o !== void 0 ? _o : [],
-      ...(_p = projectFrontmatter.contributors) !== null && _p !== void 0 ? _p : []
+      ...(_o = pageFrontmatter.authors) !== null && _o !== void 0 ? _o : [],
+      ...(_p = projectFrontmatter.authors) !== null && _p !== void 0 ? _p : [],
+      ...(_q = pageFrontmatter.contributors) !== null && _q !== void 0 ? _q : [],
+      ...(_r = projectFrontmatter.contributors) !== null && _r !== void 0 ? _r : []
     ];
     const peopleLookup = {};
     people.forEach((auth) => {
@@ -200917,7 +200991,7 @@ function fillPageFrontmatter(pageFrontmatter, projectFrontmatter, opts) {
         validationWarning(`Duplicate contributor id within project: ${auth.id}`, incrementOptions("authors", opts));
       }
     });
-    if ((_q = frontmatter.authors) === null || _q === void 0 ? void 0 : _q.length) {
+    if ((_s = frontmatter.authors) === null || _s === void 0 ? void 0 : _s.length) {
       frontmatter.authors = frontmatter.authors.map((auth) => {
         var _a7;
         if (!auth.id)
@@ -200933,20 +201007,20 @@ function fillPageFrontmatter(pageFrontmatter, projectFrontmatter, opts) {
       });
     }
   }
-  [...(_r = frontmatter.authors) !== null && _r !== void 0 ? _r : [], ...(_s = frontmatter.contributors) !== null && _s !== void 0 ? _s : []].forEach((auth) => {
+  [...(_t = frontmatter.authors) !== null && _t !== void 0 ? _t : [], ...(_u = frontmatter.contributors) !== null && _u !== void 0 ? _u : []].forEach((auth) => {
     var _a7;
     (_a7 = auth.affiliations) === null || _a7 === void 0 ? void 0 : _a7.forEach((aff) => {
       affiliationIds.add(aff);
     });
   });
-  (_t = frontmatter.affiliations) === null || _t === void 0 ? void 0 : _t.forEach((aff) => {
+  (_v = frontmatter.affiliations) === null || _v === void 0 ? void 0 : _v.forEach((aff) => {
     if (aff.id)
       affiliationIds.add(aff.id);
   });
   if (affiliationIds.size) {
     const affiliations2 = [
-      ...(_u = pageFrontmatter.affiliations) !== null && _u !== void 0 ? _u : [],
-      ...(_v = projectFrontmatter.affiliations) !== null && _v !== void 0 ? _v : []
+      ...(_w = pageFrontmatter.affiliations) !== null && _w !== void 0 ? _w : [],
+      ...(_x2 = projectFrontmatter.affiliations) !== null && _x2 !== void 0 ? _x2 : []
     ];
     const affiliationLookup = {};
     affiliations2.forEach((aff) => {
@@ -201764,7 +201838,7 @@ function createId() {
 function normalizeLabel(label) {
   if (!label)
     return void 0;
-  const identifier = label.replace(/[\t\n\r ]+/g, " ").trim().toLowerCase();
+  const identifier = label.replace(/[\t\n\r ]+/g, " ").replace(/['‘’"“”]+/g, "").trim().toLowerCase();
   const html_id = createHtmlId(identifier);
   return { identifier, label, html_id };
 }
@@ -202503,17 +202577,17 @@ function coercePart(part) {
   if (!part) {
     return [];
   }
-  return typeof part === "string" ? [part] : part;
+  return typeof part === "string" ? [part.toLowerCase()] : part.map((s5) => s5.toLowerCase());
 }
 function selectBlockParts(tree, part) {
   const parts = coercePart(part);
   if (parts.length === 0)
     return [];
   const blockParts = selectAll("block", tree).filter((block5) => {
-    return parts.map((p5) => {
-      var _a6, _b;
-      return ((_a6 = block5.data) === null || _a6 === void 0 ? void 0 : _a6.part) === p5 || ((_b = block5.data) === null || _b === void 0 ? void 0 : _b.tags) && Array.isArray(block5.data.tags) && block5.data.tags.includes(p5);
-    }).reduce((a2, b) => a2 || b, false);
+    var _a6, _b, _c;
+    const blockTags = (((_a6 = block5.data) === null || _a6 === void 0 ? void 0 : _a6.tags) && Array.isArray(block5.data.tags) ? block5.data.tags : []).map((tag) => tag === null || tag === void 0 ? void 0 : tag.toLowerCase());
+    const blockPart = (_c = (_b = block5.data) === null || _b === void 0 ? void 0 : _b.part) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+    return parts.map((p5) => blockPart === p5 || blockTags.includes(p5)).reduce((a2, b) => a2 || b, false);
   });
   return blockParts;
 }
@@ -202585,8 +202659,8 @@ function extractPart(tree, part, opts) {
     var _a6;
     (_a6 = block5.data) !== null && _a6 !== void 0 ? _a6 : block5.data = {};
     block5.data.part = partStrings[0];
-    if (block5.data.tags && Array.isArray(block5.data.tags) && block5.data.tags.reduce((a2, t2) => a2 || partStrings.includes(t2), false)) {
-      block5.data.tags = block5.data.tags.filter((tag) => !partStrings.includes(tag));
+    if (block5.data.tags && Array.isArray(block5.data.tags) && block5.data.tags.reduce((a2, t2) => a2 || partStrings.includes(t2.toLowerCase()), false)) {
+      block5.data.tags = block5.data.tags.filter((tag) => !partStrings.includes(tag.toLowerCase()));
       if (block5.data.tags.length === 0) {
         delete block5.data.tags;
       }
@@ -237774,6 +237848,32 @@ function renderEquation(file, node3, opts) {
   }
 }
 function mathNestingTransform(tree, file) {
+  const paragraphs = selectAll("paragraph", tree);
+  paragraphs.forEach((paragraph4) => {
+    if (paragraph4.children.length === 1)
+      return;
+    paragraph4.children.forEach((child, index4) => {
+      var _a6, _b, _c, _d2;
+      if (child.type !== "math")
+        return;
+      const math7 = child;
+      const before = paragraph4.children[index4 - 1];
+      const after = paragraph4.children[index4 + 1];
+      if (index4 === 0) {
+        math7.tight = "after";
+      } else if (index4 === paragraph4.children.length - 1) {
+        math7.tight = "before";
+      } else {
+        math7.tight = true;
+      }
+      if ((before === null || before === void 0 ? void 0 : before.type) === "text") {
+        before.value = (_b = (_a6 = before.value) === null || _a6 === void 0 ? void 0 : _a6.replace(/\n$/, "")) !== null && _b !== void 0 ? _b : "";
+      }
+      if ((after === null || after === void 0 ? void 0 : after.type) === "text") {
+        after.value = (_d2 = (_c = after.value) === null || _c === void 0 ? void 0 : _c.replace(/^\n/, "")) !== null && _d2 !== void 0 ? _d2 : "";
+      }
+    });
+  });
   unnestTransform(tree, "paragraph", "math");
 }
 function mathLabelTransform(tree, file) {
@@ -278006,6 +278106,8 @@ var macros17 = {
   multicolumn: 3,
   subfigure: 2,
   tabularx: 2,
+  longtable: 2,
+  ["longtable*"]: 2,
   supertabular: 1,
   cmidrule: 2,
   cline: 1,
@@ -279027,60 +279129,221 @@ var MISC_HANDLERS = {
 };
 
 // ../tex-to-myst/dist/tables.js
-function createTable(node3, state) {
-  state.closeParagraph();
-  const table5 = {
-    rows: [],
-    cells: [],
-    cell: []
-  };
-  const IGNORE = /* @__PURE__ */ new Set([
-    "cline",
-    "hline",
-    "rule",
-    "midrule",
-    "cmidrule",
-    "toprule",
-    "bottomrule"
-  ]);
-  node3.content.forEach((n) => {
-    if (n.type === "macro" && IGNORE.has(n.content))
-      return;
-    if (n.type === "macro" && (n.content === "\\" || n.content === "tabularnewline")) {
+var ALIGNMENT_MAP = { c: "center", l: "left", r: "right" };
+function getTabularAlignment(arg2) {
+  if (!arg2 || !arg2.content.reduce((b, { type: type2 }) => b && ["string", "whitespace"].includes(type2), true)) {
+    return;
+  }
+  const spec = texToText(arg2.content).replace(/[\s|]/g, "");
+  if (!spec.match(/([lrc]*)/))
+    return;
+  return spec.split("").map((a2) => ALIGNMENT_MAP[a2]);
+}
+function fixTable(vfile2, table5, alignments) {
+  if ((table5 === null || table5 === void 0 ? void 0 : table5.type) !== "table")
+    return;
+  const multirowTracker = {};
+  const rowSizes = table5.children.map((tr3) => ({
+    tr: tr3,
+    size: tr3.children.reduce((size, td) => {
+      var _a6;
+      return size + ((_a6 = td.colspan) !== null && _a6 !== void 0 ? _a6 : 1);
+    }, 0)
+  }));
+  const uniqueSizes = [...new Set(rowSizes.map(({ size }) => size))];
+  if (uniqueSizes.length !== 1) {
+    fileWarn(vfile2, `Uneven table found, please check your rows to get an even table.`, {
+      node: table5,
+      note: `Row sizes are: ${rowSizes.map(({ size }) => size).join(", ")}`
+    });
+    rowSizes.reduce((rows, row2, index4) => {
+      if (index4 > 0 && rowSizes[index4 - 1].size !== row2.size) {
+        rows.push({ ...row2, previous: rowSizes[index4 - 1].size });
+      }
+      return rows;
+    }, []).forEach(({ tr: tr3, size, previous }) => {
+      fileWarn(vfile2, `Table row of size (${size}) does not match previous row size (${previous})`, {
+        node: tr3
+      });
+    });
+  }
+  let useAlignments = false;
+  if (alignments && uniqueSizes.length === 1 && (uniqueSizes[0] === alignments.length || alignments.length === 1)) {
+    useAlignments = true;
+  } else if (alignments && uniqueSizes.length === 1 && uniqueSizes[0] !== alignments.length) {
+    fileWarn(vfile2, `Table alignment argument does not match number of columns`, { node: table5 });
+  }
+  table5.children.forEach((tr3, rowIndex) => {
+    Object.keys(multirowTracker).forEach((key2) => {
+      const colIndex = key2;
+      if (multirowTracker[colIndex] > 1) {
+        multirowTracker[colIndex]--;
+      } else {
+        delete multirowTracker[colIndex];
+      }
+    });
+    const columnIndex = tr3.children.reduce((info, td) => {
+      var _a6;
+      info.columnIndex.push(info.size);
+      info.size += (_a6 = td.colspan) !== null && _a6 !== void 0 ? _a6 : 1;
+      return info;
+    }, { columnIndex: [], size: 0 }).columnIndex;
+    tr3.children = tr3.children.filter((td, index4) => {
+      var _a6, _b;
+      const colIndex = columnIndex[index4];
+      if (td.rowspan && td.rowspan > 1) {
+        for (let col = 0; col < ((_a6 = td.colspan) !== null && _a6 !== void 0 ? _a6 : 1); col++) {
+          multirowTracker[colIndex + col] = td.rowspan;
+        }
+      }
+      if (alignments && useAlignments && !td.align) {
+        const align = (_b = alignments[colIndex]) !== null && _b !== void 0 ? _b : alignments[0];
+        if (align !== "left")
+          td.align = align;
+      }
+      if (multirowTracker[colIndex] && td.rowspan !== multirowTracker[colIndex]) {
+        if (!isEmptyCell(td)) {
+          fileWarn(vfile2, `Non-empty placeholder cell found at row ${rowIndex}, column ${colIndex}.`, { node: table5 });
+        }
+        return false;
+      }
+      return true;
+    });
+  });
+}
+function isEmptyCell(cell3) {
+  return toText(cell3).trim() === "";
+}
+var createTable = (addContainer = false) => {
+  return (node3, state) => {
+    state.closeParagraph();
+    const table5 = {
+      rows: [],
+      cells: [],
+      cell: [],
+      // These are used for longtable
+      caption: void 0,
+      label: void 0,
+      firstHead: [],
+      head: [],
+      foot: [],
+      lastFoot: []
+    };
+    const IGNORE = /* @__PURE__ */ new Set([
+      "cline",
+      "hline",
+      "rule",
+      "midrule",
+      "cmidrule",
+      "toprule",
+      "bottomrule"
+    ]);
+    const alignments = getTabularAlignment(node3.args[node3.args.length - 1]);
+    node3.content.forEach((n) => {
+      if (n.type === "comment")
+        return;
+      if (n.type === "macro" && IGNORE.has(n.content))
+        return;
+      if (n.type === "macro" && n.content === "label" && !table5.label) {
+        table5.label = n;
+        return;
+      }
+      if (n.type === "macro" && n.content === "caption") {
+        table5.caption = n;
+        return;
+      }
+      if (n.type === "macro" && n.content === "endfirsthead") {
+        table5.firstHead = table5.rows;
+        table5.rows = [];
+        return;
+      }
+      if (n.type === "macro" && n.content === "endhead") {
+        table5.head = table5.rows;
+        table5.rows = [];
+        return;
+      }
+      if (n.type === "macro" && n.content === "endfoot") {
+        table5.foot = table5.rows;
+        table5.rows = [];
+        return;
+      }
+      if (n.type === "macro" && n.content === "endlastfoot") {
+        table5.lastFoot = table5.rows;
+        table5.rows = [];
+        return;
+      }
+      if (n.type === "macro" && (n.content === "\\" || n.content === "tabularnewline")) {
+        table5.cells.push(table5.cell);
+        if (table5.cells.flat().length > 0)
+          table5.rows.push(table5.cells);
+        table5.cell = [];
+        table5.cells = [];
+        return;
+      }
+      if (n.type === "string" && n.content === "&") {
+        table5.cells.push(table5.cell);
+        table5.cell = [];
+        return;
+      }
+      if (table5.cell.length === 0 && (n.type === "whitespace" || n.type === "parbreak"))
+        return;
+      table5.cell.push(n);
+    });
+    if (table5.cell.length > 0)
       table5.cells.push(table5.cell);
+    if (table5.cells.length > 0)
       table5.rows.push(table5.cells);
-      table5.cell = [];
-      table5.cells = [];
-      return;
+    if (table5.firstHead.length > 0) {
+      table5.rows.unshift(...table5.firstHead);
+    } else {
+      table5.rows.unshift(...table5.head);
     }
-    if (n.type === "string" && n.content === "&") {
-      table5.cells.push(table5.cell);
-      table5.cell = [];
-      return;
+    if (table5.lastFoot.length > 0) {
+      table5.rows.push(...table5.lastFoot);
+    } else {
+      table5.rows.push(...table5.foot);
     }
-    if (table5.cell.length === 0 && n.type === "whitespace")
-      return;
-    table5.cell.push(n);
-  });
-  if (table5.cell.length > 0)
-    table5.cells.push(table5.cell);
-  if (table5.cells.length > 0)
-    table5.rows.push(table5.cells);
-  state.openNode("table");
-  table5.rows.forEach((row2, rowIndex) => {
-    state.openNode("tableRow");
-    row2.forEach((cell3) => {
-      state.openNode("tableCell", rowIndex === 0 ? { header: true } : void 0);
-      trimWhitespace(cell3);
-      state.renderChildren({ content: [{ type: "group", content: cell3 }] });
+    if (addContainer) {
+      state.openNode("container", { kind: "table" });
+      if (table5.caption) {
+        state.renderChildren({ content: [{ type: "group", content: [table5.caption] }] });
+      }
+      if (table5.label) {
+        state.renderChildren({ content: [{ type: "group", content: [table5.label] }] });
+      }
+    }
+    state.openNode("table");
+    table5.rows.forEach((row2) => {
+      state.openNode("tableRow");
+      row2.forEach((cell3) => {
+        state.openNode("tableCell");
+        state.renderChildren({
+          content: [
+            {
+              // Putting things in a group helps with floating `\bf` commands
+              // For example:
+              // `& \bf title &` --> `& {\bf title} &`
+              type: "group",
+              // Ignore ending whitespace "title &" should become "title"
+              content: trimWhitespace(cell3)
+            }
+          ]
+        });
+        state.closeParagraph();
+        unnestParagraphs(state.top(), "tableCell");
+        state.closeNode("tableCell");
+      });
+      state.closeNode("tableRow");
+    });
+    const tableNode = state.top();
+    fixTable(state.file, tableNode, alignments);
+    state.closeNode("table");
+    if (addContainer) {
       state.closeParagraph();
-      unnestParagraphs(state.top(), "tableCell");
       state.closeNode();
-    });
-    state.closeNode();
-  });
-  state.closeNode();
-}
+    }
+  };
+};
 var TABLE_HANDLERS = {
   env_table(node3, state) {
     state.closeParagraph();
@@ -279096,9 +279359,11 @@ var TABLE_HANDLERS = {
     state.closeParagraph();
     state.closeNode();
   },
-  env_tabular: createTable,
-  env_tabularx: createTable,
-  env_supertabular: createTable,
+  env_tabular: createTable(),
+  env_tabularx: createTable(),
+  env_supertabular: createTable(),
+  env_longtable: createTable(true),
+  "env_longtable*": createTable(true),
   env_threeparttable(node3, state) {
     state.closeParagraph();
     const envId = createId();
@@ -279171,7 +279436,9 @@ var TABLE_HANDLERS = {
     if ((currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === "tableCell" && Number.isInteger(rowspan)) {
       currentNode.rowspan = rowspan;
     }
-    state.renderChildren(node3.args[node3.args.length - 1]);
+    const cell3 = node3.args[node3.args.length - 1];
+    cell3.content = trimWhitespace(cell3.content);
+    state.renderChildren(cell3);
     state.closeParagraph();
   },
   macro_multicolumn(node3, state) {
@@ -279179,20 +279446,34 @@ var TABLE_HANDLERS = {
     const ncolArg = node3.args[0];
     const colspan = Number((_b = (_a6 = ncolArg === null || ncolArg === void 0 ? void 0 : ncolArg.content) === null || _a6 === void 0 ? void 0 : _a6[0]) === null || _b === void 0 ? void 0 : _b.content);
     const currentNode = state.top();
-    if ((currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === "tableCell" && Number.isInteger(colspan)) {
-      currentNode.colspan = colspan;
+    const td = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === "tableCell" ? currentNode : void 0;
+    if (td && Number.isInteger(colspan)) {
+      td.colspan = colspan;
+    }
+    if (td && node3.args.length === 3) {
+      const alignmentText = texToText(node3.args[1].content).replace(/([|\s])/g, "");
+      const align = ALIGNMENT_MAP[alignmentText] || void 0;
+      if (align && align !== "left") {
+        td.align = align;
+      }
     }
-    state.renderChildren(node3.args[node3.args.length - 1]);
+    const cell3 = node3.args[node3.args.length - 1];
+    cell3.content = trimWhitespace(cell3.content);
+    state.renderChildren(cell3);
     state.closeNode();
   }
 };
 function trimWhitespace(content3) {
-  var _a6;
-  if (((_a6 = content3.slice(-1)[0]) === null || _a6 === void 0 ? void 0 : _a6.type) === "whitespace") {
-    content3.pop();
-    return trimWhitespace(content3);
+  var _a6, _b;
+  let startIndex = 0;
+  let endIndex = content3.length - 1;
+  while (startIndex <= endIndex && ((_a6 = content3[startIndex]) === null || _a6 === void 0 ? void 0 : _a6.type) === "whitespace") {
+    startIndex++;
   }
-  return content3;
+  while (endIndex >= startIndex && ((_b = content3[endIndex]) === null || _b === void 0 ? void 0 : _b.type) === "whitespace") {
+    endIndex--;
+  }
+  return content3.slice(startIndex, endIndex + 1);
 }
 
 // ../tex-to-myst/dist/footnotes.js
@@ -279875,7 +280156,9 @@ var TexParser = class {
     }
     this.closeNode();
   }
-  closeNode() {
+  closeNode(type2) {
+    if (type2 && this.top().type !== type2)
+      return this.top();
     const node3 = this.stack.pop();
     this.pushNode(node3);
     return node3;
@@ -280277,6 +280560,13 @@ function stateError(state, message) {
 
 // ../markdown-it-myst/dist/directives.js
 var COLON_OPTION_REGEX = /^:(?<option>[^:\s]+?):(\s*(?<value>.*)){0,1}\s*$/;
+function computeBlockTightness(src, map6) {
+  const lines = src.split("\n");
+  const tightBefore = typeof (map6 === null || map6 === void 0 ? void 0 : map6[0]) === "number" && map6[0] > 0 ? lines[map6[0] - 1].trim() !== "" : false;
+  const tightAfter = typeof (map6 === null || map6 === void 0 ? void 0 : map6[1]) === "number" && map6[1] < lines.length ? lines[map6[1]].trim() !== "" : false;
+  const tight = tightBefore && tightAfter ? true : tightBefore ? "before" : tightAfter ? "after" : false;
+  return tight;
+}
 function replaceFences(state) {
   for (const token of state.tokens) {
     if (token.type === "fence" || token.type === "colon_fence") {
@@ -280313,7 +280603,9 @@ function runDirectives(state) {
         directiveOpen.map = map6;
         directiveOpen.meta = {
           arg: arg2,
-          options: simplifyDirectiveOptions(options)
+          options: simplifyDirectiveOptions(options),
+          // Tightness is computed for all directives (are they separated by a newline before/after)
+          tight: computeBlockTightness(state.src, token.map)
         };
         const startLineNumber = map6 ? map6[0] : 0;
         const argTokens = directiveArgToTokens(arg2, startLineNumber, state);
@@ -282084,14 +282376,16 @@ var mathDirective = {
   run(data) {
     var _a6;
     const { label, identifier } = normalizeLabel((_a6 = data.options) === null || _a6 === void 0 ? void 0 : _a6.label) || {};
-    return [
-      {
-        type: "math",
-        identifier,
-        label,
-        value: data.body
-      }
-    ];
+    const math7 = {
+      type: "math",
+      identifier,
+      label,
+      value: data.body
+    };
+    if (data.node.tight) {
+      math7.tight = data.node.tight;
+    }
+    return [math7];
   }
 };
 
@@ -283967,7 +284261,8 @@ function withoutTrailingNewline(str2) {
   return str2[str2.length - 1] == "\n" ? str2.slice(0, str2.length - 1) : str2;
 }
 var MarkdownParseState = class {
-  constructor(handlers6) {
+  constructor(src, handlers6) {
+    this.src = src;
     this.stack = [u2("root", [])];
     this.handlers = getTokenHandlers(handlers6);
   }
@@ -284013,8 +284308,9 @@ var MarkdownParseState = class {
       if (token.hidden && !UNHIDDEN_TOKENS.has(token.type))
         return;
       const handler = this.handlers[token.type];
-      if (!handler)
+      if (!handler) {
         throw new Error(`Token type ${token.type} not supported by tokensToMyst parser`);
+      }
       handler(this, token, tokens, index4);
     });
   }
@@ -284037,9 +284333,9 @@ var MarkdownParseState = class {
     }
   }
 };
-function getAttrs(spec, token, tokens, index4) {
+function getAttrs(state, spec, token, tokens, index4) {
   var _a6;
-  const attrs = ((_a6 = spec.getAttrs) === null || _a6 === void 0 ? void 0 : _a6.call(spec, token, tokens, index4)) || spec.attrs || {};
+  const attrs = ((_a6 = spec.getAttrs) === null || _a6 === void 0 ? void 0 : _a6.call(spec, token, tokens, index4, state)) || spec.attrs || {};
   if ("type" in attrs)
     throw new Error('You can not have "type" as attrs.');
   if ("children" in attrs)
@@ -284056,15 +284352,15 @@ function getTokenHandlers(specHandlers) {
     if (noCloseToken(spec, type2)) {
       handlers6[type2] = (state, tok, tokens, i2) => {
         if (spec.isText) {
-          state.addText(withoutTrailingNewline(tok.content), tok, spec.type, getAttrs(spec, tok, tokens, i2));
+          state.addText(withoutTrailingNewline(tok.content), tok, spec.type, getAttrs(state, spec, tok, tokens, i2));
           return;
         }
-        state.openNode(nodeType, tok, getAttrs(spec, tok, tokens, i2), spec.isLeaf);
+        state.openNode(nodeType, tok, getAttrs(state, spec, tok, tokens, i2), spec.isLeaf);
         state.addText(withoutTrailingNewline(tok.content), tok);
         state.closeNode();
       };
     } else {
-      handlers6[type2 + "_open"] = (state, tok, tokens, i2) => state.openNode(nodeType, tok, getAttrs(spec, tok, tokens, i2));
+      handlers6[type2 + "_open"] = (state, tok, tokens, i2) => state.openNode(nodeType, tok, getAttrs(state, spec, tok, tokens, i2));
       handlers6[type2 + "_close"] = (state) => state.closeNode();
     }
   });
@@ -284075,6 +284371,15 @@ function getTokenHandlers(specHandlers) {
 }
 
 // ../myst-parser/dist/tokensToMyst.js
+function computeAmsmathTightness(src, map6) {
+  var _a6;
+  const lines = src.split("\n");
+  const tightBefore = typeof (map6 === null || map6 === void 0 ? void 0 : map6[0]) === "number" && map6[0] > 0 ? lines[map6[0] - 1].trim() !== "" : false;
+  const last = typeof (map6 === null || map6 === void 0 ? void 0 : map6[1]) === "number" ? (map6 === null || map6 === void 0 ? void 0 : map6[1]) + 1 : void 0;
+  const tightAfter = typeof last === "number" && last < lines.length ? ((_a6 = lines[last]) === null || _a6 === void 0 ? void 0 : _a6.trim()) !== "" : false;
+  const tight = tightBefore && tightAfter ? true : tightBefore ? "before" : tightAfter ? "after" : false;
+  return tight;
+}
 var NUMBERED_CLASS = /^numbered$/;
 var ALIGN_CLASS = /(?:(?:align-)|^)(left|right|center)/;
 function getClassName(token, exclude) {
@@ -284351,11 +284656,15 @@ var defaultMdast = {
     type: "math",
     noCloseToken: true,
     isText: true,
-    getAttrs(t2) {
+    getAttrs(t2, tokens, index4, state) {
       var _a6;
-      return {
+      const tight = computeAmsmathTightness(state.src, t2.map);
+      const attrs = {
         enumerated: (_a6 = t2.meta) === null || _a6 === void 0 ? void 0 : _a6.enumerated
       };
+      if (tight)
+        attrs.tight = tight;
+      return attrs;
     }
   },
   footnote_ref: {
@@ -284412,12 +284721,13 @@ var defaultMdast = {
   parsed_directive: {
     type: "mystDirective",
     getAttrs(t2) {
-      var _a6, _b;
+      var _a6, _b, _c;
       return {
         name: t2.info,
         args: (_a6 = t2.meta) === null || _a6 === void 0 ? void 0 : _a6.arg,
         options: (_b = t2.meta) === null || _b === void 0 ? void 0 : _b.options,
-        value: t2.content || void 0
+        value: t2.content || void 0,
+        tight: ((_c = t2.meta) === null || _c === void 0 ? void 0 : _c.tight) || void 0
       };
     }
   },
@@ -284544,14 +284854,14 @@ var defaultOptions2 = {
   hoistSingleImagesOutofParagraphs: true,
   nestBlocks: true
 };
-function tokensToMyst(tokens, options = defaultOptions2) {
+function tokensToMyst(src, tokens, options = defaultOptions2) {
   var _a6;
   const opts = {
     ...defaultOptions2,
     ...options,
     handlers: { ...defaultOptions2.handlers, ...options === null || options === void 0 ? void 0 : options.handlers }
   };
-  const state = new MarkdownParseState(opts.handlers);
+  const state = new MarkdownParseState(src, opts.handlers);
   state.parseTokens(tokens);
   let tree;
   do {
@@ -284949,7 +285259,7 @@ function mystParse(content3, opts) {
   const { vfile: vfile2 } = opts || {};
   const parsedOpts = parseOptions(opts);
   const tokenizer = createTokenizer(parsedOpts);
-  const tree = tokensToMyst(tokenizer.parse(content3, { vfile: vfile2 }), parsedOpts.mdast);
+  const tree = tokensToMyst(content3, tokenizer.parse(content3, { vfile: vfile2 }), parsedOpts.mdast);
   applyDirectives(tree, parsedOpts.directives, parsedOpts.vfile);
   applyRoles(tree, parsedOpts.roles, parsedOpts.vfile);
   return tree;
@@ -285498,7 +285808,7 @@ var import_node_path16 = __toESM(require("path"), 1);
 var import_nbtx = __toESM(require_cjs2(), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.1.48";
+var version2 = "1.1.50";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -287490,7 +287800,7 @@ function reduceOutputs(session, mdast2, file, writeFolder, opts) {
 // ../myst-cli/dist/transforms/inlineExpressions.js
 var metadataSection = "user_expressions";
 function findExpression(expressions, value) {
-  return expressions.find((expr) => expr.expression === value);
+  return expressions === null || expressions === void 0 ? void 0 : expressions.find((expr) => expr.expression === value);
 }
 function processLatex(value) {
   return value.trim().replace(/^\$(\\displaystyle)?/, "").replace(/\$$/, "").trim();
@@ -287839,7 +288149,7 @@ async function getRawFrontmatterFromFile(session, file, projectPath) {
     return void 0;
   return result.pre.frontmatter;
 }
-function getExportListFromRawFrontmatter(session, formats, rawFrontmatter, file) {
+function getExportListFromRawFrontmatter(session, rawFrontmatter, file) {
   var _a6;
   const vfile2 = new VFile();
   vfile2.path = file;
@@ -287848,10 +288158,7 @@ function getExportListFromRawFrontmatter(session, formats, rawFrontmatter, file)
     ruleId: RuleId.validFrontmatterExportList
   }));
   logMessagesFromVFile(session, vfile2);
-  if (!exports2)
-    return [];
-  const exportOptions = exports2.filter((exp) => !!exp && formats.includes(exp.format));
-  return exportOptions;
+  return exports2 !== null && exports2 !== void 0 ? exports2 : [];
 }
 function updateFileInfoFromFrontmatter(session, file, frontmatter, url, dataUrl) {
   session.store.dispatch(watch.actions.updateFileInfo({
@@ -297246,121 +297553,232 @@ function getDefaultExportFilename(session, file, projectPath) {
   const slug = slugFromProject || createSlug(name3);
   return slug;
 }
-function getDefaultExportFolder(session, file, projectPath, ext2) {
+function getDefaultExportFolder(session, file, format, projectPath) {
   const subpaths = [projectPath || import_node_path32.default.parse(file).dir, "_build", "exports"];
-  if (ext2 === "tex")
+  if (format === ExportFormats.tex) {
     subpaths.push(`${getDefaultExportFilename(session, file, projectPath)}_tex`);
-  if (ext2 === "typ")
+  }
+  if (format === ExportFormats.typst) {
     subpaths.push(`${getDefaultExportFilename(session, file, projectPath)}_typst`);
+  }
   return import_node_path32.default.join(...subpaths);
 }
 
 // ../myst-cli/dist/build/utils/collectExportOptions.js
 var SOURCE_EXTENSIONS = [".ipynb", ".md", ".tex"];
-function assignArticlesFromProject(exp, proj, vfile2) {
+function resolveArticlesFromProject(exp, proj, vfile2) {
   var _a6;
   const { file, pages } = proj;
   const fileAsPage = { file, level: 1 };
   const articles = (pages === null || pages === void 0 ? void 0 : pages.length) ? pages : [fileAsPage];
   if (MULTI_ARTICLE_EXPORT_FORMATS.includes(exp.format)) {
-    exp.articles = articles;
-  } else if (exp.format === ExportFormats.xml) {
-    exp.articles = [fileAsPage];
-    exp.sub_articles = pages.map((page) => page.file).filter((pageFile) => !!pageFile);
+    return { articles };
+  }
+  if (exp.format === ExportFormats.xml) {
+    return {
+      articles: [fileAsPage],
+      sub_articles: pages.map((page) => page.file).filter((pageFile) => !!pageFile)
+    };
   } else {
-    fileError(vfile2, "multiple articles are only supported for 'tex', 'typst', and 'pdf' exports", {
-      ruleId: RuleId.validFrontmatterExportList
-    });
-    exp.articles = [(_a6 = singleArticleWithFile(articles)) !== null && _a6 !== void 0 ? _a6 : fileAsPage];
+    if (articles.length > 1) {
+      fileError(vfile2, "multiple articles are only supported for 'tex', 'typst', and 'pdf' exports", {
+        ruleId: RuleId.validFrontmatterExportList
+      });
+    }
+    return { articles: [(_a6 = singleArticleWithFile(articles)) !== null && _a6 !== void 0 ? _a6 : fileAsPage] };
   }
 }
-function assignArticlesFromTOC(session, exp, tocPath, vfile2) {
+function resolveArticlesFromTOC(session, exp, tocPath, vfile2) {
   const allowLevelLessThanOne = [
     ExportFormats.tex,
     ExportFormats.pdf,
     ExportFormats.pdftex
   ].includes(exp.format);
   const proj = projectFromToc(session, tocPath, allowLevelLessThanOne ? -1 : 1);
-  assignArticlesFromProject(exp, proj, vfile2);
+  return resolveArticlesFromProject(exp, proj, vfile2);
 }
-async function prepareExportOptions(session, sourceFile, formats, projectPath, opts) {
-  const { disableTemplate, filename, template } = opts;
-  const vfile2 = new VFile();
-  vfile2.path = sourceFile;
-  let rawFrontmatter;
-  const state = session.store.getState();
-  if (projectPath && import_node_path33.default.resolve(sourceFile) === selectors_exports.selectLocalConfigFile(state, projectPath)) {
-    rawFrontmatter = selectors_exports.selectLocalProjectConfig(state, projectPath);
-  } else {
-    rawFrontmatter = await getRawFrontmatterFromFile(session, sourceFile, projectPath);
+function resolveTemplate(sourceFile, exp, disableTemplate) {
+  if (disableTemplate)
+    return null;
+  if (exp.template) {
+    const resolvedTemplatePath = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), exp.template);
+    if (import_node_fs26.default.existsSync(resolvedTemplatePath)) {
+      return resolvedTemplatePath;
+    }
+  }
+  return exp.template;
+}
+function resolveFormat(vfile2, exp) {
+  var _a6, _b, _c;
+  if (exp.format && exp.format !== ExportFormats.pdf) {
+    return exp.format;
+  }
+  let suggestedPdfFormat = ExportFormats.pdf;
+  let suggestedOutputFormat;
+  if (exp.output) {
+    const ext2 = import_node_path33.default.extname(exp.output);
+    if (!ext2) {
+      suggestedPdfFormat = ExportFormats.pdftex;
+    } else {
+      suggestedOutputFormat = EXT_TO_FORMAT[ext2];
+    }
+  }
+  if ((_a6 = exp.template) === null || _a6 === void 0 ? void 0 : _a6.endsWith("-tex"))
+    return suggestedPdfFormat;
+  if ((_b = exp.template) === null || _b === void 0 ? void 0 : _b.endsWith("-typst"))
+    return ExportFormats.typst;
+  if ((_c = exp.template) === null || _c === void 0 ? void 0 : _c.endsWith("-docx"))
+    return ExportFormats.docx;
+  if (exp.template && import_node_fs26.default.existsSync(exp.template)) {
+    const templateFiles = import_node_fs26.default.readdirSync(exp.template);
+    const templateTexFiles = templateFiles.filter((file) => file.endsWith(".tex"));
+    const templateTypFiles = templateFiles.filter((file) => file.endsWith(".typ"));
+    if (templateTexFiles.length && !templateTypFiles.length)
+      return suggestedPdfFormat;
+    if (!templateTexFiles.length && templateTypFiles.length)
+      return ExportFormats.typst;
+  }
+  if (exp.format)
+    return suggestedPdfFormat;
+  return suggestedOutputFormat !== null && suggestedOutputFormat !== void 0 ? suggestedOutputFormat : suggestedPdfFormat;
+}
+function resolveArticles(session, sourceFile, vfile2, exp, projectPath) {
+  var _a6, _b, _c, _d2;
+  const { articles, sub_articles } = exp;
+  let resolved = { articles, sub_articles };
+  if (exp.toc && !resolved.articles && !resolved.sub_articles) {
+    const resolvedToc = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), exp.toc);
+    if (validateTOC(session, resolvedToc)) {
+      resolved = resolveArticlesFromTOC(session, exp, resolvedToc, vfile2);
+    }
   }
-  let exportOptions = getExportListFromRawFrontmatter(session, formats, rawFrontmatter, sourceFile);
-  if (exportOptions.length === 0 && formats.length && opts.force) {
-    exportOptions = [{ format: formats[0] }];
+  if (!resolved.articles && SOURCE_EXTENSIONS.includes(import_node_path33.default.extname(sourceFile))) {
+    resolved.articles = [{ file: import_node_path33.default.resolve(sourceFile) }];
   }
-  if (filename || disableTemplate || template) {
-    exportOptions = exportOptions.slice(0, 1);
+  if (((_a6 = resolved.articles) === null || _a6 === void 0 ? void 0 : _a6.length) === 1 && resolved.articles[0].level == null) {
+    resolved.articles[0].level = 0;
   }
-  exportOptions.forEach((exp) => {
-    var _a6, _b, _c, _d2, _e, _f, _g, _h;
-    if (exp.toc && !((_a6 = exp.articles) === null || _a6 === void 0 ? void 0 : _a6.length) && !((_b = exp.sub_articles) === null || _b === void 0 ? void 0 : _b.length)) {
-      const resolvedToc = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), exp.toc);
-      if (validateTOC(session, resolvedToc)) {
-        assignArticlesFromTOC(session, exp, resolvedToc, vfile2);
-      }
-    }
-    if (!((_c = exp.articles) === null || _c === void 0 ? void 0 : _c.length) && SOURCE_EXTENSIONS.includes(import_node_path33.default.extname(sourceFile))) {
-      exp.articles = [{ file: import_node_path33.default.resolve(sourceFile) }];
-    }
-    if (((_d2 = exp.articles) === null || _d2 === void 0 ? void 0 : _d2.length) === 1 && exp.articles[0].level == null) {
-      exp.articles[0].level = 0;
-    }
-    if (!((_e = exp.articles) === null || _e === void 0 ? void 0 : _e.length) && !((_f = exp.sub_articles) === null || _f === void 0 ? void 0 : _f.length)) {
-      if (validateTOC(session, projectPath !== null && projectPath !== void 0 ? projectPath : ".")) {
-        assignArticlesFromTOC(session, exp, projectPath !== null && projectPath !== void 0 ? projectPath : ".", vfile2);
-      } else {
-        const cachedProject = selectors_exports.selectLocalProject(session.store.getState(), projectPath !== null && projectPath !== void 0 ? projectPath : ".");
-        if (cachedProject) {
-          assignArticlesFromProject(exp, cachedProject, vfile2);
-        }
+  if (!resolved.articles && !resolved.sub_articles) {
+    if (validateTOC(session, projectPath !== null && projectPath !== void 0 ? projectPath : ".")) {
+      resolved = resolveArticlesFromTOC(session, exp, projectPath !== null && projectPath !== void 0 ? projectPath : ".", vfile2);
+    } else {
+      const cachedProject = selectors_exports.selectLocalProject(session.store.getState(), projectPath !== null && projectPath !== void 0 ? projectPath : ".");
+      if (cachedProject) {
+        resolved = resolveArticlesFromProject(exp, cachedProject, vfile2);
       }
     }
-    exp.articles = (_g = exp.articles) === null || _g === void 0 ? void 0 : _g.map((article) => {
-      if (!article.file)
-        return article;
-      const resolvedFile = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), article.file);
-      if (!import_node_fs26.default.existsSync(resolvedFile)) {
-        fileError(vfile2, `Invalid export article '${article.file}' in source: ${sourceFile}`, {
-          ruleId: RuleId.exportArticleExists
-        });
-        return void 0;
-      }
-      return { ...article, file: resolvedFile };
-    }).filter((article) => !!article);
-    exp.sub_articles = (_h = exp.sub_articles) === null || _h === void 0 ? void 0 : _h.map((file) => {
-      const resolvedFile = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), file);
-      if (!import_node_fs26.default.existsSync(resolvedFile)) {
-        fileError(vfile2, `Invalid export sub_article '${file}' in source: ${sourceFile}`, {
-          ruleId: RuleId.exportArticleExists
-        });
-        return void 0;
-      } else {
-        return resolvedFile;
-      }
-    }).filter((resolvedFile) => !!resolvedFile);
-  });
-  const filteredExportOptions = exportOptions.map((exp) => {
-    var _a6;
-    if ((_a6 = exp.articles) === null || _a6 === void 0 ? void 0 : _a6.length)
-      return exp;
-    if (exp.format === ExportFormats.meca)
-      return exp;
-    if (!opts.force) {
-      fileError(vfile2, `Invalid export - unable to resolve 'articles' to export: ${sourceFile}`, {
+  }
+  if (!((_b = resolved.articles) === null || _b === void 0 ? void 0 : _b.length) && exp.format !== ExportFormats.meca) {
+    fileError(vfile2, `Unable to resolve any 'articles' to export`, {
+      ruleId: RuleId.exportArticleExists
+    });
+    return resolved;
+  }
+  resolved.articles = (_c = resolved.articles) === null || _c === void 0 ? void 0 : _c.map((article) => {
+    if (!article.file)
+      return article;
+    const resolvedFile = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), article.file);
+    if (!import_node_fs26.default.existsSync(resolvedFile)) {
+      fileError(vfile2, `Invalid export article - '${article.file}' does not exist`, {
         ruleId: RuleId.exportArticleExists
       });
+      return void 0;
     }
+    return { ...article, file: resolvedFile };
+  }).filter((article) => !!article);
+  resolved.sub_articles = (_d2 = resolved.sub_articles) === null || _d2 === void 0 ? void 0 : _d2.map((file) => {
+    const resolvedFile = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), file);
+    if (!import_node_fs26.default.existsSync(resolvedFile)) {
+      fileError(vfile2, `Invalid export sub_article - '${file}' does not exist`, {
+        ruleId: RuleId.exportArticleExists
+      });
+      return void 0;
+    } else {
+      return resolvedFile;
+    }
+  }).filter((resolvedFile) => !!resolvedFile);
+  return resolved;
+}
+var ALLOWED_EXTENSIONS = {
+  [ExportFormats.docx]: [".doc", ".docx"],
+  [ExportFormats.md]: [".md"],
+  [ExportFormats.meca]: [".zip", ".meca"],
+  [ExportFormats.pdf]: [".pdf"],
+  [ExportFormats.pdftex]: [".pdf", ".tex", ".zip"],
+  [ExportFormats.tex]: [".tex", ".zip"],
+  [ExportFormats.typst]: [".pdf", ".typ", ".typst", ".zip"],
+  [ExportFormats.xml]: [".xml", ".jats"]
+};
+function resolveOutput(session, sourceFile, vfile2, exp, projectPath) {
+  var _a6, _b, _c, _d2, _e;
+  let output2;
+  if (exp.output) {
+    output2 = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), exp.output);
+  } else {
+    output2 = getDefaultExportFolder(session, sourceFile, exp.format, projectPath);
+  }
+  if (exp.format === ExportFormats.meca && exp.zip === false) {
+    fileWarn(vfile2, `ignoring "zip: false" for export of format "${ExportFormats.meca}"`);
+  }
+  if (exp.zip && !((_a6 = ALLOWED_EXTENSIONS[exp.format]) === null || _a6 === void 0 ? void 0 : _a6.includes(".zip"))) {
+    fileWarn(vfile2, `ignoring "zip: true" for export of format "${exp.format}"`);
+    exp.zip = false;
+  }
+  if (!import_node_path33.default.extname(output2)) {
+    const basename3 = getDefaultExportFilename(session, (_c = (_b = singleArticleWithFile(exp.articles)) === null || _b === void 0 ? void 0 : _b.file) !== null && _c !== void 0 ? _c : sourceFile, projectPath);
+    const ext2 = exp.zip ? ".zip" : (_d2 = ALLOWED_EXTENSIONS[exp.format]) === null || _d2 === void 0 ? void 0 : _d2[0];
+    output2 = import_node_path33.default.join(output2, `${basename3}${ext2 !== null && ext2 !== void 0 ? ext2 : ""}`);
+  }
+  if (!((_e = ALLOWED_EXTENSIONS[exp.format]) === null || _e === void 0 ? void 0 : _e.includes(import_node_path33.default.extname(output2)))) {
+    fileError(vfile2, `Output file "${output2}" has invalid extension for export format of "${exp.format}"`, { ruleId: RuleId.exportExtensionCorrect });
     return void 0;
+  }
+  if (exp.zip && import_node_path33.default.extname(output2) !== ".zip") {
+    fileWarn(vfile2, `Output file "${output2}" has non-zip extension but "zip: true" is specified; ignoring "zip: true"`, { ruleId: RuleId.exportExtensionCorrect });
+  }
+  return output2;
+}
+async function getExportListFromFile(session, sourceFile, projectPath, opts) {
+  const { disableTemplate } = opts;
+  let rawFrontmatter;
+  const state = session.store.getState();
+  if (projectPath && import_node_path33.default.resolve(sourceFile) === selectors_exports.selectLocalConfigFile(state, projectPath)) {
+    rawFrontmatter = selectors_exports.selectLocalProjectConfig(state, projectPath);
+  } else {
+    rawFrontmatter = await getRawFrontmatterFromFile(session, sourceFile, projectPath);
+  }
+  const exportList = getExportListFromRawFrontmatter(session, rawFrontmatter, sourceFile);
+  const exportListWithTemplate = exportList.map((exp) => {
+    const template = resolveTemplate(sourceFile, exp, disableTemplate);
+    return { ...exp, template };
+  }).filter((exp) => !!exp);
+  return exportListWithTemplate;
+}
+function resolveExportListFormats(session, sourceFile, formats, exportList) {
+  const vfile2 = new VFile();
+  vfile2.path = sourceFile;
+  const exportListWithFormat = exportList.map((exp) => {
+    const format = resolveFormat(vfile2, exp);
+    if (!format || !formats.includes(format))
+      return void 0;
+    return { ...exp, format };
+  }).filter((exp) => !!exp);
+  logMessagesFromVFile(session, vfile2);
+  return exportListWithFormat;
+}
+function resolveExportListArticles(session, sourceFile, exportList, projectPath, opts) {
+  const { renderer } = opts;
+  const vfile2 = new VFile();
+  vfile2.path = sourceFile;
+  const filteredExportOptions = exportList.map((exp) => {
+    const { articles, sub_articles } = resolveArticles(session, sourceFile, vfile2, exp, projectPath);
+    if (!(articles === null || articles === void 0 ? void 0 : articles.length) && exp.format !== ExportFormats.meca) {
+      return void 0;
+    }
+    const output2 = resolveOutput(session, sourceFile, vfile2, exp, projectPath);
+    if (!output2)
+      return void 0;
+    return { ...exp, output: output2, articles, sub_articles, renderer };
   }).filter((exp) => !!exp);
   logMessagesFromVFile(session, vfile2);
   return filteredExportOptions;
@@ -297377,93 +297795,6 @@ function filterAndMakeUnique(exports2) {
     };
   });
 }
-function getOutput(session, sourceFile, exp, filename, extension, formats, projectPath) {
-  var _a6, _b;
-  let output2;
-  if (filename) {
-    output2 = filename;
-  } else if (exp.output) {
-    output2 = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), exp.output);
-  } else {
-    output2 = getDefaultExportFolder(session, sourceFile, projectPath, formats.includes(ExportFormats.tex) ? "tex" : formats.includes(ExportFormats.typst) ? "typ" : void 0);
-  }
-  if (!import_node_path33.default.extname(output2)) {
-    const basename3 = getDefaultExportFilename(session, (_b = (_a6 = singleArticleWithFile(exp.articles)) === null || _a6 === void 0 ? void 0 : _a6.file) !== null && _b !== void 0 ? _b : sourceFile, projectPath);
-    output2 = import_node_path33.default.join(output2, `${basename3}.${extension}`);
-  }
-  if (!output2.endsWith(`.${extension}`)) {
-    addWarningForFile(session, sourceFile, `The filename must end with '.${extension}': "${output2}"`, "error", { ruleId: RuleId.exportExtensionCorrect });
-    return void 0;
-  }
-  return output2;
-}
-async function collectTexExportOptions(session, sourceFile, extension, formats, projectPath, opts) {
-  const exportOptions = await prepareExportOptions(session, sourceFile, formats, projectPath, opts);
-  const { disableTemplate, filename, template, zip: zip2 } = opts;
-  if (disableTemplate && template) {
-    throw new Error("Conflicting tex export options: disableTemplate requested but a template was provided");
-  }
-  const resolvedExportOptions = filterAndMakeUnique(exportOptions.map((exp) => {
-    const rawOutput = filename || exp.output || "";
-    const useZip = (extension === "tex" || extension === "typ") && (zip2 || import_node_path33.default.extname(rawOutput) === ".zip");
-    const usePdf = extension === "typ" && import_node_path33.default.extname(rawOutput) === ".pdf";
-    const expExtension = useZip ? "zip" : usePdf ? "pdf" : extension;
-    const output2 = getOutput(session, sourceFile, exp, filename, expExtension, formats, projectPath);
-    if (!output2)
-      return void 0;
-    const resolvedOptions = { output: output2 };
-    if (disableTemplate) {
-      resolvedOptions.template = null;
-    } else if (template) {
-      resolvedOptions.template = template;
-    } else if (exp.template) {
-      const resolvedTemplatePath = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), exp.template);
-      if (import_node_fs26.default.existsSync(resolvedTemplatePath)) {
-        resolvedOptions.template = resolvedTemplatePath;
-      } else {
-        resolvedOptions.template = exp.template;
-      }
-    }
-    return { ...exp, ...resolvedOptions };
-  }));
-  return resolvedExportOptions;
-}
-async function collectBasicExportOptions(session, sourceFile, extension, formats, projectPath, opts) {
-  const exportOptions = await prepareExportOptions(session, sourceFile, formats, projectPath, opts);
-  const { filename } = opts;
-  const resolvedExportOptions = filterAndMakeUnique(exportOptions.map((exp) => {
-    const output2 = getOutput(session, sourceFile, exp, filename, extension, formats, projectPath);
-    if (!output2)
-      return void 0;
-    return { ...exp, output: output2 };
-  }));
-  return resolvedExportOptions;
-}
-async function collectWordExportOptions(session, sourceFile, extension, formats, projectPath, opts) {
-  const exportOptions = await prepareExportOptions(session, sourceFile, formats, projectPath, opts);
-  const { template, filename, renderer } = opts;
-  const resolvedExportOptions = filterAndMakeUnique(exportOptions.map((exp) => {
-    const output2 = getOutput(session, sourceFile, exp, filename, extension, formats, projectPath);
-    if (!output2)
-      return void 0;
-    const resolvedOptions = { output: output2 };
-    if (renderer) {
-      resolvedOptions.renderer = renderer;
-    }
-    if (template) {
-      resolvedOptions.template = template;
-    } else if (exp.template) {
-      const resolvedTemplatePath = import_node_path33.default.resolve(import_node_path33.default.dirname(sourceFile), exp.template);
-      if (import_node_fs26.default.existsSync(resolvedTemplatePath)) {
-        resolvedOptions.template = resolvedTemplatePath;
-      } else {
-        resolvedOptions.template = exp.template;
-      }
-    }
-    return { ...exp, ...resolvedOptions };
-  }));
-  return resolvedExportOptions;
-}
 async function collectExportOptions(session, files, formats, opts) {
   const { projectPath } = opts;
   const sourceFiles = [...files];
@@ -297483,29 +297814,10 @@ async function collectExportOptions(session, files, formats, opts) {
     } else {
       fileProjectPath = projectPath;
     }
-    const fileExportOptionsList = [];
-    if (formats.includes(ExportFormats.docx)) {
-      fileExportOptionsList.push(...await collectWordExportOptions(session, file, "docx", [ExportFormats.docx], fileProjectPath, opts));
-    }
-    if (formats.includes(ExportFormats.pdf) || formats.includes(ExportFormats.pdftex)) {
-      fileExportOptionsList.push(...await collectTexExportOptions(session, file, "pdf", [ExportFormats.pdf, ExportFormats.pdftex], fileProjectPath, opts));
-    }
-    if (formats.includes(ExportFormats.tex)) {
-      fileExportOptionsList.push(...await collectTexExportOptions(session, file, "tex", [ExportFormats.tex], fileProjectPath, opts));
-    }
-    if (formats.includes(ExportFormats.typst)) {
-      fileExportOptionsList.push(...await collectTexExportOptions(session, file, "typ", [ExportFormats.typst], fileProjectPath, opts));
-    }
-    if (formats.includes(ExportFormats.xml)) {
-      fileExportOptionsList.push(...await collectBasicExportOptions(session, file, "xml", [ExportFormats.xml], fileProjectPath, opts));
-    }
-    if (formats.includes(ExportFormats.md)) {
-      fileExportOptionsList.push(...await collectBasicExportOptions(session, file, "md", [ExportFormats.md], fileProjectPath, opts));
-    }
-    if (formats.includes(ExportFormats.meca)) {
-      fileExportOptionsList.push(...await collectBasicExportOptions(session, file, "zip", [ExportFormats.meca], fileProjectPath, opts));
-    }
-    exportOptionsList.push(...fileExportOptionsList.map((exportOptions) => {
+    const fileExports = await getExportListFromFile(session, file, fileProjectPath, opts);
+    const fileExportsWithFormat = resolveExportListFormats(session, file, formats, fileExports);
+    const fileExportsResolved = resolveExportListArticles(session, file, fileExportsWithFormat, fileProjectPath, opts);
+    exportOptionsList.push(...fileExportsResolved.map((exportOptions) => {
       return { ...exportOptions, $file: file, $project: fileProjectPath };
     }));
   }));
@@ -300632,6 +300944,11 @@ function withRecursiveCommands(state, plugins2 = state.data.mathPlugins) {
 }
 var math4 = (node3, state) => {
   const { label, enumerated } = node3;
+  const tightBefore = node3.tight === true || node3.tight === "before";
+  const tightAfter = node3.tight === true || node3.tight === "after";
+  if (tightBefore) {
+    state.ensureNewLine(true);
+  }
   state.usePackages("amsmath");
   addMacrosToState(node3.value, state);
   if (state.data.isInTable) {
@@ -300656,8 +300973,13 @@ var math4 = (node3, state) => {
       state.write(`\\end{equation${enumerated === false ? "*" : ""}}`);
     }
   }
-  if (!state.data.isInTable)
+  if (state.data.isInTable)
+    return;
+  if (tightAfter) {
+    state.ensureNewLine(true);
+  } else {
     state.closeBlock(node3);
+  }
 };
 var inlineMath2 = (node3, state) => {
   state.usePackages("amsmath");
@@ -302925,8 +303247,7 @@ function isTypstAvailable() {
 }
 async function runTypstExecutable(session, typstFile) {
   if (!isTypstAvailable()) {
-    session.log.error("The typst CLI must be installed to build PDFs with typst");
-    return;
+    throw new Error("The typst CLI must be installed to build PDFs with typst");
   }
   if (import_node_path49.default.extname(typstFile) !== ".typ") {
     throw new Error(`invalid input file for typst executable: ${typstFile}`);
@@ -303198,7 +303519,7 @@ async function runTypstPdfExport(session, file, exportOptions, opts) {
   exportOptions.output = import_node_path49.default.join(typFolder, `${import_node_path49.default.basename(pdfOutput, import_node_path49.default.extname(pdfOutput))}.typ`);
   await runTypstExport(session, file, exportOptions, { ...opts !== null && opts !== void 0 ? opts : {}, clean: false });
   const writeFolder = import_node_path49.default.dirname(pdfOutput);
-  session.log.info(`\u{1F5A8} Rendering typst pdf to ${pdfOutput}`);
+  session.log.info(`\u{1F5A8}  Rendering typst pdf to ${pdfOutput}`);
   if (!import_node_fs34.default.existsSync(writeFolder))
     import_node_fs34.default.mkdirSync(writeFolder, { recursive: true });
   import_node_fs34.default.copyFileSync(exportOptions.output.replace(".typ", ".pdf"), pdfOutput);
@@ -306496,7 +306817,12 @@ async function runJatsExport(session, sourceFile, exportOptions, opts) {
     abstractParts: [
       { part: "abstract" },
       {
-        part: ["plain-language-summary", "plain-language-abstract", "summary"],
+        part: [
+          "plain-language-summary",
+          "plain-language-abstract",
+          "summary",
+          "plain language summary"
+        ],
         type: "plain-language-summary",
         title: "Plain Language Summary"
       },
@@ -306504,7 +306830,7 @@ async function runJatsExport(session, sourceFile, exportOptions, opts) {
     ],
     backSections: [
       {
-        part: ["data-availability", "data_availability", "availability"],
+        part: ["data-availability", "data_availability", "availability", "data availability"],
         type: "data-availability",
         title: "Data Availability"
       }
@@ -311525,24 +311851,45 @@ function hasAnyExplicitExportFormat(opts) {
   const { docx, pdf, tex, typst, xml: xml2, md, meca } = opts;
   return docx || pdf || tex || typst || xml2 || md || meca || false;
 }
-function getExportFormats(opts) {
-  const { docx, pdf, tex, typst, xml: xml2, md, meca, all: all10, explicit, extension } = opts;
+function getAllowedExportFormats(opts) {
+  const { docx, pdf, tex, typst, xml: xml2, md, meca, all: all10, explicit } = opts;
   const formats = [];
   const any = hasAnyExplicitExportFormat(opts);
-  const override = all10 || !any && explicit && !extension;
-  if (docx || override || extension === ".docx")
+  const override = all10 || !any && explicit;
+  if (docx || override)
     formats.push(ExportFormats.docx);
-  if (pdf || override || extension === ".pdf")
+  if (pdf || override) {
+    formats.push(ExportFormats.pdf, ExportFormats.pdftex, ExportFormats.typst);
+  }
+  if (tex || override) {
+    formats.push(ExportFormats.tex, ExportFormats.pdftex);
+  }
+  if (typst || override)
+    formats.push(ExportFormats.typst);
+  if (xml2 || override)
+    formats.push(ExportFormats.xml);
+  if (md || override)
+    formats.push(ExportFormats.md);
+  if (meca || override)
+    formats.push(ExportFormats.meca);
+  return [...new Set(formats)];
+}
+function getRequestedExportFormats(opts) {
+  const { docx, pdf, tex, typst, xml: xml2, md, meca } = opts;
+  const formats = [];
+  if (docx)
+    formats.push(ExportFormats.docx);
+  if (pdf)
     formats.push(ExportFormats.pdf);
-  if (tex || override || extension === ".tex")
+  if (tex)
     formats.push(ExportFormats.tex);
-  if (typst || override || extension === ".typ")
+  if (typst)
     formats.push(ExportFormats.typst);
-  if (xml2 || override || extension === ".xml")
+  if (xml2)
     formats.push(ExportFormats.xml);
-  if (md || override || extension === ".md")
+  if (md)
     formats.push(ExportFormats.md);
-  if (meca || override)
+  if (meca)
     formats.push(ExportFormats.meca);
   return formats;
 }
@@ -311561,46 +311908,61 @@ function getProjectPaths(session) {
   return uniqueArray(projectPaths);
 }
 async function collectAllBuildExportOptions(session, files, opts) {
-  const { force, output: output2 } = opts;
+  var _a6;
+  const { output: output2 } = opts;
   files = files.map((file) => import_node_path57.default.resolve(file));
   if (output2 && files.length !== 1) {
     throw new Error("When specifying a named output for export, you must list exactly one file.");
   }
-  const formats = getExportFormats({
-    ...opts,
-    explicit: files.length > 0,
-    extension: output2 ? import_node_path57.default.extname(output2) : void 0
-  });
-  if (output2 && formats.length !== 1) {
-    throw new Error(`Unrecognized file extension for output: ${import_node_path57.default.extname(output2)}`);
+  const requestedFormats = getRequestedExportFormats(opts);
+  if (output2 && requestedFormats.length > 1) {
+    throw new Error(`When specifying output, you can only request one format`);
   }
-  session.log.debug(`Exporting formats: "${formats.join('", "')}"`);
   let exportOptionsList;
-  if (files.length) {
-    exportOptionsList = await collectExportOptions(session, files, formats, {
-      // If there is an output and file specified, force is implied
-      force: force || !!output2 || hasAnyExplicitExportFormat(opts)
-    });
-    if (output2) {
-      if (exportOptionsList.length !== 1) {
-        throw new Error("Expecting only a single export when using output");
-      }
-      exportOptionsList[0].output = import_node_path57.default.join(import_node_path57.default.resolve("."), output2);
+  const projectPath = findCurrentProjectAndLoad(session, files[0] ? import_node_path57.default.dirname(files[0]) : ".");
+  if (projectPath)
+    await loadProjectFromDisk(session, projectPath);
+  if (output2) {
+    session.log.debug(`Exporting formats: "${requestedFormats.join('", "')}"`);
+    const format = (_a6 = requestedFormats[0]) !== null && _a6 !== void 0 ? _a6 : EXT_TO_FORMAT[import_node_path57.default.extname(output2)];
+    if (!format) {
+      throw new Error(`Cannot specify format from output "${output2}" - please specify format option, e.g. --pdf`);
     }
+    exportOptionsList = resolveExportListArticles(session, files[0], [{ format, output: import_node_path57.default.join(import_node_path57.default.resolve("."), output2) }], projectPath, opts).map((exp) => {
+      return { ...exp, $file: files[0], $project: projectPath };
+    });
+  } else if (files.length) {
+    const allowedFormats = getAllowedExportFormats({
+      ...opts,
+      explicit: true
+    });
+    session.log.debug(`Exporting formats: "${allowedFormats.join('", "')}"`);
+    exportOptionsList = (await Promise.all(files.map(async (file) => {
+      const fileExportOptionsList = await collectExportOptions(session, [file], allowedFormats, {});
+      if (fileExportOptionsList.length > 0) {
+        return fileExportOptionsList;
+      }
+      return resolveExportListArticles(session, file, requestedFormats.map((format) => {
+        return { format };
+      }), projectPath, opts).map((exp) => {
+        return { ...exp, $file: files[0], $project: projectPath };
+      });
+    }))).flat();
   } else {
+    const allowedFormats = getAllowedExportFormats(opts);
+    session.log.debug(`Exporting formats: "${allowedFormats.join('", "')}"`);
     const projectPaths = getProjectPaths(session);
-    exportOptionsList = (await Promise.all(projectPaths.map(async (projectPath) => {
+    exportOptionsList = (await Promise.all(projectPaths.map(async (projPath) => {
       try {
-        const project = await loadProjectFromDisk(session, projectPath);
+        const project = await loadProjectFromDisk(session, projPath);
         files = filterPages(project).map((page) => page.file);
       } catch (err) {
-        session.log.debug(`Unable to load any content from project at: ${projectPath}
+        session.log.debug(`Unable to load any content from project at: ${projPath}
 ${err}`);
         return [];
       }
-      const exportOptions = await collectExportOptions(session, files, formats, {
-        force,
-        projectPath
+      const exportOptions = await collectExportOptions(session, files, allowedFormats, {
+        projectPath: projPath
       });
       return exportOptions;
     }))).flat();
@@ -311629,7 +311991,7 @@ async function build(session, files, opts) {
   });
   if (exportLogList.length === 0) {
     if (!(site || performSiteBuild)) {
-      const kinds = Object.entries(opts).filter(([k, v]) => k !== "force" && k !== "output" && k !== "checkLinks" && k !== "site" && v).map(([k]) => k);
+      const kinds = Object.entries(opts).filter(([k, v]) => !["force", "output", "checkLinks", "site", "maxSizeWebp"].includes(k) && v).map(([k]) => k);
       session.log.info(`\u{1F4ED} No file exports${kinds.length > 0 ? ` with kind "${kinds.map(extToKind).join('", "')}"` : ""} found.`);
       if (kinds.length) {
         session.log.info(source_default.dim(`You may need to add an 'exports' field to the frontmatter of the file(s) you wish to export: