Merge branch 'main' into feature/conf-proj

Author: Al Manning

.prettierignore

@@ -0,0 +1,8 @@
+src/resources/formats/revealjs/plugins/line-highlight/line-highlight.js
+src/resources/formats/revealjs/plugins/menu/menu.js
+src/resources/formats/revealjs/plugins/menu/quarto-menu.js
+src/resources/formats/revealjs/plugins/multiplex/multiplex.js
+src/resources/formats/revealjs/plugins/multiplex/socket.io.js
+src/resources/formats/revealjs/plugins/pdfexport/pdfexport.js
+src/resources/formats/revealjs/plugins/support/support.js
+src/resources/formats/revealjs/plugins/tone/tone.js

configuration

@@ -27,7 +27,7 @@ export CLIPBOARD_JS=2.0.11
 export TIPPY_JS=6.3.7
 export PDF_JS=2.8.335
 # Using commit to fix https://github.com/quarto-dev/quarto-cli/issues/2430 - revert to using a release tag when included
-export REVEAL_JS=e281b3234e7991283ce4dcca705dd9a6a9ebe5d2 
+export REVEAL_JS=e281b3234e7991283ce4dcca705dd9a6a9ebe5d2
 export REVEAL_JS_MENU=2.1.0
 export REVEAL_JS_CHALKBOARD=a88c134e2cf3c7780448db003e7329c3cbd8cfb4
 export REVEAL_JS_PDFEXPORT=2.0.1

deno.jsonc

@@ -16,6 +16,8 @@
 ## Knitr engine
 
 - Help rmarkdown find pandoc binary bundled with Quarto if none is found ([#3688](https://github.com/quarto-dev/quarto-cli/issues/3688)).
+- Do not bind knitr engine when only inline `r` expressions are found ([#3908](https://github.com/quarto-dev/quarto-cli/issues/3908)).
+- Fix an issue with `output: asis` in chunks with plots ([#3683](https://github.com/quarto-dev/quarto-cli/issue3683)).
 
 ## Code Annotation
 
@@ -41,6 +43,7 @@
 - Use custom `styles.html` template partial to better support checkbox alignment ([#4556](https://github.com/quarto-dev/quarto-cli/issues/4556)).
 - Improve ergonomics of text-highting in HTML output, not emitting difficult overwrite styles and better supporting theme -> CSS conversion. ([#4334](https://github.com/quarto-dev/quarto-cli/issues/4334)).
 - Improve CSS of nested tight and loose lists ([#4560](https://github.com/quarto-dev/quarto-cli/discussions/4650)).
+- Resolve Bootstrap responsive classes in tables ([#2997](https://github.com/quarto-dev/quarto-cli/issues/2997)).
 
 ## Article Layout
 
@@ -57,6 +60,9 @@
 - Properly support `show-notes: separate-page` [#3996](https://github.com/quarto-dev/quarto-cli/issues/3996)
 - Improve footnote / aside layout for centered slides. [#4297](https://github.com/quarto-dev/quarto-cli/issues/4297)
 - Ensure anchors refer to the containing slide in case of crossrefs ([#3533](https://github.com/quarto-dev/quarto-cli/issues/4297)).
+- Support `output-location` as a top level option in Revealjs presentations ([#3261](https://github.com/quarto-dev/quarto-cli/issues/3261))
+- Fix PDF export keyboard shortcut and button in menu ([#2988](https://github.com/quarto-dev/quarto-cli/issues/2988))
+- Fix title slide CSS when `hash-type: number` ([#4418](https://github.com/quarto-dev/quarto-cli/issues/4418)).
 
 ## EPUB Format
 
@@ -77,6 +83,7 @@
   - Note that this fix changes the filenames used for PDF files with variants. In quarto 1.3, the automatic output names for PDF files include format variants and modifiers.
 - Correctly download online image on Windows ([#3982](https://github.com/quarto-dev/quarto-cli/issues/3982)).
 - Permissions of `.tex` file are now correct when `keep-tex: true` ([#4380](https://github.com/quarto-dev/quarto-cli/issues/4380)).
+- Better support footnotes within Callouts in PDF / LaTeX output ([#1235](https://github.com/quarto-dev/quarto-cli/issues/1235)).
 
 ## Beamer Format
 
@@ -157,6 +164,7 @@
 ## Preview
 
 - Correct redirect for VS Code Server (#3352) (Thank you, @benz0li!)
+- Correct redirect for GitHub Codespaces
 
 ## LUA
 
@@ -197,7 +205,9 @@
 - Fix typo `thumnail-image` -> `thumbnail-image` in listing template ([#4602](//github.com/quarto-dev/quarto-cli/pull/4602)) (Thank you, @mattspence!).
 - Add support for targeting the `#refs` divs with citations when using `natbib` or `biblatex` to generate a bibliography.
 - Warn users about Chromium installation issues in WSL ([#4596](https://github.com/quarto-dev/quarto-cli/issues/4586)).
+- Fix issue with "No inspectable targets" with Chrome Browser ([#4653](https://github.com/quarto-dev/quarto-cli/issues/4653))
 - Add `title` attribute for callouts (can be used rather than heading for defining the title)
+- Handle more varieties of raw HTML for Docusaurus output
 
 ## Pandoc filter changes
 
@@ -216,7 +226,8 @@
 
 ## Other
 
-- fix error when running the command `quarto render -h` to receive help ([#3202](https://github.com/quarto-dev/quarto-cli/issues/3202)).
+- Fix error when running the command `quarto render -h` to receive help ([#3202](https://github.com/quarto-dev/quarto-cli/issues/3202)).
 - Fix error when rendering a document with an extension which provides a directory as `format-resources` ([#4377](https://github.com/quarto-dev/quarto-cli/issues/4377)).
 - Fix incorrect copying of resource files during rendering ([#4544](https://github.com/quarto-dev/quarto-cli/issues/4544))
 - Extension authors may now force files to be included in their template by writing the file / file path in the `.quartoignore` file prefixed with a `!`. For example `!README.md` ([#4061](https://github.com/quarto-dev/quarto-cli/issues/4061)).
+- Fix issue when installing extensions on older Windows ([#4203](https://github.com/quarto-dev/quarto-cli/issues/4203)).

news/changelog-1.3.md

@@ -10,7 +10,7 @@ import { configure } from "./common/configure.ts";
 import { mainRunner } from "../../src/core/main.ts";
 
 import { prepareDist } from "./common/prepare-dist.ts";
-import { updateHtmlDepedencies } from "./common/update-html-dependencies.ts";
+import { updateHtmlDependencies } from "./common/update-html-dependencies.ts";
 import { makeInstallerDeb } from "./linux/installer.ts";
 import { makeInstallerMac } from "./macos/installer.ts";
 import {
@@ -64,7 +64,7 @@ function getCommands() {
       ),
   );
   commands.push(
-    packageCommand(updateHtmlDepedencies)
+    packageCommand(updateHtmlDependencies)
       .name("update-html-dependencies")
       .description(
         "Updates Bootstrap, themes, and JS/CSS dependencies based upon the version in configuration",

package/src/bld.ts

@@ -0,0 +1,31 @@
+import { expandGlobSync } from "https://deno.land/[email protected]/fs/mod.ts";
+
+const json = JSON.parse(
+  Deno.readTextFileSync("package/src/common/deno-meta.json"),
+  //deno-lint-ignore no-explicit-any
+) as any;
+const meta = json.meta;
+
+delete json.meta;
+
+let excludes: string[] = [];
+for (const file of meta.excludeGlobs) {
+  const f: string = file;
+  if (f.includes("*")) {
+    for (const { path } of expandGlobSync(f)) {
+      excludes.push(path);
+    }
+  } else {
+    excludes.push(f);
+  }
+}
+
+// drop the current working directory from the paths
+excludes = excludes.map((e) => e.replace(Deno.cwd() + "/", ""));
+
+json.lint.files.exclude = excludes;
+json.fmt.files.exclude = excludes;
+
+console.log("// auto-generated by package/src/common/create-deno-config.ts");
+console.log("// see dev-docs/update-deno_jsonc.md");
+console.log(JSON.stringify(json, null, 2));

package/src/common/create-deno-config.ts

@@ -0,0 +1,33 @@
+{
+  "meta": {
+    "comment": "We use this file to create deno.json, specifically because deno lint doesn't support globs",
+    "excludeGlobs": [
+      "src/resources/create/extensions/revealjs-plugin/_extensions/qstart-filesafename-qend/qstart-filesafename-qend.js",
+      "src/resources/editor/",
+      "src/core/lib/external/",
+      "src/vendor/",
+      "src/resources/vendor/",
+      "src/resources/formats/pdf/pdfjs/",
+      "src/resources/deno_std/",
+      "**/*.min.js",
+      "**/*.umd.js",
+      "**/*.esm.js",
+      "src/resources/library/**/*.js",
+      "src/resources/formats/**/*.js",
+      "src/resources/projects/website/**/*.js"
+    ]
+  },
+  "lint": {
+    "files": {
+      "include": ["src/"]
+    },
+    "rules": {
+      "exclude": ["require-await", "no-inferrable-types"]
+    }
+  },
+  "fmt": {
+    "files": {
+      "include": ["src/"]
+    }
+  }
+}

package/src/common/deno-meta.json

@@ -0,0 +1,27 @@
+From cdf668f9b164dca04eece54c88eaed4541211335 Mon Sep 17 00:00:00 2001
+From: Christophe Dervieux <[email protected]>
+Date: Tue, 7 Mar 2023 16:12:53 +0100
+Subject: [PATCH] Patch PdfExport RevealJS plugin to export toggle function
+
+This will enable toggling PDF export mode using API
+---
+ src/resources/formats/revealjs/plugins/pdfexport/pdfexport.js | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/resources/formats/revealjs/plugins/pdfexport/pdfexport.js b/src/resources/formats/revealjs/plugins/pdfexport/pdfexport.js
+index c399fa9de..bf9104c8e 100644
+--- a/src/resources/formats/revealjs/plugins/pdfexport/pdfexport.js
++++ b/src/resources/formats/revealjs/plugins/pdfexport/pdfexport.js
+@@ -101,6 +101,9 @@ var PdfExport = ( function( _Reveal ){
+ 			Reveal = _Reveal;
+ 			install();
+ 		};
++		Plugin.togglePdfExport = function () {
++      togglePdfExport();
++    };
+ 	}
+ 
+ 	return Plugin;
+-- 
+2.39.2.windows.1
+

package/src/common/patches/0001-Patch-PdfExport-RevealJS-plugin-to-export-toggle-fun.patch

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# run this from the top-level quarto-cli directory
+deno lint -c deno.jsonc 2>&1 |  grep ' *at ' | sed "s/:.*$//" | sort | uniq | sort

package/src/common/project-lint.sh

@@ -10,14 +10,14 @@ import { info } from "log/mod.ts";
 import { dirname, extname, join } from "path/mod.ts";
 import { lines } from "../../../src/core/text.ts";
 import { runCmd } from "../util/cmd.ts";
-import { Repo, withRepo } from "../util/git.ts";
+import { applyGitPatches, Repo, withRepo } from "../util/git.ts";
 
 import { download, unzip } from "../util/utils.ts";
 import { Configuration } from "./config.ts";
 import { visitLines } from "../../../src/core/file.ts";
 import { copyMinimal } from "../../../src/core/copy.ts";
 
-export async function updateHtmlDepedencies(config: Configuration) {
+export async function updateHtmlDependencies(config: Configuration) {
   info("Updating Bootstrap with version info:");
 
   // Read the version information from the environment
@@ -57,6 +57,18 @@ export async function updateHtmlDepedencies(config: Configuration) {
     "dist",
   );
 
+  // For applying git patch to what we retreive
+  const patchesDir = join(
+    config.directoryInfo.pkg,
+    "src", "common", "patches"
+  )
+
+  function resolvePatches (patches: string[]) {
+    return patches.map(patch => {
+      return join(patchesDir, patch)
+    })
+  }
+
   // Anchor
   const anchorJs = join(formatDir, "anchor", "anchor.min.js");
   await updateUnpkgDependency(
@@ -360,6 +372,7 @@ export async function updateHtmlDepedencies(config: Configuration) {
     "plugins",
     "pdfexport",
   );
+
   await updateGithubSourceCodeDependency(
     "reveal-pdfexport",
     "McShelby/reveal-pdfexport",
@@ -374,7 +387,10 @@ export async function updateHtmlDepedencies(config: Configuration) {
       return Promise.resolve();
     },
     false, // not a commit
-    false, // no v prefix
+    false, // no v prefix,
+    resolvePatches([
+      "0001-Patch-PdfExport-RevealJS-plugin-to-export-toggle-fun.patch"
+    ])
   );
 
   // Github CSS (used for GFM HTML preview)
@@ -492,6 +508,7 @@ export async function updateHtmlDepedencies(config: Configuration) {
   info(
     "\n** Done- please commit any files that have been updated. **\n",
   );
+
 }
 
 async function updatePdfJs(
@@ -786,9 +803,10 @@ async function updateGithubSourceCodeDependency(
   onDownload: (dir: string, version: string) => Promise<void>,
   commit = false, // set to true when commit is used instead of a tag
   vPrefix = true, // set to false if github tags don't use a v prefix
+  patches?: string[]
 ) {
   info(`Updating ${name}...`);
-  const version = Deno.env.get(versionEnvVar);
+  const version = Deno.env.get(versionEnvVar)?.trim();
   if (version) {
     const fileName = `${name}.zip`;
     const distUrl = join(
@@ -805,6 +823,7 @@ async function updateGithubSourceCodeDependency(
     await unzip(zipFile, working);
 
     await onDownload(working, version);
+    if (patches) await applyGitPatches(patches)
   } else {
     throw new Error(`${versionEnvVar} is not defined`);
   }