From 61abbb9845d686d1f94a59c891da0f70b68f3a6d Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Tue, 20 May 2025 12:49:12 -0400 Subject: [PATCH 1/3] remove commented-out code --- src/command/render/render-contexts.ts | 33 --------------------------- 1 file changed, 33 deletions(-) diff --git a/src/command/render/render-contexts.ts b/src/command/render/render-contexts.ts index b02c2df565d..8b020f27180 100644 --- a/src/command/render/render-contexts.ts +++ b/src/command/render/render-contexts.ts @@ -505,39 +505,6 @@ async function resolveFormats( const directoryFormat = directoryFormats[format].format; const inputFormat = inputFormats[format].format; - // resolve theme (project-level bootstrap theme always wins for web drived output) - if ( - project && - (isHtmlOutput(format, true) || isHtmlDashboardOutput(format)) && - formatHasBootstrap(projFormat) && projectTypeIsWebsite(projType) - ) { - // if (formatHasBootstrap(inputFormat)) { - // if ( - // inputFormat.metadata[kTheme] !== undefined && - // !ld.isEqual(inputFormat.metadata[kTheme], projFormat.metadata[kTheme]) - // ) { - // warnOnce( - // `The file ${file.path} contains a theme property which is being ignored. Website projects do not support per document themes since all pages within a website share the website's theme.`, - // ); - // } - // delete inputFormat.metadata[kTheme]; - // } - // if (formatHasBootstrap(directoryFormat)) { - // if ( - // directoryFormat.metadata[kTheme] !== undefined && - // !ld.isEqual( - // directoryFormat.metadata[kTheme], - // projFormat.metadata[kTheme], - // ) - // ) { - // warnOnce( - // `The file ${file.path} contains a theme provided by a metadata file. This theme metadata is being ignored. Website projects do not support per directory themes since all pages within a website share the website's theme.`, - // ); - // } - // delete directoryFormat.metadata[kTheme]; - // } - } - // combine user formats const userFormat = mergeFormatMetadata( projFormat || {}, From e6dfde33e0ae30b88a11d8634719db007963b526 Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Tue, 20 May 2025 12:49:32 -0400 Subject: [PATCH 2/3] latex - switch default pdf engine to lualatex (#11321) --- src/format/pdf/format-pdf.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/format/pdf/format-pdf.ts b/src/format/pdf/format-pdf.ts index 32f3d999ef1..4e80f00d559 100644 --- a/src/format/pdf/format-pdf.ts +++ b/src/format/pdf/format-pdf.ts @@ -128,7 +128,7 @@ function createPdfFormat( [kFigDpi]: 300, }, pandoc: { - [kPdfEngine]: "xelatex", + [kPdfEngine]: "lualatex", standalone: true, variables: { graphics: true, From 67fb6097aab25bb03047d99a82ea5b40f955b6b4 Mon Sep 17 00:00:00 2001 From: Carlos Scheidegger Date: Tue, 20 May 2025 12:52:16 -0400 Subject: [PATCH 3/3] changelog --- news/changelog-1.8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/news/changelog-1.8.md b/news/changelog-1.8.md index 0bc7f25cd00..5061c1489de 100644 --- a/news/changelog-1.8.md +++ b/news/changelog-1.8.md @@ -60,4 +60,5 @@ All changes included in 1.8: ## Other fixes and improvements +- ([#11321](https://github.com/quarto-dev/quarto-cli/issues/11321)): Follow [recommendation from LaTeX project](https://latex-project.org/news/latex2e-news/ltnews40.pdf) and use `lualatex` instead of `xelatex` as the default PDF engine. - ([#12782](https://github.com/quarto-dev/quarto-cli/pull/12782)): fix bug on `safeRemoveDirSync`'s detection of safe directory boundaries. \ No newline at end of file