Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/changelog-1.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
33 changes: 0 additions & 33 deletions src/command/render/render-contexts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 || {},
Expand Down
2 changes: 1 addition & 1 deletion src/format/pdf/format-pdf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function createPdfFormat(
[kFigDpi]: 300,
},
pandoc: {
[kPdfEngine]: "xelatex",
[kPdfEngine]: "lualatex",
standalone: true,
variables: {
graphics: true,
Expand Down
Loading