From 73615f7e3ce23f2ea656d04ea9f96184f5ebdc0a Mon Sep 17 00:00:00 2001 From: Laurenz Date: Wed, 24 Mar 2021 17:12:34 +0100 Subject: =?UTF-8?q?Text=20shaping=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Shapes text with rustybuzz - Font fallback with family list - Tofus are shown in the first font Co-Authored-By: Martin --- src/library/mod.rs | 2 +- src/library/spacing.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/library') 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 = 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); -- cgit v1.2.3