From 42754477886f6a12afbabfd2a64d8c787a57bc03 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 18 Jul 2024 10:49:08 +0200
Subject: [PATCH] Fix panic in link linebreaking (#4579)

---
 crates/typst/src/layout/inline/linebreak.rs |  12 +++++-------
 tests/ref/issue-hyphenate-in-link.png       | Bin 0 -> 1200 bytes
 tests/suite/layout/inline/linebreak.typ     |   8 ++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 tests/ref/issue-hyphenate-in-link.png

diff --git a/crates/typst/src/layout/inline/linebreak.rs b/crates/typst/src/layout/inline/linebreak.rs
index 075d24b33..1f30bb732 100644
--- a/crates/typst/src/layout/inline/linebreak.rs
+++ b/crates/typst/src/layout/inline/linebreak.rs
@@ -655,9 +655,9 @@ fn breakpoints(p: &Preparation, mut f: impl FnMut(usize, Breakpoint)) {
         let (head, tail) = text.split_at(last);
         if head.ends_with("://") || tail.starts_with("www.") {
             let (link, _) = link_prefix(tail);
-            let end = last + link.len();
             linebreak_link(link, |i| f(last + i, Breakpoint::Normal));
-            while iter.peek().is_some_and(|&p| p < end) {
+            last += link.len();
+            while iter.peek().is_some_and(|&p| p < last) {
                 iter.next();
             }
         }
@@ -687,19 +687,17 @@ fn breakpoints(p: &Preparation, mut f: impl FnMut(usize, Breakpoint)) {
         };
 
         // Hyphenate between the last and current breakpoint.
-        if hyphenate {
-            let mut offset = last;
+        if hyphenate && last < point {
             for segment in text[last..point].split_word_bounds() {
                 if !segment.is_empty() && segment.chars().all(char::is_alphabetic) {
-                    hyphenations(p, &lb, offset, segment, &mut f);
+                    hyphenations(p, &lb, last, segment, &mut f);
                 }
-                offset += segment.len();
+                last += segment.len();
             }
         }
 
         // Call `f` for the UAX #14 break opportunity.
         f(point, breakpoint);
-
         last = point;
     }
 }
diff --git a/tests/ref/issue-hyphenate-in-link.png b/tests/ref/issue-hyphenate-in-link.png
new file mode 100644
index 0000000000000000000000000000000000000000..932c23ae994d61febff645f091481cdf34f4fbfb
GIT binary patch
literal 1200
zcmV;h1W)^kP)<h;3K|Lk000e1NJLTq004LZ001=z00000ugP${000DcNkl<Zc-rmN
z+fUPH0LF3uj~TNqyVJQjGpS~HxX^9tBrxaPAdIO~As`AwoTpVhaaaKhVx_e$RAivD
zpcT+4OwcNhLJ``6j#Dd0Ij#b2DQ&;wV)J4fhYMF1?Q`|ZFHiDG-n@C<IlQFI@xy-D
z55G#VvF0Vg6`uo)d$Gdv6hPT9f6thM(w|-!Y~BR0p`XR@JZC||KN8xC$MfRg5P3v>
z*Mh8bZ=chzE8CMp?PKoiapYqV9W|$=Zqe1Ll1BTAL}sht<l{J1^?FnD_JON~KQf#w
zuH=j|)uV|mjJTd2=~e!q2&+s^#3@qbA~`M%e?-1AdrEkTt9(Bn|4smWb`QZoRTC0W
zTUkQ0P8&F8U-`>+>8-BHqlC7h6cg0aUSZl;wW9IcrV+I|h3r$Fd85VAMEv$-kt^dQ
zYsQXh*m<*c*@P<H8#tn$=BTxCf5IU>L|6WG(t`_uU!yU7)NL6vXJ>9_5-t!^v0p)c
zbhpL5U>FV-quqvpvLi&*TZ53w2<i<skeksKO6dvIA84k6+k>f$WSzzJq0<%8#TT}c
z``U-tRq$q$tD|}=BXfJaJzJY6zrvgBvQ)f+3)H<oK4J?!LyKky#d6mo)ce_@?OaRt
zX+G&n5hJ{B*hul=N7|v)Q^Bf)r#XpzB}bf!<MxmgX(O#Y61dzCO;I^+Q9=v%cFUZ1
zQ_J_7Z|?0na>&NT5hzN$$Y8>Wr>LX~G%=?1gXX=t=i@q(k~-sx+*#5RWbr*|2Rf2+
z>t-_`K^6dpV92M-Wm<g9ztyh^{7lPC>C^oO@Xv;Mw52d@r7Dn_Q|f{0*~2b50=z>^
zTXC#n=14&M-gNMFsn}tRxO$u-Sw;@mEC`UMVa^csx>PxhhKSmP%b4;Ky?uG20gqHv
zJ6UloR3?v{kL=gQKZA+*GEuyj^U6Gc*1Uag{S^sVOBhltp9XFVN3)xN+udbZo>d?L
z0s3zUoY2)AxKy>0fI7z#q8jfKRDUW_n_zE1!sH*>9_PYwW2Mt*bcy${*-$PdbHZqJ
z?9yow6W>I>gLL<FaG{Xlr7Rz(J+?iDaRmr4McCd2mfmP+A<#_#rsapcZ|LhSu9!95
zlNHA*8iP5el+h^`+s-P9d9d#SSjFPr))n7VCl4z@LVI}fTLn|WHcRuTJdPsZ88xbU
z&~(Fm^j|Z#!}}yu&L9DH=5vX)Pu?*wcy+ws<YdLM5}Azt`IiC6%4NqLc^GDZOKj*|
zhEV;q6d;h%u78K`$SKT9x7CHou&m$tRf7bozr2z8UE95|Q}*7dG@U-|TJ`4IWJM+o
z+p^8KM5z`D*rSyyV6zKgEMeb3q{w|Z;TAxuB7+oZmQd~l%EKP$a%Q~Mu|tdsdzdlL
zD<0)+TFeON?NS$8nSI)WhF{Qtc>RyWs|ojAcLNnZhleBEVxh+1bNF-~t8GZ|IUHNg
zrib2K-^0Qy1Y2&Kd=K9i5$u)Vdl>n-TCenFz`$sqf4TgyANIrld-xCNHj=Q(`<8|P
O0000<MNUMnLSTZX!d7em

literal 0
HcmV?d00001

diff --git a/tests/suite/layout/inline/linebreak.typ b/tests/suite/layout/inline/linebreak.typ
index 2fa29b6ce..7e959352b 100644
--- a/tests/suite/layout/inline/linebreak.typ
+++ b/tests/suite/layout/inline/linebreak.typ
@@ -107,3 +107,11 @@ For info see #link("https://myhost.tld").
 #set page(width: 50pt, height: auto)
 #h(99%) 🏳️‍🌈
 🏳️‍🌈
+
+--- issue-hyphenate-in-link ---
+#set par(justify: true)
+
+// The `linebreak()` function accidentally generated out-of-order breakpoints
+// for links because it now splits on word boundaries. We avoid the link markup
+// syntax because it's show rule interferes.
+#"http://creativecommons.org/licenses/by-nc-sa/4.0/"