From af925f569b343a8cedd03932155a3713cb51a82e Mon Sep 17 00:00:00 2001
From: Tuyen Mai <maivutuyen.91@gmail.com>
Date: Sun, 4 Aug 2019 11:05:16 +0700
Subject: [PATCH] fix issue #41 oong, ooc

---
 Sources/OpenKey/engine/Engine.cpp     | 6 +++++-
 Sources/OpenKey/engine/Vietnamese.cpp | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Sources/OpenKey/engine/Engine.cpp b/Sources/OpenKey/engine/Engine.cpp
index 30a3c04..e21a932 100644
--- 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
index 4ab94ca..df3c465 100644
--- 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},