Text shaping 🚀

- Shapes text with rustybuzz
- Font fallback with family list
- Tofus are shown in the first font

Co-Authored-By: Martin <mhaug@live.de>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/library/mod.rs b/src/library/mod.rs
index 58e62d56..1f412cd0 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -32,8 +32,8 @@ use fontdock::{FontStyle, FontWeight};
 use crate::eval::{AnyValue, FuncValue, Scope};
 use crate::eval::{EvalContext, FuncArgs, TemplateValue, Value};
 use crate::exec::{Exec, ExecContext, FontFamily};
+use crate::font::VerticalFontMetric;
 use crate::geom::*;
-use crate::layout::VerticalFontMetric;
 use crate::syntax::{Node, Spanned};
 
 /// Construct a scope containing all standard library definitions.
diff --git a/src/library/spacing.rs b/src/library/spacing.rs
index 506f6585..d4648566 100644
--- a/src/library/spacing.rs
+++ b/src/library/spacing.rs
@@ -27,7 +27,7 @@ fn spacing_impl(ctx: &mut EvalContext, args: &mut FuncArgs, axis: SpecAxis) -> V
     let spacing: Option<Linear> = args.require(ctx, "spacing");
     Value::template("spacing", move |ctx| {
         if let Some(linear) = spacing {
-            let amount = linear.resolve(ctx.state.font.font_size());
+            let amount = linear.resolve(ctx.state.font.resolve_size());
             let spacing = SpacingNode { amount, softness: 0 };
             if axis == ctx.state.dirs.main.axis() {
                 ctx.push_into_stack(spacing);