Make percentages for h and v relative to area instead of font size

1 files changed, 6 insertions, 9 deletions

diff --git a/src/library/layout.rs b/src/library/layout.rs
index 977b3153..67e58606 100644
--- a/src/library/layout.rs
+++ b/src/library/layout.rs
@@ -80,20 +80,17 @@ pub fn pagebreak(_: &mut EvalContext, _: &mut Arguments) -> TypResult<Value> {
 
 /// `h`: Horizontal spacing.
 pub fn h(_: &mut EvalContext, args: &mut Arguments) -> TypResult<Value> {
-    spacing_impl(args, GenAxis::Cross)
+    let spacing = args.expect("spacing")?;
+    Ok(Value::template(move |ctx| {
+        ctx.push_spacing(GenAxis::Cross, spacing);
+    }))
 }
 
 /// `v`: Vertical spacing.
 pub fn v(_: &mut EvalContext, args: &mut Arguments) -> TypResult<Value> {
-    spacing_impl(args, GenAxis::Main)
-}
-
-fn spacing_impl(args: &mut Arguments, axis: GenAxis) -> TypResult<Value> {
-    let spacing = args.expect::<Linear>("spacing")?;
+    let spacing = args.expect("spacing")?;
     Ok(Value::template(move |ctx| {
-        // TODO: Should this really always be font-size relative?
-        let amount = spacing.resolve(ctx.state.font.size);
-        ctx.push_spacing(axis, amount);
+        ctx.push_spacing(GenAxis::Main, spacing);
     }))
 }