fix issue #41 oong, ooc

tuyenvm · Aug 4, 2019 · af925f5 · af925f5
1 parent a96e622
commit af925f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Sources/OpenKey/engine/Engine.cpp b/Sources/OpenKey/engine/Engine.cpp
@@ -471,6 +471,9 @@ void handleModernMark() {
                 VWSM = VSI + 1;
                 hBPC = _index - VWSM;
             }
+        } else if ((CHR(VSI) == KEY_O) && (CHR(VSI+1) == KEY_O)) { //thoong
+            VWSM = VEI;
+            hBPC = _index - VWSM;
         }
     }
 }
@@ -600,7 +603,8 @@ void insertAOE(const Uint16& data, const bool& isCaps) {
                 TypingWord[ii] &= ~TONE_MASK;
                 hData[_index - 1 - ii] = TypingWord[ii];
                 //_index = 0;
-                tempDisableKey = true;
+                if (data != KEY_O) //case thoòng
+                    tempDisableKey = true;
                 break;
             } else {
                 TypingWord[ii] |= TONE_MASK;

diff --git a/Sources/OpenKey/engine/Vietnamese.cpp b/Sources/OpenKey/engine/Vietnamese.cpp
@@ -185,6 +185,7 @@ map<Uint16, vector<vector<Uint16>>> _vowelForMark = {
             {KEY_O, KEY_O, KEY_N, KEY_G},
             {KEY_O, KEY_N, KEY_G},
             {KEY_O, KEY_O, KEY_N},
+            {KEY_O, KEY_O, KEY_C},
             {KEY_O, KEY_O},
             {KEY_O, KEY_N},
             {KEY_O, KEY_M},