caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Filter out prohibited line breaks in par (#2376)

Browse Source
This commit is contained in:
tingerrr 2023-10-17 11:26:34 +02:00 committed by GitHub
parent 5f1ea5c48c
commit 80175db397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/typst-library/src/layout/par.rs
View File

@ -1189,18 +1189,25 @@ impl Iterator for Breakpoints<'_> {
let lb = LINEBREAK_DATA.as_borrowed();
// Get the next "word".
self.end = self.linebreaks.next()?;
self.mandatory =
self.p.bidi.text[..self.end].chars().next_back().map_or(false, |c| {
matches!(
lb.get(c),
loop {
// Get the next "word".
self.end = self.linebreaks.next()?;
self.mandatory = false;
// Fix for: https://github.com/unicode-org/icu4x/issues/4146
if let Some(c) = self.p.bidi.text[..self.end].chars().next_back() {
self.mandatory = match lb.get(c) {
LineBreak::Glue | LineBreak::WordJoiner | LineBreak::ZWJ => continue,
LineBreak::MandatoryBreak
| LineBreak::CarriageReturn
| LineBreak::LineFeed
| LineBreak::NextLine
) || self.end == self.p.bidi.text.len()
});
| LineBreak::CarriageReturn
| LineBreak::LineFeed
| LineBreak::NextLine => true,
_ => self.end == self.p.bidi.text.len(),
};
};
break;
}
// Hyphenate the next word.
if self.p.hyphenate != Some(false) {