Better value representations, type function 🌐

1 files changed, 16 insertions, 20 deletions

diff --git a/src/eval/state.rs b/src/eval/state.rs
index 7860c004..2a8ee2f0 100644
--- a/src/eval/state.rs
+++ b/src/eval/state.rs
@@ -128,7 +128,22 @@ impl StateFont {
 impl Default for StateFont {
     fn default() -> Self {
         Self {
-            families: Rc::new(default_font_families()),
+            /// The default tree of font fallbacks.
+            families: Rc::new(fallback! {
+                list: ["sans-serif"],
+                classes: {
+                    "serif"      => ["source serif pro", "noto serif"],
+                    "sans-serif" => ["source sans pro", "noto sans"],
+                    "monospace"  => ["source code pro", "noto sans mono"],
+                },
+                base: [
+                    "source sans pro",
+                    "noto sans",
+                    "segoe ui emoji",
+                    "noto emoji",
+                    "latin modern math",
+                ],
+            }),
             variant: FontVariant {
                 style: FontStyle::Normal,
                 weight: FontWeight::REGULAR,
@@ -141,22 +156,3 @@ impl Default for StateFont {
         }
     }
 }
-
-/// The default tree of font fallbacks.
-fn default_font_families() -> FallbackTree {
-    fallback! {
-        list: ["sans-serif"],
-        classes: {
-            "serif"      => ["source serif pro", "noto serif"],
-            "sans-serif" => ["source sans pro", "noto sans"],
-            "monospace"  => ["source code pro", "noto sans mono"],
-        },
-        base: [
-            "source sans pro",
-            "noto sans",
-            "segoe ui emoji",
-            "noto emoji",
-            "latin modern math",
-        ],
-    }
-}