From 8cdfc7faafc1d8df60d44e5db9d1c9e26345675b Mon Sep 17 00:00:00 2001 From: Laurenz Date: Wed, 17 Mar 2021 22:08:44 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20box=20to=20rect=20and=20color=20to=20f?= =?UTF-8?q?ill=20=E2=9C=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/library/mod.rs | 2 +- src/library/shapes.rs | 18 +++++++++--------- tests/ref/repr.png | Bin 10208 -> 10195 bytes tests/typ/control/let.typ | 4 ++-- tests/typ/expand.typ | 6 +++--- tests/typ/expr/ops-invalid.typ | 10 +++++----- tests/typ/full/coma.typ | 6 +++--- tests/typ/library/base.typ | 2 +- tests/typ/library/pad.typ | 8 ++++---- tests/typ/library/shapes.typ | 26 ++++++++++++++------------ tests/typ/markup/emph.typ | 2 +- tests/typ/markup/heading.typ | 4 ++-- tests/typ/markup/strong.typ | 2 +- tests/typ/repr.typ | 2 +- 14 files changed, 47 insertions(+), 45 deletions(-) diff --git a/src/library/mod.rs b/src/library/mod.rs index b33ec7116..7e9689941 100644 --- a/src/library/mod.rs +++ b/src/library/mod.rs @@ -44,13 +44,13 @@ pub fn new() -> Scope { // Functions. set!(func: "align", align); - set!(func: "box", box_); set!(func: "font", font); set!(func: "h", h); set!(func: "image", image); set!(func: "pad", pad); set!(func: "page", page); set!(func: "pagebreak", pagebreak); + set!(func: "rect", rect); set!(func: "repr", repr); set!(func: "rgb", rgb); set!(func: "type", type_); diff --git a/src/library/shapes.rs b/src/library/shapes.rs index 254a22852..41be3b2b2 100644 --- a/src/library/shapes.rs +++ b/src/library/shapes.rs @@ -1,16 +1,16 @@ use super::*; -/// `box`: Create a rectangular box. +/// `rect`: Create a rectangular box. /// /// # Positional arguments /// - Body: optional, of type `template`. /// /// # Named arguments -/// - Width of the box: `width`, of type `linear` relative to parent width. -/// - Height of the box: `height`, of type `linear` relative to parent height. -/// - Main layouting direction: `main-dir`, of type `direction`. -/// - Cross layouting direction: `cross-dir`, of type `direction`. -/// - Background color of the box: `color`, of type `color`. +/// - Width of the box: `width`, of type `linear` relative to parent width. +/// - Height of the box: `height`, of type `linear` relative to parent height. +/// - Main layouting direction: `main-dir`, of type `direction`. +/// - Cross layouting direction: `cross-dir`, of type `direction`. +/// - Fill color of the box: `fill`, of type `color`. /// /// # Relevant types and constants /// - Type `direction` @@ -18,12 +18,12 @@ use super::*; /// - `rtl` (right to left) /// - `ttb` (top to bottom) /// - `btt` (bottom to top) -pub fn box_(ctx: &mut EvalContext, args: &mut ValueArgs) -> Value { +pub fn rect(ctx: &mut EvalContext, args: &mut ValueArgs) -> Value { let width = args.get(ctx, "width"); let height = args.get(ctx, "height"); let main = args.get(ctx, "main-dir"); let cross = args.get(ctx, "cross-dir"); - let color = args.get(ctx, "color"); + let fill = args.get(ctx, "fill"); let body = args.find::(ctx).unwrap_or_default(); Value::template("box", move |ctx| { @@ -33,7 +33,7 @@ pub fn box_(ctx: &mut EvalContext, args: &mut ValueArgs) -> Value { let child = ctx.exec(&body).into(); let fixed = NodeFixed { width, height, child }; - if let Some(color) = color { + if let Some(color) = fill { ctx.push(NodeBackground { fill: Fill::Color(color), child: fixed.into(), diff --git a/tests/ref/repr.png b/tests/ref/repr.png index 21d7af27849ac7d352a20780738190afe5fcddbb..2f5697fd588fc4db38318ba8bbe80a52c2842d5b 100644 GIT binary patch delta 9615 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 O?kOv1$QL4v1OFc_s6q_@ diff --git a/tests/typ/control/let.typ b/tests/typ/control/let.typ index 7752ec901..dd971ee5e 100644 --- a/tests/typ/control/let.typ +++ b/tests/typ/control/let.typ @@ -18,8 +18,8 @@ --- // Syntax sugar for function definitions. #let background = #239dad -#let box(body) = box(width: 2cm, height: 1cm, color: background, body) -#box[Hi!] +#let rect(body) = rect(width: 2cm, height: 1cm, fill: background, body) +#rect[Hi!] // Error: 13 expected body #let func(x) diff --git a/tests/typ/expand.typ b/tests/typ/expand.typ index 3b2429289..230447443 100644 --- a/tests/typ/expand.typ +++ b/tests/typ/expand.typ @@ -6,9 +6,9 @@ // Top-level paragraph fills page, boxed paragraph only when width is fixed. L #right[R] \ -#box(width: 50pt)[L #right[R]] \ -#box[L #right[R]] \ +#rect(width: 50pt)[L #right[R]] \ +#rect[L #right[R]] \ // Pad inherits expansion behaviour. #pad[PL #right[PR]] \ -#box(pad[PL #right[PR]]) +#rect(pad[PL #right[PR]]) diff --git a/tests/typ/expr/ops-invalid.typ b/tests/typ/expr/ops-invalid.typ index f760ae312..12d2a2c30 100644 --- a/tests/typ/expr/ops-invalid.typ +++ b/tests/typ/expr/ops-invalid.typ @@ -50,10 +50,10 @@ // Error: 3-4 unknown variable { z = 1 } -// Error: 3-6 cannot assign to a constant -{ box = "hi" } +// Error: 3-7 cannot assign to a constant +{ rect = "hi" } -// Works if we define box beforehand +// Works if we define rect beforehand // (since then it doesn't resolve to the standard library version anymore). -#let box = "" -{ box = "hi" } +#let rect = "" +{ rect = "hi" } diff --git a/tests/typ/full/coma.typ b/tests/typ/full/coma.typ index d324627f3..243c667f9 100644 --- a/tests/typ/full/coma.typ +++ b/tests/typ/full/coma.typ @@ -10,10 +10,10 @@ #let university = [*Technische Universität {city}*] #let faculty = [*Fakultät II, Institut for Mathematik*] -// The `box` function just places content into a rectangular container. When +// The `rect` function just places content into a rectangular container. When // the only argument to a function is a template, the parentheses can be omitted // (i.e. `f[a]` is the same as `f([a])`). -#box[ +#rect[ // Backslash adds a forced line break. #university \ #faculty \ @@ -21,7 +21,7 @@ Dr. Max Mustermann \ Ola Nordmann, John Doe ] -#align(right, box[*WiSe 2019/2020* \ Woche 3]) +#align(right, rect[*WiSe 2019/2020* \ Woche 3]) // Adds vertical spacing. #v(6mm) diff --git a/tests/typ/library/base.typ b/tests/typ/library/base.typ index 000a80ea3..29c976c2a 100644 --- a/tests/typ/library/base.typ +++ b/tests/typ/library/base.typ @@ -3,7 +3,7 @@ --- #test(type("hi"), "string") -#test(repr([Hi #box[there]]), "[Hi []]") +#test(repr([Hi #rect[there]]), "[Hi []]") --- // Check the output. diff --git a/tests/typ/library/pad.typ b/tests/typ/library/pad.typ index c8bfe907b..c3d3786ba 100644 --- a/tests/typ/library/pad.typ +++ b/tests/typ/library/pad.typ @@ -5,9 +5,9 @@ #pad(left: 10pt, [Indented!]) // All sides together. -#box(color: #9feb52, +#rect(fill: #9feb52, pad(10pt, right: 20pt, - box(color: #eb5278, width: 20pt, height: 20pt))) + rect(width: 20pt, height: 20pt, fill: #eb5278))) -// Error: 13-23 missing argument: body -Hi #box(pad(left: 10pt)) there +// Error: 14-24 missing argument: body +Hi #rect(pad(left: 10pt)) there diff --git a/tests/typ/library/shapes.typ b/tests/typ/library/shapes.typ index efb68edfd..c5a8abf95 100644 --- a/tests/typ/library/shapes.typ +++ b/tests/typ/library/shapes.typ @@ -1,31 +1,33 @@ // Test shapes. --- +// Test `rect` function. + #page("a8", flip: true) -// Box with fixed width, should have text height. -#box(width: 2cm, color: #9650D6)[Legal] +// Fixed width, should have text height. +#rect(width: 2cm, fill: #9650D6)[Legal] Sometimes there is no box. -// Box with fixed height, should span line. -#box(height: 1cm, width: 100%, color: #734CED)[B] +// Fixed height, should span line. +#rect(height: 1cm, width: 100%, fill: #734CED)[B] -// Empty box with fixed width and height. -#box(width: 6cm, height: 12pt, color: #CB4CED) +// Empty with fixed width and height. +#rect(width: 6cm, height: 12pt, fill: #CB4CED) // Not visible, but creates a gap between the boxes above and below. -#box(width: 2in, color: #ff0000) +#rect(width: 2in, fill: #ff0000) // These are in a row! -#box(width: 0.5in, height: 10pt, color: #D6CD67) -#box(width: 0.5in, height: 10pt, color: #EDD466) -#box(width: 0.5in, height: 10pt, color: #E3BE62) +#rect(width: 0.5in, height: 10pt, fill: #D6CD67) +#rect(width: 0.5in, height: 10pt, fill: #EDD466) +#rect(width: 0.5in, height: 10pt, fill: #E3BE62) --- -// Make sure that you can't do page related stuff in a box. +// Make sure that you can't do page related stuff in a shape. A -#box[ +#rect[ B // Error: 16 cannot modify page from here #pagebreak() diff --git a/tests/typ/markup/emph.typ b/tests/typ/markup/emph.typ index 772e15abf..500381c12 100644 --- a/tests/typ/markup/emph.typ +++ b/tests/typ/markup/emph.typ @@ -8,7 +8,7 @@ _Emphasized!_ Partly em_phas_ized. // Scoped to body. -#box[_Scoped] to body. +#rect[_Scoped] to body. // Unterminated is fine. _The End diff --git a/tests/typ/markup/heading.typ b/tests/typ/markup/heading.typ index 8497ec8f7..15c391d1b 100644 --- a/tests/typ/markup/heading.typ +++ b/tests/typ/markup/heading.typ @@ -21,7 +21,7 @@ } // Function call continues heading. -= #box[ += #rect[ A ] B @@ -35,7 +35,7 @@ B // Parsed as headings if at start of the context. /**/ = Ok {[== Ok]} -#box[=== Ok] +#rect[=== Ok] // Not at the start of the context. No = heading diff --git a/tests/typ/markup/strong.typ b/tests/typ/markup/strong.typ index b02a55a5c..a56e0e1cf 100644 --- a/tests/typ/markup/strong.typ +++ b/tests/typ/markup/strong.typ @@ -8,7 +8,7 @@ Partly str*ength*ened. // Scoped to body. -#box[*Scoped] to body. +#rect[*Scoped] to body. // Unterminated is fine. *The End diff --git a/tests/typ/repr.typ b/tests/typ/repr.typ index 96eb710ef..cf137745c 100644 --- a/tests/typ/repr.typ +++ b/tests/typ/repr.typ @@ -52,6 +52,6 @@ // Functions #let f(x) = x -{box} \ +{rect} \ {f} \ {() => none} \