From 381a82e764829281b22d4959333c7c0f477a53e3 Mon Sep 17 00:00:00 2001
From: Eric Biedert <github@ericbiedert.de>
Date: Sat, 22 Jun 2024 11:09:28 +0200
Subject: [PATCH] Fix color mixing and gradients in luma space (#4424)

Co-authored-by: Laurenz <laurmaedje@gmail.com>
---
 crates/typst/src/visualize/color.rs |   2 +-
 tests/ref/issue-color-mix-luma.png  | Bin 0 -> 126 bytes
 tests/suite/visualize/color.typ     |   4 ++++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/issue-color-mix-luma.png

diff --git a/crates/typst/src/visualize/color.rs b/crates/typst/src/visualize/color.rs
index 185e990b7..17f4b5a43 100644
--- a/crates/typst/src/visualize/color.rs
+++ b/crates/typst/src/visualize/color.rs
@@ -1191,7 +1191,7 @@ impl Color {
                 Color::Hsv(Hsv::new(RgbHue::from_degrees(m[0]), m[1], m[2], m[3]))
             }
             ColorSpace::Cmyk => Color::Cmyk(Cmyk::new(m[0], m[1], m[2], m[3])),
-            ColorSpace::D65Gray => Color::Luma(Luma::new(m[0], m[1])),
+            ColorSpace::D65Gray => Color::Luma(Luma::new(m[0], m[3])),
         })
     }
 
diff --git a/tests/ref/issue-color-mix-luma.png b/tests/ref/issue-color-mix-luma.png
new file mode 100644
index 0000000000000000000000000000000000000000..957168926fa3c925d6f0445837e39ba0dc45bfa6
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^6+mpn0VEhUopE3RQm&pZjv*Dd-d^9x$)Lc);=pXx
z{o8*<#>%w|9@GjRG7qocQliet)_jotfrfJBy{C6ya{)OC1`<3#>Op(rZy@78dpWCI
V0He0x<BK4JJzf1=);T3K0RYuFC@=s3

literal 0
HcmV?d00001

diff --git a/tests/suite/visualize/color.typ b/tests/suite/visualize/color.typ
index 332594615..da93cb4e2 100644
--- a/tests/suite/visualize/color.typ
+++ b/tests/suite/visualize/color.typ
@@ -329,3 +329,7 @@
 #color.hsl(blue) \
 #color.hsv(blue) \
 #luma(blue)
+
+--- issue-color-mix-luma ---
+// When mixing luma colors, we accidentally used the wrong component.
+#rect(fill: gradient.linear(black, silver, space: luma))