Merge branch 'master' into nomem

2 files changed, 18 insertions, 0 deletions

diff --git a/tests/runewidth.ha b/tests/runewidth.ha
index 5e570a5..820dcf0 100644
--- a/tests/runewidth.ha
+++ b/tests/runewidth.ha
@@ -6,4 +6,20 @@ fn runewidth() void = {
 	assert(tui::runewidth('大') == 2);
 	assert(tui::runewidth('ぁ') == 2);
 	assert(tui::runewidth('😀') == 2);
+	assert(tui::runewidth('近') == 2);
+	assert(tui::runewidth('く') == 2);
+	assert(tui::runewidth('の') == 2);
+	assert(tui::runewidth('さ') == 2);
+	assert(tui::runewidth('や') == 2);
+	assert(tui::runewidth('き') == 2);
+	assert(tui::runewidth('😪') == 2);
+	assert(tui::runewidth('「') == 2);
+	assert(tui::runewidth('ま') == 2);
+	assert(tui::runewidth('行') == 2);
+	assert(tui::runewidth('」') == 2);
+	assert(tui::runewidth('オ') == 2);
+	assert(tui::runewidth('ノ') == 2);
+	assert(tui::runewidth('マ') == 2);
+	assert(tui::runewidth('ト') == 2);
+	assert(tui::runewidth('ペ') == 2);
 };
diff --git a/tests/strwidth.ha b/tests/strwidth.ha
index e3863d6..2024ca9 100644
--- a/tests/strwidth.ha
+++ b/tests/strwidth.ha
@@ -3,4 +3,6 @@ use tui;
 @test
 fn strwidth() void = {
 	assert(tui::strwidth("大ぁ😀f") == 7);
+	assert(tui::strwidth("近く遠くのささやき😪「ま行」オノマトペ") == 38);
+	assert(tui::strwidth("힐러뽀모쨩癒しのヒーラーちゃん") == 30);
 };