Skip to content

Commit d000b29

Browse files
authored
Merge pull request #11655 from quarto-dev/bugfix/issue-11654
Fix `column: page-inset` missing from YAML schemas
2 parents 4ee26df + c6ca1ac commit d000b29

File tree

8 files changed

+27
-9
lines changed

8 files changed

+27
-9
lines changed

news/changelog-1.7.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ All changes included in 1.7:
66
- ([#11532](https://github.com/quarto-dev/quarto-cli/issues/11532)): Fix regression for [#660](https://github.com/quarto-dev/quarto-cli/issues/660), which causes files to have incorrect permissions when Quarto is installed in a location not writable by the current user.
77
- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with documents containing `categories` fields that are not strings.
88

9+
## YAML validation
10+
11+
- ([#11654](https://github.com/quarto-dev/quarto-cli/issues/11654)): Allow `page-inset` as value in `column` key for code cells.
12+
913
## `quarto check`
1014

1115
- ([#11608](https://github.com/quarto-dev/quarto-cli/pull/11608)): Do not issue error message when calling `quarto check info`.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8464,6 +8464,7 @@ var require_yaml_intelligence_resources = __commonJS({
84648464
"page",
84658465
"page-left",
84668466
"page-right",
8467+
"page-inset",
84678468
"page-inset-left",
84688469
"page-inset-right",
84698470
"screen",
@@ -24187,12 +24188,12 @@ var require_yaml_intelligence_resources = __commonJS({
2418724188
mermaid: "%%"
2418824189
},
2418924190
"handlers/mermaid/schema.yml": {
24190-
_internalId: 193524,
24191+
_internalId: 193535,
2419124192
type: "object",
2419224193
description: "be an object",
2419324194
properties: {
2419424195
"mermaid-format": {
24195-
_internalId: 193516,
24196+
_internalId: 193527,
2419624197
type: "enum",
2419724198
enum: [
2419824199
"png",
@@ -24208,7 +24209,7 @@ var require_yaml_intelligence_resources = __commonJS({
2420824209
exhaustiveCompletions: true
2420924210
},
2421024211
theme: {
24211-
_internalId: 193523,
24212+
_internalId: 193534,
2421224213
type: "anyOf",
2421324214
anyOf: [
2421424215
{

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

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,6 +1436,7 @@
14361436
"page",
14371437
"page-left",
14381438
"page-right",
1439+
"page-inset",
14391440
"page-inset-left",
14401441
"page-inset-right",
14411442
"screen",
@@ -17159,12 +17160,12 @@
1715917160
"mermaid": "%%"
1716017161
},
1716117162
"handlers/mermaid/schema.yml": {
17162-
"_internalId": 193524,
17163+
"_internalId": 193535,
1716317164
"type": "object",
1716417165
"description": "be an object",
1716517166
"properties": {
1716617167
"mermaid-format": {
17167-
"_internalId": 193516,
17168+
"_internalId": 193527,
1716817169
"type": "enum",
1716917170
"enum": [
1717017171
"png",
@@ -17180,7 +17181,7 @@
1718017181
"exhaustiveCompletions": true
1718117182
},
1718217183
"theme": {
17183-
"_internalId": 193523,
17184+
"_internalId": 193534,
1718417185
"type": "anyOf",
1718517186
"anyOf": [
1718617187
{

src/resources/schema/definitions.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
page,
6666
page-left,
6767
page-right,
68+
page-inset,
6869
page-inset-left,
6970
page-inset-right,
7071
screen,

src/resources/schema/json-schemas.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
"page",
131131
"page-left",
132132
"page-right",
133+
"page-inset",
133134
"page-inset-left",
134135
"page-inset-right",
135136
"screen",

src/resources/types/schema-types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export type PageColumn =
4545
| "page"
4646
| "page-left"
4747
| "page-right"
48+
| "page-inset"
4849
| "page-inset-left"
4950
| "page-inset-right"
5051
| "screen"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
format: html
3+
---
4+
5+
```{python}
6+
#| column: page-inset
7+
print("Hello, world")
8+
```

0 commit comments

Comments
 (0)