Merge branch 'main' into bugfix/issue-11699

Author: cscheid

news/changelog-1.7.md

@@ -11,6 +11,10 @@ All changes included in 1.7:
 
 - ([#11654](https://github.com/quarto-dev/quarto-cli/issues/11654)): Allow `page-inset` as value in `column` key for code cells.
 
+## Book Project
+
+- ([#11520](https://github.com/quarto-dev/quarto-cli/issues/11520)): Book's cover image now escapes lightbox treatment, which was incorrectly applied to it when `lightbox: true` was set in the book's configuration.
+
 ## `quarto check`
 
 - ([#11608](https://github.com/quarto-dev/quarto-cli/pull/11608)): Do not issue error message when calling `quarto check info`.
@@ -27,6 +31,7 @@ All changes included in 1.7:
   that allows to check whether a node is empty, i.e., whether it's an
   empty list, has no child nodes, and contains no text.
 - ([#11699](https://github.com/quarto-dev/quarto-cli/issues/11699)): Fix crash with `video` shortcode inside HTML comments.
+- Expose new `quarto.paths.tinytex_bin_dir` in Quarto's Lua API. If TinyTeX is found by Quarto, this will be set to the path to the `bin` directory of the TinyTeX installation where command line tool are located (e.g., `pdflatex`, `tlmgr`, etc.). If TinyTeX is not found, this will be `nil`, meaning Quarto will use the system PATH to find the command line tools.
 
 ## Other Fixes and Improvements
 

src/command/render/filters.ts

@@ -93,6 +93,7 @@ import { isServerShinyPython } from "../../core/render.ts";
 import { pythonExec } from "../../core/jupyter/exec.ts";
 import { kTocIndent } from "../../config/constants.ts";
 import { isWindows } from "../../deno_ral/platform.ts";
+import { tinyTexBinDir } from "../../tools/impl/tinytex-info.ts";
 
 const kQuartoParams = "quarto-params";
 
@@ -205,6 +206,7 @@ async function quartoEnvironmentParams(_options: PandocOptions) {
   return {
     "paths": {
       "Rscript": await rBinaryPath("Rscript"),
+      "TinyTexBinDir": tinyTexBinDir(), // will be undefined if no tinytex found and quarto will look in PATH
     },
   };
 }

src/project/types/book/book-render.ts

@@ -173,7 +173,7 @@ export function bookPandocRenderer(
             const title = file.recipe.format.metadata[kTitle] || "";
             const alt = coverImageAlt ? ` fig-alt="${coverImageAlt}"` : "";
             file.executeResult.markdown =
-              `![](${coverImage} "${title}"){.quarto-cover-image${alt}}\n\n` +
+              `![](${coverImage} "${title}"){.quarto-cover-image .nolightbox${alt}}\n\n` +
               file.executeResult.markdown;
           }
 

src/resources/lua-types/quarto/paths.lua

@@ -7,3 +7,9 @@ Returns the path to the `Rscript` file that Quarto itself would use in its knitr
 ]]
 ---@return string # Path to `Rscript` file
 function quarto.paths.rscript() end
+
+--[[
+Returns the path to the `TinyTeX` bin directory that `quarto install tinytex` installed to, or nil if not found.
+]]
+---@return string|nil # Path to `TinyTeX` bin directory
+function quarto.paths.tinytex_bin_dir() end

src/resources/pandoc/datadir/init.lua

@@ -2093,10 +2093,13 @@ quarto = {
     add_to_blocks = utils.add_to_blocks,
   },
   paths = {
+     -- matches the path from `quartoEnvironmentParams` from src/command/render/filters.ts
     rscript = function()
-      -- matches the path from `quartoEnvironmentParams` from src/command/render/filters.ts
       return param('quarto-environment', nil).paths.Rscript
     end,
+    tinytex_bin_dir = function()
+      return param('quarto-environment', nil).paths.TinyTexBinDir
+    end,
   },
   json = json,
   base64 = base64,

tests/docs/smoke-all/2024/12/12/11520/.gitignore

@@ -0,0 +1,2 @@
+/.quarto/
+/_book/

tests/docs/smoke-all/2024/12/12/11520/_quarto.yml

@@ -0,0 +1,16 @@
+project:
+  type: book
+
+book:
+  title: "mybook"
+  author: "Norah Jones"
+  date: "11/24/2024"
+  cover-image: cover.png
+  chapters:
+    - index.qmd
+
+format:
+  html:
+    theme: cosmo
+
+lightbox: true

tests/docs/smoke-all/2024/12/12/11520/cover.png

@@ -0,0 +1,14 @@
+---
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['section#preface .quarto-cover-image']
+        - ['.ligtbox > .quarto-cover-image']
+---
+
+# Preface {.unnumbered}
+
+This is a Quarto book. Cover image should not have Lightbox treatment in books when `lightbox: true`
+
+To learn more about Quarto books visit <https://quarto.org/docs/books>.