From 51bf3268ddf5db1bdd61e59bfb4a30f0463a4bfb Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sat, 10 Oct 2020 22:35:24 +0200
Subject: =?UTF-8?q?Refactor=20text=20state=20=F0=9F=86=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/library/font.rs    | 18 +++++++++---------
 src/library/spacing.rs |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/library')

diff --git a/src/library/font.rs b/src/library/font.rs
index e6d9cd12..7460b21b 100644
--- a/src/library/font.rs
+++ b/src/library/font.rs
@@ -58,10 +58,10 @@ pub fn font(mut args: Args, ctx: &mut EvalContext) -> Value {
 
     if let Some(linear) = args.find::<Linear>() {
         if linear.is_absolute() {
-            ctx.state.text.font_size.base = linear.abs;
-            ctx.state.text.font_size.scale = Relative::ONE.into();
+            ctx.state.font.size = linear.abs;
+            ctx.state.font.scale = Relative::ONE.into();
         } else {
-            ctx.state.text.font_size.scale = linear;
+            ctx.state.font.scale = linear;
         }
     }
 
@@ -69,20 +69,20 @@ pub fn font(mut args: Args, ctx: &mut EvalContext) -> Value {
     let list: Vec<_> = args.find_all::<StringLike>().map(|s| s.to_lowercase()).collect();
 
     if !list.is_empty() {
-        Rc::make_mut(&mut ctx.state.text.fallback).list = list;
+        Rc::make_mut(&mut ctx.state.font.families).list = list;
         needs_flattening = true;
     }
 
     if let Some(style) = args.get::<_, FontStyle>(ctx, "style") {
-        ctx.state.text.variant.style = style;
+        ctx.state.font.variant.style = style;
     }
 
     if let Some(weight) = args.get::<_, FontWeight>(ctx, "weight") {
-        ctx.state.text.variant.weight = weight;
+        ctx.state.font.variant.weight = weight;
     }
 
     if let Some(stretch) = args.get::<_, FontStretch>(ctx, "stretch") {
-        ctx.state.text.variant.stretch = stretch;
+        ctx.state.font.variant.stretch = stretch;
     }
 
     for (class, dict) in args.find_all_str::<Spanned<ValueDict>>() {
@@ -91,14 +91,14 @@ pub fn font(mut args: Args, ctx: &mut EvalContext) -> Value {
             .map(|s| s.to_lowercase())
             .collect();
 
-        Rc::make_mut(&mut ctx.state.text.fallback).update_class_list(class, fallback);
+        Rc::make_mut(&mut ctx.state.font.families).update_class_list(class, fallback);
         needs_flattening = true;
     }
 
     args.done(ctx);
 
     if needs_flattening {
-        Rc::make_mut(&mut ctx.state.text.fallback).flatten();
+        Rc::make_mut(&mut ctx.state.font.families).flatten();
     }
 
     if let Some(body) = body {
diff --git a/src/library/spacing.rs b/src/library/spacing.rs
index a2b21e93..76515381 100644
--- a/src/library/spacing.rs
+++ b/src/library/spacing.rs
@@ -24,7 +24,7 @@ fn spacing(mut args: Args, ctx: &mut EvalContext, axis: SpecAxis) -> Value {
     args.done(ctx);
 
     if let Some(linear) = spacing {
-        let amount = linear.eval(ctx.state.text.font_size());
+        let amount = linear.eval(ctx.state.font.font_size());
         let spacing = Spacing { amount, softness: Softness::Hard };
         if ctx.state.dirs.main.axis() == axis {
             ctx.end_par_group();
-- 
cgit v1.2.3