From c340c2792410664d438b1ece6e2cb8caf1d83ec4 Mon Sep 17 00:00:00 2001
From: "Y.D.X." <73375426+YDX-2147483647@users.noreply.github.com>
Date: Thu, 4 Sep 2025 17:17:00 +0800
Subject: [PATCH] Fix CJ-Latin space at manual line breaks (#6700)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Laurenz Mädje <laurmaedje@gmail.com>
---
 crates/typst-layout/src/inline/line.rs           |  10 ++++++++--
 ...539-cjk-latin-spacing-at-manual-linebreak.png | Bin 0 -> 1532 bytes
 tests/suite/layout/inline/cjk.typ                |  13 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref/issue-6539-cjk-latin-spacing-at-manual-linebreak.png

diff --git a/crates/typst-layout/src/inline/line.rs b/crates/typst-layout/src/inline/line.rs
index ca991467..0010c585 100644
--- a/crates/typst-layout/src/inline/line.rs
+++ b/crates/typst-layout/src/inline/line.rs
@@ -149,6 +149,7 @@ pub fn line<'a>(
 
     // Trim the line at the end, if necessary for this breakpoint.
     let trim = range.start + breakpoint.trim(full).len();
+    let trimmed_range = range.start..trim;
 
     // Collect the items for the line.
     let mut items = Items::new();
@@ -179,7 +180,8 @@ pub fn line<'a>(
     trim_weak_spacing(&mut items);
 
     // Deal with CJ characters at line boundaries.
-    adjust_cj_at_line_boundaries(p, full, &mut items);
+    // Use the trimmed range for robust boundary checks.
+    adjust_cj_at_line_boundaries(p, trimmed_range, &mut items);
 
     // Compute the line's width.
     let width = items.iter().map(Item::natural_width).sum();
@@ -319,7 +321,11 @@ fn collect_range<'a>(
 ///
 /// See Requirements for Chinese Text Layout, Section 3.1.6.3 Compression of
 /// punctuation marks at line start or line end.
-fn adjust_cj_at_line_boundaries(p: &Preparation, text: &str, items: &mut Items) {
+///
+/// The `range` should only contain regular texts, with linebreaks trimmed.
+fn adjust_cj_at_line_boundaries(p: &Preparation, range: Range, items: &mut Items) {
+    let text = &p.text[range];
+
     if text.starts_with(BEGIN_PUNCT_PAT)
         || (p.config.cjk_latin_spacing && text.starts_with(is_of_cj_script))
     {
diff --git a/tests/ref/issue-6539-cjk-latin-spacing-at-manual-linebreak.png b/tests/ref/issue-6539-cjk-latin-spacing-at-manual-linebreak.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc572f7aeae4f0a0ceb979c4f51144b2aa68a627
GIT binary patch
literal 1532
zcmV<Y1q1qtP)<h;3K|Lk000e1NJLTq004LZ004{#0{{R3fVrLT00069P)t-s|NsBD
zx3}c@=efDL!otGg;o<rD`7bXo`1ts+>$m>?{@U8w-QC^$`}^_n@vpD1rKP3p?CkRL
z@}8cagoK3O-`~T-!_d&sgvyMYo13w*vF+{ctgNi#<KyS&=R-q7v$L~?hK81wmg?&2
z-rnA_va+qMt%!(-*x1<3&COC$Qh0cHO-)ULf`Y25s^;eAMn*>W_xHfSz*SXMnVFfR
zqoaw5iPqNEc6N5ZzrPa`6Jlaw{r&x`<gw1q&QVcO(b3Tw8X8_+UTtk{M@L7Fj*fM8
zb$)(+^z`(Tlap&}YfDQ@NJvOiQ&W_bl*`M@jEsz?rl!Zo$E2jBxVX4sVPS4=Zo0a<
zg@uL5$;nSoPdPa`7Z(>678bm`ykB2mTwGj$fPi~@dr3)24Gj%SN=mi0wU3XFE-o%i
zOiZupws3H8P*70J%*@Kl%KG~H+uPd^5D=@YtG2eb+}zxqot=k=hoGRK)YQ~LK|y(W
zd6<}(ySuxUm6d&ceW|Ibi;IhIZ*Q)yu3B1JPEJm}y}jb%;^pP#sHmvY($d%0*K>1o
z@bK`Bjg5MGdh_%1>+9?3>FJS?k!EIQfq{WmR#tz1e|&s=S65fY#>SA4kk!@I<mBX7
zSXjQkzVGkv$jHcdcX#~!{Bm+~qN1X~!NK<S_O!IL?(Xi>)6-j9TU}jUmgS$YOifJy
z00Xc|L_t(|+U?s%S6W*b#_?x+fQuA~Aab#H(|f<YruW`^@4aZ6iHW@n3MdD{0g-&j
zxZi}8Ny<duGugj^11A4<TnqPp76?UAlv&c0$<)+jYMOzBAj4M7wGSTvOaSvdz(ODg
z0I}#az044f$5*e3$47x&R!h7TH@L!Mx<0a2*JT(;P2RpmVZL9r3{Pd=hg+O%PpoN)
zO`10G`H7z<xx#NjPn-sF77^|(OK^ojVJQc~85WQh3$l<e{40n9AbjCG6=n`6*~6;@
z+5R(6xT?;Vdem|sK+YNn1j;;I@8gap?_W{R0~z+#?`*2?=L)-lpKNf*uq_sO;aSEN
z28E?uI#3d+DCZB;=@hYZhV7uRMMQ#SVZN~Cd<&%OPO_L@=1@K`2&vCSmZ+PzqA1EY
z*wfNF040KSGY#|K4a1mxaxM9J!W3H>kHw;~7XS_OP{gy6FYN!f^UFnGnS(7H-BtyO
zhWYa?>$t+!D_#(K;`TnaVSaP~QfIlm`uyL#lxvu~kKMinU`6*7_b~5Ve`<7e^z^GP
zEEnV)`*vCZl2rRxg=andiy(h64fEoqHTN<VmGmbw7K@Efa=nl5u5LJC1bs66F8a_H
zjd6whX{M%S*kOC1mBvlj$2}(#BdM54!@SmQLf9gj>&h1Kg|m0=LK=&cRdXLMD1hYZ
zdJJh;C;t=_sJpkKD9YE^i$3vHVMvgX80K1GAz&>nEnPn}^P>_pVfqKAuNJbLPP*S;
zyT|Wuq+wqBtm7Wr=f_Ux!9z~xatG)l&;zdUG;m-Xm;ep)P;ZtmoT=!FP#8$Ho&j6<
zW-Bnykl{b|(6h!8wy*<|4141<yli0rh=zuNYC)=*!o`q^9Y8tAW;Ih)c-F(O1o@k3
zm=|r>yGu6)0p#2^o6Wg^>wWAwd}L$W!$&ea-{`w!M7hEP^fB&Kex_#A>@$^4r?Wwq
zNyGek(v)F7GQ|0PuF8!Yc)!n;ALa`zD<SO=<h2^+ilQjr7XVTQ8LH<Q=9;GYN;EC>
z7_ZYarUu7;;~3^-JOY4*`G3JRZFD-ZhUp?;2YZ;VK1*t|<~;HKwJ;(4*0p<IYn=&U
zt8+#JTiD+IrUO#7AWvArqyfYVGN@*%3eS2tEXY=-VV=(3_q(D!`3Y0S_TN8^?=Rj7
zcBeq6Q(tdJ=L%N>m+g3$Kb`z;bB1}iZoWywe33cB{OL;%<1p_(o;7Efx3^V5x**6K
i_F<k>mwZK0e&8cK69PGMU@P+g0000<MNUMnLSTaa)g^fV

literal 0
HcmV?d00001

diff --git a/tests/suite/layout/inline/cjk.typ b/tests/suite/layout/inline/cjk.typ
index 0540cd19..75002f25 100644
--- a/tests/suite/layout/inline/cjk.typ
+++ b/tests/suite/layout/inline/cjk.typ
@@ -84,6 +84,19 @@ abc字#linebreak()
 abc字\
 母
 
+--- issue-6539-cjk-latin-spacing-at-manual-linebreak ---
+// Issue #6539
+#set text(cjk-latin-spacing: auto)
+#set box(width: 2.3em, stroke: (x: green))
+
+#box(align(end)[甲国\ T国])
+
+#box(align(end)[乙国 \ T国])
+
+#box(align(end)[丙国 T国])
+
+#box(align(end)[丁国T国])
+
 --- issue-2650-cjk-latin-spacing-meta ---
 测a试