- Add case "uýt".

- Improve typing English in Vietnamese mode. * Update version 1.0.14
huongdp · Apr 9, 2019 · 6bbdee0 · 6bbdee0
1 parent 5da4a46
commit 6bbdee0
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,14 @@
 # OpenKey Change Log
 
-##### Version 1.1: (Under construction)
+##### Version 1.1: (in plan)
 - Quick Telex: cc=ch, gg=gi, kk=kh, nn=ng, qq=qu, pp=ph, tt=th (On/Off)
 - Macro (On/Off).
 - Macro table.
 
+##### Version 1.0.14: (09/04/2019)
+- Add case "uýt".
+- Improve typing English in Vietnamese mode.
+
 ##### Version 1.0.11: (27/02/2019)
 - Add case "chú thòong", "gòong".
 

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Bộ gõ tiếng Việt mới cho macOS, sử dụng kỹ thuật backkey. Loạ
 - ...
 
 ### Download Binary - Tải xuống: 
-v1.0.11: [macOS](https://github.com/tuyenvm/OpenKey/raw/master/Release/OpenKey1.0.11.dmg)
+v1.0.14: [macOS](https://github.com/tuyenvm/OpenKey/raw/master/Release/OpenKey1.0.14.dmg)
 
 [Changelog](https://github.com/tuyenvm/OpenKey/blob/master/CHANGELOG.md)
 

diff --git a/Release/OpenKey1.0.11.dmg b/Release/OpenKey1.0.11.dmg
diff --git a/Release/OpenKey1.0.14.dmg b/Release/OpenKey1.0.14.dmg
diff --git a/Sources/OpenKey/engine/Engine.cpp b/Sources/OpenKey/engine/Engine.cpp
@@ -258,6 +258,8 @@ void checkCorrectVowel(vector<vector<Uint16>>& charset, int& i, int& k, const Ui
     if (isCorect && charset[i].size() > 1 && (IS_KEY_F(markKey) || IS_KEY_X(markKey) || IS_KEY_R(markKey))) {
         if (charset[i][1] == KEY_C || charset[i][1] == KEY_T) {
             isCorect = false;
+        } else if (charset[i].size() > 2 && (charset[i][2] == KEY_T)) {
+            isCorect = false;
         }
     }
 
@@ -496,7 +498,7 @@ void insertMark(const Uint32& markMask, const bool& canModifyFlag) {
             TypingWord[ii] &= ~MARK_MASK;
             hData[kk--] = GET(TypingWord[ii]);
         }
-        _index = 0;
+        //_index = 0;
         tempDisableKey = true;
     } else {
         //remove other mark
@@ -931,7 +933,8 @@ void vKeyHandleEvent(const vKeyEvent& event,
         }
     }
 
+    //Debug
     //cout<<(int)_index<<endl;
     //cout<<(int)hBPC<<endl;
-    //cout<<(int)hNCC<<endl;
+    //cout<<(int)hNCC<<endl<<endl;
 }
diff --git a/Sources/OpenKey/engine/Vietnamese.cpp b/Sources/OpenKey/engine/Vietnamese.cpp
@@ -224,6 +224,7 @@ map<Uint16, vector<vector<Uint16>>> _vowelForMark = {
             { KEY_U, KEY_O},
             { KEY_U, KEY_Y},
             { KEY_U, KEY_Y, KEY_N},
+            { KEY_U, KEY_Y, KEY_T},
             { KEY_U, KEY_Y, KEY_N, KEY_H},
             { KEY_U, KEY_T},
             { KEY_U, KEY_U},

diff --git a/Sources/README.md b/Sources/README.md
@@ -1,4 +1,4 @@
 # OpenKey
 ### Open source Vietnamese Input App for macOS
-Check out source for macOS.   
+Check out source for macOS and engine.   
 Windows version will be available soon.