Bugfix/issue 3762 (#3924)

* add format variants to output recipe name

* changelog

* fix default filenames correctly

Author: cscheid

news/changelog-1.3.md

@@ -37,6 +37,8 @@
 - Previously, if the `pdf-engine` was set to `latexmk`, we would bypass many features of Quarto and use Pandoc to produce the PDF output. Starting in in Quarto 1.3, all Quarto features will be enabled for the `latexmk` engine and `latexmk` will be used to run the PDF generation loop.
 - Fix author processing in default PDFs for complex author names (#3483)
 - Remove excessive vertical space between theorem type blocks ([#3776](https://github.com/quarto-dev/quarto-cli/issues/3776)).
+- Fix temporary `.tex` filenames in the presence of multiple variants ([#3762](https://github.com/quarto-dev/quarto-cli/issues/3762)).
+  - Note that this fix changes the filenames used for PDF files with variants. In quarto 1.3, the automatic output names for PDF files include format variants and modifiers.
 
 ## Beamer Format
 

src/command/render/output-tex.ts

@@ -20,6 +20,7 @@ import { kStdOut, replacePandocOutputArg } from "./flags.ts";
 import { OutputRecipe } from "./types.ts";
 import { pdfEngine } from "../../config/pdf.ts";
 import { execProcess } from "../../core/process.ts";
+import { parseFormatString } from "../../core/pandoc/pandoc-formats.ts";
 
 export interface PdfGenerator {
   generate: (
@@ -44,7 +45,18 @@ export function texToPdfOutputRecipe(
 
   // there are many characters that give tex trouble in filenames, create
   // a target stem that replaces them with the '-' character
-  const texStem = texSafeFilename(inputStem);
+
+  // include variants in the tex stem if they are present to avoid
+  // overwriting files
+  let fixupInputName = "";
+  if (format.identifier["target-format"]) {
+    const formatDesc = parseFormatString(format.identifier["target-format"]);
+    fixupInputName = `${formatDesc.variants.join("")}${
+      formatDesc.modifiers.join("")
+    }`;
+  }
+
+  const texStem = texSafeFilename(`${inputStem}${fixupInputName}`);
 
   // cacluate output and args for pandoc (this is an intermediate file
   // which we will then compile to a pdf and rename to .tex)

tests/smoke/render/render-format-extension.test.ts

@@ -72,7 +72,7 @@ testRender(
     // deno-lint-ignore require-await
     teardown: async () => {
       // Clean up the SPL file that is generated by the elesevier class
-      Deno.removeSync(docs("extensions/format/academic/document.spl"));
+      Deno.removeSync(docs("extensions/format/academic/document+foobar.spl"));
     },
   },
 );

tests/utils.ts

@@ -12,10 +12,15 @@ import { parseFormatString } from "../src/core/pandoc/pandoc-formats.ts";
 export function outputForInput(input: string, to: string) {
   // TODO: Consider improving this (e.g. for cases like Beamer)
   const dir = dirname(input);
-  const stem = basename(input, extname(input));
+  let stem = basename(input, extname(input));
 
   const formatDesc = parseFormatString(to);
   const baseFormat = formatDesc.baseFormat;
+  if (formatDesc.baseFormat === "pdf") {
+    stem = `${stem}${formatDesc.variants.join("")}${
+      formatDesc.modifiers.join("")
+    }`;
+  }
 
   let outputExt = baseFormat || "html";
   if (baseFormat === "latex" || baseFormat == "context") {