Introduce page / block / inline levels

2 files changed, 10 insertions, 10 deletions

diff --git a/src/library/layout.rs b/src/library/layout.rs
index bb9e5936..d412af67 100644
--- a/src/library/layout.rs
+++ b/src/library/layout.rs
@@ -220,16 +220,16 @@ pub fn stack(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
         for child in &list {
             match child {
                 Child::Spacing(v) => {
-                    children.push(StackChild::spacing(*v, dir.axis()));
+                    children.push(StackChild::Spacing(*v));
                     delayed = None;
                 }
                 Child::Any(template) => {
                     if let Some(v) = delayed {
-                        children.push(StackChild::spacing(v, dir.axis()));
+                        children.push(StackChild::Spacing(v));
                     }
 
-                    let node = template.to_stack(style);
-                    children.push(StackChild::new(node, style.aligns.block));
+                    let node = template.to_stack(style).into();
+                    children.push(StackChild::Any(node, style.aligns.block));
                     delayed = spacing;
                 }
             }
diff --git a/src/library/text.rs b/src/library/text.rs
index fa334620..3c7055d3 100644
--- a/src/library/text.rs
+++ b/src/library/text.rs
@@ -110,18 +110,18 @@ pub fn font(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
 
 /// `par`: Configure paragraphs.
 pub fn par(ctx: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
-    let par_spacing = args.named("spacing")?;
-    let line_spacing = args.named("leading")?;
+    let spacing = args.named("spacing")?;
+    let leading = args.named("leading")?;
 
     ctx.template.modify(move |style| {
         let par = style.par_mut();
 
-        if let Some(par_spacing) = par_spacing {
-            par.par_spacing = par_spacing;
+        if let Some(spacing) = spacing {
+            par.spacing = spacing;
         }
 
-        if let Some(line_spacing) = line_spacing {
-            par.line_spacing = line_spacing;
+        if let Some(leading) = leading {
+            par.leading = leading;
         }
     });