Add support for global output-location

Fixes #3261

Author: dragonstyle

src/command/render/filters.ts

@@ -29,6 +29,7 @@ import {
   kKeepHidden,
   kMergeIncludes,
   kOutputDivs,
+  kOutputLocation,
   kPdfEngine,
   kQuartoFilters,
   kReferenceLocation,
@@ -489,6 +490,12 @@ async function quartoFilterParams(
   if (figResponsive) {
     params[kFigResponsive] = figResponsive;
   }
+
+  const outputLocation = format.metadata[kOutputLocation];
+  if (outputLocation) {
+    params[kOutputLocation] = outputLocation;
+  }
+
   const lineNumbers = format.render[kCodeLineNumbers];
   if (lineNumbers) {
     params[kCodeLineNumbers] = lineNumbers;

src/config/constants.ts

@@ -514,6 +514,7 @@ export const kCrossrefChaptersAlpha = "chapters-alpha";
 export const kCrossrefChapterId = "chapter-id";
 
 export const kFigResponsive = "fig-responsive";
+export const kOutputLocation = "output-location";
 
 export const kCapLoc = "cap-location";
 export const kFigCapLoc = "fig-cap-location";

src/resources/editor/tools/vs-code.mjs

@@ -8016,17 +8016,7 @@ var require_yaml_intelligence_resources = __commonJS({
             ]
           },
           schema: {
-            enum: [
-              "default",
-              "fragment",
-              "slide",
-              "column",
-              "column-fragment"
-            ]
-          },
-          description: {
-            short: "Location of output relative to the code that generated it (`default`, `fragment`, `slide`, `column`, or `column-location`)",
-            long: "Location of output relative to the code that generated it. The possible values are as follows:\n\n- `default`: Normal flow of the slide after the code\n- `fragment`: In a fragment (not visible until you advance)\n- `slide`: On a new slide after the curent one\n- 'column': In an adjacent column \n- `column-fragment`:   In an adjacent column (not visible until you advance)\n\nNote that this option is supported only for the `revealjs` format.\n"
+            ref: "output-location-schema"
           }
         },
         {
@@ -11102,6 +11092,22 @@ var require_yaml_intelligence_resources = __commonJS({
               }
             }
           }
+        },
+        {
+          id: "output-location-schema",
+          schema: {
+            enum: [
+              "default",
+              "fragment",
+              "slide",
+              "column",
+              "column-fragment"
+            ],
+            description: {
+              short: "Location of output relative to the code that generated it (`default`, `fragment`, `slide`, `column`, or `column-location`)",
+              long: "Location of output relative to the code that generated it. The possible values are as follows:\n\n- `default`: Normal flow of the slide after the code\n- `fragment`: In a fragment (not visible until you advance)\n- `slide`: On a new slide after the curent one\n- 'column': In an adjacent column \n- `column-fragment`:   In an adjacent column (not visible until you advance)\n\nNote that this option is supported only for the `revealjs` format.\n"
+            }
+          }
         }
       ],
       "schema/document-about.yml": [
@@ -15671,6 +15677,17 @@ var require_yaml_intelligence_resources = __commonJS({
             short: "Use a smaller default font for slide content",
             long: "`true` to use a smaller default font for slide content. This can also\nbe set per-slide by including the `.smaller` class on the slide title.\n"
           }
+        },
+        {
+          name: "output-location",
+          tags: {
+            formats: [
+              "revealjs"
+            ]
+          },
+          schema: {
+            ref: "output-location-schema"
+          }
         }
       ],
       "schema/document-reveal-hidden.yml": [
@@ -19237,6 +19254,10 @@ var require_yaml_intelligence_resources = __commonJS({
         "Specify a default profile and profile groups",
         "Default profile to apply if QUARTO_PROFILE is not defined.",
         "Define a profile group for which at least one profile is always\nactive.",
+        {
+          short: "Location of output relative to the code that generated it\n(<code>default</code>, <code>fragment</code>, <code>slide</code>,\n<code>column</code>, or <code>column-location</code>)",
+          long: "Location of output relative to the code that generated it. The\npossible values are as follows:"
+        },
         {
           short: "Unique label for code cell",
           long: "Unique label for code cell. Used when other code needs to refer to\nthe cell (e.g.&nbsp;for cross references <code>fig-samples</code> or\n<code>tbl-summary</code>)"
@@ -21009,7 +21030,11 @@ var require_yaml_intelligence_resources = __commonJS({
           long: "Title of the volume of the item or container holding the item.\nAlso use for titles of periodical special issues, special sections,\nand the like."
         },
         "Disambiguating year suffix in author-date styles (e.g.&nbsp;\u201Ca\u201D in \u201CDoe,\n1999a\u201D).",
-        "internal-schema-hack"
+        "internal-schema-hack",
+        {
+          short: "Location of output relative to the code that generated it\n(<code>default</code>, <code>fragment</code>, <code>slide</code>,\n<code>column</code>, or <code>column-location</code>)",
+          long: "Location of output relative to the code that generated it. The\npossible values are as follows:"
+        }
       ],
       "schema/external-schemas.yml": [
         {
@@ -21234,12 +21259,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 151732,
+        _internalId: 152009,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 151724,
+            _internalId: 152001,
             type: "enum",
             enum: [
               "png",
@@ -21255,7 +21280,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 151731,
+            _internalId: 152008,
             type: "anyOf",
             anyOf: [
               {

src/resources/editor/tools/yaml/web-worker.js

@@ -992,17 +992,7 @@
         ]
       },
       "schema": {
-        "enum": [
-          "default",
-          "fragment",
-          "slide",
-          "column",
-          "column-fragment"
-        ]
-      },
-      "description": {
-        "short": "Location of output relative to the code that generated it (`default`, `fragment`, `slide`, `column`, or `column-location`)",
-        "long": "Location of output relative to the code that generated it. The possible values are as follows:\n\n- `default`: Normal flow of the slide after the code\n- `fragment`: In a fragment (not visible until you advance)\n- `slide`: On a new slide after the curent one\n- 'column': In an adjacent column \n- `column-fragment`:   In an adjacent column (not visible until you advance)\n\nNote that this option is supported only for the `revealjs` format.\n"
+        "ref": "output-location-schema"
       }
     },
     {
@@ -4078,6 +4068,22 @@
           }
         }
       }
+    },
+    {
+      "id": "output-location-schema",
+      "schema": {
+        "enum": [
+          "default",
+          "fragment",
+          "slide",
+          "column",
+          "column-fragment"
+        ],
+        "description": {
+          "short": "Location of output relative to the code that generated it (`default`, `fragment`, `slide`, `column`, or `column-location`)",
+          "long": "Location of output relative to the code that generated it. The possible values are as follows:\n\n- `default`: Normal flow of the slide after the code\n- `fragment`: In a fragment (not visible until you advance)\n- `slide`: On a new slide after the curent one\n- 'column': In an adjacent column \n- `column-fragment`:   In an adjacent column (not visible until you advance)\n\nNote that this option is supported only for the `revealjs` format.\n"
+        }
+      }
     }
   ],
   "schema/document-about.yml": [
@@ -8647,6 +8653,17 @@
         "short": "Use a smaller default font for slide content",
         "long": "`true` to use a smaller default font for slide content. This can also\nbe set per-slide by including the `.smaller` class on the slide title.\n"
       }
+    },
+    {
+      "name": "output-location",
+      "tags": {
+        "formats": [
+          "revealjs"
+        ]
+      },
+      "schema": {
+        "ref": "output-location-schema"
+      }
     }
   ],
   "schema/document-reveal-hidden.yml": [
@@ -12213,6 +12230,10 @@
     "Specify a default profile and profile groups",
     "Default profile to apply if QUARTO_PROFILE is not defined.",
     "Define a profile group for which at least one profile is always\nactive.",
+    {
+      "short": "Location of output relative to the code that generated it\n(<code>default</code>, <code>fragment</code>, <code>slide</code>,\n<code>column</code>, or <code>column-location</code>)",
+      "long": "Location of output relative to the code that generated it. The\npossible values are as follows:"
+    },
     {
       "short": "Unique label for code cell",
       "long": "Unique label for code cell. Used when other code needs to refer to\nthe cell (e.g.&nbsp;for cross references <code>fig-samples</code> or\n<code>tbl-summary</code>)"
@@ -13985,7 +14006,11 @@
       "long": "Title of the volume of the item or container holding the item.\nAlso use for titles of periodical special issues, special sections,\nand the like."
     },
     "Disambiguating year suffix in author-date styles (e.g.&nbsp;“a” in “Doe,\n1999a”).",
-    "internal-schema-hack"
+    "internal-schema-hack",
+    {
+      "short": "Location of output relative to the code that generated it\n(<code>default</code>, <code>fragment</code>, <code>slide</code>,\n<code>column</code>, or <code>column-location</code>)",
+      "long": "Location of output relative to the code that generated it. The\npossible values are as follows:"
+    }
   ],
   "schema/external-schemas.yml": [
     {
@@ -14210,12 +14235,12 @@
     "mermaid": "%%"
   },
   "handlers/mermaid/schema.yml": {
-    "_internalId": 151732,
+    "_internalId": 152009,
     "type": "object",
     "description": "be an object",
     "properties": {
       "mermaid-format": {
-        "_internalId": 151724,
+        "_internalId": 152001,
         "type": "enum",
         "enum": [
           "png",
@@ -14231,7 +14256,7 @@
         "exhaustiveCompletions": true
       },
       "theme": {
-        "_internalId": 151731,
+        "_internalId": 152008,
         "type": "anyOf",
         "anyOf": [
           {

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

@@ -6,6 +6,9 @@ local function collectCellOutputLocation(el)
      el.attr.classes:includes("cell")  then
     local outputLoc = el.attr.attributes["output-location"]
     el.attr.attributes["output-location"] = nil 
+    if outputLoc == nil then
+      outputLoc = param('output-location')
+    end
     return outputLoc
   else
     return nil

src/resources/filters/quarto-pre/output-location.lua

@@ -55,19 +55,7 @@
   tags:
     formats: [revealjs]
   schema:
-    enum: [default, fragment, slide, column, column-fragment]
-  description:
-    short: Location of output relative to the code that generated it (`default`, `fragment`, `slide`, `column`, or `column-location`)
-    long: |
-      Location of output relative to the code that generated it. The possible values are as follows:
-
-      - `default`: Normal flow of the slide after the code
-      - `fragment`: In a fragment (not visible until you advance)
-      - `slide`: On a new slide after the curent one
-      - 'column': In an adjacent column 
-      - `column-fragment`:   In an adjacent column (not visible until you advance)
-
-      Note that this option is supported only for the `revealjs` format.
+    ref: output-location-schema
 
 - name: message
   tags: