caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-13 12:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add baseline argument to box

Browse Source
This commit is contained in:
Laurenz 2023-02-12 21:14:21 +01:00
parent d689d706ea
commit d99359dede
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/src/layout/container.rs
View File

@ -47,6 +47,8 @@ pub struct BoxNode {
pub width: Smart<Rel<Length>>, pub width: Smart<Rel<Length>>,
/// The box's height. /// The box's height.
pub height: Smart<Rel<Length>>, pub height: Smart<Rel<Length>>,
/// The box's baseline shift.
pub baseline: Rel<Length>,
} }
#[node] #[node]
@ -55,7 +57,8 @@ impl BoxNode {
let body = args.eat::<Content>()?.unwrap_or_default(); let body = args.eat::<Content>()?.unwrap_or_default();
let width = args.named("width")?.unwrap_or_default(); let width = args.named("width")?.unwrap_or_default();
let height = args.named("height")?.unwrap_or_default(); let height = args.named("height")?.unwrap_or_default();
Ok(Self { body, width, height }.pack()) let baseline = args.named("baseline")?.unwrap_or_default();
Ok(Self { body, width, height, baseline }.pack())
} }
fn field(&self, name: &str) -> Option<Value> { fn field(&self, name: &str) -> Option<Value> {
@ -86,7 +89,15 @@ impl Layout for BoxNode {
let is_auto = sizing.as_ref().map(Smart::is_auto); let is_auto = sizing.as_ref().map(Smart::is_auto);
let expand = regions.expand | !is_auto; let expand = regions.expand | !is_auto;
let pod = Regions::one(size, expand); let pod = Regions::one(size, expand);
self.body.layout(vt, styles, pod) let mut frame = self.body.layout(vt, styles, pod)?.into_frame();
// Apply baseline shift.
let shift = self.baseline.resolve(styles).relative_to(frame.height());
if !shift.is_zero() {
frame.set_baseline(frame.baseline() - shift);
}
Ok(Fragment::frame(frame))
} }
} }

BIN
tests/ref/text/baseline.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 28 KiB

5
tests/typ/text/baseline.typ
View File

@ -1,4 +1,4 @@
// Test text baseline. // Test baseline handling.
--- ---
Hi #text(1.5em)[You], #text(0.75em)[how are you?] Hi #text(1.5em)[You], #text(0.75em)[how are you?]
@ -7,3 +7,6 @@ Our cockatoo was one of the
#text(baseline: -0.2em)[#box(circle(radius: 2pt)) first] #text(baseline: -0.2em)[#box(circle(radius: 2pt)) first]
#text(baseline: 0.2em)[birds #box(circle(radius: 2pt))] #text(baseline: 0.2em)[birds #box(circle(radius: 2pt))]
that ever learned to mimic a human voice. that ever learned to mimic a human voice.
---
Hey #box(baseline: 40%, image("/tiger.jpg", width: 1.5cm)) there!