Fr in stack and par

2 files changed, 17 insertions, 15 deletions

diff --git a/src/eval/template.rs b/src/eval/template.rs
index fe3d0cca..b1559b8f 100644
--- a/src/eval/template.rs
+++ b/src/eval/template.rs
@@ -8,8 +8,8 @@ use super::Str;
 use crate::diag::StrResult;
 use crate::geom::{Align, Dir, GenAxis, Length, Linear, Sides, Size};
 use crate::layout::{
-    BlockNode, Decoration, InlineNode, PadNode, PageNode, ParChild, ParNode, StackChild,
-    StackNode,
+    BlockNode, Decoration, InlineNode, PadNode, PageNode, ParChild, ParNode, Spacing,
+    StackChild, StackNode,
 };
 use crate::style::Style;
 use crate::util::EcoString;
@@ -32,7 +32,7 @@ enum TemplateNode {
     /// Plain text.
     Text(EcoString),
     /// Spacing.
-    Spacing(GenAxis, Linear),
+    Spacing(GenAxis, Spacing),
     /// A decorated template.
     Decorated(Decoration, Template),
     /// An inline node builder.
@@ -107,7 +107,7 @@ impl Template {
     }
 
     /// Add spacing along an axis.
-    pub fn spacing(&mut self, axis: GenAxis, spacing: Linear) {
+    pub fn spacing(&mut self, axis: GenAxis, spacing: Spacing) {
         self.make_mut().push(TemplateNode::Spacing(axis, spacing));
     }
 
@@ -308,7 +308,8 @@ impl Builder {
     fn parbreak(&mut self) {
         let amount = self.style.par_spacing();
         self.stack.finish_par(&self.style);
-        self.stack.push_soft(StackChild::Spacing(amount.into()));
+        self.stack
+            .push_soft(StackChild::Spacing(Spacing::Linear(amount.into())));
     }
 
     /// Apply a forced page break.
@@ -328,25 +329,26 @@ impl Builder {
     /// Push an inline node into the active paragraph.
     fn inline(&mut self, node: impl Into<InlineNode>) {
         let align = self.style.aligns.inline;
-        self.stack.par.push(ParChild::Any(node.into(), align));
+        self.stack.par.push(ParChild::Node(node.into(), align));
     }
 
     /// Push a block node into the active stack, finishing the active paragraph.
     fn block(&mut self, node: impl Into<BlockNode>) {
         self.parbreak();
-        self.stack.push(StackChild::Any(node.into(), self.style.aligns.block));
+        self.stack
+            .push(StackChild::Node(node.into(), self.style.aligns.block));
         self.parbreak();
     }
 
     /// Push spacing into the active paragraph or stack depending on the `axis`.
-    fn spacing(&mut self, axis: GenAxis, amount: Linear) {
+    fn spacing(&mut self, axis: GenAxis, spacing: Spacing) {
         match axis {
             GenAxis::Block => {
                 self.stack.finish_par(&self.style);
-                self.stack.push_hard(StackChild::Spacing(amount));
+                self.stack.push_hard(StackChild::Spacing(spacing));
             }
             GenAxis::Inline => {
-                self.stack.par.push_hard(ParChild::Spacing(amount));
+                self.stack.par.push_hard(ParChild::Spacing(spacing));
             }
         }
     }
@@ -500,7 +502,7 @@ impl ParBuilder {
     fn build(self) -> Option<StackChild> {
         let Self { align, dir, leading, children, .. } = self;
         (!children.is_empty())
-            .then(|| StackChild::Any(ParNode { dir, leading, children }.into(), align))
+            .then(|| StackChild::Node(ParNode { dir, leading, children }.into(), align))
     }
 }
 
diff --git a/src/eval/walk.rs b/src/eval/walk.rs
index 6ac30150..9dd7cd2e 100644
--- a/src/eval/walk.rs
+++ b/src/eval/walk.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use super::{Eval, EvalContext, Str, Template, Value};
 use crate::diag::TypResult;
 use crate::geom::Align;
-use crate::layout::{ParChild, ParNode, StackChild, StackNode};
+use crate::layout::{ParChild, ParNode, Spacing, StackChild, StackNode};
 use crate::syntax::*;
 use crate::util::BoolExt;
 
@@ -118,9 +118,9 @@ fn walk_item(ctx: &mut EvalContext, label: Str, body: Template) {
         StackNode {
             dir: style.dir,
             children: vec![
-                StackChild::Any(label.into(), Align::Start),
-                StackChild::Spacing((style.text.size / 2.0).into()),
-                StackChild::Any(body.to_stack(&style).into(), Align::Start),
+                StackChild::Node(label.into(), Align::Start),
+                StackChild::Spacing(Spacing::Linear((style.text.size / 2.0).into())),
+                StackChild::Node(body.to_stack(&style).into(), Align::Start),
             ],
         }
     });