diff options
| -rw-r--r-- | src/library/elements.rs | 6 | ||||
| -rw-r--r-- | tests/typ/elements/square.typ | 4 | ||||
| -rw-r--r-- | tests/typ/layout/stack.typ | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/library/elements.rs b/src/library/elements.rs index 75a43282..d1c52ab7 100644 --- a/src/library/elements.rs +++ b/src/library/elements.rs @@ -41,9 +41,9 @@ pub fn rect(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { /// `square`: A square with optional content. pub fn square(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { - let length = args.named::<Length>("length")?.map(Linear::from); - let width = match length { - Some(length) => Some(length), + let size = args.named::<Length>("size")?.map(Linear::from); + let width = match size { + Some(size) => Some(size), None => args.named("width")?, }; let height = match width { diff --git a/tests/typ/elements/square.typ b/tests/typ/elements/square.typ index 07dce4be..7597cb22 100644 --- a/tests/typ/elements/square.typ +++ b/tests/typ/elements/square.typ @@ -29,6 +29,6 @@ ] --- -// Length wins over width and height. +// Size wins over width and height. // Error: 09-20 unexpected argument -#square(width: 10cm, height: 20cm, length: 1cm, fill: rgb("eb5278")) +#square(width: 10cm, height: 20cm, size: 1cm, fill: rgb("eb5278")) diff --git a/tests/typ/layout/stack.typ b/tests/typ/layout/stack.typ index aee66d6a..a6e7e001 100644 --- a/tests/typ/layout/stack.typ +++ b/tests/typ/layout/stack.typ @@ -28,7 +28,7 @@ #page(width: 50pt, margins: 0pt) #par(spacing: 5pt) -#let x = square(length: 10pt, fill: eastern) +#let x = square(size: 10pt, fill: eastern) #stack(dir: rtl, spacing: 5pt, x, x, x) #stack(dir: ltr, x, 20%, x, 20%, x) #stack(dir: ltr, spacing: 5pt, x, x, 7pt, 3pt, x) |