Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions news/changelog-1.11.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ All changes included in 1.11:

- ([#14735](https://github.com/quarto-dev/quarto-cli/issues/14735)): Fix `cache-globals` rejecting arrays and booleans, so it now accepts the same forms as `cache-vars` and as knitr itself. Previously only a single string validated, which rejected both `cache-globals: [var_1, var_2]` and the documented `cache-globals: false`.

## Crossrefs

- Adds `axiom` (`axm`) and `assumption` (`asm`) theorem environments with english and spanish defaults (`_language_yml`, `_language-es.yml`), sets `algorithm` (`alg`) style to definition and wires title-to-prefix inheritance for theorem cross-references.

## Other fixes and improvements

- [#14735](https://github.com/quarto-dev/quarto-cli/issues/14735) Fix a crash when the `QUARTO_R` environment variable is set to a malformed path. Quarto now warns and falls back to other R lookup strategies instead of aborting the render. ([posit-dev/positron#15614](https://github.com/posit-dev/positron/discussions/15614))
3 changes: 3 additions & 0 deletions src/command/render/filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,9 @@ function languageFilterParams(format: Format) {
"def",
"exm",
"exr",
"alg",
"axm",
"asm",
].forEach((type) => {
params[`crossref-${type}-prefix`] = language[`crossref-${type}-title`];
});
Expand Down
12 changes: 12 additions & 0 deletions src/config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@ export const kCrossrefCnjTitle = "crossref-cnj-title";
export const kCrossrefDefTitle = "crossref-def-title";
export const kCrossrefExmTitle = "crossref-exm-title";
export const kCrossrefExrTitle = "crossref-exr-title";
export const kCrossrefAlgTitle = "crossref-alg-title";
export const kCrossrefAxmTitle = "crossref-axm-title";
export const kCrossrefAsmTitle = "crossref-asm-title";
export const kCrossrefFigPrefix = "crossref-fig-prefix";
export const kCrossrefTblPrefix = "crossref-tbl-prefix";
export const kCrossrefLstPrefix = "crossref-lst-prefix";
Expand All @@ -347,6 +350,9 @@ export const kCrossrefCnjPrefix = "crossref-cnj-prefix";
export const kCrossrefDefPrefix = "crossref-def-prefix";
export const kCrossrefExmPrefix = "crossref-exm-prefix";
export const kCrossrefExrPrefix = "crossref-exr-prefix";
export const kCrossrefAlgPrefix = "crossref-alg-prefix";
export const kCrossrefAxmPrefix = "crossref-axm-prefix";
export const kCrossrefAsmPrefix = "crossref-asm-prefix";
export const kCrossrefLofTitle = "crossref-lof-title";
export const kCrossrefLotTitle = "crossref-lot-title";
export const kCrossrefLolTitle = "crossref-lol-title";
Expand Down Expand Up @@ -459,6 +465,9 @@ export const kLanguageDefaultsKeys = [
kCrossrefDefTitle,
kCrossrefExmTitle,
kCrossrefExrTitle,
kCrossrefAlgTitle,
kCrossrefAxmTitle,
kCrossrefAsmTitle,
kCrossrefFigPrefix,
kCrossrefTblPrefix,
kCrossrefLstPrefix,
Expand All @@ -474,6 +483,9 @@ export const kLanguageDefaultsKeys = [
kCrossrefDefPrefix,
kCrossrefExmPrefix,
kCrossrefExrPrefix,
kCrossrefAlgPrefix,
kCrossrefAxmPrefix,
kCrossrefAsmPrefix,
kCrossrefLofTitle,
kCrossrefLotTitle,
kCrossrefLolTitle,
Expand Down
63 changes: 60 additions & 3 deletions src/resources/editor/tools/vs-code.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10396,6 +10396,9 @@ var require_yaml_intelligence_resources = __commonJS({
"crossref-def-title": "string",
"crossref-exm-title": "string",
"crossref-exr-title": "string",
"crossref-alg-title": "string",
"crossref-axm-title": "string",
"crossref-asm-title": "string",
"crossref-fig-prefix": "string",
"crossref-tbl-prefix": "string",
"crossref-lst-prefix": "string",
Expand All @@ -10411,6 +10414,9 @@ var require_yaml_intelligence_resources = __commonJS({
"crossref-def-prefix": "string",
"crossref-exm-prefix": "string",
"crossref-exr-prefix": "string",
"crossref-alg-prefix": "string",
"crossref-axm-prefix": "string",
"crossref-asm-prefix": "string",
"crossref-lof-title": "string",
"crossref-lot-title": "string",
"crossref-lol-title": "string"
Expand Down Expand Up @@ -14159,6 +14165,21 @@ var require_yaml_intelligence_resources = __commonJS({
description: "The title prefix used for exercise captions."
}
},
"alg-title": {
string: {
description: "The title prefix used for algorithm captions."
}
},
"axm-title": {
string: {
description: "The title prefix used for axiom captions."
}
},
"asm-title": {
string: {
description: "The title prefix used for assumption captions."
}
},
"fig-prefix": {
string: {
description: "The prefix used for an inline reference to a figure."
Expand Down Expand Up @@ -14224,6 +14245,21 @@ var require_yaml_intelligence_resources = __commonJS({
description: "The prefix used for an inline reference to an exercise."
}
},
"alg-prefix": {
string: {
description: "The prefix used for an inline reference to an algorithm."
}
},
"axm-prefix": {
string: {
description: "The prefix used for an inline reference to an axiom."
}
},
"asm-prefix": {
string: {
description: "The prefix used for an inline reference to an assumption."
}
},
"fig-labels": {
ref: "crossref-labels-schema",
description: "The numbering scheme used for figures."
Expand Down Expand Up @@ -14276,6 +14312,18 @@ var require_yaml_intelligence_resources = __commonJS({
ref: "crossref-labels-schema",
description: "The numbering scheme used for exercises."
},
"alg-labels": {
ref: "crossref-labels-schema",
description: "The numbering scheme used for algorithms."
},
"axm-labels": {
ref: "crossref-labels-schema",
description: "The numbering scheme used for axioms."
},
"asm-labels": {
ref: "crossref-labels-schema",
description: "The numbering scheme used for assumptions."
},
"lof-title": {
string: {
description: "The title used for the list of figures."
Expand Down Expand Up @@ -23362,6 +23410,9 @@ var require_yaml_intelligence_resources = __commonJS({
"The title prefix used for definition captions.",
"The title prefix used for example captions.",
"The title prefix used for exercise captions.",
"The title prefix used for algorithm captions.",
"The title prefix used for axiom captions.",
"The title prefix used for assumption captions.",
"The prefix used for an inline reference to a figure.",
"The prefix used for an inline reference to a table.",
"The prefix used for an inline reference to an equation.",
Expand All @@ -23375,6 +23426,9 @@ var require_yaml_intelligence_resources = __commonJS({
"The prefix used for an inline reference to a definition.",
"The prefix used for an inline reference to an example.",
"The prefix used for an inline reference to an exercise.",
"The prefix used for an inline reference to an algorithm.",
"The prefix used for an inline reference to an axiom.",
"The prefix used for an inline reference to an assumption.",
"The numbering scheme used for figures.",
"The numbering scheme used for tables.",
"The numbering scheme used for equations.",
Expand All @@ -23388,6 +23442,9 @@ var require_yaml_intelligence_resources = __commonJS({
"The numbering scheme used for definitions.",
"The numbering scheme used for examples.",
"The numbering scheme used for exercises.",
"The numbering scheme used for algorithms.",
"The numbering scheme used for axioms.",
"The numbering scheme used for assumptions.",
"The title used for the list of figures.",
"The title used for the list of tables.",
"The title used for the list of listings.",
Expand Down Expand Up @@ -25387,12 +25444,12 @@ var require_yaml_intelligence_resources = __commonJS({
mermaid: "%%"
},
"handlers/mermaid/schema.yml": {
_internalId: 223031,
_internalId: 225476,
type: "object",
description: "be an object",
properties: {
"mermaid-format": {
_internalId: 223023,
_internalId: 225468,
type: "enum",
enum: [
"png",
Expand All @@ -25408,7 +25465,7 @@ var require_yaml_intelligence_resources = __commonJS({
exhaustiveCompletions: true
},
theme: {
_internalId: 223030,
_internalId: 225475,
type: "anyOf",
anyOf: [
{
Expand Down

Large diffs are not rendered by default.

63 changes: 60 additions & 3 deletions src/resources/editor/tools/yaml/web-worker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading