Merge pull request #168 from w0rm/fix-breaking-long-words

Fix breaking long words with wide utf8 characters
embedded-graphics · May 3, 2024 · e1559ec · e1559ec
2 parents 11ec450 + 5e110cd
commit e1559ec
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+0.7.2 (2024-05-03)
+==================
+
+ - [#168] Fix breaking long words with wide utf8 characters 
+
+[#168]: https://github.com/embedded-graphics/embedded-text/pull/168
+
+
 0.7.1 (2024-04-29)
 ==================
 

diff --git a/src/rendering/line_iter.rs b/src/rendering/line_iter.rs
@@ -363,7 +363,7 @@ where
 
                     if !remainder.is_empty() {
                         // Consume what was printed.
-                        self.plugin.consume_partial(word.len());
+                        self.plugin.consume_partial(word.chars().count());
                         return Ok(LineEndType::LineBreak);
                     }
                 }

diff --git a/src/rendering/mod.rs b/src/rendering/mod.rs
@@ -552,4 +552,46 @@ pub mod test {
             ".......................................          ",
         ]);
     }
+
+    #[test]
+    fn correctly_breaks_long_words_with_wide_utf8_characters() {
+        let mut display = MockDisplay::new();
+        let character_style = MonoTextStyleBuilder::new()
+            .font(&FONT_6X10)
+            .text_color(BinaryColor::On)
+            .background_color(BinaryColor::Off)
+            .build();
+
+        TextBox::with_textbox_style(
+            "広広広", // MonoText replaces unrecognized characters with "?"
+            Rectangle::new(Point::zero(), size_for(&FONT_6X10, 2, 2)),
+            character_style,
+            TextBoxStyleBuilder::new().build(),
+        )
+        .draw(&mut display)
+        .unwrap();
+
+        display.assert_pattern(&[
+            "............",
+            ".###...###..",
+            "#...#.#...#.",
+            "...#.....#..",
+            "..#.....#...",
+            "..#.....#...",
+            "............",
+            "..#.....#...",
+            "............",
+            "............",
+            "......      ",
+            ".###..      ",
+            "#...#.      ",
+            "...#..      ",
+            "..#...      ",
+            "..#...      ",
+            "......      ",
+            "..#...      ",
+            "......      ",
+            "......      ",
+        ]);
+    }
 }