Text colors 🦩 (#18)

3 files changed, 17 insertions, 8 deletions

diff --git a/tests/ref/library/font.png b/tests/ref/library/font.png
index 199a15f2..1cfbc499 100644
--- a/tests/ref/library/font.png
+++ b/tests/ref/library/font.png
diff --git a/tests/typ/library/font.typ b/tests/typ/library/font.typ
index ecea303f..3e818f19 100644
--- a/tests/typ/library/font.typ
+++ b/tests/typ/library/font.typ
@@ -31,6 +31,9 @@ Emoji: 🐪, 🌋, 🏞
     ∫ 𝛼 + 3𝛽 d𝑡
 ]
 
+// Colors.
+#font(color: #239DAD)[This is #font(color: #FA644B)[way more] colorful.]
+
 ---
 // Test top and bottom edge.
 
diff --git a/tests/typeset.rs b/tests/typeset.rs
index 7e7efc67..65347033 100644
--- a/tests/typeset.rs
+++ b/tests/typeset.rs
@@ -426,7 +426,7 @@ fn draw_text(env: &Env, canvas: &mut Canvas, pos: Point, shaped: &Shaped) {
                 .transform(&Transform::from_row(scale, 0.0, 0.0, -scale, x, y).unwrap())
                 .unwrap();
 
-            let mut paint = Paint::default();
+            let mut paint = paint_from_fill(shaped.color);
             paint.anti_alias = true;
 
             canvas.fill_path(&placed, &paint, FillRule::default());
@@ -438,13 +438,7 @@ fn draw_geometry(_: &Env, canvas: &mut Canvas, pos: Point, element: &Geometry) {
     let x = pos.x.to_pt() as f32;
     let y = pos.y.to_pt() as f32;
 
-    let mut paint = Paint::default();
-    match &element.fill {
-        Fill::Color(c) => match c {
-            typst::color::Color::Rgba(c) => paint.set_color_rgba8(c.r, c.g, c.b, c.a),
-        },
-        Fill::Image(_) => todo!(),
-    };
+    let paint = paint_from_fill(element.fill);
 
     match &element.shape {
         Shape::Rect(s) => {
@@ -454,6 +448,18 @@ fn draw_geometry(_: &Env, canvas: &mut Canvas, pos: Point, element: &Geometry) {
     };
 }
 
+fn paint_from_fill(fill: Fill) -> Paint<'static> {
+    let mut paint = Paint::default();
+    match fill {
+        Fill::Color(c) => match c {
+            typst::color::Color::Rgba(c) => paint.set_color_rgba8(c.r, c.g, c.b, c.a),
+        },
+        Fill::Image(_) => todo!(),
+    }
+
+    paint
+}
+
 fn draw_image(env: &Env, canvas: &mut Canvas, pos: Point, element: &Image) {
     let img = &env.resources.loaded::<ImageResource>(element.res);