From fbb6d3e1d5f62b96fcb91d82fc101fe30ac87fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:13:47 +0200 Subject: [PATCH 1/4] fix: Possible options for `repo-actions` is not documented Fixes #10501 --- src/resources/editor/tools/vs-code.mjs | 10 ++++++---- src/resources/editor/tools/yaml/web-worker.js | 10 ++++++---- .../editor/tools/yaml/yaml-intelligence-resources.json | 10 ++++++---- src/resources/schema/document-website.yml | 5 +++-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/resources/editor/tools/vs-code.mjs b/src/resources/editor/tools/vs-code.mjs index 2fca072630d..c5de097b5b5 100644 --- a/src/resources/editor/tools/vs-code.mjs +++ b/src/resources/editor/tools/vs-code.mjs @@ -18999,7 +18999,7 @@ var require_yaml_intelligence_resources = __commonJS({ "$html-doc" ] }, - description: "Setting this to false prevents the `repo-actions` from appearing on this page." + description: "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" }, { name: "aliases", @@ -21374,6 +21374,8 @@ var require_yaml_intelligence_resources = __commonJS({ "The color used for errors, dangerous actions, or negative\ninformation.", "A bright color, used as a high-contrast foreground color on dark\nelements or low-contrast background color on light elements.", "A dark color, used as a high-contrast foreground color on light\nelements or high-contrast background color on light elements.", + "A color used to emphasize or highlight text or elements.", + "The color used for hyperlinks. If not defined, the\nprimary color is used.", "A color, which may be a named brand color.", "A named brand color, taken either from color.theme or\ncolor.palette (in that order).", "Typography definitions for the brand.", @@ -23678,12 +23680,12 @@ var require_yaml_intelligence_resources = __commonJS({ mermaid: "%%" }, "handlers/mermaid/schema.yml": { - _internalId: 187413, + _internalId: 187423, type: "object", description: "be an object", properties: { "mermaid-format": { - _internalId: 187405, + _internalId: 187415, type: "enum", enum: [ "png", @@ -23699,7 +23701,7 @@ var require_yaml_intelligence_resources = __commonJS({ exhaustiveCompletions: true }, theme: { - _internalId: 187412, + _internalId: 187422, type: "anyOf", anyOf: [ { diff --git a/src/resources/editor/tools/yaml/web-worker.js b/src/resources/editor/tools/yaml/web-worker.js index 992702a807d..54bbda3cdc8 100644 --- a/src/resources/editor/tools/yaml/web-worker.js +++ b/src/resources/editor/tools/yaml/web-worker.js @@ -19000,7 +19000,7 @@ try { "$html-doc" ] }, - description: "Setting this to false prevents the `repo-actions` from appearing on this page." + description: "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" }, { name: "aliases", @@ -21375,6 +21375,8 @@ try { "The color used for errors, dangerous actions, or negative\ninformation.", "A bright color, used as a high-contrast foreground color on dark\nelements or low-contrast background color on light elements.", "A dark color, used as a high-contrast foreground color on light\nelements or high-contrast background color on light elements.", + "A color used to emphasize or highlight text or elements.", + "The color used for hyperlinks. If not defined, the\nprimary color is used.", "A color, which may be a named brand color.", "A named brand color, taken either from color.theme or\ncolor.palette (in that order).", "Typography definitions for the brand.", @@ -23679,12 +23681,12 @@ try { mermaid: "%%" }, "handlers/mermaid/schema.yml": { - _internalId: 187413, + _internalId: 187423, type: "object", description: "be an object", properties: { "mermaid-format": { - _internalId: 187405, + _internalId: 187415, type: "enum", enum: [ "png", @@ -23700,7 +23702,7 @@ try { exhaustiveCompletions: true }, theme: { - _internalId: 187412, + _internalId: 187422, type: "anyOf", anyOf: [ { diff --git a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json index 1c6903ae5c3..64dba8c707c 100644 --- a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json +++ b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json @@ -11971,7 +11971,7 @@ "$html-doc" ] }, - "description": "Setting this to false prevents the `repo-actions` from appearing on this page." + "description": "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" }, { "name": "aliases", @@ -14346,6 +14346,8 @@ "The color used for errors, dangerous actions, or negative\ninformation.", "A bright color, used as a high-contrast foreground color on dark\nelements or low-contrast background color on light elements.", "A dark color, used as a high-contrast foreground color on light\nelements or high-contrast background color on light elements.", + "A color used to emphasize or highlight text or elements.", + "The color used for hyperlinks. If not defined, the\nprimary color is used.", "A color, which may be a named brand color.", "A named brand color, taken either from color.theme or\ncolor.palette (in that order).", "Typography definitions for the brand.", @@ -16650,12 +16652,12 @@ "mermaid": "%%" }, "handlers/mermaid/schema.yml": { - "_internalId": 187413, + "_internalId": 187423, "type": "object", "description": "be an object", "properties": { "mermaid-format": { - "_internalId": 187405, + "_internalId": 187415, "type": "enum", "enum": [ "png", @@ -16671,7 +16673,7 @@ "exhaustiveCompletions": true }, "theme": { - "_internalId": 187412, + "_internalId": 187422, "type": "anyOf", "anyOf": [ { diff --git a/src/resources/schema/document-website.yml b/src/resources/schema/document-website.yml index bd09e6223a5..e1395415747 100644 --- a/src/resources/schema/document-website.yml +++ b/src/resources/schema/document-website.yml @@ -14,10 +14,11 @@ description: short: "Links to source repository actions" long: "Links to source repository actions (`none` or one or more of `edit`, `source`, `issue`)" - tags: formats: [$html-doc] - description: Setting this to false prevents the `repo-actions` from appearing on this page. + description: | + Setting this to false prevents the `repo-actions` from appearing on this page. + Possible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`. - name: aliases schema: From dfd1e23aeaec6b4196ef45e01a53c43ac9e43f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Fri, 31 Jan 2025 20:09:31 +0100 Subject: [PATCH 2/4] revert: quarto build-js --- src/resources/editor/tools/vs-code.mjs | 1297 ++++++++++++----- src/resources/editor/tools/yaml/web-worker.js | 1297 ++++++++++++----- .../yaml/yaml-intelligence-resources.json | 1191 +++++++++++---- 3 files changed, 2725 insertions(+), 1060 deletions(-) diff --git a/src/resources/editor/tools/vs-code.mjs b/src/resources/editor/tools/vs-code.mjs index c5de097b5b5..4e9ee07760e 100644 --- a/src/resources/editor/tools/vs-code.mjs +++ b/src/resources/editor/tools/vs-code.mjs @@ -8220,9 +8220,18 @@ var require_yaml_intelligence_resources = __commonJS({ tags: { engine: "knitr" }, - schema: "boolean", + schema: { + enum: [ + true, + false, + "NA" + ] + }, default: true, - description: "Include messages in rendered output." + description: { + short: "Include messages in rendered output.", + long: "Include messages in rendered output. Possible values are `true`, `false`, or `NA`. \nIf `true`, messages are included in the output. If `false`, messages are not included. \nIf `NA`, messages are not included in output but shown in the knitr log to console.\n" + } }, { name: "results", @@ -8455,6 +8464,7 @@ var require_yaml_intelligence_resources = __commonJS({ "page", "page-left", "page-right", + "page-inset", "page-inset-left", "page-inset-right", "screen", @@ -11830,6 +11840,11 @@ var require_yaml_intelligence_resources = __commonJS({ description: "The brand's Mastodon URL." } }, + bluesky: { + string: { + description: "The brand's Bluesky URL." + } + }, github: { string: { description: "The brand's GitHub URL." @@ -11880,46 +11895,76 @@ var require_yaml_intelligence_resources = __commonJS({ ] }, { - id: "brand-logo", - description: "Provide definitions and defaults for brand's logo in various formats and sizes.\n", + id: "brand-logo-explicit-resource", + object: { + closed: true, + properties: { + path: "path", + alt: { + schema: "string", + description: "Alternative text for the logo, used for accessibility.\n" + } + }, + required: [ + "path" + ] + } + }, + { + id: "brand-logo-resource", anyOf: [ "string", { - object: { - closed: true, - properties: { - with: { - schema: { - object: { - additionalProperties: { - schema: { - ref: "brand-string-light-dark" - } - } + ref: "brand-logo-explicit-resource" + } + ] + }, + { + id: "brand-logo", + description: "Provide definitions and defaults for brand's logo in various formats and sizes.\n", + object: { + closed: true, + properties: { + images: { + description: "A dictionary of named logo resources.", + schema: { + object: { + additionalProperties: { + schema: { + ref: "brand-logo-resource" } } - }, - small: { - description: "A link or path to the brand's small-sized logo or icon, or a link or path to both the light and dark versions.\n", - schema: { - ref: "brand-string-light-dark" - } - }, - medium: { - description: "A link or path to the brand's medium-sized logo, or a link or path to both the light and dark versions.\n", - schema: { - ref: "brand-string-light-dark" - } - }, - large: { - description: "A link or path to the brand's large- or full-sized logo, or a link or path to both the light and dark versions.\n", - schema: { - ref: "brand-string-light-dark" - } } } + }, + small: { + description: "A link or path to the brand's small-sized logo or icon, or a link or path to both the light and dark versions.\n", + schema: { + ref: "brand-string-light-dark" + } + }, + medium: { + description: "A link or path to the brand's medium-sized logo, or a link or path to both the light and dark versions.\n", + schema: { + ref: "brand-string-light-dark" + } + }, + large: { + description: "A link or path to the brand's large- or full-sized logo, or a link or path to both the light and dark versions.\n", + schema: { + ref: "brand-string-light-dark" + } } } + } + }, + { + id: "brand-named-logo", + description: "Names of customizeable logos", + enum: [ + "small", + "medium", + "large" ] }, { @@ -11932,10 +11977,9 @@ var require_yaml_intelligence_resources = __commonJS({ object: { closed: true, properties: { - with: { + palette: { description: "The brand's custom color palette. Any number of colors can be defined, each color having a custom name.\n", object: { - closed: false, additionalProperties: { schema: { ref: "brand-color-value" @@ -12011,12 +12055,6 @@ var require_yaml_intelligence_resources = __commonJS({ ref: "brand-color-value" } }, - emphasis: { - description: "A color used to emphasize or highlight text or elements.\n", - schema: { - ref: "brand-color-value" - } - }, link: { description: "The color used for hyperlinks. If not defined, the `primary` color is used.\n", schema: { @@ -12053,7 +12091,6 @@ var require_yaml_intelligence_resources = __commonJS({ "danger", "light", "dark", - "emphasis", "link" ] }, @@ -12063,126 +12100,227 @@ var require_yaml_intelligence_resources = __commonJS({ object: { closed: true, properties: { - with: { + fonts: { description: "Font files and definitions for the brand.", - ref: "brand-font" + arrayOf: { + ref: "brand-font" + } }, base: { description: "The base font settings for the brand. These are used as the default for all text.\n", - ref: "brand-typography-options" + ref: "brand-typography-options-base" }, headings: { - description: "The font settings for headings.\n", - ref: "brand-typography-options-no-size" + description: "Settings for headings, or a string specifying the font family only.", + ref: "brand-typography-options-headings" }, monospace: { - description: "The font settings for monospace text. Color in this context refers to inline code.\n", - ref: "brand-typography-options" + description: "Settings for monospace text, or a string specifying the font family only.", + ref: "brand-typography-options-monospace" }, - emphasis: { - description: "The text properties used for emphasized (or emboldened) text.", - object: { - closed: true, - properties: { - weight: { - ref: "brand-font-weight" - }, - color: { - ref: "brand-maybe-named-color" - }, - "background-color": { - ref: "brand-maybe-named-color" - } - } - } + "monospace-inline": { + description: "Settings for inline code, or a string specifying the font family only.", + ref: "brand-typography-options-monospace-inline" + }, + "monospace-block": { + description: "Settings for code blocks, or a string specifying the font family only.", + ref: "brand-typography-options-monospace-block" }, link: { - description: "The text properties used for hyperlinks.", - object: { - closed: true, - properties: { - weight: { - ref: "brand-font-weight" - }, - decoration: "string", - color: { - schema: { - ref: "brand-maybe-named-color" - }, - default: "primary" - }, - "background-color": { - ref: "brand-maybe-named-color" - } + description: "Settings for links.", + ref: "brand-typography-options-link" + } + } + } + }, + { + id: "brand-typography-options-base", + description: "Base typographic options.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + "line-height": { + ref: "line-height-number-string" } } } } - } + ] }, { - id: "brand-typography-options", - description: "Typographic options.", - object: { - closed: true, - properties: { - family: "string", - size: "string", - "line-height": "string", - weight: { - ref: "brand-font-weight" - }, - style: { - ref: "brand-font-style" - }, - color: { - ref: "brand-maybe-named-color" - }, - "background-color": { - ref: "brand-maybe-named-color" + id: "brand-typography-options-headings", + description: "Typographic options for headings.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + weight: { + ref: "brand-font-weight" + }, + style: { + ref: "brand-font-style" + }, + color: { + ref: "brand-maybe-named-color" + }, + "line-height": { + ref: "line-height-number-string" + } + } } } - } + ] }, { - id: "brand-typography-options-no-size", - description: "Typographic options without a font size.", - object: { - closed: true, - properties: { - family: "string", - "line-height": "string", - weight: { - ref: "brand-font-weight" - }, - style: { - ref: "brand-font-style" - }, - color: { - ref: "brand-maybe-named-color" - }, - "background-color": { - ref: "brand-maybe-named-color" + id: "brand-typography-options-monospace", + description: "Typographic options for monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + } + } } } - } + ] + }, + { + id: "brand-typography-options-monospace-inline", + description: "Typographic options for inline monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + } + } + } + } + ] + }, + { + id: "line-height-number-string", + description: "Line height", + anyOf: [ + "number", + "string" + ] + }, + { + id: "brand-typography-options-monospace-block", + description: "Typographic options for block monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + }, + "line-height": { + ref: "line-height-number-string" + } + } + } + } + ] + }, + { + id: "brand-typography-options-link", + description: "Typographic options for inline monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + }, + decoration: "string" + } + } + } + ] + }, + { + id: "brand-named-font", + description: "Names of customizeable fonts", + enum: [ + "base", + "headings", + "monospace" + ] }, { id: "brand-font", description: "Font files and definitions for the brand.", - arrayOf: { - anyOf: [ - { - ref: "brand-font-google" - }, - { - ref: "brand-font-file" - }, - { - ref: "brand-font-family" - } - ] - } + anyOf: [ + { + ref: "brand-font-google" + }, + { + ref: "brand-font-bunny" + }, + { + ref: "brand-font-file" + }, + { + ref: "brand-font-system" + }, + { + ref: "brand-font-common" + } + ] }, { id: "brand-font-weight", @@ -12196,7 +12334,20 @@ var require_yaml_intelligence_resources = __commonJS({ 600, 700, 800, - 900 + 900, + "thin", + "extra-light", + "ultra-light", + "light", + "normal", + "regular", + "medium", + "semi-bold", + "demi-bold", + "bold", + "extra-bold", + "ultra-bold", + "black" ], default: 400 }, @@ -12205,61 +12356,102 @@ var require_yaml_intelligence_resources = __commonJS({ description: "A font style.", enum: [ "normal", - "italic" + "italic", + "oblique" ], default: "normal" }, { - id: "brand-font-google", - description: "A Google Font definition.", + id: "brand-font-common", + schema: { + object: { + closed: true, + properties: { + family: { + description: "The font family name, which must match the name of the font on the foundry website.", + schema: "string" + }, + weight: { + description: "The font weights to include.", + maybeArrayOf: { + ref: "brand-font-weight" + }, + default: [ + 400, + 700 + ] + }, + style: { + description: "The font styles to include.", + maybeArrayOf: { + ref: "brand-font-style" + }, + default: [ + "normal", + "italic" + ] + }, + display: { + description: "The font display method, determines how a font face is font face is shown depending on its download status and readiness for use.\n", + enum: [ + "auto", + "block", + "swap", + "fallback", + "optional" + ], + default: "swap" + } + } + } + } + }, + { + id: "brand-font-system", + description: "A system font definition.", object: { + super: { + resolveRef: "brand-font-common" + }, closed: true, properties: { - google: { - anyOf: [ - "string", - { - object: { - closed: true, - properties: { - family: { - description: "The font family name, which must match the name of the font on Google Fonts.", - schema: "string" - }, - weight: { - description: "The font weights to include.", - maybeArrayOf: { - ref: "brand-font-weight" - }, - default: [ - 400, - 700 - ] - }, - style: { - description: "The font style to include.", - maybeArrayOf: { - ref: "brand-font-style" - }, - default: [ - "normal", - "italic" - ] - }, - display: { - description: "The font display method, determines how a font face is font face is shown depending on its download status and readiness for use.\n", - enum: [ - "auto", - "block", - "swap", - "fallback", - "optional" - ], - default: "swap" - } - } - } - } + source: { + enum: [ + "system" + ] + } + } + } + }, + { + id: "brand-font-google", + description: "A font definition from Google Fonts.", + object: { + super: { + resolveRef: "brand-font-common" + }, + closed: true, + properties: { + source: { + enum: [ + "google" + ] + } + } + } + }, + { + id: "brand-font-bunny", + description: "A font definition from fonts.bunny.net.", + object: { + super: { + resolveRef: "brand-font-common" + }, + closed: true, + properties: { + source: { + enum: [ + "bunny" ] } } @@ -12271,20 +12463,50 @@ var require_yaml_intelligence_resources = __commonJS({ object: { closed: true, properties: { + source: { + enum: [ + "file" + ] + }, family: { description: "The font family name.", schema: "string" }, files: { - maybeArrayOf: { + arrayOf: { anyOf: [ "path", - "string" + { + schema: { + object: { + properties: { + path: { + schema: "path", + description: "The path to the font file. This can be a local path or a URL.\n" + }, + weight: { + ref: "brand-font-weight" + }, + style: { + ref: "brand-font-style" + } + }, + required: [ + "path" + ] + } + } + } ] }, description: "The font files to include. These can be local or online. Local file paths should be relative to the `brand.yml` file. Online paths should be complete URLs.\n" } - } + }, + required: [ + "files", + "family", + "source" + ] } }, { @@ -12310,10 +12532,45 @@ var require_yaml_intelligence_resources = __commonJS({ ref: "brand-typography" }, defaults: { + ref: "brand-defaults" + } + } + } + }, + { + id: "brand-defaults", + object: { + properties: { + bootstrap: { + ref: "brand-defaults-bootstrap" + }, + quarto: { schema: "object" } } } + }, + { + id: "brand-defaults-bootstrap", + object: { + properties: { + defaults: { + schema: { + object: { + additionalProperties: { + schema: { + anyOf: [ + "string", + "boolean", + "number" + ] + } + } + } + } + } + } + } } ], "schema/document-about.yml": [ @@ -15359,7 +15616,7 @@ var require_yaml_intelligence_resources = __commonJS({ schema: "number", description: { short: "Target page width for output (used to compute columns widths for `layout` divs)\n", - long: "Target page width for output (used to compute columns widths for `layout` divs).\nDefaults to 6.5 inches, which corresponds to default letter page settings in \ndocx and odt.\n" + long: "Target body page width for output (used to compute columns widths for `layout` divs).\nDefaults to 6.5 inches, which corresponds to default letter page settings in \ndocx and odt (8.5 inches with 1 inch for each margins).\n" } }, { @@ -16422,6 +16679,19 @@ var require_yaml_intelligence_resources = __commonJS({ schema: "path", description: "Use the specified file as a style reference in producing a docx, \npptx, or odt file.\n" }, + { + name: "brand", + schema: { + anyOf: [ + "string", + "boolean", + { + ref: "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", tags: { @@ -17436,10 +17706,16 @@ var require_yaml_intelligence_resources = __commonJS({ name: "logo", tags: { formats: [ - "revealjs" + "revealjs", + "typst" + ] + }, + schema: { + anyOf: [ + "string", + "object" ] }, - schema: "path", description: "Logo image (placed in bottom right corner of slides)" }, { @@ -18147,6 +18423,17 @@ var require_yaml_intelligence_resources = __commonJS({ schema: "boolean", default: false, description: "Play a subtle sound when changing slides" + }, + { + name: "jump-to-slide", + tags: { + formats: [ + "revealjs" + ] + }, + schema: "boolean", + default: true, + description: "Deactivate jump to slide feature." } ], "schema/document-reveal-print.yml": [ @@ -18351,6 +18638,66 @@ var require_yaml_intelligence_resources = __commonJS({ } ] } + }, + { + name: "scroll-view", + description: "Control the scroll view feature of Revealjs", + tags: { + formats: [ + "revealjs" + ] + }, + schema: { + anyOf: [ + "boolean", + { + object: { + properties: { + activate: { + boolean: { + default: true, + description: "Activate scroll view by default for the presentation. Otherwise, it is manually avalaible by adding `?view=scroll` to url." + } + }, + progress: { + anyOf: [ + "boolean", + { + enum: [ + "auto" + ] + } + ], + default: "auto", + description: "Show the scrollbar while scrolling, hide while idle (default `auto`). Set to 'true' to always show, `false` to always hide." + }, + snap: { + enum: [ + "mandatory", + "proximity", + false + ], + default: "mandatory", + description: "When scrolling, it will automatically snap to the closest slide. Only snap when close to the top of a slide using `proximity`. Disable snapping altogether by setting to `false`.\n" + }, + layout: { + enum: [ + "compact", + "full" + ], + default: "full", + description: "By default each slide will be sized to be as tall as the viewport. If you prefer a more dense layout with multiple slides visible in parallel, set to `compact`.\n" + }, + "activation-width": { + number: { + description: "Control scroll view activation width. The scroll view is automatically unable when the viewport reaches mobile widths. Set to `0` to disable automatic scroll view.\n" + } + } + } + } + } + ] + } } ], "schema/document-reveal-transitions.yml": [ @@ -18999,7 +19346,7 @@ var require_yaml_intelligence_resources = __commonJS({ "$html-doc" ] }, - description: "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" + description: "Setting this to false prevents the `repo-actions` from appearing on this page." }, { name: "aliases", @@ -19600,6 +19947,9 @@ var require_yaml_intelligence_resources = __commonJS({ super: { resolveRef: "schema/base" }, + required: [ + "enum" + ], properties: { enum: { anyOf: [ @@ -19630,99 +19980,196 @@ var require_yaml_intelligence_resources = __commonJS({ }, { id: "schema/null", + anyOf: [ + { + enum: [ + "null" + ] + }, + { + object: { + closed: true, + required: [ + "null" + ], + properties: { + null: { + anyOf: [ + { + ref: "schema/base" + } + ] + } + } + } + } + ] + }, + { + id: "schema/explicit-schema", object: { closed: true, + required: [ + "schema" + ], super: { resolveRef: "schema/base" }, properties: { - null: { + schema: { ref: "schema/schema" } } } }, { - id: "schema/explicit-schema", + id: "schema/explicit-pattern-string", object: { closed: true, super: { resolveRef: "schema/base" }, + required: [ + "pattern" + ], properties: { - schema: { - ref: "schema/schema" + pattern: "string" + } + } + }, + { + id: "schema/string", + anyOf: [ + { + enum: [ + "string", + "path" + ] + }, + { + ref: "schema/explicit-pattern-string" + }, + { + object: { + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "path" + ], + properties: { + path: { + anyOf: [ + { + ref: "schema/explicit-pattern-string" + }, + { + ref: "schema/base" + } + ] + } + } + } + }, + { + object: { + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "string" + ], + properties: { + string: { + anyOf: [ + { + ref: "schema/explicit-pattern-string" + }, + { + ref: "schema/base" + } + ] + } + } + } + } + ] + }, + { + id: "schema/number", + anyOf: [ + { + enum: [ + "number" + ] + }, + { + object: { + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "number" + ], + properties: { + number: { + anyOf: [ + { + ref: "schema/schema" + }, + { + ref: "schema/base" + } + ] + } + } } } - } + ] }, { - id: "schema/string", + id: "schema/boolean", anyOf: [ { - object: { - closed: true, - super: { - resolveRef: "schema/base" - }, - properties: { - pattern: "string" - } - } + enum: [ + "boolean" + ] }, { object: { closed: true, + required: [ + "boolean" + ], super: { resolveRef: "schema/base" }, properties: { - string: { - ref: "schema/schema" - }, - path: { - ref: "schema/schema" - }, - pattern: { - ref: "schema/schema" + boolean: { + anyOf: [ + { + ref: "schema/schema" + }, + { + ref: "schema/base" + } + ] } } } } ] }, - { - id: "schema/number", - object: { - closed: true, - super: { - resolveRef: "schema/base" - }, - properties: { - number: { - ref: "schema/schema" - } - } - } - }, - { - id: "schema/boolean", - object: { - closed: true, - super: { - resolveRef: "schema/base" - }, - properties: { - boolean: { - ref: "schema/schema" - } - } - } - }, { id: "schema/resolve-ref", object: { closed: true, + required: [ + "resolveRef" + ], properties: { resolveRef: "string" } @@ -19732,6 +20179,9 @@ var require_yaml_intelligence_resources = __commonJS({ id: "schema/ref", object: { closed: true, + required: [ + "ref" + ], properties: { ref: "string", description: { @@ -19744,6 +20194,9 @@ var require_yaml_intelligence_resources = __commonJS({ id: "schema/maybe-array-of", object: { closed: true, + required: [ + "maybeArrayOf" + ], super: { resolveRef: "schema/base" }, @@ -19761,6 +20214,9 @@ var require_yaml_intelligence_resources = __commonJS({ super: { resolveRef: "schema/base" }, + required: [ + "arrayOf" + ], properties: { arrayOf: { anyOf: [ @@ -19793,6 +20249,9 @@ var require_yaml_intelligence_resources = __commonJS({ super: { resolveRef: "schema/base" }, + required: [ + "allOf" + ], properties: { allOf: { anyOf: [ @@ -19827,6 +20286,9 @@ var require_yaml_intelligence_resources = __commonJS({ super: { resolveRef: "schema/base" }, + required: [ + "anyOf" + ], properties: { anyOf: { anyOf: [ @@ -19861,6 +20323,9 @@ var require_yaml_intelligence_resources = __commonJS({ super: { resolveRef: "schema/base" }, + required: [ + "record" + ], properties: { record: { anyOf: [ @@ -19898,101 +20363,113 @@ var require_yaml_intelligence_resources = __commonJS({ }, { id: "schema/object", - object: { - closed: true, - super: { - resolveRef: "schema/base" + anyOf: [ + { + enum: [ + "object" + ] }, - properties: { + { object: { - object: { - super: { - resolveRef: "schema/base" - }, - closed: true, - properties: { - namingConvention: { - anyOf: [ - { - enum: [ - "ignore" + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "object" + ], + properties: { + object: { + object: { + super: { + resolveRef: "schema/base" + }, + closed: true, + properties: { + namingConvention: { + anyOf: [ + { + enum: [ + "ignore" + ] + }, + { + arrayOf: { + enum: [ + "camelCase", + "camel-case", + "camel_case", + "capitalizationCase", + "capitalization-case", + "capitalization_case", + "underscoreCase", + "underscore-case", + "underscore_case", + "snakeCase", + "snake-case", + "snake_case", + "dashCase", + "dash-case", + "dash_case", + "kebabCase", + "kebab-case", + "kebab_case" + ] + } + } ] }, - { - arrayOf: { - enum: [ - "camelCase", - "camel-case", - "camel_case", - "capitalizationCase", - "capitalization-case", - "capitalization_case", - "underscoreCase", - "underscore-case", - "underscore_case", - "snakeCase", - "snake-case", - "snake_case", - "dashCase", - "dash-case", - "dash_case", - "kebabCase", - "kebab-case", - "kebab_case" - ] + properties: { + object: { + additionalProperties: { + ref: "schema/schema" + } } - } - ] - }, - properties: { - object: { - additionalProperties: { + }, + patternProperties: { + object: { + additionalProperties: { + ref: "schema/schema" + } + } + }, + propertyNames: { ref: "schema/schema" - } - } - }, - patternProperties: { - object: { + }, additionalProperties: { ref: "schema/schema" - } - } - }, - propertyNames: { - ref: "schema/schema" - }, - additionalProperties: { - ref: "schema/schema" - }, - super: { - maybeArrayOf: { - ref: "schema/schema" - } - }, - required: { - anyOf: [ - { - enum: [ - "all" + }, + super: { + maybeArrayOf: { + ref: "schema/schema" + } + }, + required: { + anyOf: [ + { + enum: [ + "all" + ] + }, + { + arrayOf: "string" + } ] }, - { + closed: "boolean", + description: { + ref: "schema/description" + }, + completions: { arrayOf: "string" } - ] - }, - closed: "boolean", - description: { - ref: "schema/description" - }, - completions: { - arrayOf: "string" + } } } } } } - } + ] }, { id: "schema/schema", @@ -20041,13 +20518,7 @@ var require_yaml_intelligence_resources = __commonJS({ }, { enum: [ - "number", - "boolean", - "path", - "string", null, - "null", - "object", "any" ] } @@ -20100,6 +20571,7 @@ var require_yaml_intelligence_resources = __commonJS({ } ], "pandoc/formats.yml": [ + "ansi", "asciidoc", "asciidoc_legacy", "asciidoctor", @@ -21179,7 +21651,7 @@ var require_yaml_intelligence_resources = __commonJS({ "Short/abbreviated form of container-title;", "A minor contributor to the item; typically cited using \u201Cwith\u201D before\nthe name when listed in a bibliography.", "Curator of an exhibit or collection (e.g. in a museum).", - "Physical (e.g. size) or temporal (e.g. running time) dimensions of\nthe item.", + "Physical (e.g. size) or temporal (e.g.\uFFFD\uFFFDrunning time) dimensions of\nthe item.", "Director (e.g. of a film).", "Minor subdivision of a court with a jurisdiction for a\nlegal item", "(Container) edition holding the item (e.g. \u201C3\u201D when citing a chapter\nin the third edition of a book).", @@ -21351,16 +21823,20 @@ var require_yaml_intelligence_resources = __commonJS({ "Important links for the brand, including social media links. If a\nsingle string, it is the brand\u2019s home page or website. Additional fields\nare allowed for internal use.", "The brand\u2019s home page or website.", "The brand\u2019s Mastodon URL.", + "The brand\u2019s Bluesky URL.", "The brand\u2019s GitHub URL.", "The brand\u2019s LinkedIn URL.", "The brand\u2019s Twitter URL.", "The brand\u2019s Facebook URL.", "A link or path to the brand\u2019s light-colored logo or icon.", "A link or path to the brand\u2019s dark-colored logo or icon.", + "Alternative text for the logo, used for accessibility.", "Provide definitions and defaults for brand\u2019s logo in various formats\nand sizes.", + "A dictionary of named logo resources.", "A link or path to the brand\u2019s small-sized logo or icon, or a link or\npath to both the light and dark versions.", "A link or path to the brand\u2019s medium-sized logo, or a link or path to\nboth the light and dark versions.", "A link or path to the brand\u2019s large- or full-sized logo, or a link or\npath to both the light and dark versions.", + "Names of customizeable logos", "The brand\u2019s custom color palette and theme.", "The brand\u2019s custom color palette. Any number of colors can be\ndefined, each color having a custom name.", "The foreground color, used for text.", @@ -21374,30 +21850,51 @@ var require_yaml_intelligence_resources = __commonJS({ "The color used for errors, dangerous actions, or negative\ninformation.", "A bright color, used as a high-contrast foreground color on dark\nelements or low-contrast background color on light elements.", "A dark color, used as a high-contrast foreground color on light\nelements or high-contrast background color on light elements.", - "A color used to emphasize or highlight text or elements.", "The color used for hyperlinks. If not defined, the\nprimary color is used.", "A color, which may be a named brand color.", "A named brand color, taken either from color.theme or\ncolor.palette (in that order).", "Typography definitions for the brand.", "Font files and definitions for the brand.", "The base font settings for the brand. These are used as the default\nfor all text.", - "The font settings for headings.", - "The font settings for monospace text. Color in this context refers to\ninline code.", - "The text properties used for emphasized (or emboldened) text.", - "The text properties used for hyperlinks.", - "Typographic options.", - "Typographic options without a font size.", + "Settings for headings, or a string specifying the font family\nonly.", + "Settings for monospace text, or a string specifying the font family\nonly.", + "Settings for inline code, or a string specifying the font family\nonly.", + "Settings for code blocks, or a string specifying the font family\nonly.", + "Settings for links.", + "Base typographic options.", + "Typographic options for headings.", + "Typographic options for monospace elements.", + "Typographic options for inline monospace elements.", + "Line height", + "Typographic options for block monospace elements.", + "Typographic options for inline monospace elements.", + "Names of customizeable fonts", "Font files and definitions for the brand.", "A font weight.", "A font style.", - "A Google Font definition.", - "The font family name, which must match the name of the font on Google\nFonts.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A system font definition.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A font definition from Google Fonts.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A font definition from fonts.bunny.net.", + "The font family name, which must match the name of the font on the\nfoundry website.", "The font weights to include.", - "The font style to include.", + "The font styles to include.", "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", "A method for providing font files directly, either locally or from an\nonline location.", "The font family name.", "The font files to include. These can be local or online. Local file\npaths should be relative to the brand.yml file. Online\npaths should be complete URLs.", + "The path to the font file. This can be a local path or a URL.", "A locally-installed font family name. When used, the end-user is\nresponsible for ensuring that the font is installed on their system.", { short: "Unique label for code cell", @@ -21589,7 +22086,10 @@ var require_yaml_intelligence_resources = __commonJS({ short: "Location of output relative to the code that generated it\n(default, fragment, slide,\ncolumn, or column-location)", long: "Location of output relative to the code that generated it. The\npossible values are as follows:" }, - "Include messages in rendered output.", + { + short: "Include messages in rendered output.", + long: "Include messages in rendered output. Possible values are\ntrue, false, or NA. If\ntrue, messages are included in the output. If\nfalse, messages are not included. If NA,\nmessages are not included in output but shown in the knitr log to\nconsole." + }, { short: "How to display text results", long: "How to display text results. Note that this option only applies to\nnormal text output (not warnings, messages, or errors). The possible\nvalues are as follows:" @@ -22187,7 +22687,7 @@ var require_yaml_intelligence_resources = __commonJS({ "The page layout to use for this document (article,\nfull, or custom)", { short: "Target page width for output (used to compute columns widths for\nlayout divs)", - long: "Target page width for output (used to compute columns widths for\nlayout divs). Defaults to 6.5 inches, which corresponds to\ndefault letter page settings in docx and odt." + long: "Target body page width for output (used to compute columns widths for\nlayout divs). Defaults to 6.5 inches, which corresponds to\ndefault letter page settings in docx and odt (8.5 inches with 1 inch for\neach margins)." }, { short: "Properties of the grid system used to layout Quarto HTML pages.", @@ -22365,6 +22865,7 @@ var require_yaml_intelligence_resources = __commonJS({ }, "If true, force the presence of the OJS runtime. If\nfalse, force the absence instead. If unset, the OJS runtime\nis included only if OJS cells are present in the document.", "Use the specified file as a style reference in producing a docx,\npptx, or odt file.", + "Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline brand definition.", "Theme name, theme scss file, or a mix of both.", "The light theme name, theme scss file, or a mix of both.", "The light theme name, theme scss file, or a mix of both.", @@ -22614,6 +23115,7 @@ var require_yaml_intelligence_resources = __commonJS({ "Monitor the hash and change slides accordingly", "Include the current fragment in the URL", "Play a subtle sound when changing slides", + "Deactivate jump to slide feature.", { short: "Slides that are too tall to fit within a single page will expand onto\nmultiple pages", long: "Slides that are too tall to fit within a single page will expand onto\nmultiple pages. You can limit how many pages a slide may expand to using\nthis option." @@ -22641,6 +23143,12 @@ var require_yaml_intelligence_resources = __commonJS({ "Multiplex token server (defaults to Reveal-hosted server)", "Unique presentation id provided by multiplex token server", "Secret provided by multiplex token server", + "Control the scroll view feature of Revealjs", + "Activate scroll view by default for the presentation. Otherwise, it\nis manually avalaible by adding ?view=scroll to url.", + "Show the scrollbar while scrolling, hide while idle (default\nauto). Set to \u2018true\u2019 to always show, false to\nalways hide.", + "When scrolling, it will automatically snap to the closest slide. Only\nsnap when close to the top of a slide using proximity.\nDisable snapping altogether by setting to false.", + "By default each slide will be sized to be as tall as the viewport. If\nyou prefer a more dense layout with multiple slides visible in parallel,\nset to compact.", + "Control scroll view activation width. The scroll view is\nautomatically unable when the viewport reaches mobile widths. Set to\n0 to disable automatic scroll view.", { short: "Transition style for slides", long: "Transition style for slides backgrounds. (none,\nfade, slide, convex,\nconcave, or zoom)" @@ -23108,6 +23616,14 @@ var require_yaml_intelligence_resources = __commonJS({ "Disambiguating year suffix in author-date styles (e.g. \u201Ca\u201D in \u201CDoe,\n1999a\u201D).", "Manuscript configuration", "internal-schema-hack", + { + short: "Include an automatically generated table of contents", + long: "" + }, + { + short: "Use smart quotes in document output. Defaults to true.", + long: "" + }, "Project configuration.", "Project type (default, website,\nbook, or manuscript)", "Files to render (defaults to all files)", @@ -23680,12 +24196,12 @@ var require_yaml_intelligence_resources = __commonJS({ mermaid: "%%" }, "handlers/mermaid/schema.yml": { - _internalId: 187423, + _internalId: 194269, type: "object", description: "be an object", properties: { "mermaid-format": { - _internalId: 187415, + _internalId: 194261, type: "enum", enum: [ "png", @@ -23701,7 +24217,7 @@ var require_yaml_intelligence_resources = __commonJS({ exhaustiveCompletions: true }, theme: { - _internalId: 187422, + _internalId: 194268, type: "anyOf", anyOf: [ { @@ -23741,7 +24257,42 @@ var require_yaml_intelligence_resources = __commonJS({ "case-detection": true }, $id: "handlers/mermaid" - } + }, + "schema/document-typst.yml": [ + { + name: "page-numbering", + tags: { + formats: [ + "typst" + ] + }, + schema: { + anyOf: [ + "string", + { + enum: [ + false + ] + } + ] + }, + description: { + short: "Include an automatically generated table of contents" + } + }, + { + name: "smart", + tags: { + formats: [ + "typst" + ] + }, + schema: "boolean", + description: { + short: "Use smart quotes in document output. Defaults to true." + } + } + ] }; } }); @@ -23837,7 +24388,7 @@ function platformHasNonAsciiCharacters() { try { return Deno.build.os !== "windows"; } catch (_e) { - return false; + return true; } } function tidyverseInfo(msg) { @@ -24266,8 +24817,8 @@ function mappedIndexToLineCol(eitherText) { }; } function mappedLines(str2, keepNewLines = false) { - const lines2 = rangedLines(str2.value, keepNewLines); - return lines2.map((v) => mappedString(str2, [v.range])); + const lines3 = rangedLines(str2.value, keepNewLines); + return lines3.map((v) => mappedString(str2, [v.range])); } // parsing.ts @@ -30394,7 +30945,17 @@ function buildJsYamlAnnotation(mappedYaml) { `Expected a single result, got ${results.length} instead` ); } - JSON.stringify(results[0]); + try { + JSON.stringify(results[0]); + } catch (e) { + if (e.message.match("invalid string length")) { + } else if (e.message.match(/circular structure/)) { + throw new InternalError( + `Circular structure detected in parsed yaml: ${e.message}` + ); + } else { + } + } return postProcessAnnotation(results[0]); } function buildTreeSitterAnnotation(tree, mappedSource2) { @@ -33057,9 +33618,7 @@ async function breakQuartoMd(src, validate2 = false, lenient = false) { } else if (cell_type === "directive") { cell.source = mappedString(src, mappedChunks.slice(1, -1), fileName); } - if (mdTrimEmptyLines(lines(cell.sourceVerbatim.value)).length > 0 || cell.options !== void 0) { - nb.cells.push(cell); - } + nb.cells.push(cell); lineBuffer.splice(0, lineBuffer.length); } }; @@ -33121,24 +33680,6 @@ async function breakQuartoMd(src, validate2 = false, lenient = false) { await flushLineBuffer("markdown", srcLines.length); return nb; } -function mdTrimEmptyLines(lines2) { - const firstNonEmpty = lines2.findIndex((line) => line.trim().length > 0); - if (firstNonEmpty === -1) { - return []; - } - lines2 = lines2.slice(firstNonEmpty); - let lastNonEmpty = -1; - for (let i = lines2.length - 1; i >= 0; i--) { - if (lines2[i].trim().length > 0) { - lastNonEmpty = i; - break; - } - } - if (lastNonEmpty > -1) { - lines2 = lines2.slice(0, lastNonEmpty + 1); - } - return lines2; -} // ../yaml-schema/format-aliases.ts var formatAliases = void 0; @@ -33594,6 +34135,11 @@ async function locateCellWithCursor(context) { return foundCell; } +// ../yaml-schema/brand.ts +var getBrandConfigSchema = async () => { + return refSchema("brand", ""); +}; + // yaml-intelligence.ts function getTagValue(schema2, tag) { if (schema2 === true || schema2 === false) { @@ -34120,7 +34666,6 @@ async function automationFromGoodParseMarkdown(kind, context) { return size; }; if (kind === "completions") { - debugger; let foundCell = void 0; for (const cell of result.cells) { const size = lines((cell.sourceWithYaml || cell.source).value).length; @@ -34323,7 +34868,19 @@ var determineSchema = async (context) => { schema: extensionConfigSchema, schemaName: "extension-config" }; - } else { + } + const brandYamlNames = [ + "_brand.yml", + "_brand.yaml" + ]; + if (context.path && brandYamlNames.some((name) => context.path.endsWith(name))) { + const brandYamlSchema = await getBrandConfigSchema(); + return { + schema: brandYamlSchema, + schemaName: "brand" + }; + } + { const projectConfigSchema = await getProjectConfigSchema(); return { schema: projectConfigSchema, diff --git a/src/resources/editor/tools/yaml/web-worker.js b/src/resources/editor/tools/yaml/web-worker.js index 54bbda3cdc8..4d3273d8d1a 100644 --- a/src/resources/editor/tools/yaml/web-worker.js +++ b/src/resources/editor/tools/yaml/web-worker.js @@ -8221,9 +8221,18 @@ try { tags: { engine: "knitr" }, - schema: "boolean", + schema: { + enum: [ + true, + false, + "NA" + ] + }, default: true, - description: "Include messages in rendered output." + description: { + short: "Include messages in rendered output.", + long: "Include messages in rendered output. Possible values are `true`, `false`, or `NA`. \nIf `true`, messages are included in the output. If `false`, messages are not included. \nIf `NA`, messages are not included in output but shown in the knitr log to console.\n" + } }, { name: "results", @@ -8456,6 +8465,7 @@ try { "page", "page-left", "page-right", + "page-inset", "page-inset-left", "page-inset-right", "screen", @@ -11831,6 +11841,11 @@ try { description: "The brand's Mastodon URL." } }, + bluesky: { + string: { + description: "The brand's Bluesky URL." + } + }, github: { string: { description: "The brand's GitHub URL." @@ -11881,46 +11896,76 @@ try { ] }, { - id: "brand-logo", - description: "Provide definitions and defaults for brand's logo in various formats and sizes.\n", + id: "brand-logo-explicit-resource", + object: { + closed: true, + properties: { + path: "path", + alt: { + schema: "string", + description: "Alternative text for the logo, used for accessibility.\n" + } + }, + required: [ + "path" + ] + } + }, + { + id: "brand-logo-resource", anyOf: [ "string", { - object: { - closed: true, - properties: { - with: { - schema: { - object: { - additionalProperties: { - schema: { - ref: "brand-string-light-dark" - } - } + ref: "brand-logo-explicit-resource" + } + ] + }, + { + id: "brand-logo", + description: "Provide definitions and defaults for brand's logo in various formats and sizes.\n", + object: { + closed: true, + properties: { + images: { + description: "A dictionary of named logo resources.", + schema: { + object: { + additionalProperties: { + schema: { + ref: "brand-logo-resource" } } - }, - small: { - description: "A link or path to the brand's small-sized logo or icon, or a link or path to both the light and dark versions.\n", - schema: { - ref: "brand-string-light-dark" - } - }, - medium: { - description: "A link or path to the brand's medium-sized logo, or a link or path to both the light and dark versions.\n", - schema: { - ref: "brand-string-light-dark" - } - }, - large: { - description: "A link or path to the brand's large- or full-sized logo, or a link or path to both the light and dark versions.\n", - schema: { - ref: "brand-string-light-dark" - } } } + }, + small: { + description: "A link or path to the brand's small-sized logo or icon, or a link or path to both the light and dark versions.\n", + schema: { + ref: "brand-string-light-dark" + } + }, + medium: { + description: "A link or path to the brand's medium-sized logo, or a link or path to both the light and dark versions.\n", + schema: { + ref: "brand-string-light-dark" + } + }, + large: { + description: "A link or path to the brand's large- or full-sized logo, or a link or path to both the light and dark versions.\n", + schema: { + ref: "brand-string-light-dark" + } } } + } + }, + { + id: "brand-named-logo", + description: "Names of customizeable logos", + enum: [ + "small", + "medium", + "large" ] }, { @@ -11933,10 +11978,9 @@ try { object: { closed: true, properties: { - with: { + palette: { description: "The brand's custom color palette. Any number of colors can be defined, each color having a custom name.\n", object: { - closed: false, additionalProperties: { schema: { ref: "brand-color-value" @@ -12012,12 +12056,6 @@ try { ref: "brand-color-value" } }, - emphasis: { - description: "A color used to emphasize or highlight text or elements.\n", - schema: { - ref: "brand-color-value" - } - }, link: { description: "The color used for hyperlinks. If not defined, the `primary` color is used.\n", schema: { @@ -12054,7 +12092,6 @@ try { "danger", "light", "dark", - "emphasis", "link" ] }, @@ -12064,126 +12101,227 @@ try { object: { closed: true, properties: { - with: { + fonts: { description: "Font files and definitions for the brand.", - ref: "brand-font" + arrayOf: { + ref: "brand-font" + } }, base: { description: "The base font settings for the brand. These are used as the default for all text.\n", - ref: "brand-typography-options" + ref: "brand-typography-options-base" }, headings: { - description: "The font settings for headings.\n", - ref: "brand-typography-options-no-size" + description: "Settings for headings, or a string specifying the font family only.", + ref: "brand-typography-options-headings" }, monospace: { - description: "The font settings for monospace text. Color in this context refers to inline code.\n", - ref: "brand-typography-options" + description: "Settings for monospace text, or a string specifying the font family only.", + ref: "brand-typography-options-monospace" }, - emphasis: { - description: "The text properties used for emphasized (or emboldened) text.", - object: { - closed: true, - properties: { - weight: { - ref: "brand-font-weight" - }, - color: { - ref: "brand-maybe-named-color" - }, - "background-color": { - ref: "brand-maybe-named-color" - } - } - } + "monospace-inline": { + description: "Settings for inline code, or a string specifying the font family only.", + ref: "brand-typography-options-monospace-inline" + }, + "monospace-block": { + description: "Settings for code blocks, or a string specifying the font family only.", + ref: "brand-typography-options-monospace-block" }, link: { - description: "The text properties used for hyperlinks.", - object: { - closed: true, - properties: { - weight: { - ref: "brand-font-weight" - }, - decoration: "string", - color: { - schema: { - ref: "brand-maybe-named-color" - }, - default: "primary" - }, - "background-color": { - ref: "brand-maybe-named-color" - } + description: "Settings for links.", + ref: "brand-typography-options-link" + } + } + } + }, + { + id: "brand-typography-options-base", + description: "Base typographic options.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + "line-height": { + ref: "line-height-number-string" } } } } - } + ] }, { - id: "brand-typography-options", - description: "Typographic options.", - object: { - closed: true, - properties: { - family: "string", - size: "string", - "line-height": "string", - weight: { - ref: "brand-font-weight" - }, - style: { - ref: "brand-font-style" - }, - color: { - ref: "brand-maybe-named-color" - }, - "background-color": { - ref: "brand-maybe-named-color" + id: "brand-typography-options-headings", + description: "Typographic options for headings.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + weight: { + ref: "brand-font-weight" + }, + style: { + ref: "brand-font-style" + }, + color: { + ref: "brand-maybe-named-color" + }, + "line-height": { + ref: "line-height-number-string" + } + } } } - } + ] }, { - id: "brand-typography-options-no-size", - description: "Typographic options without a font size.", - object: { - closed: true, - properties: { - family: "string", - "line-height": "string", - weight: { - ref: "brand-font-weight" - }, - style: { - ref: "brand-font-style" - }, - color: { - ref: "brand-maybe-named-color" - }, - "background-color": { - ref: "brand-maybe-named-color" + id: "brand-typography-options-monospace", + description: "Typographic options for monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + } + } } } - } + ] + }, + { + id: "brand-typography-options-monospace-inline", + description: "Typographic options for inline monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + } + } + } + } + ] + }, + { + id: "line-height-number-string", + description: "Line height", + anyOf: [ + "number", + "string" + ] + }, + { + id: "brand-typography-options-monospace-block", + description: "Typographic options for block monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + family: "string", + size: "string", + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + }, + "line-height": { + ref: "line-height-number-string" + } + } + } + } + ] + }, + { + id: "brand-typography-options-link", + description: "Typographic options for inline monospace elements.", + anyOf: [ + "string", + { + object: { + closed: true, + properties: { + weight: { + ref: "brand-font-weight" + }, + color: { + ref: "brand-maybe-named-color" + }, + "background-color": { + ref: "brand-maybe-named-color" + }, + decoration: "string" + } + } + } + ] + }, + { + id: "brand-named-font", + description: "Names of customizeable fonts", + enum: [ + "base", + "headings", + "monospace" + ] }, { id: "brand-font", description: "Font files and definitions for the brand.", - arrayOf: { - anyOf: [ - { - ref: "brand-font-google" - }, - { - ref: "brand-font-file" - }, - { - ref: "brand-font-family" - } - ] - } + anyOf: [ + { + ref: "brand-font-google" + }, + { + ref: "brand-font-bunny" + }, + { + ref: "brand-font-file" + }, + { + ref: "brand-font-system" + }, + { + ref: "brand-font-common" + } + ] }, { id: "brand-font-weight", @@ -12197,7 +12335,20 @@ try { 600, 700, 800, - 900 + 900, + "thin", + "extra-light", + "ultra-light", + "light", + "normal", + "regular", + "medium", + "semi-bold", + "demi-bold", + "bold", + "extra-bold", + "ultra-bold", + "black" ], default: 400 }, @@ -12206,61 +12357,102 @@ try { description: "A font style.", enum: [ "normal", - "italic" + "italic", + "oblique" ], default: "normal" }, { - id: "brand-font-google", - description: "A Google Font definition.", + id: "brand-font-common", + schema: { + object: { + closed: true, + properties: { + family: { + description: "The font family name, which must match the name of the font on the foundry website.", + schema: "string" + }, + weight: { + description: "The font weights to include.", + maybeArrayOf: { + ref: "brand-font-weight" + }, + default: [ + 400, + 700 + ] + }, + style: { + description: "The font styles to include.", + maybeArrayOf: { + ref: "brand-font-style" + }, + default: [ + "normal", + "italic" + ] + }, + display: { + description: "The font display method, determines how a font face is font face is shown depending on its download status and readiness for use.\n", + enum: [ + "auto", + "block", + "swap", + "fallback", + "optional" + ], + default: "swap" + } + } + } + } + }, + { + id: "brand-font-system", + description: "A system font definition.", object: { + super: { + resolveRef: "brand-font-common" + }, closed: true, properties: { - google: { - anyOf: [ - "string", - { - object: { - closed: true, - properties: { - family: { - description: "The font family name, which must match the name of the font on Google Fonts.", - schema: "string" - }, - weight: { - description: "The font weights to include.", - maybeArrayOf: { - ref: "brand-font-weight" - }, - default: [ - 400, - 700 - ] - }, - style: { - description: "The font style to include.", - maybeArrayOf: { - ref: "brand-font-style" - }, - default: [ - "normal", - "italic" - ] - }, - display: { - description: "The font display method, determines how a font face is font face is shown depending on its download status and readiness for use.\n", - enum: [ - "auto", - "block", - "swap", - "fallback", - "optional" - ], - default: "swap" - } - } - } - } + source: { + enum: [ + "system" + ] + } + } + } + }, + { + id: "brand-font-google", + description: "A font definition from Google Fonts.", + object: { + super: { + resolveRef: "brand-font-common" + }, + closed: true, + properties: { + source: { + enum: [ + "google" + ] + } + } + } + }, + { + id: "brand-font-bunny", + description: "A font definition from fonts.bunny.net.", + object: { + super: { + resolveRef: "brand-font-common" + }, + closed: true, + properties: { + source: { + enum: [ + "bunny" ] } } @@ -12272,20 +12464,50 @@ try { object: { closed: true, properties: { + source: { + enum: [ + "file" + ] + }, family: { description: "The font family name.", schema: "string" }, files: { - maybeArrayOf: { + arrayOf: { anyOf: [ "path", - "string" + { + schema: { + object: { + properties: { + path: { + schema: "path", + description: "The path to the font file. This can be a local path or a URL.\n" + }, + weight: { + ref: "brand-font-weight" + }, + style: { + ref: "brand-font-style" + } + }, + required: [ + "path" + ] + } + } + } ] }, description: "The font files to include. These can be local or online. Local file paths should be relative to the `brand.yml` file. Online paths should be complete URLs.\n" } - } + }, + required: [ + "files", + "family", + "source" + ] } }, { @@ -12311,10 +12533,45 @@ try { ref: "brand-typography" }, defaults: { + ref: "brand-defaults" + } + } + } + }, + { + id: "brand-defaults", + object: { + properties: { + bootstrap: { + ref: "brand-defaults-bootstrap" + }, + quarto: { schema: "object" } } } + }, + { + id: "brand-defaults-bootstrap", + object: { + properties: { + defaults: { + schema: { + object: { + additionalProperties: { + schema: { + anyOf: [ + "string", + "boolean", + "number" + ] + } + } + } + } + } + } + } } ], "schema/document-about.yml": [ @@ -15360,7 +15617,7 @@ try { schema: "number", description: { short: "Target page width for output (used to compute columns widths for `layout` divs)\n", - long: "Target page width for output (used to compute columns widths for `layout` divs).\nDefaults to 6.5 inches, which corresponds to default letter page settings in \ndocx and odt.\n" + long: "Target body page width for output (used to compute columns widths for `layout` divs).\nDefaults to 6.5 inches, which corresponds to default letter page settings in \ndocx and odt (8.5 inches with 1 inch for each margins).\n" } }, { @@ -16423,6 +16680,19 @@ try { schema: "path", description: "Use the specified file as a style reference in producing a docx, \npptx, or odt file.\n" }, + { + name: "brand", + schema: { + anyOf: [ + "string", + "boolean", + { + ref: "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", tags: { @@ -17437,10 +17707,16 @@ try { name: "logo", tags: { formats: [ - "revealjs" + "revealjs", + "typst" + ] + }, + schema: { + anyOf: [ + "string", + "object" ] }, - schema: "path", description: "Logo image (placed in bottom right corner of slides)" }, { @@ -18148,6 +18424,17 @@ try { schema: "boolean", default: false, description: "Play a subtle sound when changing slides" + }, + { + name: "jump-to-slide", + tags: { + formats: [ + "revealjs" + ] + }, + schema: "boolean", + default: true, + description: "Deactivate jump to slide feature." } ], "schema/document-reveal-print.yml": [ @@ -18352,6 +18639,66 @@ try { } ] } + }, + { + name: "scroll-view", + description: "Control the scroll view feature of Revealjs", + tags: { + formats: [ + "revealjs" + ] + }, + schema: { + anyOf: [ + "boolean", + { + object: { + properties: { + activate: { + boolean: { + default: true, + description: "Activate scroll view by default for the presentation. Otherwise, it is manually avalaible by adding `?view=scroll` to url." + } + }, + progress: { + anyOf: [ + "boolean", + { + enum: [ + "auto" + ] + } + ], + default: "auto", + description: "Show the scrollbar while scrolling, hide while idle (default `auto`). Set to 'true' to always show, `false` to always hide." + }, + snap: { + enum: [ + "mandatory", + "proximity", + false + ], + default: "mandatory", + description: "When scrolling, it will automatically snap to the closest slide. Only snap when close to the top of a slide using `proximity`. Disable snapping altogether by setting to `false`.\n" + }, + layout: { + enum: [ + "compact", + "full" + ], + default: "full", + description: "By default each slide will be sized to be as tall as the viewport. If you prefer a more dense layout with multiple slides visible in parallel, set to `compact`.\n" + }, + "activation-width": { + number: { + description: "Control scroll view activation width. The scroll view is automatically unable when the viewport reaches mobile widths. Set to `0` to disable automatic scroll view.\n" + } + } + } + } + } + ] + } } ], "schema/document-reveal-transitions.yml": [ @@ -19000,7 +19347,7 @@ try { "$html-doc" ] }, - description: "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" + description: "Setting this to false prevents the `repo-actions` from appearing on this page." }, { name: "aliases", @@ -19601,6 +19948,9 @@ try { super: { resolveRef: "schema/base" }, + required: [ + "enum" + ], properties: { enum: { anyOf: [ @@ -19631,99 +19981,196 @@ try { }, { id: "schema/null", + anyOf: [ + { + enum: [ + "null" + ] + }, + { + object: { + closed: true, + required: [ + "null" + ], + properties: { + null: { + anyOf: [ + { + ref: "schema/base" + } + ] + } + } + } + } + ] + }, + { + id: "schema/explicit-schema", object: { closed: true, + required: [ + "schema" + ], super: { resolveRef: "schema/base" }, properties: { - null: { + schema: { ref: "schema/schema" } } } }, { - id: "schema/explicit-schema", + id: "schema/explicit-pattern-string", object: { closed: true, super: { resolveRef: "schema/base" }, + required: [ + "pattern" + ], properties: { - schema: { - ref: "schema/schema" + pattern: "string" + } + } + }, + { + id: "schema/string", + anyOf: [ + { + enum: [ + "string", + "path" + ] + }, + { + ref: "schema/explicit-pattern-string" + }, + { + object: { + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "path" + ], + properties: { + path: { + anyOf: [ + { + ref: "schema/explicit-pattern-string" + }, + { + ref: "schema/base" + } + ] + } + } + } + }, + { + object: { + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "string" + ], + properties: { + string: { + anyOf: [ + { + ref: "schema/explicit-pattern-string" + }, + { + ref: "schema/base" + } + ] + } + } + } + } + ] + }, + { + id: "schema/number", + anyOf: [ + { + enum: [ + "number" + ] + }, + { + object: { + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "number" + ], + properties: { + number: { + anyOf: [ + { + ref: "schema/schema" + }, + { + ref: "schema/base" + } + ] + } + } } } - } + ] }, { - id: "schema/string", + id: "schema/boolean", anyOf: [ { - object: { - closed: true, - super: { - resolveRef: "schema/base" - }, - properties: { - pattern: "string" - } - } + enum: [ + "boolean" + ] }, { object: { closed: true, + required: [ + "boolean" + ], super: { resolveRef: "schema/base" }, properties: { - string: { - ref: "schema/schema" - }, - path: { - ref: "schema/schema" - }, - pattern: { - ref: "schema/schema" + boolean: { + anyOf: [ + { + ref: "schema/schema" + }, + { + ref: "schema/base" + } + ] } } } } ] }, - { - id: "schema/number", - object: { - closed: true, - super: { - resolveRef: "schema/base" - }, - properties: { - number: { - ref: "schema/schema" - } - } - } - }, - { - id: "schema/boolean", - object: { - closed: true, - super: { - resolveRef: "schema/base" - }, - properties: { - boolean: { - ref: "schema/schema" - } - } - } - }, { id: "schema/resolve-ref", object: { closed: true, + required: [ + "resolveRef" + ], properties: { resolveRef: "string" } @@ -19733,6 +20180,9 @@ try { id: "schema/ref", object: { closed: true, + required: [ + "ref" + ], properties: { ref: "string", description: { @@ -19745,6 +20195,9 @@ try { id: "schema/maybe-array-of", object: { closed: true, + required: [ + "maybeArrayOf" + ], super: { resolveRef: "schema/base" }, @@ -19762,6 +20215,9 @@ try { super: { resolveRef: "schema/base" }, + required: [ + "arrayOf" + ], properties: { arrayOf: { anyOf: [ @@ -19794,6 +20250,9 @@ try { super: { resolveRef: "schema/base" }, + required: [ + "allOf" + ], properties: { allOf: { anyOf: [ @@ -19828,6 +20287,9 @@ try { super: { resolveRef: "schema/base" }, + required: [ + "anyOf" + ], properties: { anyOf: { anyOf: [ @@ -19862,6 +20324,9 @@ try { super: { resolveRef: "schema/base" }, + required: [ + "record" + ], properties: { record: { anyOf: [ @@ -19899,101 +20364,113 @@ try { }, { id: "schema/object", - object: { - closed: true, - super: { - resolveRef: "schema/base" + anyOf: [ + { + enum: [ + "object" + ] }, - properties: { + { object: { - object: { - super: { - resolveRef: "schema/base" - }, - closed: true, - properties: { - namingConvention: { - anyOf: [ - { - enum: [ - "ignore" + closed: true, + super: { + resolveRef: "schema/base" + }, + required: [ + "object" + ], + properties: { + object: { + object: { + super: { + resolveRef: "schema/base" + }, + closed: true, + properties: { + namingConvention: { + anyOf: [ + { + enum: [ + "ignore" + ] + }, + { + arrayOf: { + enum: [ + "camelCase", + "camel-case", + "camel_case", + "capitalizationCase", + "capitalization-case", + "capitalization_case", + "underscoreCase", + "underscore-case", + "underscore_case", + "snakeCase", + "snake-case", + "snake_case", + "dashCase", + "dash-case", + "dash_case", + "kebabCase", + "kebab-case", + "kebab_case" + ] + } + } ] }, - { - arrayOf: { - enum: [ - "camelCase", - "camel-case", - "camel_case", - "capitalizationCase", - "capitalization-case", - "capitalization_case", - "underscoreCase", - "underscore-case", - "underscore_case", - "snakeCase", - "snake-case", - "snake_case", - "dashCase", - "dash-case", - "dash_case", - "kebabCase", - "kebab-case", - "kebab_case" - ] + properties: { + object: { + additionalProperties: { + ref: "schema/schema" + } } - } - ] - }, - properties: { - object: { - additionalProperties: { + }, + patternProperties: { + object: { + additionalProperties: { + ref: "schema/schema" + } + } + }, + propertyNames: { ref: "schema/schema" - } - } - }, - patternProperties: { - object: { + }, additionalProperties: { ref: "schema/schema" - } - } - }, - propertyNames: { - ref: "schema/schema" - }, - additionalProperties: { - ref: "schema/schema" - }, - super: { - maybeArrayOf: { - ref: "schema/schema" - } - }, - required: { - anyOf: [ - { - enum: [ - "all" + }, + super: { + maybeArrayOf: { + ref: "schema/schema" + } + }, + required: { + anyOf: [ + { + enum: [ + "all" + ] + }, + { + arrayOf: "string" + } ] }, - { + closed: "boolean", + description: { + ref: "schema/description" + }, + completions: { arrayOf: "string" } - ] - }, - closed: "boolean", - description: { - ref: "schema/description" - }, - completions: { - arrayOf: "string" + } } } } } } - } + ] }, { id: "schema/schema", @@ -20042,13 +20519,7 @@ try { }, { enum: [ - "number", - "boolean", - "path", - "string", null, - "null", - "object", "any" ] } @@ -20101,6 +20572,7 @@ try { } ], "pandoc/formats.yml": [ + "ansi", "asciidoc", "asciidoc_legacy", "asciidoctor", @@ -21180,7 +21652,7 @@ try { "Short/abbreviated form of container-title;", "A minor contributor to the item; typically cited using \u201Cwith\u201D before\nthe name when listed in a bibliography.", "Curator of an exhibit or collection (e.g. in a museum).", - "Physical (e.g. size) or temporal (e.g. running time) dimensions of\nthe item.", + "Physical (e.g. size) or temporal (e.g.\uFFFD\uFFFDrunning time) dimensions of\nthe item.", "Director (e.g. of a film).", "Minor subdivision of a court with a jurisdiction for a\nlegal item", "(Container) edition holding the item (e.g. \u201C3\u201D when citing a chapter\nin the third edition of a book).", @@ -21352,16 +21824,20 @@ try { "Important links for the brand, including social media links. If a\nsingle string, it is the brand\u2019s home page or website. Additional fields\nare allowed for internal use.", "The brand\u2019s home page or website.", "The brand\u2019s Mastodon URL.", + "The brand\u2019s Bluesky URL.", "The brand\u2019s GitHub URL.", "The brand\u2019s LinkedIn URL.", "The brand\u2019s Twitter URL.", "The brand\u2019s Facebook URL.", "A link or path to the brand\u2019s light-colored logo or icon.", "A link or path to the brand\u2019s dark-colored logo or icon.", + "Alternative text for the logo, used for accessibility.", "Provide definitions and defaults for brand\u2019s logo in various formats\nand sizes.", + "A dictionary of named logo resources.", "A link or path to the brand\u2019s small-sized logo or icon, or a link or\npath to both the light and dark versions.", "A link or path to the brand\u2019s medium-sized logo, or a link or path to\nboth the light and dark versions.", "A link or path to the brand\u2019s large- or full-sized logo, or a link or\npath to both the light and dark versions.", + "Names of customizeable logos", "The brand\u2019s custom color palette and theme.", "The brand\u2019s custom color palette. Any number of colors can be\ndefined, each color having a custom name.", "The foreground color, used for text.", @@ -21375,30 +21851,51 @@ try { "The color used for errors, dangerous actions, or negative\ninformation.", "A bright color, used as a high-contrast foreground color on dark\nelements or low-contrast background color on light elements.", "A dark color, used as a high-contrast foreground color on light\nelements or high-contrast background color on light elements.", - "A color used to emphasize or highlight text or elements.", "The color used for hyperlinks. If not defined, the\nprimary color is used.", "A color, which may be a named brand color.", "A named brand color, taken either from color.theme or\ncolor.palette (in that order).", "Typography definitions for the brand.", "Font files and definitions for the brand.", "The base font settings for the brand. These are used as the default\nfor all text.", - "The font settings for headings.", - "The font settings for monospace text. Color in this context refers to\ninline code.", - "The text properties used for emphasized (or emboldened) text.", - "The text properties used for hyperlinks.", - "Typographic options.", - "Typographic options without a font size.", + "Settings for headings, or a string specifying the font family\nonly.", + "Settings for monospace text, or a string specifying the font family\nonly.", + "Settings for inline code, or a string specifying the font family\nonly.", + "Settings for code blocks, or a string specifying the font family\nonly.", + "Settings for links.", + "Base typographic options.", + "Typographic options for headings.", + "Typographic options for monospace elements.", + "Typographic options for inline monospace elements.", + "Line height", + "Typographic options for block monospace elements.", + "Typographic options for inline monospace elements.", + "Names of customizeable fonts", "Font files and definitions for the brand.", "A font weight.", "A font style.", - "A Google Font definition.", - "The font family name, which must match the name of the font on Google\nFonts.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A system font definition.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A font definition from Google Fonts.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A font definition from fonts.bunny.net.", + "The font family name, which must match the name of the font on the\nfoundry website.", "The font weights to include.", - "The font style to include.", + "The font styles to include.", "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", "A method for providing font files directly, either locally or from an\nonline location.", "The font family name.", "The font files to include. These can be local or online. Local file\npaths should be relative to the brand.yml file. Online\npaths should be complete URLs.", + "The path to the font file. This can be a local path or a URL.", "A locally-installed font family name. When used, the end-user is\nresponsible for ensuring that the font is installed on their system.", { short: "Unique label for code cell", @@ -21590,7 +22087,10 @@ try { short: "Location of output relative to the code that generated it\n(default, fragment, slide,\ncolumn, or column-location)", long: "Location of output relative to the code that generated it. The\npossible values are as follows:" }, - "Include messages in rendered output.", + { + short: "Include messages in rendered output.", + long: "Include messages in rendered output. Possible values are\ntrue, false, or NA. If\ntrue, messages are included in the output. If\nfalse, messages are not included. If NA,\nmessages are not included in output but shown in the knitr log to\nconsole." + }, { short: "How to display text results", long: "How to display text results. Note that this option only applies to\nnormal text output (not warnings, messages, or errors). The possible\nvalues are as follows:" @@ -22188,7 +22688,7 @@ try { "The page layout to use for this document (article,\nfull, or custom)", { short: "Target page width for output (used to compute columns widths for\nlayout divs)", - long: "Target page width for output (used to compute columns widths for\nlayout divs). Defaults to 6.5 inches, which corresponds to\ndefault letter page settings in docx and odt." + long: "Target body page width for output (used to compute columns widths for\nlayout divs). Defaults to 6.5 inches, which corresponds to\ndefault letter page settings in docx and odt (8.5 inches with 1 inch for\neach margins)." }, { short: "Properties of the grid system used to layout Quarto HTML pages.", @@ -22366,6 +22866,7 @@ try { }, "If true, force the presence of the OJS runtime. If\nfalse, force the absence instead. If unset, the OJS runtime\nis included only if OJS cells are present in the document.", "Use the specified file as a style reference in producing a docx,\npptx, or odt file.", + "Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline brand definition.", "Theme name, theme scss file, or a mix of both.", "The light theme name, theme scss file, or a mix of both.", "The light theme name, theme scss file, or a mix of both.", @@ -22615,6 +23116,7 @@ try { "Monitor the hash and change slides accordingly", "Include the current fragment in the URL", "Play a subtle sound when changing slides", + "Deactivate jump to slide feature.", { short: "Slides that are too tall to fit within a single page will expand onto\nmultiple pages", long: "Slides that are too tall to fit within a single page will expand onto\nmultiple pages. You can limit how many pages a slide may expand to using\nthis option." @@ -22642,6 +23144,12 @@ try { "Multiplex token server (defaults to Reveal-hosted server)", "Unique presentation id provided by multiplex token server", "Secret provided by multiplex token server", + "Control the scroll view feature of Revealjs", + "Activate scroll view by default for the presentation. Otherwise, it\nis manually avalaible by adding ?view=scroll to url.", + "Show the scrollbar while scrolling, hide while idle (default\nauto). Set to \u2018true\u2019 to always show, false to\nalways hide.", + "When scrolling, it will automatically snap to the closest slide. Only\nsnap when close to the top of a slide using proximity.\nDisable snapping altogether by setting to false.", + "By default each slide will be sized to be as tall as the viewport. If\nyou prefer a more dense layout with multiple slides visible in parallel,\nset to compact.", + "Control scroll view activation width. The scroll view is\nautomatically unable when the viewport reaches mobile widths. Set to\n0 to disable automatic scroll view.", { short: "Transition style for slides", long: "Transition style for slides backgrounds. (none,\nfade, slide, convex,\nconcave, or zoom)" @@ -23109,6 +23617,14 @@ try { "Disambiguating year suffix in author-date styles (e.g. \u201Ca\u201D in \u201CDoe,\n1999a\u201D).", "Manuscript configuration", "internal-schema-hack", + { + short: "Include an automatically generated table of contents", + long: "" + }, + { + short: "Use smart quotes in document output. Defaults to true.", + long: "" + }, "Project configuration.", "Project type (default, website,\nbook, or manuscript)", "Files to render (defaults to all files)", @@ -23681,12 +24197,12 @@ try { mermaid: "%%" }, "handlers/mermaid/schema.yml": { - _internalId: 187423, + _internalId: 194269, type: "object", description: "be an object", properties: { "mermaid-format": { - _internalId: 187415, + _internalId: 194261, type: "enum", enum: [ "png", @@ -23702,7 +24218,7 @@ try { exhaustiveCompletions: true }, theme: { - _internalId: 187422, + _internalId: 194268, type: "anyOf", anyOf: [ { @@ -23742,7 +24258,42 @@ try { "case-detection": true }, $id: "handlers/mermaid" - } + }, + "schema/document-typst.yml": [ + { + name: "page-numbering", + tags: { + formats: [ + "typst" + ] + }, + schema: { + anyOf: [ + "string", + { + enum: [ + false + ] + } + ] + }, + description: { + short: "Include an automatically generated table of contents" + } + }, + { + name: "smart", + tags: { + formats: [ + "typst" + ] + }, + schema: "boolean", + description: { + short: "Use smart quotes in document output. Defaults to true." + } + } + ] }; } }); @@ -23851,7 +24402,7 @@ try { try { return Deno.build.os !== "windows"; } catch (_e) { - return false; + return true; } } function tidyverseInfo(msg) { @@ -24280,8 +24831,8 @@ ${heading}`; }; } function mappedLines(str2, keepNewLines = false) { - const lines2 = rangedLines(str2.value, keepNewLines); - return lines2.map((v) => mappedString(str2, [v.range])); + const lines3 = rangedLines(str2.value, keepNewLines); + return lines3.map((v) => mappedString(str2, [v.range])); } // parsing.ts @@ -30408,7 +30959,17 @@ ${tidyverseInfo( `Expected a single result, got ${results.length} instead` ); } - JSON.stringify(results[0]); + try { + JSON.stringify(results[0]); + } catch (e) { + if (e.message.match("invalid string length")) { + } else if (e.message.match(/circular structure/)) { + throw new InternalError( + `Circular structure detected in parsed yaml: ${e.message}` + ); + } else { + } + } return postProcessAnnotation(results[0]); } function buildTreeSitterAnnotation(tree, mappedSource2) { @@ -33071,9 +33632,7 @@ ${tidyverseInfo( } else if (cell_type === "directive") { cell.source = mappedString(src, mappedChunks.slice(1, -1), fileName); } - if (mdTrimEmptyLines(lines(cell.sourceVerbatim.value)).length > 0 || cell.options !== void 0) { - nb.cells.push(cell); - } + nb.cells.push(cell); lineBuffer.splice(0, lineBuffer.length); } }; @@ -33135,24 +33694,6 @@ ${tidyverseInfo( await flushLineBuffer("markdown", srcLines.length); return nb; } - function mdTrimEmptyLines(lines2) { - const firstNonEmpty = lines2.findIndex((line) => line.trim().length > 0); - if (firstNonEmpty === -1) { - return []; - } - lines2 = lines2.slice(firstNonEmpty); - let lastNonEmpty = -1; - for (let i = lines2.length - 1; i >= 0; i--) { - if (lines2[i].trim().length > 0) { - lastNonEmpty = i; - break; - } - } - if (lastNonEmpty > -1) { - lines2 = lines2.slice(0, lastNonEmpty + 1); - } - return lines2; - } // ../yaml-schema/format-aliases.ts var formatAliases = void 0; @@ -33448,6 +33989,11 @@ ${tidyverseInfo( } } + // ../yaml-schema/brand.ts + var getBrandConfigSchema = async () => { + return refSchema("brand", ""); + }; + // yaml-intelligence.ts function getTagValue(schema2, tag) { if (schema2 === true || schema2 === false) { @@ -33974,7 +34520,6 @@ ${tidyverseInfo( return size; }; if (kind === "completions") { - debugger; let foundCell = void 0; for (const cell of result.cells) { const size = lines((cell.sourceWithYaml || cell.source).value).length; @@ -34177,7 +34722,19 @@ ${tidyverseInfo( schema: extensionConfigSchema, schemaName: "extension-config" }; - } else { + } + const brandYamlNames = [ + "_brand.yml", + "_brand.yaml" + ]; + if (context.path && brandYamlNames.some((name) => context.path.endsWith(name))) { + const brandYamlSchema = await getBrandConfigSchema(); + return { + schema: brandYamlSchema, + schemaName: "brand" + }; + } + { const projectConfigSchema = await getProjectConfigSchema(); return { schema: projectConfigSchema, diff --git a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json index 64dba8c707c..b37443e99fe 100644 --- a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json +++ b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json @@ -1192,9 +1192,18 @@ "tags": { "engine": "knitr" }, - "schema": "boolean", + "schema": { + "enum": [ + true, + false, + "NA" + ] + }, "default": true, - "description": "Include messages in rendered output." + "description": { + "short": "Include messages in rendered output.", + "long": "Include messages in rendered output. Possible values are `true`, `false`, or `NA`. \nIf `true`, messages are included in the output. If `false`, messages are not included. \nIf `NA`, messages are not included in output but shown in the knitr log to console.\n" + } }, { "name": "results", @@ -1427,6 +1436,7 @@ "page", "page-left", "page-right", + "page-inset", "page-inset-left", "page-inset-right", "screen", @@ -4802,6 +4812,11 @@ "description": "The brand's Mastodon URL." } }, + "bluesky": { + "string": { + "description": "The brand's Bluesky URL." + } + }, "github": { "string": { "description": "The brand's GitHub URL." @@ -4852,46 +4867,76 @@ ] }, { - "id": "brand-logo", - "description": "Provide definitions and defaults for brand's logo in various formats and sizes.\n", + "id": "brand-logo-explicit-resource", + "object": { + "closed": true, + "properties": { + "path": "path", + "alt": { + "schema": "string", + "description": "Alternative text for the logo, used for accessibility.\n" + } + }, + "required": [ + "path" + ] + } + }, + { + "id": "brand-logo-resource", "anyOf": [ "string", { - "object": { - "closed": true, - "properties": { - "with": { - "schema": { - "object": { - "additionalProperties": { - "schema": { - "ref": "brand-string-light-dark" - } - } + "ref": "brand-logo-explicit-resource" + } + ] + }, + { + "id": "brand-logo", + "description": "Provide definitions and defaults for brand's logo in various formats and sizes.\n", + "object": { + "closed": true, + "properties": { + "images": { + "description": "A dictionary of named logo resources.", + "schema": { + "object": { + "additionalProperties": { + "schema": { + "ref": "brand-logo-resource" } } - }, - "small": { - "description": "A link or path to the brand's small-sized logo or icon, or a link or path to both the light and dark versions.\n", - "schema": { - "ref": "brand-string-light-dark" - } - }, - "medium": { - "description": "A link or path to the brand's medium-sized logo, or a link or path to both the light and dark versions.\n", - "schema": { - "ref": "brand-string-light-dark" - } - }, - "large": { - "description": "A link or path to the brand's large- or full-sized logo, or a link or path to both the light and dark versions.\n", - "schema": { - "ref": "brand-string-light-dark" - } } } + }, + "small": { + "description": "A link or path to the brand's small-sized logo or icon, or a link or path to both the light and dark versions.\n", + "schema": { + "ref": "brand-string-light-dark" + } + }, + "medium": { + "description": "A link or path to the brand's medium-sized logo, or a link or path to both the light and dark versions.\n", + "schema": { + "ref": "brand-string-light-dark" + } + }, + "large": { + "description": "A link or path to the brand's large- or full-sized logo, or a link or path to both the light and dark versions.\n", + "schema": { + "ref": "brand-string-light-dark" + } } } + } + }, + { + "id": "brand-named-logo", + "description": "Names of customizeable logos", + "enum": [ + "small", + "medium", + "large" ] }, { @@ -4904,10 +4949,9 @@ "object": { "closed": true, "properties": { - "with": { + "palette": { "description": "The brand's custom color palette. Any number of colors can be defined, each color having a custom name.\n", "object": { - "closed": false, "additionalProperties": { "schema": { "ref": "brand-color-value" @@ -4983,12 +5027,6 @@ "ref": "brand-color-value" } }, - "emphasis": { - "description": "A color used to emphasize or highlight text or elements.\n", - "schema": { - "ref": "brand-color-value" - } - }, "link": { "description": "The color used for hyperlinks. If not defined, the `primary` color is used.\n", "schema": { @@ -5025,7 +5063,6 @@ "danger", "light", "dark", - "emphasis", "link" ] }, @@ -5035,126 +5072,227 @@ "object": { "closed": true, "properties": { - "with": { + "fonts": { "description": "Font files and definitions for the brand.", - "ref": "brand-font" + "arrayOf": { + "ref": "brand-font" + } }, "base": { "description": "The base font settings for the brand. These are used as the default for all text.\n", - "ref": "brand-typography-options" + "ref": "brand-typography-options-base" }, "headings": { - "description": "The font settings for headings.\n", - "ref": "brand-typography-options-no-size" + "description": "Settings for headings, or a string specifying the font family only.", + "ref": "brand-typography-options-headings" }, "monospace": { - "description": "The font settings for monospace text. Color in this context refers to inline code.\n", - "ref": "brand-typography-options" + "description": "Settings for monospace text, or a string specifying the font family only.", + "ref": "brand-typography-options-monospace" }, - "emphasis": { - "description": "The text properties used for emphasized (or emboldened) text.", - "object": { - "closed": true, - "properties": { - "weight": { - "ref": "brand-font-weight" - }, - "color": { - "ref": "brand-maybe-named-color" - }, - "background-color": { - "ref": "brand-maybe-named-color" - } - } - } + "monospace-inline": { + "description": "Settings for inline code, or a string specifying the font family only.", + "ref": "brand-typography-options-monospace-inline" + }, + "monospace-block": { + "description": "Settings for code blocks, or a string specifying the font family only.", + "ref": "brand-typography-options-monospace-block" }, "link": { - "description": "The text properties used for hyperlinks.", - "object": { - "closed": true, - "properties": { - "weight": { - "ref": "brand-font-weight" - }, - "decoration": "string", - "color": { - "schema": { - "ref": "brand-maybe-named-color" - }, - "default": "primary" - }, - "background-color": { - "ref": "brand-maybe-named-color" - } + "description": "Settings for links.", + "ref": "brand-typography-options-link" + } + } + } + }, + { + "id": "brand-typography-options-base", + "description": "Base typographic options.", + "anyOf": [ + "string", + { + "object": { + "closed": true, + "properties": { + "family": "string", + "size": "string", + "weight": { + "ref": "brand-font-weight" + }, + "line-height": { + "ref": "line-height-number-string" } } } } - } + ] }, { - "id": "brand-typography-options", - "description": "Typographic options.", - "object": { - "closed": true, - "properties": { - "family": "string", - "size": "string", - "line-height": "string", - "weight": { - "ref": "brand-font-weight" - }, - "style": { - "ref": "brand-font-style" - }, - "color": { - "ref": "brand-maybe-named-color" - }, - "background-color": { - "ref": "brand-maybe-named-color" + "id": "brand-typography-options-headings", + "description": "Typographic options for headings.", + "anyOf": [ + "string", + { + "object": { + "closed": true, + "properties": { + "family": "string", + "weight": { + "ref": "brand-font-weight" + }, + "style": { + "ref": "brand-font-style" + }, + "color": { + "ref": "brand-maybe-named-color" + }, + "line-height": { + "ref": "line-height-number-string" + } + } } } - } + ] }, { - "id": "brand-typography-options-no-size", - "description": "Typographic options without a font size.", - "object": { - "closed": true, - "properties": { - "family": "string", - "line-height": "string", - "weight": { - "ref": "brand-font-weight" - }, - "style": { - "ref": "brand-font-style" - }, - "color": { - "ref": "brand-maybe-named-color" - }, - "background-color": { - "ref": "brand-maybe-named-color" + "id": "brand-typography-options-monospace", + "description": "Typographic options for monospace elements.", + "anyOf": [ + "string", + { + "object": { + "closed": true, + "properties": { + "family": "string", + "size": "string", + "weight": { + "ref": "brand-font-weight" + }, + "color": { + "ref": "brand-maybe-named-color" + }, + "background-color": { + "ref": "brand-maybe-named-color" + } + } } } - } + ] + }, + { + "id": "brand-typography-options-monospace-inline", + "description": "Typographic options for inline monospace elements.", + "anyOf": [ + "string", + { + "object": { + "closed": true, + "properties": { + "family": "string", + "size": "string", + "weight": { + "ref": "brand-font-weight" + }, + "color": { + "ref": "brand-maybe-named-color" + }, + "background-color": { + "ref": "brand-maybe-named-color" + } + } + } + } + ] + }, + { + "id": "line-height-number-string", + "description": "Line height", + "anyOf": [ + "number", + "string" + ] + }, + { + "id": "brand-typography-options-monospace-block", + "description": "Typographic options for block monospace elements.", + "anyOf": [ + "string", + { + "object": { + "closed": true, + "properties": { + "family": "string", + "size": "string", + "weight": { + "ref": "brand-font-weight" + }, + "color": { + "ref": "brand-maybe-named-color" + }, + "background-color": { + "ref": "brand-maybe-named-color" + }, + "line-height": { + "ref": "line-height-number-string" + } + } + } + } + ] + }, + { + "id": "brand-typography-options-link", + "description": "Typographic options for inline monospace elements.", + "anyOf": [ + "string", + { + "object": { + "closed": true, + "properties": { + "weight": { + "ref": "brand-font-weight" + }, + "color": { + "ref": "brand-maybe-named-color" + }, + "background-color": { + "ref": "brand-maybe-named-color" + }, + "decoration": "string" + } + } + } + ] + }, + { + "id": "brand-named-font", + "description": "Names of customizeable fonts", + "enum": [ + "base", + "headings", + "monospace" + ] }, { "id": "brand-font", "description": "Font files and definitions for the brand.", - "arrayOf": { - "anyOf": [ - { - "ref": "brand-font-google" - }, - { - "ref": "brand-font-file" - }, - { - "ref": "brand-font-family" - } - ] - } + "anyOf": [ + { + "ref": "brand-font-google" + }, + { + "ref": "brand-font-bunny" + }, + { + "ref": "brand-font-file" + }, + { + "ref": "brand-font-system" + }, + { + "ref": "brand-font-common" + } + ] }, { "id": "brand-font-weight", @@ -5168,7 +5306,20 @@ 600, 700, 800, - 900 + 900, + "thin", + "extra-light", + "ultra-light", + "light", + "normal", + "regular", + "medium", + "semi-bold", + "demi-bold", + "bold", + "extra-bold", + "ultra-bold", + "black" ], "default": 400 }, @@ -5177,61 +5328,102 @@ "description": "A font style.", "enum": [ "normal", - "italic" + "italic", + "oblique" ], "default": "normal" }, + { + "id": "brand-font-common", + "schema": { + "object": { + "closed": true, + "properties": { + "family": { + "description": "The font family name, which must match the name of the font on the foundry website.", + "schema": "string" + }, + "weight": { + "description": "The font weights to include.", + "maybeArrayOf": { + "ref": "brand-font-weight" + }, + "default": [ + 400, + 700 + ] + }, + "style": { + "description": "The font styles to include.", + "maybeArrayOf": { + "ref": "brand-font-style" + }, + "default": [ + "normal", + "italic" + ] + }, + "display": { + "description": "The font display method, determines how a font face is font face is shown depending on its download status and readiness for use.\n", + "enum": [ + "auto", + "block", + "swap", + "fallback", + "optional" + ], + "default": "swap" + } + } + } + } + }, + { + "id": "brand-font-system", + "description": "A system font definition.", + "object": { + "super": { + "resolveRef": "brand-font-common" + }, + "closed": true, + "properties": { + "source": { + "enum": [ + "system" + ] + } + } + } + }, { "id": "brand-font-google", - "description": "A Google Font definition.", + "description": "A font definition from Google Fonts.", "object": { + "super": { + "resolveRef": "brand-font-common" + }, "closed": true, "properties": { - "google": { - "anyOf": [ - "string", - { - "object": { - "closed": true, - "properties": { - "family": { - "description": "The font family name, which must match the name of the font on Google Fonts.", - "schema": "string" - }, - "weight": { - "description": "The font weights to include.", - "maybeArrayOf": { - "ref": "brand-font-weight" - }, - "default": [ - 400, - 700 - ] - }, - "style": { - "description": "The font style to include.", - "maybeArrayOf": { - "ref": "brand-font-style" - }, - "default": [ - "normal", - "italic" - ] - }, - "display": { - "description": "The font display method, determines how a font face is font face is shown depending on its download status and readiness for use.\n", - "enum": [ - "auto", - "block", - "swap", - "fallback", - "optional" - ], - "default": "swap" - } - } - } - } + "source": { + "enum": [ + "google" + ] + } + } + } + }, + { + "id": "brand-font-bunny", + "description": "A font definition from fonts.bunny.net.", + "object": { + "super": { + "resolveRef": "brand-font-common" + }, + "closed": true, + "properties": { + "source": { + "enum": [ + "bunny" ] } } @@ -5243,20 +5435,50 @@ "object": { "closed": true, "properties": { + "source": { + "enum": [ + "file" + ] + }, "family": { "description": "The font family name.", "schema": "string" }, "files": { - "maybeArrayOf": { + "arrayOf": { "anyOf": [ "path", - "string" + { + "schema": { + "object": { + "properties": { + "path": { + "schema": "path", + "description": "The path to the font file. This can be a local path or a URL.\n" + }, + "weight": { + "ref": "brand-font-weight" + }, + "style": { + "ref": "brand-font-style" + } + }, + "required": [ + "path" + ] + } + } + } ] }, "description": "The font files to include. These can be local or online. Local file paths should be relative to the `brand.yml` file. Online paths should be complete URLs.\n" } - } + }, + "required": [ + "files", + "family", + "source" + ] } }, { @@ -5282,10 +5504,45 @@ "ref": "brand-typography" }, "defaults": { + "ref": "brand-defaults" + } + } + } + }, + { + "id": "brand-defaults", + "object": { + "properties": { + "bootstrap": { + "ref": "brand-defaults-bootstrap" + }, + "quarto": { "schema": "object" } } } + }, + { + "id": "brand-defaults-bootstrap", + "object": { + "properties": { + "defaults": { + "schema": { + "object": { + "additionalProperties": { + "schema": { + "anyOf": [ + "string", + "boolean", + "number" + ] + } + } + } + } + } + } + } } ], "schema/document-about.yml": [ @@ -8331,7 +8588,7 @@ "schema": "number", "description": { "short": "Target page width for output (used to compute columns widths for `layout` divs)\n", - "long": "Target page width for output (used to compute columns widths for `layout` divs).\nDefaults to 6.5 inches, which corresponds to default letter page settings in \ndocx and odt.\n" + "long": "Target body page width for output (used to compute columns widths for `layout` divs).\nDefaults to 6.5 inches, which corresponds to default letter page settings in \ndocx and odt (8.5 inches with 1 inch for each margins).\n" } }, { @@ -9394,6 +9651,19 @@ "schema": "path", "description": "Use the specified file as a style reference in producing a docx, \npptx, or odt file.\n" }, + { + "name": "brand", + "schema": { + "anyOf": [ + "string", + "boolean", + { + "ref": "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", "tags": { @@ -10408,10 +10678,16 @@ "name": "logo", "tags": { "formats": [ - "revealjs" + "revealjs", + "typst" + ] + }, + "schema": { + "anyOf": [ + "string", + "object" ] }, - "schema": "path", "description": "Logo image (placed in bottom right corner of slides)" }, { @@ -11119,6 +11395,17 @@ "schema": "boolean", "default": false, "description": "Play a subtle sound when changing slides" + }, + { + "name": "jump-to-slide", + "tags": { + "formats": [ + "revealjs" + ] + }, + "schema": "boolean", + "default": true, + "description": "Deactivate jump to slide feature." } ], "schema/document-reveal-print.yml": [ @@ -11323,6 +11610,66 @@ } ] } + }, + { + "name": "scroll-view", + "description": "Control the scroll view feature of Revealjs", + "tags": { + "formats": [ + "revealjs" + ] + }, + "schema": { + "anyOf": [ + "boolean", + { + "object": { + "properties": { + "activate": { + "boolean": { + "default": true, + "description": "Activate scroll view by default for the presentation. Otherwise, it is manually avalaible by adding `?view=scroll` to url." + } + }, + "progress": { + "anyOf": [ + "boolean", + { + "enum": [ + "auto" + ] + } + ], + "default": "auto", + "description": "Show the scrollbar while scrolling, hide while idle (default `auto`). Set to 'true' to always show, `false` to always hide." + }, + "snap": { + "enum": [ + "mandatory", + "proximity", + false + ], + "default": "mandatory", + "description": "When scrolling, it will automatically snap to the closest slide. Only snap when close to the top of a slide using `proximity`. Disable snapping altogether by setting to `false`.\n" + }, + "layout": { + "enum": [ + "compact", + "full" + ], + "default": "full", + "description": "By default each slide will be sized to be as tall as the viewport. If you prefer a more dense layout with multiple slides visible in parallel, set to `compact`.\n" + }, + "activation-width": { + "number": { + "description": "Control scroll view activation width. The scroll view is automatically unable when the viewport reaches mobile widths. Set to `0` to disable automatic scroll view.\n" + } + } + } + } + } + ] + } } ], "schema/document-reveal-transitions.yml": [ @@ -11971,7 +12318,7 @@ "$html-doc" ] }, - "description": "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" + "description": "Setting this to false prevents the `repo-actions` from appearing on this page." }, { "name": "aliases", @@ -12572,6 +12919,9 @@ "super": { "resolveRef": "schema/base" }, + "required": [ + "enum" + ], "properties": { "enum": { "anyOf": [ @@ -12602,43 +12952,95 @@ }, { "id": "schema/null", + "anyOf": [ + { + "enum": [ + "null" + ] + }, + { + "object": { + "closed": true, + "required": [ + "null" + ], + "properties": { + "null": { + "anyOf": [ + { + "ref": "schema/base" + } + ] + } + } + } + } + ] + }, + { + "id": "schema/explicit-schema", "object": { "closed": true, + "required": [ + "schema" + ], "super": { "resolveRef": "schema/base" }, "properties": { - "null": { + "schema": { "ref": "schema/schema" } } } }, { - "id": "schema/explicit-schema", + "id": "schema/explicit-pattern-string", "object": { "closed": true, "super": { "resolveRef": "schema/base" }, + "required": [ + "pattern" + ], "properties": { - "schema": { - "ref": "schema/schema" - } + "pattern": "string" } } }, { "id": "schema/string", "anyOf": [ + { + "enum": [ + "string", + "path" + ] + }, + { + "ref": "schema/explicit-pattern-string" + }, { "object": { "closed": true, "super": { "resolveRef": "schema/base" }, + "required": [ + "path" + ], "properties": { - "pattern": "string" + "path": { + "anyOf": [ + { + "ref": "schema/explicit-pattern-string" + }, + { + "ref": "schema/base" + } + ] + } } } }, @@ -12648,15 +13050,19 @@ "super": { "resolveRef": "schema/base" }, + "required": [ + "string" + ], "properties": { "string": { - "ref": "schema/schema" - }, - "path": { - "ref": "schema/schema" - }, - "pattern": { - "ref": "schema/schema" + "anyOf": [ + { + "ref": "schema/explicit-pattern-string" + }, + { + "ref": "schema/base" + } + ] } } } @@ -12665,36 +13071,77 @@ }, { "id": "schema/number", - "object": { - "closed": true, - "super": { - "resolveRef": "schema/base" + "anyOf": [ + { + "enum": [ + "number" + ] }, - "properties": { - "number": { - "ref": "schema/schema" + { + "object": { + "closed": true, + "super": { + "resolveRef": "schema/base" + }, + "required": [ + "number" + ], + "properties": { + "number": { + "anyOf": [ + { + "ref": "schema/schema" + }, + { + "ref": "schema/base" + } + ] + } + } } } - } + ] }, { "id": "schema/boolean", - "object": { - "closed": true, - "super": { - "resolveRef": "schema/base" + "anyOf": [ + { + "enum": [ + "boolean" + ] }, - "properties": { - "boolean": { - "ref": "schema/schema" + { + "object": { + "closed": true, + "required": [ + "boolean" + ], + "super": { + "resolveRef": "schema/base" + }, + "properties": { + "boolean": { + "anyOf": [ + { + "ref": "schema/schema" + }, + { + "ref": "schema/base" + } + ] + } + } } } - } + ] }, { "id": "schema/resolve-ref", "object": { "closed": true, + "required": [ + "resolveRef" + ], "properties": { "resolveRef": "string" } @@ -12704,6 +13151,9 @@ "id": "schema/ref", "object": { "closed": true, + "required": [ + "ref" + ], "properties": { "ref": "string", "description": { @@ -12716,6 +13166,9 @@ "id": "schema/maybe-array-of", "object": { "closed": true, + "required": [ + "maybeArrayOf" + ], "super": { "resolveRef": "schema/base" }, @@ -12733,6 +13186,9 @@ "super": { "resolveRef": "schema/base" }, + "required": [ + "arrayOf" + ], "properties": { "arrayOf": { "anyOf": [ @@ -12765,6 +13221,9 @@ "super": { "resolveRef": "schema/base" }, + "required": [ + "allOf" + ], "properties": { "allOf": { "anyOf": [ @@ -12799,6 +13258,9 @@ "super": { "resolveRef": "schema/base" }, + "required": [ + "anyOf" + ], "properties": { "anyOf": { "anyOf": [ @@ -12833,6 +13295,9 @@ "super": { "resolveRef": "schema/base" }, + "required": [ + "record" + ], "properties": { "record": { "anyOf": [ @@ -12870,101 +13335,113 @@ }, { "id": "schema/object", - "object": { - "closed": true, - "super": { - "resolveRef": "schema/base" + "anyOf": [ + { + "enum": [ + "object" + ] }, - "properties": { + { "object": { - "object": { - "super": { - "resolveRef": "schema/base" - }, - "closed": true, - "properties": { - "namingConvention": { - "anyOf": [ - { - "enum": [ - "ignore" + "closed": true, + "super": { + "resolveRef": "schema/base" + }, + "required": [ + "object" + ], + "properties": { + "object": { + "object": { + "super": { + "resolveRef": "schema/base" + }, + "closed": true, + "properties": { + "namingConvention": { + "anyOf": [ + { + "enum": [ + "ignore" + ] + }, + { + "arrayOf": { + "enum": [ + "camelCase", + "camel-case", + "camel_case", + "capitalizationCase", + "capitalization-case", + "capitalization_case", + "underscoreCase", + "underscore-case", + "underscore_case", + "snakeCase", + "snake-case", + "snake_case", + "dashCase", + "dash-case", + "dash_case", + "kebabCase", + "kebab-case", + "kebab_case" + ] + } + } ] }, - { - "arrayOf": { - "enum": [ - "camelCase", - "camel-case", - "camel_case", - "capitalizationCase", - "capitalization-case", - "capitalization_case", - "underscoreCase", - "underscore-case", - "underscore_case", - "snakeCase", - "snake-case", - "snake_case", - "dashCase", - "dash-case", - "dash_case", - "kebabCase", - "kebab-case", - "kebab_case" - ] + "properties": { + "object": { + "additionalProperties": { + "ref": "schema/schema" + } } - } - ] - }, - "properties": { - "object": { - "additionalProperties": { + }, + "patternProperties": { + "object": { + "additionalProperties": { + "ref": "schema/schema" + } + } + }, + "propertyNames": { "ref": "schema/schema" - } - } - }, - "patternProperties": { - "object": { + }, "additionalProperties": { "ref": "schema/schema" - } - } - }, - "propertyNames": { - "ref": "schema/schema" - }, - "additionalProperties": { - "ref": "schema/schema" - }, - "super": { - "maybeArrayOf": { - "ref": "schema/schema" - } - }, - "required": { - "anyOf": [ - { - "enum": [ - "all" + }, + "super": { + "maybeArrayOf": { + "ref": "schema/schema" + } + }, + "required": { + "anyOf": [ + { + "enum": [ + "all" + ] + }, + { + "arrayOf": "string" + } ] }, - { + "closed": "boolean", + "description": { + "ref": "schema/description" + }, + "completions": { "arrayOf": "string" } - ] - }, - "closed": "boolean", - "description": { - "ref": "schema/description" - }, - "completions": { - "arrayOf": "string" + } } } } } } - } + ] }, { "id": "schema/schema", @@ -13013,13 +13490,7 @@ }, { "enum": [ - "number", - "boolean", - "path", - "string", null, - "null", - "object", "any" ] } @@ -13072,6 +13543,7 @@ } ], "pandoc/formats.yml": [ + "ansi", "asciidoc", "asciidoc_legacy", "asciidoctor", @@ -14151,7 +14623,7 @@ "Short/abbreviated form of container-title;", "A minor contributor to the item; typically cited using “with” before\nthe name when listed in a bibliography.", "Curator of an exhibit or collection (e.g. in a museum).", - "Physical (e.g. size) or temporal (e.g. running time) dimensions of\nthe item.", + "Physical (e.g. size) or temporal (e.g.��running time) dimensions of\nthe item.", "Director (e.g. of a film).", "Minor subdivision of a court with a jurisdiction for a\nlegal item", "(Container) edition holding the item (e.g. “3” when citing a chapter\nin the third edition of a book).", @@ -14323,16 +14795,20 @@ "Important links for the brand, including social media links. If a\nsingle string, it is the brand’s home page or website. Additional fields\nare allowed for internal use.", "The brand’s home page or website.", "The brand’s Mastodon URL.", + "The brand’s Bluesky URL.", "The brand’s GitHub URL.", "The brand’s LinkedIn URL.", "The brand’s Twitter URL.", "The brand’s Facebook URL.", "A link or path to the brand’s light-colored logo or icon.", "A link or path to the brand’s dark-colored logo or icon.", + "Alternative text for the logo, used for accessibility.", "Provide definitions and defaults for brand’s logo in various formats\nand sizes.", + "A dictionary of named logo resources.", "A link or path to the brand’s small-sized logo or icon, or a link or\npath to both the light and dark versions.", "A link or path to the brand’s medium-sized logo, or a link or path to\nboth the light and dark versions.", "A link or path to the brand’s large- or full-sized logo, or a link or\npath to both the light and dark versions.", + "Names of customizeable logos", "The brand’s custom color palette and theme.", "The brand’s custom color palette. Any number of colors can be\ndefined, each color having a custom name.", "The foreground color, used for text.", @@ -14346,30 +14822,51 @@ "The color used for errors, dangerous actions, or negative\ninformation.", "A bright color, used as a high-contrast foreground color on dark\nelements or low-contrast background color on light elements.", "A dark color, used as a high-contrast foreground color on light\nelements or high-contrast background color on light elements.", - "A color used to emphasize or highlight text or elements.", "The color used for hyperlinks. If not defined, the\nprimary color is used.", "A color, which may be a named brand color.", "A named brand color, taken either from color.theme or\ncolor.palette (in that order).", "Typography definitions for the brand.", "Font files and definitions for the brand.", "The base font settings for the brand. These are used as the default\nfor all text.", - "The font settings for headings.", - "The font settings for monospace text. Color in this context refers to\ninline code.", - "The text properties used for emphasized (or emboldened) text.", - "The text properties used for hyperlinks.", - "Typographic options.", - "Typographic options without a font size.", + "Settings for headings, or a string specifying the font family\nonly.", + "Settings for monospace text, or a string specifying the font family\nonly.", + "Settings for inline code, or a string specifying the font family\nonly.", + "Settings for code blocks, or a string specifying the font family\nonly.", + "Settings for links.", + "Base typographic options.", + "Typographic options for headings.", + "Typographic options for monospace elements.", + "Typographic options for inline monospace elements.", + "Line height", + "Typographic options for block monospace elements.", + "Typographic options for inline monospace elements.", + "Names of customizeable fonts", "Font files and definitions for the brand.", "A font weight.", "A font style.", - "A Google Font definition.", - "The font family name, which must match the name of the font on Google\nFonts.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A system font definition.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A font definition from Google Fonts.", + "The font family name, which must match the name of the font on the\nfoundry website.", + "The font weights to include.", + "The font styles to include.", + "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", + "A font definition from fonts.bunny.net.", + "The font family name, which must match the name of the font on the\nfoundry website.", "The font weights to include.", - "The font style to include.", + "The font styles to include.", "The font display method, determines how a font face is font face is\nshown depending on its download status and readiness for use.", "A method for providing font files directly, either locally or from an\nonline location.", "The font family name.", "The font files to include. These can be local or online. Local file\npaths should be relative to the brand.yml file. Online\npaths should be complete URLs.", + "The path to the font file. This can be a local path or a URL.", "A locally-installed font family name. When used, the end-user is\nresponsible for ensuring that the font is installed on their system.", { "short": "Unique label for code cell", @@ -14561,7 +15058,10 @@ "short": "Location of output relative to the code that generated it\n(default, fragment, slide,\ncolumn, or column-location)", "long": "Location of output relative to the code that generated it. The\npossible values are as follows:" }, - "Include messages in rendered output.", + { + "short": "Include messages in rendered output.", + "long": "Include messages in rendered output. Possible values are\ntrue, false, or NA. If\ntrue, messages are included in the output. If\nfalse, messages are not included. If NA,\nmessages are not included in output but shown in the knitr log to\nconsole." + }, { "short": "How to display text results", "long": "How to display text results. Note that this option only applies to\nnormal text output (not warnings, messages, or errors). The possible\nvalues are as follows:" @@ -15159,7 +15659,7 @@ "The page layout to use for this document (article,\nfull, or custom)", { "short": "Target page width for output (used to compute columns widths for\nlayout divs)", - "long": "Target page width for output (used to compute columns widths for\nlayout divs). Defaults to 6.5 inches, which corresponds to\ndefault letter page settings in docx and odt." + "long": "Target body page width for output (used to compute columns widths for\nlayout divs). Defaults to 6.5 inches, which corresponds to\ndefault letter page settings in docx and odt (8.5 inches with 1 inch for\neach margins)." }, { "short": "Properties of the grid system used to layout Quarto HTML pages.", @@ -15337,6 +15837,7 @@ }, "If true, force the presence of the OJS runtime. If\nfalse, force the absence instead. If unset, the OJS runtime\nis included only if OJS cells are present in the document.", "Use the specified file as a style reference in producing a docx,\npptx, or odt file.", + "Branding information to use for this document. If a string, the path\nto a brand file. If false, don’t use branding on this document. If an\nobject, an inline brand definition.", "Theme name, theme scss file, or a mix of both.", "The light theme name, theme scss file, or a mix of both.", "The light theme name, theme scss file, or a mix of both.", @@ -15586,6 +16087,7 @@ "Monitor the hash and change slides accordingly", "Include the current fragment in the URL", "Play a subtle sound when changing slides", + "Deactivate jump to slide feature.", { "short": "Slides that are too tall to fit within a single page will expand onto\nmultiple pages", "long": "Slides that are too tall to fit within a single page will expand onto\nmultiple pages. You can limit how many pages a slide may expand to using\nthis option." @@ -15613,6 +16115,12 @@ "Multiplex token server (defaults to Reveal-hosted server)", "Unique presentation id provided by multiplex token server", "Secret provided by multiplex token server", + "Control the scroll view feature of Revealjs", + "Activate scroll view by default for the presentation. Otherwise, it\nis manually avalaible by adding ?view=scroll to url.", + "Show the scrollbar while scrolling, hide while idle (default\nauto). Set to ‘true’ to always show, false to\nalways hide.", + "When scrolling, it will automatically snap to the closest slide. Only\nsnap when close to the top of a slide using proximity.\nDisable snapping altogether by setting to false.", + "By default each slide will be sized to be as tall as the viewport. If\nyou prefer a more dense layout with multiple slides visible in parallel,\nset to compact.", + "Control scroll view activation width. The scroll view is\nautomatically unable when the viewport reaches mobile widths. Set to\n0 to disable automatic scroll view.", { "short": "Transition style for slides", "long": "Transition style for slides backgrounds. (none,\nfade, slide, convex,\nconcave, or zoom)" @@ -16080,6 +16588,14 @@ "Disambiguating year suffix in author-date styles (e.g. “a” in “Doe,\n1999a”).", "Manuscript configuration", "internal-schema-hack", + { + "short": "Include an automatically generated table of contents", + "long": "" + }, + { + "short": "Use smart quotes in document output. Defaults to true.", + "long": "" + }, "Project configuration.", "Project type (default, website,\nbook, or manuscript)", "Files to render (defaults to all files)", @@ -16652,12 +17168,12 @@ "mermaid": "%%" }, "handlers/mermaid/schema.yml": { - "_internalId": 187423, + "_internalId": 194269, "type": "object", "description": "be an object", "properties": { "mermaid-format": { - "_internalId": 187415, + "_internalId": 194261, "type": "enum", "enum": [ "png", @@ -16673,7 +17189,7 @@ "exhaustiveCompletions": true }, "theme": { - "_internalId": 187422, + "_internalId": 194268, "type": "anyOf", "anyOf": [ { @@ -16713,5 +17229,40 @@ "case-detection": true }, "$id": "handlers/mermaid" - } + }, + "schema/document-typst.yml": [ + { + "name": "page-numbering", + "tags": { + "formats": [ + "typst" + ] + }, + "schema": { + "anyOf": [ + "string", + { + "enum": [ + false + ] + } + ] + }, + "description": { + "short": "Include an automatically generated table of contents" + } + }, + { + "name": "smart", + "tags": { + "formats": [ + "typst" + ] + }, + "schema": "boolean", + "description": { + "short": "Use smart quotes in document output. Defaults to true." + } + } + ] } \ No newline at end of file From 4354f54e726a41b983486d4bb66035e292224002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Fri, 31 Jan 2025 20:12:23 +0100 Subject: [PATCH 3/4] chore: quarto build-js --- src/resources/editor/tools/vs-code.mjs | 45 ++++++++++++------- src/resources/editor/tools/yaml/web-worker.js | 45 ++++++++++++------- .../yaml/yaml-intelligence-resources.json | 6 +-- .../formats/html/esbuild-analysis-cache.json | 6 +-- 4 files changed, 66 insertions(+), 36 deletions(-) diff --git a/src/resources/editor/tools/vs-code.mjs b/src/resources/editor/tools/vs-code.mjs index 4e9ee07760e..1676b2c4b13 100644 --- a/src/resources/editor/tools/vs-code.mjs +++ b/src/resources/editor/tools/vs-code.mjs @@ -19346,7 +19346,7 @@ var require_yaml_intelligence_resources = __commonJS({ "$html-doc" ] }, - description: "Setting this to false prevents the `repo-actions` from appearing on this page." + description: "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" }, { name: "aliases", @@ -21651,7 +21651,7 @@ var require_yaml_intelligence_resources = __commonJS({ "Short/abbreviated form of container-title;", "A minor contributor to the item; typically cited using \u201Cwith\u201D before\nthe name when listed in a bibliography.", "Curator of an exhibit or collection (e.g. in a museum).", - "Physical (e.g. size) or temporal (e.g.\uFFFD\uFFFDrunning time) dimensions of\nthe item.", + "Physical (e.g. size) or temporal (e.g. running time) dimensions of\nthe item.", "Director (e.g. of a film).", "Minor subdivision of a court with a jurisdiction for a\nlegal item", "(Container) edition holding the item (e.g. \u201C3\u201D when citing a chapter\nin the third edition of a book).", @@ -23251,7 +23251,7 @@ var require_yaml_intelligence_resources = __commonJS({ "Print a list of figures in the document.", "Print a list of tables in the document.", "Setting this to false prevents this document from being included in\nsearches.", - "Setting this to false prevents the repo-actions from\nappearing on this page.", + "Setting this to false prevents the repo-actions from\nappearing on this page. Possible values are none or one or\nmore of edit, source, and issue,\ne.g. [edit, source, issue].", { short: "Links to source repository actions", long: "Links to source repository actions (none or one or more\nof edit, source, issue)" @@ -24817,8 +24817,8 @@ function mappedIndexToLineCol(eitherText) { }; } function mappedLines(str2, keepNewLines = false) { - const lines3 = rangedLines(str2.value, keepNewLines); - return lines3.map((v) => mappedString(str2, [v.range])); + const lines2 = rangedLines(str2.value, keepNewLines); + return lines2.map((v) => mappedString(str2, [v.range])); } // parsing.ts @@ -30795,6 +30795,27 @@ function createLocalizedError(obj) { }; } +// ../is-circular.ts +var isCircular = (obj) => { + const objectSet = /* @__PURE__ */ new WeakSet(); + const detect = (obj2) => { + if (obj2 && typeof obj2 === "object") { + if (objectSet.has(obj2)) { + return true; + } + objectSet.add(obj2); + for (const key in obj2) { + if (Object.hasOwn(obj2, key) && detect(obj2[key])) { + return true; + } + } + objectSet.delete(obj2); + } + return false; + }; + return detect(obj); +}; + // annotated-yaml.ts function postProcessAnnotation(parse) { if (parse.components.length === 1 && parse.start === parse.components[0].start && parse.end === parse.components[0].end) { @@ -30945,16 +30966,10 @@ function buildJsYamlAnnotation(mappedYaml) { `Expected a single result, got ${results.length} instead` ); } - try { - JSON.stringify(results[0]); - } catch (e) { - if (e.message.match("invalid string length")) { - } else if (e.message.match(/circular structure/)) { - throw new InternalError( - `Circular structure detected in parsed yaml: ${e.message}` - ); - } else { - } + if (isCircular(results[0])) { + throw new InternalError( + `Circular structure detected in yaml` + ); } return postProcessAnnotation(results[0]); } diff --git a/src/resources/editor/tools/yaml/web-worker.js b/src/resources/editor/tools/yaml/web-worker.js index 4d3273d8d1a..7e1d5166db2 100644 --- a/src/resources/editor/tools/yaml/web-worker.js +++ b/src/resources/editor/tools/yaml/web-worker.js @@ -19347,7 +19347,7 @@ try { "$html-doc" ] }, - description: "Setting this to false prevents the `repo-actions` from appearing on this page." + description: "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" }, { name: "aliases", @@ -21652,7 +21652,7 @@ try { "Short/abbreviated form of container-title;", "A minor contributor to the item; typically cited using \u201Cwith\u201D before\nthe name when listed in a bibliography.", "Curator of an exhibit or collection (e.g. in a museum).", - "Physical (e.g. size) or temporal (e.g.\uFFFD\uFFFDrunning time) dimensions of\nthe item.", + "Physical (e.g. size) or temporal (e.g. running time) dimensions of\nthe item.", "Director (e.g. of a film).", "Minor subdivision of a court with a jurisdiction for a\nlegal item", "(Container) edition holding the item (e.g. \u201C3\u201D when citing a chapter\nin the third edition of a book).", @@ -23252,7 +23252,7 @@ try { "Print a list of figures in the document.", "Print a list of tables in the document.", "Setting this to false prevents this document from being included in\nsearches.", - "Setting this to false prevents the repo-actions from\nappearing on this page.", + "Setting this to false prevents the repo-actions from\nappearing on this page. Possible values are none or one or\nmore of edit, source, and issue,\ne.g. [edit, source, issue].", { short: "Links to source repository actions", long: "Links to source repository actions (none or one or more\nof edit, source, issue)" @@ -24831,8 +24831,8 @@ ${heading}`; }; } function mappedLines(str2, keepNewLines = false) { - const lines3 = rangedLines(str2.value, keepNewLines); - return lines3.map((v) => mappedString(str2, [v.range])); + const lines2 = rangedLines(str2.value, keepNewLines); + return lines2.map((v) => mappedString(str2, [v.range])); } // parsing.ts @@ -30809,6 +30809,27 @@ ${reindented} }; } + // ../is-circular.ts + var isCircular = (obj) => { + const objectSet = /* @__PURE__ */ new WeakSet(); + const detect = (obj2) => { + if (obj2 && typeof obj2 === "object") { + if (objectSet.has(obj2)) { + return true; + } + objectSet.add(obj2); + for (const key in obj2) { + if (Object.hasOwn(obj2, key) && detect(obj2[key])) { + return true; + } + } + objectSet.delete(obj2); + } + return false; + }; + return detect(obj); + }; + // annotated-yaml.ts function postProcessAnnotation(parse) { if (parse.components.length === 1 && parse.start === parse.components[0].start && parse.end === parse.components[0].end) { @@ -30959,16 +30980,10 @@ ${tidyverseInfo( `Expected a single result, got ${results.length} instead` ); } - try { - JSON.stringify(results[0]); - } catch (e) { - if (e.message.match("invalid string length")) { - } else if (e.message.match(/circular structure/)) { - throw new InternalError( - `Circular structure detected in parsed yaml: ${e.message}` - ); - } else { - } + if (isCircular(results[0])) { + throw new InternalError( + `Circular structure detected in yaml` + ); } return postProcessAnnotation(results[0]); } diff --git a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json index b37443e99fe..6e06c9b377a 100644 --- a/src/resources/editor/tools/yaml/yaml-intelligence-resources.json +++ b/src/resources/editor/tools/yaml/yaml-intelligence-resources.json @@ -12318,7 +12318,7 @@ "$html-doc" ] }, - "description": "Setting this to false prevents the `repo-actions` from appearing on this page." + "description": "Setting this to false prevents the `repo-actions` from appearing on this page.\nPossible values are `none` or one or more of `edit`, `source`, and `issue`, *e.g.* `[edit, source, issue]`.\n" }, { "name": "aliases", @@ -14623,7 +14623,7 @@ "Short/abbreviated form of container-title;", "A minor contributor to the item; typically cited using “with” before\nthe name when listed in a bibliography.", "Curator of an exhibit or collection (e.g. in a museum).", - "Physical (e.g. size) or temporal (e.g.��running time) dimensions of\nthe item.", + "Physical (e.g. size) or temporal (e.g. running time) dimensions of\nthe item.", "Director (e.g. of a film).", "Minor subdivision of a court with a jurisdiction for a\nlegal item", "(Container) edition holding the item (e.g. “3” when citing a chapter\nin the third edition of a book).", @@ -16223,7 +16223,7 @@ "Print a list of figures in the document.", "Print a list of tables in the document.", "Setting this to false prevents this document from being included in\nsearches.", - "Setting this to false prevents the repo-actions from\nappearing on this page.", + "Setting this to false prevents the repo-actions from\nappearing on this page. Possible values are none or one or\nmore of edit, source, and issue,\ne.g. [edit, source, issue].", { "short": "Links to source repository actions", "long": "Links to source repository actions (none or one or more\nof edit, source, issue)" diff --git a/src/resources/formats/html/esbuild-analysis-cache.json b/src/resources/formats/html/esbuild-analysis-cache.json index 61165dbc321..110a06d005f 100644 --- a/src/resources/formats/html/esbuild-analysis-cache.json +++ b/src/resources/formats/html/esbuild-analysis-cache.json @@ -2,7 +2,7 @@ "quarto.js": { "inputs": { "quarto.js": { - "bytes": 26327, + "bytes": 26396, "imports": [], "format": "esm" } @@ -20,10 +20,10 @@ "entryPoint": "quarto.js", "inputs": { "quarto.js": { - "bytesInOutput": 21890 + "bytesInOutput": 21946 } }, - "bytes": 21890 + "bytes": 21946 } } } From 64a7faf326d37c46bd007b6b0270a9334ef588c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Canouil?= <8896044+mcanouil@users.noreply.github.com> Date: Fri, 31 Jan 2025 20:12:30 +0100 Subject: [PATCH 4/4] chore: add changelog entry --- news/changelog-1.7.md | 1 + 1 file changed, 1 insertion(+) diff --git a/news/changelog-1.7.md b/news/changelog-1.7.md index 8912205b900..ee5530ae4af 100644 --- a/news/changelog-1.7.md +++ b/news/changelog-1.7.md @@ -17,6 +17,7 @@ All changes included in 1.7: ## Website projects - ([#11701](https://github.com/quarto-dev/quarto-cli/issues/11701)): Wrap HTML emitted by EJS templates in `{=html}` blocks to avoid memory blowup issues with Pandoc's parser. +- ([#10501](https://github.com/quarto-dev/quarto-cli/issues/10501)): add possible option to `repo-actions` option. ## Blog projects