Reset stream safe iterator to buffered character when outputting CGJ

Manishearth · Manishearth · commit 0786dc02d0df · 2020-11-17T19:39:16.000-08:00
diff --git a/src/stream_safe.rs b/src/stream_safe.rs
@@ -42,7 +42,7 @@ impl<I: Iterator<Item = char>> Iterator for StreamSafe<I> {
         let d = classify_nonstarters(next_ch);
         if self.nonstarter_count + d.leading_nonstarters > MAX_NONSTARTERS {
             self.buffer = Some(next_ch);
-            self.nonstarter_count = 0;
+            self.nonstarter_count += d.decomposition_len;
             return Some(COMBINING_GRAPHEME_JOINER);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ impl<I: Iterator<Item = char>> Iterator for StreamSafe<I> {`
`42`	`42`	`let d = classify_nonstarters(next_ch);`
`43`	`43`	`if self.nonstarter_count + d.leading_nonstarters > MAX_NONSTARTERS {`
`44`	`44`	`self.buffer = Some(next_ch);`
`45`		`- self.nonstarter_count = 0;`
	`45`	`+ self.nonstarter_count += d.decomposition_len;`
`46`	`46`	`return Some(COMBINING_GRAPHEME_JOINER);`
`47`	`47`	`}`
`48`	`48`