Merge branch 'prerelease' into highlightsv1.6

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,11 +129,15 @@ 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/authoring/callouts.qmd
                 - docs/authoring/code-annotation.qmd
+                - text: "Brand"                
+                  href: docs/authoring/brand.qmd
                 - docs/authoring/article-layout.qmd
                 - section: "Scholarly Writing"
                   contents:
@@ -575,6 +579,8 @@ website:
                   href: docs/reference/metadata/citation.qmd
                 - text: "Cross-References"
                   href: docs/reference/metadata/crossref.qmd
+                - text: "Brand"
+                  href: docs/reference/metadata/brand.qmd
     - id: prerelease
       title: "Quarto 1.3"
       contents:

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       |