From ea5272bb2b6461757f25c6b59d3ea9eb02e92dbc Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Wed, 16 Jul 2025 16:10:21 +0800
Subject: [PATCH] Support setting fonts repeatedly with different `covers`
 (#6604)

---
 crates/typst-layout/src/inline/shaping.rs |   9 ++++++-
 tests/ref/text-font-covers-repeat.png     | Bin 0 -> 467 bytes
 tests/ref/text-font-covers-riffle.png     | Bin 0 -> 1603 bytes
 tests/suite/text/font.typ                 |  28 ++++++++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/text-font-covers-repeat.png
 create mode 100644 tests/ref/text-font-covers-riffle.png

diff --git a/crates/typst-layout/src/inline/shaping.rs b/crates/typst-layout/src/inline/shaping.rs
index d1e748da8..a8f2bcaba 100644
--- a/crates/typst-layout/src/inline/shaping.rs
+++ b/crates/typst-layout/src/inline/shaping.rs
@@ -719,6 +719,10 @@ fn glyphs_width(glyphs: &[ShapedGlyph]) -> Abs {
 struct ShapingContext<'a, 'v> {
     engine: &'a Engine<'v>,
     glyphs: Vec<ShapedGlyph>,
+    /// Font families that have been used with unlimited coverage.
+    ///
+    /// These font families are considered exhausted and will not be used again,
+    /// even if they are declared again (e.g., during fallback after normal selection).
     used: Vec<Font>,
     styles: StyleChain<'a>,
     size: Abs,
@@ -777,7 +781,10 @@ fn shape_segment<'a>(
         return;
     };
 
-    ctx.used.push(font.clone());
+    // This font has been exhausted and will not be used again.
+    if covers.is_none() {
+        ctx.used.push(font.clone());
+    }
 
     // Fill the buffer with our text.
     let mut buffer = UnicodeBuffer::new();
diff --git a/tests/ref/text-font-covers-repeat.png b/tests/ref/text-font-covers-repeat.png
new file mode 100644
index 0000000000000000000000000000000000000000..aceb8d007934e2747f6d2282a9f73d90d56098db
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq004LZ000{Z00000l5Z6H0004+Nkl<Zc-rmM
z-7BjB0Dy6S#<@IoI_LgeojS)U$^|###z)L&N)7X|(U|W@v=+(72xY8xL2sn+G8(0c
zCSnL>-q_@$7+zzKD;I8dF-qxu{(;}!6Tv4Hp}-2Pz+VsETqab`^^b=Wn^I#N;%sSz
zs;!c@-8kWVOazz37bZN%umSsC2B8uSyy-Bt406bH4cfP}!-T<F4|^$XDmRW%(<2-t
z%;xt|DtOZmCv_uPGp3@Tn9$w=gO;(YjL}Sh6)kuv6`$lf;eGJG+i_zc(w=MuVix&N
zUpMJH@^`<bgtQ}3hk9YWc>Wujj{8@bBMmI%)x8f^F|S{Xmpl(Z+!cQq>LJS={EN^`
z-lk}v%Um>kBB6Eg3ZK<K1Hm71xUg9Z8%a!+$UiS0y+G6{zYwbA=vn`7Y_+IXMLju^
zH5U)+X#l44L3O@uJNEk`aXy3vdul4S=-2r=^_ODV&=c$w3#;m-yQVI)Z9?NVR!ijr
zu9nUf0<8@WsiHXmTsM~Q-lz);_P30^XP8cvb1AR_EASVFUjVm!Hj|U2C9MDe002ov
JPDHLkV1g0-(BJ?7

literal 0
HcmV?d00001

diff --git a/tests/ref/text-font-covers-riffle.png b/tests/ref/text-font-covers-riffle.png
new file mode 100644
index 0000000000000000000000000000000000000000..577e4f23d9026718ec603a5be7b2585bc08d4f33
GIT binary patch
literal 1603
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
B7Ki`<

literal 0
HcmV?d00001

diff --git a/tests/suite/text/font.typ b/tests/suite/text/font.typ
index 6e21dfd23..dd61bfc86 100644
--- a/tests/suite/text/font.typ
+++ b/tests/suite/text/font.typ
@@ -135,6 +135,34 @@ I
 
 The number 123.
 
+--- text-font-covers-repeat ---
+// Repeatedly use the same font.
+#set text(font: (
+  (name: "Libertinus Serif", covers: regex("[0-9]")),
+  "Libertinus Serif"
+))
+
+The number 123.
+
+--- text-font-covers-riffle ---
+// Repeatedly use two fonts alternately.
+#set text(font: (
+  (name: "Noto Color Emoji", covers: regex("[🔗⛓‍💥]")),
+  (name: "Twitter Color Emoji", covers: regex("[^🖥️]")),
+  "Noto Color Emoji",
+))
+
+🔗⛓‍💥🖥️🔑
+
+// The above should be the same as:
+#{
+  text(font: "Noto Color Emoji", "🔗⛓‍💥🖥️")
+  text(font: "Twitter Color Emoji", "🔑")
+}
+
+// but not:
+#text(font: "Twitter Color Emoji", "🔗⛓‍💥🖥️🔑")
+
 --- text-font-covers-bad-1 ---
 // Error: 17-59 coverage regex may only use dot, letters, and character classes
 // Hint: 17-59 the regex is applied to each letter individually