diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/axes.rs | 17 | ||||
| -rw-r--r-- | src/library/style.rs | 8 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/library/axes.rs b/src/library/axes.rs index 62e0078f..1f3525f6 100644 --- a/src/library/axes.rs +++ b/src/library/axes.rs @@ -28,16 +28,17 @@ function! { } layout(this, ctx) { - let mut new_axes = ctx.axes; - new_axes.primary.alignment = this.alignment; + let mut axes = ctx.axes; + axes.primary.alignment = this.alignment; Ok(match &this.body { - Some(body) => commands![ - SetAxes(new_axes), - LayoutTree(body), - SetAxes(ctx.axes), - ], - None => commands![Command::SetAxes(new_axes)] + Some(body) => commands![AddMultiple( + layout_tree(body, LayoutContext { + axes, + .. ctx.clone() + })? + )], + None => commands![Command::SetAxes(axes)] }) } } diff --git a/src/library/style.rs b/src/library/style.rs index 90a5fd31..0615c0e7 100644 --- a/src/library/style.rs +++ b/src/library/style.rs @@ -18,16 +18,16 @@ macro_rules! stylefunc { } layout(this, ctx) { - let mut new_style = ctx.style.clone(); - new_style.toggle_class(FontClass::$ident); + let mut style = ctx.style.clone(); + style.toggle_class(FontClass::$ident); Ok(match &this.body { Some(body) => commands![ - SetStyle(new_style), + SetStyle(style), LayoutTree(body), SetStyle(ctx.style.clone()), ], - None => commands![SetStyle(new_style)] + None => commands![SetStyle(style)] }) } } |