Skip to content

Commit b9dbbd1

Browse files
authored
Merge pull request #12786 from quarto-dev/enhancement/11321
Enhancement/11321
2 parents 1251871 + 67fb609 commit b9dbbd1

File tree

3 files changed

+2
-34
lines changed

3 files changed

+2
-34
lines changed

news/changelog-1.8.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ All changes included in 1.8:
6060

6161
## Other fixes and improvements
6262

63+
- ([#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.
6364
- ([#12782](https://github.com/quarto-dev/quarto-cli/pull/12782)): fix bug on `safeRemoveDirSync`'s detection of safe directory boundaries.

src/command/render/render-contexts.ts

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -505,39 +505,6 @@ async function resolveFormats(
505505
const directoryFormat = directoryFormats[format].format;
506506
const inputFormat = inputFormats[format].format;
507507

508-
// resolve theme (project-level bootstrap theme always wins for web drived output)
509-
if (
510-
project &&
511-
(isHtmlOutput(format, true) || isHtmlDashboardOutput(format)) &&
512-
formatHasBootstrap(projFormat) && projectTypeIsWebsite(projType)
513-
) {
514-
// if (formatHasBootstrap(inputFormat)) {
515-
// if (
516-
// inputFormat.metadata[kTheme] !== undefined &&
517-
// !ld.isEqual(inputFormat.metadata[kTheme], projFormat.metadata[kTheme])
518-
// ) {
519-
// warnOnce(
520-
// `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.`,
521-
// );
522-
// }
523-
// delete inputFormat.metadata[kTheme];
524-
// }
525-
// if (formatHasBootstrap(directoryFormat)) {
526-
// if (
527-
// directoryFormat.metadata[kTheme] !== undefined &&
528-
// !ld.isEqual(
529-
// directoryFormat.metadata[kTheme],
530-
// projFormat.metadata[kTheme],
531-
// )
532-
// ) {
533-
// warnOnce(
534-
// `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.`,
535-
// );
536-
// }
537-
// delete directoryFormat.metadata[kTheme];
538-
// }
539-
}
540-
541508
// combine user formats
542509
const userFormat = mergeFormatMetadata(
543510
projFormat || {},

src/format/pdf/format-pdf.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function createPdfFormat(
128128
[kFigDpi]: 300,
129129
},
130130
pandoc: {
131-
[kPdfEngine]: "xelatex",
131+
[kPdfEngine]: "lualatex",
132132
standalone: true,
133133
variables: {
134134
graphics: true,

0 commit comments

Comments
 (0)