diff --git a/Runtime/GuiSys/CWordBreakTables.cpp b/Runtime/GuiSys/CWordBreakTables.cpp
index 061a68302..eb9894ee9 100644
--- a/Runtime/GuiSys/CWordBreakTables.cpp
+++ b/Runtime/GuiSys/CWordBreakTables.cpp
@@ -23,57 +23,57 @@ static const CCharacterIdentifier gCantBeginChars[]=
     {L'}', 1},
     {0x92, 1},
     {0x94, 1},
-    {L'»', 1},
-    {L'、', 1},
-    {L'。', 1},
-    {L'々', 1},
-    {L'」', 1},
-    {L'』', 1},
-    {L'】', 1},
-    {L'〕', 1},
-    {L'〗', 1},
-    {L'〙', 1},
-    {L'〛', 1},
-    {L'〜', 3},
-    {L'〞', 1},
-    {L'〫', 3},
-    {L'ぁ', 2},
-    {L'ぃ', 2},
-    {L'ぅ', 2},
-    {L'ぇ', 2},
-    {L'ぉ', 2},
-    {L'っ', 2},
-    {L'ゃ', 2},
-    {L'ゅ', 2},
-    {L'ょ', 2},
-    {L'ゎ', 2},
-    {L'ゝ', 3},
-    {L'ゞ', 3},
-    {L'ァ', 2},
-    {L'ィ', 2},
-    {L'ゥ', 2},
-    {L'ェ', 2},
-    {L'ォ', 2},
-    {L'ッ', 2},
-    {L'ャ', 2},
-    {L'ュ', 2},
-    {L'ョ', 2},
-    {L'ヮ', 2},
-    {L'ヵ', 2},
-    {L'ヶ', 2},
-    {L'ー', 2},
-    {L'ヽ', 3},
-    {L'ヾ', 3},
-    {L'！', 1},
-    {L'％', 3},
-    {L'）', 1},
-    {L'－', 1},
-    {L'］', 1},
-    {L'｝', 1},
-    {L'｡', 1},
-    {L'｣', 1},
-    {L'､', 1},
-    {L'？', 1}
+    {0xBB, 1},
+    {0x3001, 1},
+    {0x3002, 1},
+    {0x3005, 1},
+    {0x300D, 1},
+    {0x300F, 1},
+    {0x3011, 1},
+    {0x3015, 1},
+    {0x3017, 1},
+    {0x3019, 1},
+    {0x301B, 1},
+    {0x301C, 3},
+    {0x301E, 1},
+    {0x302B, 3},
+    {0x3041, 2},
+    {0x3043, 2},
+    {0x3045, 2},
+    {0x3047, 2},
+    {0x3049, 2},
+    {0x3063, 2},
+    {0x3083, 2},
+    {0x3085, 2},
+    {0x3087, 2},
+    {0x308E, 2},
+    {0x309D, 3},
+    {0x309E, 3},
+    {0x30A1, 2},
+    {0x30A3, 2},
+    {0x30A5, 2},
+    {0x30A7, 2},
+    {0x30A9, 2},
+    {0x30C3, 2},
+    {0x30E3, 2},
+    {0x30E5, 2},
+    {0x30E7, 2},
+    {0x30EE, 2},
+    {0x30F5, 2},
+    {0x30F6, 2},
+    {0x30FC, 2},
+    {0x30FD, 3},
+    {0x30FE, 3},
+    {0xFF01, 1},
+    {0xFF05, 3},
+    {0xFF09, 1},
+    {0xFF0D, 1},
+    {0xFF3D, 1},
+    {0xFF5D, 1},
+    {0xFF61, 1},
+    {0xFF63, 1},
+    {0xFF64, 1},
+    {0xFF1F, 1}
 };
 
 static const CCharacterIdentifier gCantEndChars[] =
@@ -124,48 +124,46 @@ static const CCharacterIdentifier gCantEndChars[] =
     {L'x', 4},
     {L'y', 4},
     {L'z', 4},
-    {L'Ñ', 4},
-    {L'ñ', 4},
+    {0xD1, 4},
+    {0xF1, 4},
     {L'[', 1},
     {L'{', 1},
     {0x91, 1},
     {0x93, 1},
-    {0x91, 1},
-    {0x93, 1},
-    {L'¢', 2},
-    {L'£', 2},
-    {L'¥', 2},
-    {L'§', 2},
-    {L'©', 2},
-    {L'«', 1},
-    {L'₠', 2},
-    {L'₡', 2},
-    {L'₢', 2},
-    {L'₣', 2},
-    {L'₤', 2},
-    {L'₥', 2},
-    {L'₦', 2},
-    {L'₧', 2},
-    {L'₨', 2},
-    {L'₩', 2},
-    {L'₪', 2},
-    {L'₫', 2},
-    {L'€', 2},
-    {L'「', 1},
-    {L'『', 1},
-    {L'【', 1},
-    {L'〒', 2},
-    {L'〔', 1},
-    {L'〖', 1},
-    {L'〘', 1},
-    {L'〚', 1},
-    {L'＃', 2},
-    {L'＄', 2},
-    {L'＠', 2},
-    {L'＼', 1},
-    {L'｜', 1},
-    {L'￠', 2},
-    {L'￡', 2},
+    {0xA2, 2},
+    {0xA3, 2},
+    {0xA5, 2},
+    {0xA7, 2},
+    {0xA9, 2},
+    {0xAB, 1},
+    {0x20A0, 2},
+    {0x20A1, 2},
+    {0x20A2, 2},
+    {0x20A3, 2},
+    {0x20A4, 2},
+    {0x20A5, 2},
+    {0x20A6, 2},
+    {0x20A7, 2},
+    {0x20A8, 2},
+    {0x20A9, 2},
+    {0x20AA, 2},
+    {0x20AB, 2},
+    {0x20AC, 2},
+    {0x300C, 1},
+    {0x300E, 1},
+    {0x3010, 1},
+    {0x3012, 2},
+    {0x3014, 1},
+    {0x3016, 1},
+    {0x3018, 1},
+    {0x301A, 1},
+    {0xFF03, 2},
+    {0xFF04, 2},
+    {0xFF20, 2},
+    {0xFF3C, 1},
+    {0xFF5C, 1},
+    {0xFFE0, 2},
+    {0xFFE1, 2},
     {0xFFEF, 2},
 };