Merge branch 'prerelease' into brand-reference

Author: cwickham

_freeze/site_libs/quarto-listing/quarto-listing.js

@@ -2,6 +2,7 @@ const kProgressiveAttr = "data-src";
 let categoriesLoaded = false;
 
 window.quartoListingCategory = (category) => {
+  category = atob(category);
   if (categoriesLoaded) {
     activateCategory(category);
     setCategoryHash(category);
@@ -58,7 +59,7 @@ window.document.addEventListener("DOMContentLoaded", function (_event) {
   );
 
   for (const categoryEl of categoryEls) {
-    const category = categoryEl.getAttribute("data-category");
+    const category = atob(categoryEl.getAttribute("data-category"));
     categoryEl.onclick = () => {
       activateCategory(category);
       setCategoryHash(category);
@@ -208,7 +209,7 @@ function activateCategory(category) {
 
   // Activate this category
   const categoryEl = window.document.querySelector(
-    `.quarto-listing-category .category[data-category='${category}'`
+    `.quarto-listing-category .category[data-category='${btoa(category)}']`
   );
   if (categoryEl) {
     categoryEl.classList.add("active");
@@ -231,7 +232,7 @@ function filterListingCategory(category) {
         list.filter(function (item) {
           const itemValues = item.values();
           if (itemValues.categories !== null) {
-            const categories = itemValues.categories.split(",");
+            const categories = atob(itemValues.categories).split(",");
             return categories.includes(category);
           } else {
             return false;

_quarto.yml

@@ -129,6 +129,8 @@ website:
                       href: docs/authoring/placeholder.qmd
                     - text: "Lorem Lipsum Text"
                       href: docs/authoring/lipsum.qmd
+                    - text: "Rearrange Contents"
+                      href: docs/authoring/contents.qmd
                 - docs/authoring/videos.qmd
                 - text: "Embeds"
                   href: docs/authoring/notebook-embed.qmd

docs/advanced/environment-vars.qmd

@@ -18,9 +18,9 @@ You can read about other ways to set environment variables in Quarto Projects in
 
 | Variable        | Description |
 |-----------------|-------------|
-| `QUARTO_R`      |             |
-| `QUARTO_PYTHON` |             |
-|                 |             |
+| `QUARTO_R`      | Explicit path to the version of `Rscript` to be used by the `knitr` engine and `quarto run *.R` command. |
+| `QUARTO_PYTHON` | Explicit path to the version of `python` to be used by the `jupyter` engine and `quarto run *.py` command. |
+| `QUARTO_VERSION_REQUIREMENT` | A [`semver`](https://semver.org/) string describing the Quarto version requested by the environment. If this check fails, Quarto will not run. |
 
 ## Variables Quarto sets
 

docs/authoring/_shortcodes.qmd

@@ -24,4 +24,4 @@ Quarto supports several shortcodes natively:
 | [embed](/docs/authoring/notebook-embed.qmd)                   | Embed cells from a Jupyter Notebook      |
 | [placeholder](/docs/authoring/placeholder.qmd)                | Add placeholder images to your document  |
 | [lipsum](/docs/authoring/lipsum.qmd)                          | Add placeholder text to your document    |
-| [contents](/docs/authors/contents.qmd)                        | Rearrange content in your document       |
+| [contents](/docs/authoring/contents.qmd)                      | Rearrange content in your document       |

docs/authoring/variables.qmd

@@ -75,6 +75,13 @@ extract the first in the array of authors:
 {{< meta author.1 >}}
 ```
 
+To reference a field that contains a dot (`.`), escape the dot with a double backslash (`\\`). For example, to get `field.with.dots`:
+
+
+``` {.markdown shortcodes="false"}
+{{< meta field\\.with\\.dots >}}
+```
+
 ## env {#env}
 
 The `env` shortcode enables you to read values from environment variables. For example:

docs/reference/formats/asciidoc.json

@@ -29,6 +29,10 @@
     "name": "options",
     "title": "Format Options",
     "options": [
+      {
+        "name": "brand",
+        "description": "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition.\n"
+      },
       {
         "name": "quarto-required",
         "description": "A semver version range describing the supported quarto versions for this document\nor project.\n\nExamples:\n\n- `>= 1.1.0`: Require at least quarto version 1.1\n- `1.*`: Require any quarto versions whose major version number is 1\n"

docs/reference/formats/context.json

@@ -33,6 +33,10 @@
     "name": "options",
     "title": "Format Options",
     "options": [
+      {
+        "name": "brand",
+        "description": "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition.\n"
+      },
       {
         "name": "pdf-engine",
         "description": "Use the specified engine when producing PDF output. If the engine is not\nin your PATH, the full path of the engine may be specified here. If this\noption is not specified, Quarto uses the following defaults\ndepending on the output format in use:\n\n- `latex`: `xelatex` (other options: `pdflatex`, `lualatex`,\n  `tectonic`, `latexmk`)\n- `context`: `context`\n- `html`:  `wkhtmltopdf` (other options: `prince`, `weasyprint`, `pagedjs-cli`;\n  see [print-css.rocks](https://print-css.rocks) for a good\n  introduction to PDF generation from HTML/CSS.)\n- `ms`:  `pdfroff`\n- `typst`: `typst`\n"

docs/reference/formats/dashboard.json

@@ -55,6 +55,10 @@
     "name": "options",
     "title": "Format Options",
     "options": [
+      {
+        "name": "brand",
+        "description": "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition.\n"
+      },
       {
         "name": "theme",
         "description": "Theme name, theme scss file, or a mix of both."

docs/reference/formats/docbook.json

@@ -25,6 +25,10 @@
     "name": "options",
     "title": "Format Options",
     "options": [
+      {
+        "name": "brand",
+        "description": "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition.\n"
+      },
       {
         "name": "identifier-prefix",
         "description": "Specify a prefix to be added to all identifiers and internal links in HTML and\nDocBook output, and to footnote numbers in Markdown and Haddock output. \nThis is useful for preventing duplicate identifiers when generating fragments\nto be included in other pages.\n"

docs/reference/formats/docx.json

@@ -41,6 +41,10 @@
         "name": "reference-doc",
         "description": "Use the specified file as a style reference in producing a docx, \npptx, or odt file.\n"
       },
+      {
+        "name": "brand",
+        "description": "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition.\n"
+      },
       {
         "name": "quarto-required",
         "description": "A semver version range describing the supported quarto versions for this document\nor project.\n\nExamples:\n\n- `>= 1.1.0`: Require at least quarto version 1.1\n- `1.*`: Require any quarto versions whose major version number is 1\n"