diff options
| author | Laurenz <laurmaedje@gmail.com> | 2020-08-03 16:01:23 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2020-08-03 16:04:55 +0200 |
| commit | dbfb3d2ced91e56314dfabbb4df9a338926c0a7a (patch) | |
| tree | 678264cb18f8abc81ebe28077f5aef2df4e5a4bd /src/library/layout.rs | |
| parent | 5a8f2fb73ddafba9fdbe952385ae2676126183ae (diff) | |
Formatting, documentation and small improvements 🧽
Diffstat (limited to 'src/library/layout.rs')
| -rw-r--r-- | src/library/layout.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/library/layout.rs b/src/library/layout.rs index d6d02436..f3ddaadf 100644 --- a/src/library/layout.rs +++ b/src/library/layout.rs @@ -1,5 +1,3 @@ -//! Layout building blocks. - use crate::length::ScaleLength; use super::*; @@ -13,7 +11,7 @@ function! { } parse(header, body, state, f) { - BoxFunc { + Self { body: parse_maybe_body(body, state, f).unwrap_or(SyntaxTree::new()), width: header.args.key.get::<ScaleLength>("width", f), height: header.args.key.get::<ScaleLength>("height", f), @@ -21,8 +19,8 @@ function! { } layout(self, ctx, f) { - ctx.repeat = false; ctx.spaces.truncate(1); + ctx.repeat = false; self.width.with(|v| { let length = v.raw_scaled(ctx.base.x); @@ -51,13 +49,13 @@ function! { #[derive(Debug, Clone, PartialEq)] pub struct AlignFunc { body: Option<SyntaxTree>, - aligns: Vec<Spanned<SpecAlign>>, + aligns: SpanVec<SpecAlign>, h: Option<Spanned<SpecAlign>>, v: Option<Spanned<SpecAlign>>, } parse(header, body, state, f) { - AlignFunc { + Self { body: parse_maybe_body(body, state, f), aligns: header.args.pos.all::<Spanned<SpecAlign>>().collect(), h: header.args.key.get::<Spanned<SpecAlign>>("horizontal", f), |
