Raw lengths 🚲

Replace unitless length with raw f64 and introduce length type with unit.

4 files changed, 6 insertions, 6 deletions

diff --git a/src/library/font.rs b/src/library/font.rs
index 5696cf4a..a78f9124 100644
--- a/src/library/font.rs
+++ b/src/library/font.rs
@@ -157,8 +157,8 @@ function! {
     layout(self, ctx, f) {
         styled(&self.body, ctx, self.size, |t, s| {
             match s {
-                ScaleLength::Absolute(size) => {
-                    t.base_font_size = size;
+                ScaleLength::Absolute(length) => {
+                    t.base_font_size = length.as_raw();
                     t.font_scale = 1.0;
                 }
                 ScaleLength::Scaled(scale) => t.font_scale = scale,
diff --git a/src/library/layout.rs b/src/library/layout.rs
index 2d0e3ac5..7d989555 100644
--- a/src/library/layout.rs
+++ b/src/library/layout.rs
@@ -125,7 +125,7 @@ function! {
         let map = self.extents.dedup(&mut f.diagnostics, ctx.axes);
         for &axis in &[Horizontal, Vertical] {
             if let Some(scale) = map.get(axis) {
-                let length = scale.scaled(ctx.base.get(axis));
+                let length = scale.raw_scaled(ctx.base.get(axis));
                 *ctx.base.get_mut(axis) = length;
                 *ctx.spaces[0].dimensions.get_mut(axis) = length;
                 *ctx.spaces[0].expansion.get_mut(axis) = true;
diff --git a/src/library/page.rs b/src/library/page.rs
index dd63a0a7..43f916b3 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -31,8 +31,8 @@ function! {
         }
 
         let map = self.extents.dedup(&mut f.diagnostics, ctx.axes);
-        map.with(Horizontal, |&width| style.dimensions.x = width);
-        map.with(Vertical, |&height| style.dimensions.y = height);
+        map.with(Horizontal, |&width| style.dimensions.x = width.as_raw());
+        map.with(Vertical, |&height| style.dimensions.y = height.as_raw());
 
         if self.flip {
             style.dimensions.swap();
diff --git a/src/library/spacing.rs b/src/library/spacing.rs
index 5ae25a92..c632bdb4 100644
--- a/src/library/spacing.rs
+++ b/src/library/spacing.rs
@@ -98,7 +98,7 @@ function! {
     layout(self, ctx, f) {
         if let Some((axis, spacing)) = self.spacing {
             let axis = axis.to_generic(ctx.axes);
-            let spacing = spacing.scaled(ctx.style.text.font_size());
+            let spacing = spacing.raw_scaled(ctx.style.text.font_size());
             vec![AddSpacing(spacing, SpacingKind::Hard, axis)]
         } else {
             vec![]