caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-15 01:25:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename length to size in square()

Browse Source
This commit is contained in:
Laurenz 2021-10-05 19:46:40 +02:00
parent ae05dc0876
commit 25b053ed93
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/library/elements.rs
View File

@ -41,9 +41,9 @@ pub fn rect(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
/// `square`: A square with optional content. /// `square`: A square with optional content.
pub fn square(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> { pub fn square(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
let length = args.named::<Length>("length")?.map(Linear::from); let size = args.named::<Length>("size")?.map(Linear::from);
let width = match length { let width = match size {
Some(length) => Some(length), Some(size) => Some(size),
None => args.named("width")?, None => args.named("width")?,
}; };
let height = match width { let height = match width {

4
tests/typ/elements/square.typ
View File

@ -29,6 +29,6 @@
] ]
--- ---
// Length wins over width and height. // Size wins over width and height.
// Error: 09-20 unexpected argument // 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"))

2
tests/typ/layout/stack.typ
View File

@ -28,7 +28,7 @@
#page(width: 50pt, margins: 0pt) #page(width: 50pt, margins: 0pt)
#par(spacing: 5pt) #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: rtl, spacing: 5pt, x, x, x)
#stack(dir: ltr, x, 20%, x, 20%, x) #stack(dir: ltr, x, 20%, x, 20%, x)
#stack(dir: ltr, spacing: 5pt, x, x, 7pt, 3pt, x) #stack(dir: ltr, spacing: 5pt, x, x, 7pt, 3pt, x)