mredaelli
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

melib/line_break: fix missing Break on B2 class 

Graphemes of B2 class, such as the Em dash can break before and after.
However this case wasn't handled in the line break iterator.
memfd
Manos Pitsidianakis 2020-08-18 12:01:13 +03:00
parent bb4754e38a
commit be31d35ff6
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
melib/src/text_processing/line_break.rs
View File

@ -51,6 +51,8 @@ pub struct LineBreakCandidateIter<'a> {
pos: usize,
/* Needed for rule LB30a */
reg_ind_streak: u32,
/* Needed for break before and after opportunities */
break_now: bool,
}
impl<'a> LineBreakCandidateIter<'a> {
@ -60,6 +62,7 @@ impl<'a> LineBreakCandidateIter<'a> {
pos: 0,
iter: UnicodeSegmentation::grapheme_indices(text, true).peekable(),
reg_ind_streak: 0,
break_now: false,
}
}
}
@ -145,6 +148,7 @@ impl<'a> Iterator for LineBreakCandidateIter<'a> {
ref mut iter,
ref text,
ref mut reg_ind_streak,
ref mut break_now,
ref mut pos,
} = self;
let (idx, mut grapheme) = iter.next().unwrap();
@ -215,6 +219,12 @@ impl<'a> Iterator for LineBreakCandidateIter<'a> {
*pos += grapheme.len();
continue;
}
_ if *break_now => {
*break_now = false;
let ret = *pos;
*pos += grapheme.len();
return Some((ret, BreakAllowed));
}
_ => {}
}
}
@ -336,10 +346,8 @@ impl<'a> Iterator for LineBreakCandidateIter<'a> {
}
B2 if get_class!(text[idx..].trim_start()) == B2 => {
*pos += grapheme.len();
while Some(SP) == next_grapheme_class!(iter, grapheme) {
*pos += grapheme.len();
}
continue;
*break_now = true;
return Some((*pos, BreakAllowed));
}
SP => {
/* LB18 Break after spaces. SP ÷ */