merge

README.md

@@ -20,15 +20,15 @@ Learn more about Quarto at <https://quarto.org>.
 
 ## Development Version
 
-To install the development version of the Quarto CLI, clone the quarto-cli repository then run the configure script for your platform (`configure.sh`, for linux/mac or `configure.cmd` for Windows). For example:
+To install the development version of the Quarto CLI, clone the quarto-cli repository then run the configure script for your platform (`configure.sh` for Linux/macOS or `configure.cmd` for Windows). For example:
 
 ```bash
 git clone https://github.com/quarto-dev/quarto-cli
 cd quarto-cli
 ./configure.sh
 ```
 
-To update to the latest development version, just `git pull` from the local repo directory:
+To update to the latest development version, run `git pull` from the local repo directory:
 
 ```bash
 cd quarto-cli

news/changelog-1.4.md

@@ -24,6 +24,7 @@
 - ([#5393](https://github.com/quarto-dev/quarto-cli/issues/5393)): Properly set color of headings without using opacity.
 - ([#5403](https://github.com/quarto-dev/quarto-cli/issues/5403)): Fix accessibility issues with the `kbd` shortcode.
 - ([#5431](https://github.com/quarto-dev/quarto-cli/issues/5431)): Properly apply column positioning to title metadata.
+- ([#5516](https://github.com/quarto-dev/quarto-cli/issues/5516)): Ensure that images which appear in the margin are properly marked as fluid.
 - ([#5700](https://github.com/quarto-dev/quarto-cli/issues/5700)): Don't show scrollbars on Windows when hovering over hover code annotations.
 - ([#5708](https://github.com/quarto-dev/quarto-cli/issues/5708)): Fix hang when viewing pages with specific query parameter
 - ([#5794](https://github.com/quarto-dev/quarto-cli/issues/5794)): Fix incorrect caching behavior when `import` is used in scss themes.
@@ -66,6 +67,7 @@
 ## PDF Format
 
 - ([#4370](https://github.com/quarto-dev/quarto-cli/issues/4370)): Hoist code cells deep in the AST out of layout cells to avoid `\raisebox` issues with the `Shaded` environment.
+- ([#5078](https://github.com/quarto-dev/quarto-cli/issues/5078)): Ensure format-resources are copied before PDF rendering when `latex-auto-mk` is `false`
 - ([#5969](https://github.com/quarto-dev/quarto-cli/issues/5969)): Correctly detect a required rerun for biblatex when using backref link options.
 - ([#6077](https://github.com/quarto-dev/quarto-cli/issues/6077)): Make sure proof environments are tight around contents.
 - ([#6907](https://github.com/quarto-dev/quarto-cli/issues/6907)): Fix issue with footnote mark line processor not triggering.
@@ -117,6 +119,7 @@
 - ([#7184](https://github.com/quarto-dev/quarto-cli/issues/7184)): Properly use the boostrap variable `pagination-active-color` for coloring pagination controls.
 - ([#7634](https://github.com/quarto-dev/quarto-cli/issues/7634)): Use an explicit width to ensure default listing layout doesn't grow outside its desired boundss
 - ([#7345](https://github.com/quarto-dev/quarto-cli/issues/7345)): Improve display of categories in a table style listing
+- ([#7699](https://github.com/quarto-dev/quarto-cli/issues/7699)): Properly ignore non-HTML output for listings when project level renders render HTML and other formats (for example, a book of both HTML and PDF format)
 
 ## Websites
 
@@ -125,6 +128,8 @@
 - Add support for `bread-crumbs: true|false` to control whether bread crumbs are displayed. Add support for display of breadcrumbs on full width (non-mobile) pages when `bread-crumbs` is true. Default value is true.
 - Add support for `show-item-context` key within the `search` key to control whether page parents are display next to items in search results. Pass `tree`, `parent`, `root`, or boolean (if you pass true, `tree` is the default).
 - ([#4739](https://github.com/quarto-dev/quarto-cli/issues/4739)): Improve handling of reader mode at mobile responsive sizes
+- ([#5204](https://github.com/quarto-dev/quarto-cli/issues/5204)): About pages rely upon TOC being positioned right, so force that to be true
+- ([#5212](https://github.com/quarto-dev/quarto-cli/issues/5212)): Ensure navbar search button respects `collapse-below` and remains aligned properly
 - ([#5251](https://github.com/quarto-dev/quarto-cli/issues/5251)): Allow individual pages to specify `image: false` to prevent image discover for Twitter and Open Graph metadata.
 - ([#5283](https://github.com/quarto-dev/quarto-cli/issues/5283)): Add support for setting `repo-actions: false` in a document to prevent the display of repository actions on a specific page.
 - ([#5389](https://github.com/quarto-dev/quarto-cli/issues/5389)): Allow a website project to provide a default image used in social metadata tags.
@@ -146,6 +151,7 @@
 - ([#7105](https://github.com/quarto-dev/quarto-cli/issues/7105)): Improve search results by raising default limit and fixing and removing warning that would appear for Algolia when limit was more than 20.
 - ([#7150](https://github.com/quarto-dev/quarto-cli/issues/7150)): Search keyboard shortcut will not intercept keys directed at inputs.
 - ([#7117](https://github.com/quarto-dev/quarto-cli/issues/7117)): Ensure that search works properly in mobile layouts when not scrolled to top of page (don't close search when scroll occurs because of keyboard being shown).
+- ([#7796](https://github.com/quarto-dev/quarto-cli/issues/7796)): Allow providing placeholder text using the language key `search-text-placeholder`
 
 ## Books
 
@@ -275,8 +281,10 @@
 - ([#1237](https://github.com/quarto-dev/quarto-cli/issues/1237)): Allow `include` shortcodes to be resolved from inside non-executable code cells and metadata blocks.
 - ([#1392](https://github.com/quarto-dev/quarto-cli/issues/1392)): Add tools and LaTeX information to `quarto check` output.
 - ([#2214](https://github.com/quarto-dev/quarto-cli/issues/2214), reopened): don't report a non-existing version of Google Chrome in macOS.
+- ([#3599](https://github.com/quarto-dev/quarto-cli/issues/3599), [#5870](https://github.com/quarto-dev/quarto-cli/issues/5870)): Fix hash issue causing unexpected render when `freeze` is activated on Windows but re-rendered on Linux (e.g. in Github Action).
 - ([#4820](https://github.com/quarto-dev/quarto-cli/issues/4820)): Add support for setting the Giscus light/dark themes.
 - ([#5377](https://github.com/quarto-dev/quarto-cli/issues/5377)): support `from: ` formats correctly.
+- ([#5421](https://github.com/quarto-dev/quarto-cli/pull/5421)): Correct `quarto --help` command to provide correct commands and descriptions
 - ([#5748](https://github.com/quarto-dev/quarto-cli/issues/5748)): Don't cleanup shared lib_dir files when using `embed-resources` within a project
 - ([#5755](https://github.com/quarto-dev/quarto-cli/pull/5755)): Allow document metadata to control conditional content.
 - ([#5785](https://github.com/quarto-dev/quarto-cli/issues/5785)): Don't process juptyer notebook markdown into metadata when embedding notebooks into documents.
@@ -300,7 +308,7 @@
 - ([#7013](https://github.com/quarto-dev/quarto-cli/issues/7013)): Improve error message when there is an issue finding or running R and add more verbosity in [verbose mode](https://quarto.org/docs/troubleshooting/#verbose-mode).
 - ([#7032](https://github.com/quarto-dev/quarto-cli/issues/7032)): `quarto` is now correctly working when installed in a folder with spaces in path.
 - ([#7131](https://github.com/quarto-dev/quarto-cli/issues/7131)): Fix typo in ISBN entry for JATS subarticle template (author: @jasonaris).
-- ([#3599](https://github.com/quarto-dev/quarto-cli/issues/3599), [#5870](https://github.com/quarto-dev/quarto-cli/issues/5870)): Fix hash issue causing unexpected render when `freeze` is activated on Windows but re-rendered on Linux (e.g. in Github Action).
 - ([#7252](https://github.com/quarto-dev/quarto-cli/issues/7252)): Improve handling with `tlmgr` of some mismatched LaTeX support files, associated with `expl3.sty` loading.
+- ([#7502](https://github.com/quarto-dev/quarto-cli/pull/7502)): Correct `execute-debug` help text
 - ([#7674](https://github.com/quarto-dev/quarto-cli/pull/7674)): Configure font paths for TinyTeX after installation so that `xetex` can find custom fonts correctly.
 - ([#7675](https://github.com/quarto-dev/quarto-cli/pull/7675)): On Windows, `quarto install tinytex` will install TinyTeX to the directory defined by the environment variable `ProgramData` when `APPDATA` is not a suitable location for TeX Live.

src/command/command.ts

@@ -38,22 +38,22 @@ export function commands(): Command<any>[] {
     previewCommand,
     serveCommand,
     createCommand,
+    makeUseCommand(),
+    addCommand,
+    updateCommand,
+    removeCommand,
     createProjectCommand,
     convertCommand,
     pandocCommand,
     typstCommand,
     runCommand,
-    addCommand,
+    listCommand,
     installCommand,
     uninstallCommand,
-    updateCommand,
-    removeCommand,
-    listCommand,
-    makeUseCommand(),
+    toolsCommand,
     publishCommand,
     capabilitiesCommand,
     inspectCommand,
-    toolsCommand,
     checkCommand,
     buildJsCommand,
     editorSupportCommand,

src/command/create-project/cmd.ts

@@ -1,9 +1,8 @@
 /*
-* cmd.ts
-*
-* Copyright (C) 2020-2022 Posit Software, PBC
-*
-*/
+ * cmd.ts
+ *
+ * Copyright (C) 2020-2022 Posit Software, PBC
+ */
 
 import { basename } from "path/mod.ts";
 
@@ -34,6 +33,7 @@ export const createProjectCommand = new Command()
   .name("create-project")
   .description("Create a project for rendering multiple documents")
   .arguments("[dir:string]")
+  .hidden()
   .option(
     "--title <title:string>",
     "Project title",

src/command/install/cmd.ts

@@ -36,7 +36,7 @@ export const installCommand = new Command()
     "Update system path when a tool is installed",
   )
   .description(
-    "Installs an extension or global dependency.",
+    "Installs a global dependency (TinyTex or Chromium).",
   )
   .example(
     "Install TinyTeX",

src/command/remove/cmd.ts

@@ -24,7 +24,6 @@ import {
 import { notebookContext } from "../../render/notebook/notebook-context.ts";
 
 export const removeCommand = new Command()
-  .hidden()
   .name("remove")
   .arguments("[target...]")
   .option(

src/command/render/cmd.ts

@@ -73,7 +73,7 @@ export const renderCommand = new Command()
   )
   .option(
     "--execute-debug",
-    "Show debug output for Jupyter kernel.",
+    "Show debug output when executing computations.",
   )
   .option(
     "--use-freezer",

src/command/render/pandoc-dependencies-html.ts

@@ -35,7 +35,7 @@ import { ProjectContext } from "../../project/types.ts";
 import { projectOutputDir } from "../../project/project-shared.ts";
 import { insecureHash } from "../../core/hash.ts";
 
-export function writeDependencies(
+export async function writeDependencies(
   dependenciesFile: string,
   extras: FormatExtras,
 ) {
@@ -48,7 +48,7 @@ export function writeDependencies(
         };
       });
 
-    appendDependencies(dependenciesFile, dependencies);
+    await appendDependencies(dependenciesFile, dependencies);
   }
 }
 

src/command/render/pandoc-dependencies-resources.ts

@@ -25,7 +25,7 @@ export interface Resource {
 
 // Populates the dependency file with format resources
 // from typescript.
-export function writeFormatResources(
+export async function writeFormatResources(
   inputDir: string,
   dependenciesFile: string,
   formatResources: string | string[] | undefined,
@@ -47,7 +47,7 @@ export function writeFormatResources(
         content: { file: absPath },
       };
     });
-    appendDependencies(dependenciesFile, dependencies);
+    await appendDependencies(dependenciesFile, dependencies);
   }
 }
 

src/command/render/pandoc-dependencies.ts

@@ -1,9 +1,8 @@
 /*
-* pandoc-dependencies.ts
-*
-* Copyright (C) 2020-2022 Posit Software, PBC
-*
-*/
+ * pandoc-dependencies.ts
+ *
+ * Copyright (C) 2020-2022 Posit Software, PBC
+ */
 
 import { DependencyFile, FormatDependency } from "../../config/types.ts";
 import { appendTextFile } from "../../core/file.ts";
@@ -51,7 +50,7 @@ export interface UsePackageDependency {
   };
 }
 
-export function appendDependencies(
+export async function appendDependencies(
   dependenciesFile: string,
   dependencies: Array<
     | HtmlFormatDependency
@@ -69,7 +68,7 @@ export function appendDependencies(
     );
   }
   if (dependencyLines.length > 0) {
-    appendTextFile(
+    await appendTextFile(
       dependenciesFile,
       `${dependencyLines.join("\n")}\n`,
     );

src/command/render/pandoc.ts

@@ -103,6 +103,7 @@ import {
   kInstitute,
   kInstitutes,
   kKeepSource,
+  kLatexAutoMk,
   kLinkColor,
   kMath,
   kMetadataFormat,
@@ -1251,7 +1252,7 @@ async function resolveExtras(
   }
 
   // resolve format resources
-  writeFormatResources(
+  await writeFormatResources(
     inputDir,
     dependenciesFile,
     format.render[kFormatResources],
@@ -1271,7 +1272,7 @@ async function resolveExtras(
     );
 
     // resolve dependencies
-    writeDependencies(dependenciesFile, extras);
+    await writeDependencies(dependenciesFile, extras);
 
     const htmlDependenciesPostProcesor = (
       doc: Document,
@@ -1305,11 +1306,19 @@ async function resolveExtras(
   }
 
   // Process format resources
-  const resourceDependenciesPostProcessor = async (_output: string) => {
-    return await processFormatResources(inputDir, dependenciesFile);
-  };
-  extras.postprocessors = extras.postprocessors || [];
-  extras.postprocessors.push(resourceDependenciesPostProcessor);
+
+  // If we're generating the PDF, we can move the format resources once the pandoc
+  // render has completed.
+  if (format.render[kLatexAutoMk] === false) {
+    // Process the format resouces right here on the spot
+    await processFormatResources(inputDir, dependenciesFile);
+  } else {
+    const resourceDependenciesPostProcessor = async (_output: string) => {
+      return await processFormatResources(inputDir, dependenciesFile);
+    };
+    extras.postprocessors = extras.postprocessors || [];
+    extras.postprocessors.push(resourceDependenciesPostProcessor);
+  }
 
   // Resolve the highlighting theme (if any)
   extras = resolveTextHighlightStyle(

src/command/render/render-files.ts

@@ -565,7 +565,7 @@ async function renderFileInternal(
           pandocRenderer.onBeforeExecute(recipe.format),
         );
 
-        const validate = context.format.metadata?.["validate-yaml"];
+        const validate = context.format.render?.["validate-yaml"];
         if (validate !== false) {
           const validationResult = await validateDocument(context);
           if (validationResult.length) {