diff options
Diffstat (limited to 'src/model/styles.rs')
| -rw-r--r-- | src/model/styles.rs | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/src/model/styles.rs b/src/model/styles.rs index eb7a7053..ae4c1586 100644 --- a/src/model/styles.rs +++ b/src/model/styles.rs @@ -7,8 +7,8 @@ use std::sync::Arc; use super::{Content, Show, ShowNode}; use crate::diag::{At, TypResult}; -use crate::eval::{Args, Func, Node, Smart, Value}; -use crate::geom::{Numeric, Relative, Sides, Spec}; +use crate::eval::{Args, Func, Node, RawLength, Smart, Value}; +use crate::geom::{Length, Numeric, Relative, Sides, Spec}; use crate::library::layout::PageNode; use crate::library::structure::{EnumNode, ListNode}; use crate::library::text::{FontFamily, ParNode, TextNode}; @@ -459,6 +459,33 @@ where } } +impl<T> Fold for Sides<T> +where + T: Fold, +{ + type Output = Sides<T::Output>; + + fn fold(self, outer: Self::Output) -> Self::Output { + self.zip(outer, |inner, outer, _| inner.fold(outer)) + } +} + +impl Fold for Sides<Option<Relative<Length>>> { + type Output = Sides<Relative<Length>>; + + fn fold(self, outer: Self::Output) -> Self::Output { + self.zip(outer, |inner, outer, _| inner.unwrap_or(outer)) + } +} + +impl Fold for Sides<Option<Smart<Relative<RawLength>>>> { + type Output = Sides<Smart<Relative<RawLength>>>; + + fn fold(self, outer: Self::Output) -> Self::Output { + self.zip(outer, |inner, outer, _| inner.unwrap_or(outer)) + } +} + /// A scoped property barrier. /// /// Barriers interact with [scoped](StyleMap::scoped) styles: A scoped style |
