Fix state of reverse iterator after ZWJ

mbrubeck · mbrubeck · commit 137f34b2aa2e · 2017-02-06T10:04:15.000-08:00
Fixes #14.
diff --git a/src/grapheme.rs b/src/grapheme.rs
@@ -344,8 +344,8 @@ impl<'a> DoubleEndedIterator for Graphemes<'a> {
                     take_curr = false;
                     break;
                 },
-                Zwj => match cat {          // char to right is (GAZ|EBG)
-                    gr::GC_ZWJ => continue, // rule GB11: ZWJ x (GAZ|EBG)
+                Zwj => match cat {            // char to right is (GAZ|EBG)
+                    gr::GC_ZWJ => FindExtend, // rule GB11: ZWJ x (GAZ|EBG)
                     _ => {
                         take_curr = false;
                         break;
diff --git a/src/test.rs b/src/test.rs
@@ -32,8 +32,8 @@ fn test_graphemes() {
 
     pub const EXTRA_SAME: &'static [(&'static str, &'static [&'static str])] = &[
         // family emoji (more than two emoji joined by ZWJ)
-        ("\u{1f681}\u{1f6a6}\u{1f468}\u{200d}\u{1f467}\u{200d}\u{1f466}\u{1f469}\u{200d}\u{1f467}\u{200d}\u{1f466}",
-         &[]),
+        ("\u{1f468}\u{200d}\u{1f467}\u{200d}\u{1f466}",
+         &["\u{1f468}\u{200d}\u{1f467}\u{200d}\u{1f466}"]),
     ];
 
     for &(s, g) in TEST_SAME.iter().chain(EXTRA_SAME) {
