@unified-latex/unified-latex 1.4.0 → 1.4.1

package/index.cjs

@@ -3343,16 +3343,16 @@ function printRaw(node, options) {
 }
 
 // ../unified-latex-util-match/dist/index.js
-function createMacroMatcher(macros15) {
-  const macrosHash = Array.isArray(macros15) ? macros15.length > 0 ? typeof macros15[0] === "string" ? Object.fromEntries(
-    macros15.map((macro2) => {
+function createMacroMatcher(macros17) {
+  const macrosHash = Array.isArray(macros17) ? macros17.length > 0 ? typeof macros17[0] === "string" ? Object.fromEntries(
+    macros17.map((macro2) => {
       if (typeof macro2 !== "string") {
         throw new Error("Wrong branch of map function");
       }
       return [macro2, {}];
     })
   ) : Object.fromEntries(
-    macros15.map((macro2) => {
+    macros17.map((macro2) => {
       if (typeof macro2 === "string") {
         throw new Error("Wrong branch of map function");
       }
@@ -3364,7 +3364,7 @@ function createMacroMatcher(macros15) {
       }
       return [macro2.content, {}];
     })
-  ) : {} : macros15;
+  ) : {} : macros17;
   return function matchAgainstMacros(node) {
     if (node == null || node.type !== "macro") {
       return false;
@@ -3379,12 +3379,12 @@ function createMacroMatcher(macros15) {
     return true;
   };
 }
-function createEnvironmentMatcher(macros15) {
-  const environmentsHash = Array.isArray(macros15) ? Object.fromEntries(
-    macros15.map((str) => {
+function createEnvironmentMatcher(macros17) {
+  const environmentsHash = Array.isArray(macros17) ? Object.fromEntries(
+    macros17.map((str) => {
       return [str, {}];
     })
-  ) : macros15;
+  ) : macros17;
   return function matchAgainstEnvironments(node) {
     if (!match.anyEnvironment(node)) {
       return false;
@@ -21043,9 +21043,9 @@ function gobbleArguments(nodes, argSpec, startPos = 0) {
   }
   return { args, nodesRemoved };
 }
-function attachMacroArgsInArray(nodes, macros15) {
+function attachMacroArgsInArray(nodes, macros17) {
   let currIndex;
-  const isRelevantMacro = match.createMacroMatcher(macros15);
+  const isRelevantMacro = match.createMacroMatcher(macros17);
   function gobbleUntilMacro() {
     while (currIndex >= 0 && !isRelevantMacro(nodes[currIndex])) {
       currIndex--;
@@ -21060,7 +21060,7 @@ function attachMacroArgsInArray(nodes, macros15) {
     const macroIndex = currIndex;
     const macro2 = nodes[macroIndex];
     const macroName = macro2.content;
-    const macroInfo2 = macros15[macroName];
+    const macroInfo2 = macros17[macroName];
     updateRenderInfo(macro2, macroInfo2.renderInfo);
     const signatureOrParser = macroInfo2.argumentParser || macroInfo2.signature;
     if (signatureOrParser == null) {
@@ -21107,7 +21107,7 @@ var macros = {
 };
 var environments = {};
 function cleanEnumerateBody(ast, itemName = "item") {
-  let { segments, macros: macros15 } = splitOnMacro(ast, itemName);
+  let { segments, macros: macros17 } = splitOnMacro(ast, itemName);
   for (let i = 0; i < segments.length; i++) {
     const segment = segments[i];
     if (i === 0) {
@@ -21120,7 +21120,7 @@ function cleanEnumerateBody(ast, itemName = "item") {
     }
   }
   let insertParbreakBefore = /* @__PURE__ */ new WeakSet();
-  let body = macros15.flatMap((node, i) => {
+  let body = macros17.flatMap((node, i) => {
     var _a;
     const segment = segments[i + 1];
     const trailingComments = popTrailingComments(segment);
@@ -21262,7 +21262,7 @@ var macros4 = {
 var environments4 = {};
 var macros5 = {
   // Special
-  "\\": { signature: "!s o" },
+  "\\": { signature: "!s !o" },
   _: { signature: "m", escapeToken: "" },
   "^": { signature: "m", escapeToken: "" },
   // \newcommand arg signature from https://www.texdev.net/2020/08/19/the-good-the-bad-and-the-ugly-creating-document-commands
@@ -21607,15 +21607,57 @@ var environments5 = {
   // Math
   math: { renderInfo: { inMathMode: true } }
 };
+var argSpecM = parse("m")[0];
+var argSpecO = parse("o")[0];
+var argSpecRDelim = {};
+var argumentParser = (nodes, startPos) => {
+  const { argument: optionalArg, nodesRemoved: optionalArgNodesRemoved } = gobbleSingleArgument(nodes, argSpecO, startPos);
+  let codeArg = null;
+  let codeArgNodesRemoved = 0;
+  const nextNode = nodes[startPos];
+  if (match.group(nextNode)) {
+    const mandatoryArg = gobbleSingleArgument(nodes, argSpecM, startPos);
+    codeArg = mandatoryArg.argument;
+    codeArgNodesRemoved = mandatoryArg.nodesRemoved;
+  } else if (match.string(nextNode) && nextNode.content.length === 1) {
+    const delim = nextNode.content;
+    argSpecRDelim[delim] = argSpecRDelim[delim] || parse(`r${delim}${delim}`)[0];
+    const delimArg = gobbleSingleArgument(
+      nodes,
+      argSpecRDelim[delim],
+      startPos
+    );
+    codeArg = delimArg.argument;
+    codeArgNodesRemoved = delimArg.nodesRemoved;
+  }
+  return {
+    args: [optionalArg || arg(null), codeArg || arg(null)],
+    nodesRemoved: optionalArgNodesRemoved + codeArgNodesRemoved
+  };
+};
 var macros6 = {
+  lstset: { signature: "m" },
+  lstinline: { argumentParser },
+  lstinputlisting: { signature: "o m" },
+  lstdefinestyle: { signature: "m m" },
+  lstnewenvironment: { signature: "m o o m m" },
+  lstMakeShortInline: { signature: "o m" },
+  lstDeleteShortInline: { signature: "m" },
+  lstdefineformat: { signature: "m m" },
+  lstdefinelanguage: { signature: "o m o m o" },
+  lstalias: { signature: "o m o m" },
+  lstloadlanguages: { signature: "m" }
+};
+var environments6 = {};
+var macros7 = {
   see: { signature: "m m" },
   seealso: { signature: "m m" },
   seename: { signature: "m" },
   alsoname: { signature: "m" },
   index: { signature: "m" }
 };
-var environments6 = {};
-var macros7 = {
+var environments7 = {};
+var macros8 = {
   mathtoolsset: {
     signature: "m",
     renderInfo: { breakAround: true, pgfkeysArgs: true }
@@ -21723,7 +21765,7 @@ var macros7 = {
     renderInfo: { breakAround: true }
   }
 };
-var environments7 = {
+var environments8 = {
   crampedsubarray: {
     signature: "m",
     renderInfo: { alignContent: true, inMathMode: true }
@@ -21827,13 +21869,59 @@ var environments7 = {
   example: { signature: "!o" },
   proof: { signature: "o" }
 };
-var macros8 = {
+var argSpecM2 = parse("m")[0];
+var argSpecO2 = parse("o")[0];
+var argSpecRDelim2 = {};
+var argumentParser2 = (nodes, startPos) => {
+  const { argument: optionalArg, nodesRemoved: optionalArgNodesRemoved } = gobbleSingleArgument(nodes, argSpecO2, startPos);
+  const { argument: languageArg, nodesRemoved: languageArgNodesRemoved } = gobbleSingleArgument(nodes, argSpecM2, startPos);
+  let codeArg = null;
+  let codeArgNodesRemoved = 0;
+  const nextNode = nodes[startPos];
+  if (match.group(nextNode)) {
+    const mandatoryArg = gobbleSingleArgument(nodes, argSpecM2, startPos);
+    codeArg = mandatoryArg.argument;
+    codeArgNodesRemoved = mandatoryArg.nodesRemoved;
+  } else if (match.string(nextNode) && nextNode.content.length === 1) {
+    const delim = nextNode.content;
+    argSpecRDelim2[delim] = argSpecRDelim2[delim] || parse(`r${delim}${delim}`)[0];
+    const delimArg = gobbleSingleArgument(
+      nodes,
+      argSpecRDelim2[delim],
+      startPos
+    );
+    codeArg = delimArg.argument;
+    codeArgNodesRemoved = delimArg.nodesRemoved;
+  }
+  return {
+    args: [
+      optionalArg || arg(null),
+      languageArg || arg(null),
+      codeArg || arg(null)
+    ],
+    nodesRemoved: optionalArgNodesRemoved + languageArgNodesRemoved + codeArgNodesRemoved
+  };
+};
+var macros9 = {
+  mint: { argumentParser: argumentParser2 },
+  mintinline: { argumentParser: argumentParser2 },
+  inputminted: { argumentParser: argumentParser2 },
+  usemintedstyle: { signature: "m" },
+  setminted: { signature: "o m" },
+  setmintedinline: { signature: "o m" },
+  newmint: { signature: "o m m" },
+  newminted: { signature: "o m m" },
+  newmintinline: { signature: "o m m" },
+  newmintedfile: { signature: "o m m" }
+};
+var environments9 = {};
+var macros10 = {
   NiceMatrixOptions: {
     signature: "m",
     renderInfo: { pgfkeysArgs: true, breakAround: true }
   }
 };
-var environments8 = {
+var environments10 = {
   NiceTabular: {
     signature: "o m !o",
     renderInfo: { pgfkeysArgs: true, alignContent: true }
@@ -21895,7 +21983,7 @@ var environments8 = {
     renderInfo: { pgfkeysArgs: true, alignContent: true }
   }
 };
-var macros9 = {
+var macros11 = {
   systeme: {
     signature: "s o o m",
     renderInfo: { inMathMode: true }
@@ -21916,7 +22004,7 @@ var macros9 = {
   sysautonum: { signature: "m" },
   syssubstitute: { signature: "m" }
 };
-var environments9 = {};
+var environments11 = {};
 (function() {
   if (typeof globalThis === "object")
     return;
@@ -22027,7 +22115,7 @@ function eatAllAnimationSpecs(nodes, startPos) {
   }
   return lastMatchPos;
 }
-var macros10 = {
+var macros12 = {
   pgfkeys: {
     signature: "m",
     renderInfo: { breakAround: true, pgfkeysArgs: true }
@@ -22060,7 +22148,7 @@ var macros10 = {
     renderInfo: { namedArguments: ["animation", "options", "command"] }
   }
 };
-var environments10 = {
+var environments12 = {
   tikzpicture: {
     signature: "o",
     renderInfo: { pgfkeysArgs: true, tikzEnvironment: true },
@@ -22410,7 +22498,7 @@ function createMatchers2() {
   };
 }
 var matchers = createMatchers2();
-var macros11 = {
+var macros13 = {
   substitutecolormodel: {
     signature: "m m",
     renderInfo: { breakAround: true }
@@ -22481,7 +22569,7 @@ var macros11 = {
   extractcolorspecs: { signature: "m m m" },
   convertcolorspec: { signature: "m m m m" }
 };
-var environments11 = {
+var environments13 = {
   testcolors: { signature: "o", renderInfo: { pgfkeysArgs: true } }
 };
 var fromRgb = ([r, g, b]) => (0, import_color2.default)([r * 255, g * 255, b * 255], "rgb");
@@ -23102,7 +23190,7 @@ var PREDEFINED_XCOLOR_COLORS = {
   ...SVG_NAMES,
   ...X11_NAMES
 };
-var macros12 = {
+var macros14 = {
   NewDocumentCommand: {
     signature: "m m m",
     renderInfo: { breakAround: true }
@@ -23157,8 +23245,8 @@ var macros12 = {
   },
   DeclareOption: { signature: "m m", renderInfo: { breakAround: true } }
 };
-var environments12 = {};
-var macros13 = {
+var environments14 = {};
+var macros15 = {
   mode: { signature: "s d<> d{}", renderInfo: { breakAround: true } },
   insertnavigation: { signature: "m", renderInfo: { breakAround: true } },
   insertsectionnavigation: {
@@ -23332,7 +23420,7 @@ var macros13 = {
     }
   }
 };
-var environments13 = {
+var environments15 = {
   frame: {
     signature: "!d<> !o !o !d{} !d{}"
   },
@@ -23357,10 +23445,10 @@ var environments13 = {
   columns: { signature: "d<> o" },
   column: { signature: "d<> o m" }
 };
-var macros14 = {
+var macros16 = {
   columnbreak: { renderInfo: { breakAround: true } }
 };
-var environments14 = {
+var environments16 = {
   multicols: {
     signature: "m o o"
   },
@@ -23374,15 +23462,17 @@ var macroInfo = {
   geometry: macros3,
   hyperref: macros4,
   latex2e: macros5,
-  makeidx: macros6,
-  mathtools: macros7,
-  nicematrix: macros8,
-  systeme: macros9,
-  tikz: macros10,
-  xcolor: macros11,
-  xparse: macros12,
-  beamer: macros13,
-  multicol: macros14
+  listings: macros6,
+  makeidx: macros7,
+  mathtools: macros8,
+  minted: macros9,
+  nicematrix: macros10,
+  systeme: macros11,
+  tikz: macros12,
+  xcolor: macros13,
+  xparse: macros14,
+  beamer: macros15,
+  multicol: macros16
 };
 var environmentInfo = {
   cleveref: environments,
@@ -23390,15 +23480,17 @@ var environmentInfo = {
   geometry: environments3,
   hyperref: environments4,
   latex2e: environments5,
-  makeidx: environments6,
-  mathtools: environments7,
-  nicematrix: environments8,
-  systeme: environments9,
-  tikz: environments10,
-  xcolor: environments11,
-  xparse: environments12,
-  beamer: environments13,
-  multicol: environments14
+  listings: environments6,
+  makeidx: environments7,
+  mathtools: environments8,
+  minted: environments9,
+  nicematrix: environments10,
+  systeme: environments11,
+  tikz: environments12,
+  xcolor: environments13,
+  xparse: environments14,
+  beamer: environments15,
+  multicol: environments16
 };
 
 // ../unified-latex-util-environments/dist/index.js
@@ -23762,9 +23854,9 @@ function wasParsedInMathMode(nodes) {
   );
 }
 var unifiedLatexProcessMacrosAndEnvironmentsWithMathReparse = function unifiedLatexProcessMacrosAndEnvironmentsWithMathReparse2(options) {
-  const { environments: environments15 = {}, macros: macros15 = {} } = options || {};
+  const { environments: environments17 = {}, macros: macros17 = {} } = options || {};
   const mathMacros = Object.fromEntries(
-    Object.entries(macros15).filter(
+    Object.entries(macros17).filter(
       ([_, info]) => {
         var _a;
         return ((_a = info.renderInfo) == null ? void 0 : _a.inMathMode) === true;
@@ -23772,7 +23864,7 @@ var unifiedLatexProcessMacrosAndEnvironmentsWithMathReparse = function unifiedLa
     )
   );
   const mathEnvs = Object.fromEntries(
-    Object.entries(environments15).filter(
+    Object.entries(environments17).filter(
       ([_, info]) => {
         var _a;
         return ((_a = info.renderInfo) == null ? void 0 : _a.inMathMode) === true;
@@ -23783,7 +23875,7 @@ var unifiedLatexProcessMacrosAndEnvironmentsWithMathReparse = function unifiedLa
     mathEnvs: Object.keys(mathEnvs),
     mathMacros: Object.keys(mathMacros)
   });
-  const isRelevantEnvironment = match.createEnvironmentMatcher(environments15);
+  const isRelevantEnvironment = match.createEnvironmentMatcher(environments17);
   const isRelevantMathEnvironment = match.createEnvironmentMatcher(mathEnvs);
   return (tree) => {
     visit(
@@ -23800,7 +23892,7 @@ var unifiedLatexProcessMacrosAndEnvironmentsWithMathReparse = function unifiedLa
             return;
           }
           const envName = printRaw(node.env);
-          const envInfo = environments15[envName];
+          const envInfo = environments17[envName];
           if (!envInfo) {
             throw new Error(
               `Could not find environment info for environment "${envName}"`
@@ -23819,14 +23911,14 @@ var unifiedLatexProcessMacrosAndEnvironmentsWithMathReparse = function unifiedLa
           if (!Array.isArray(nodes)) {
             return;
           }
-          attachMacroArgsInArray(nodes, macros15);
+          attachMacroArgsInArray(nodes, macros17);
         },
         leave: (node) => {
           if (!isRelevantEnvironment(node)) {
             return;
           }
           const envName = printRaw(node.env);
-          const envInfo = environments15[envName];
+          const envInfo = environments17[envName];
           if (!envInfo) {
             throw new Error(
               `Could not find environment info for environment "${envName}"`
@@ -23870,8 +23962,8 @@ var unifiedLatexProcessAtLetterAndExplMacros = function unifiedLatexProcessAtLet
 var unifiedLatexFromString = function unifiedLatexFromString2(options) {
   const {
     mode = "regular",
-    macros: macros15 = {},
-    environments: environments15 = {},
+    macros: macros17 = {},
+    environments: environments17 = {},
     flags: {
       atLetter = false,
       expl3 = false,
@@ -23881,12 +23973,12 @@ var unifiedLatexFromString = function unifiedLatexFromString2(options) {
   const allMacroInfo = Object.assign(
     {},
     ...Object.values(macroInfo),
-    macros15
+    macros17
   );
   const allEnvInfo = Object.assign(
     {},
     ...Object.values(environmentInfo),
-    environments15
+    environments17
   );
   const fullParser = unified().use(unifiedLatexFromStringMinimal, { mode }).use(unifiedLatexProcessAtLetterAndExplMacros, {
     atLetter,