meli
/
meli
9
Fork 13
Code Issues 13 Pull Requests 11 Actions Packages Projects 1 Releases 19 Wiki Activity

line_break: check of eof in LB13

memfd
Manos Pitsidianakis 2020-09-03 11:36:10 +03:00
parent f8f3f1817d
commit 46c44ced96
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,9 @@ impl<'a> Iterator for LineBreakCandidateIter<'a> {
match class { match class {
/* LB13 Do not break before ‘]’ or ‘!’ or ‘;’ or ‘/’, even after spaces. */ /* LB13 Do not break before ‘]’ or ‘!’ or ‘;’ or ‘/’, even after spaces. */
SP if [CL, CP, EX, IS, SY].contains(&get_class!(text[idx..].trim_start())) => { SP if !text[idx..].trim_start().is_empty()
&& [CL, CP, EX, IS, SY].contains(&get_class!(text[idx..].trim_start())) =>
{
*pos += grapheme.len(); *pos += grapheme.len();
while ![CL, CP, EX, IS, SY] while ![CL, CP, EX, IS, SY]
.contains(&next_grapheme_class!(iter, grapheme).unwrap()) .contains(&next_grapheme_class!(iter, grapheme).unwrap())
@ -314,7 +316,7 @@ impl<'a> Iterator for LineBreakCandidateIter<'a> {
} }
continue; continue;
} }
QU if get_class!(text[idx..].trim_start()) == OP => { QU if get_class!(text[idx + grapheme.len()..].trim_start()) == OP => {
/* LB15 Do not break within ‘”[’, even with intervening spaces. /* LB15 Do not break within ‘”[’, even with intervening spaces.
* QU SP* × OP */ * QU SP* × OP */
*pos += grapheme.len(); *pos += grapheme.len();
@ -332,9 +334,7 @@ impl<'a> Iterator for LineBreakCandidateIter<'a> {
} }
continue; continue;
} }
LineBreakClass::CL | LineBreakClass::CP CL | CP if get_class!(text[idx + grapheme.len()..].trim_start()) == NS => {
if get_class!(text[idx..].trim_start()) == NS =>
{
/* LB16 Do not break between closing punctuation and a nonstarter (lb=NS), even with /* LB16 Do not break between closing punctuation and a nonstarter (lb=NS), even with
* intervening spaces. * intervening spaces.
* (CL | CP) SP* × NS */ * (CL | CP) SP* × NS */