Shiki #13: UserPhrases // CHS mode compatibility.

- Also remove useless menu entry.

Source/AppDelegate.m

@@ -42,7 +42,8 @@
 #import "frmAboutWindow.h"
 
 extern void LTLoadLanguageModel(void);
-extern void LTLoadUserLanguageModelFile(void);
+extern void LTLoadUserLanguageModelFileCHT(void);
+extern void LTLoadUserLanguageModelFileCHS(void);
 
 static NSString *kCheckUpdateAutomatically = @"CheckUpdateAutomatically";
 static NSString *kNextUpdateCheckDateKey = @"NextUpdateCheckDate";
@@ -67,7 +68,8 @@ static const NSTimeInterval kTimeoutInterval = 60.0;
 - (void)applicationDidFinishLaunching:(NSNotification *)inNotification
 {
     LTLoadLanguageModel();
-    LTLoadUserLanguageModelFile();
+    LTLoadUserLanguageModelFileCHT();
+	LTLoadUserLanguageModelFileCHS();
 
 	if (![[NSUserDefaults standardUserDefaults] objectForKey:kCheckUpdateAutomatically]) {
         [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kCheckUpdateAutomatically];

Source/InputMethodController.h

@@ -89,4 +89,5 @@
 
 // the shared language model object
 extern "C" void LTLoadLanguageModel();
-extern "C" void LTLoadUserLanguageModelFile();
+extern "C" void LTLoadUserLanguageModelFileCHT();
+extern "C" void LTLoadUserLanguageModelFileCHS();

Source/InputMethodController.mm

@@ -141,10 +141,10 @@ static NSString *LTUserPhrasesDataPathCHT()
     return [LTUserDataFolderPath() stringByAppendingPathComponent:@"userdata-cht.txt"];
 }
 
-// static NSString *LTUserPhrasesDataPathCHS()
+static NSString *LTUserPhrasesDataPathCHS()
-// {
+{
-    // return [LTUserDataFolderPath() stringByAppendingPathComponent:@"userdata-chs.txt"];
+    return [LTUserDataFolderPath() stringByAppendingPathComponent:@"userdata-chs.txt"];
-    // }
+}
 
 static BOOL LTCheckIfUserLanguageModelFileExists() {
 
@@ -168,21 +168,25 @@ static BOOL LTCheckIfUserLanguageModelFileExists() {
             return NO;
         }
     }
-
+    NSString *filePathCHS = LTUserPhrasesDataPathCHS();
-	NSString *filePath = LTUserPhrasesDataPathCHT();
+    if (![[NSFileManager defaultManager] fileExistsAtPath:filePathCHS]) {
-	if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
+        BOOL result = [[@"" dataUsingEncoding:NSUTF8StringEncoding] writeToFile:filePathCHS atomically:YES];
-		BOOL result = [[@"" dataUsingEncoding:NSUTF8StringEncoding] writeToFile:filePath atomically:YES];
         if (!result) {
-			NSLog(@"Failed to write file");
+            NSLog(@"Failed to write userdict CHS file");
+            return NO;
+        }
+    }
+    NSString *filePathCHT = LTUserPhrasesDataPathCHT();
+    if (![[NSFileManager defaultManager] fileExistsAtPath:filePathCHT]) {
+        BOOL result = [[@"" dataUsingEncoding:NSUTF8StringEncoding] writeToFile:filePathCHT atomically:YES];
+        if (!result) {
+            NSLog(@"Failed to write userdict CHT file");
             return NO;
         }
     }
     return YES;
 }
 
-
-
-
 // https://clang-analyzer.llvm.org/faq.html
 __attribute__((annotate("returns_localized_nsstring")))
 static inline NSString *LocalizationNotNeeded(NSString *s) {
@@ -260,7 +264,13 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
         _languageModel = &gLanguageModelCHT;
         _userPhrasesModel = &gUserPhraseLanguageModelCHT;
         _builder = new BlockReadingBuilder(_languageModel, _userPhrasesModel);
+        if (_inputMode == kSimpBopomofoModeIdentifier) {
+            NSLog(@"gUserOverrideModelCHS called");
+            _uom = &gUserOverrideModelCHS;
+        } else {
+            NSLog(@"gUserOverrideModelCHT called");
             _uom = &gUserOverrideModelCHT;
+        }
 
         // each Mandarin syllable is separated by a hyphen
         _builder->setJoinSeparator("-");
@@ -291,10 +301,8 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
     chineseConversionMenuItem.state = _chineseConversionEnabled ? NSControlStateValueOn : NSControlStateValueOff;
     [menu addItem:chineseConversionMenuItem];
 
-    // Needs improvement for Simplified Chinese Input
+    [menu addItem:[NSMenuItem separatorItem]]; // -----------------------
-    if (_inputMode != kSimpBopomofoModeIdentifier) {
+    
-		[menu addItem:[NSMenuItem separatorItem]];
-		[menu addItemWithTitle:NSLocalizedString(@"User Phrases", @"") action:NULL keyEquivalent:@""];
     NSMenuItem *editUserPheaseItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Edit User Phrases", @"") action:@selector(openUserPhrases:) keyEquivalent:@""];
     [editUserPheaseItem setIndentationLevel:2];
     [menu addItem:editUserPheaseItem];
@@ -302,8 +310,8 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
     NSMenuItem *reloadUserPheaseItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Reload User Phrases", @"") action:@selector(reloadUserPhrases:) keyEquivalent:@""];
     [reloadUserPheaseItem setIndentationLevel:2];
     [menu addItem:reloadUserPheaseItem];
-		[menu addItem:[NSMenuItem separatorItem]];
+
-	}
+    [menu addItem:[NSMenuItem separatorItem]]; // -----------------------
     
     NSMenuItem *updateCheckItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Check for Updates…", @"") action:@selector(checkForUpdate:) keyEquivalent:@""];
     [menu addItem:updateCheckItem];
@@ -410,19 +418,17 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
     NSString *newInputMode;
     Formosa::Gramambular::FastLM *newLanguageModel;
     Formosa::Gramambular::FastLM *userPhraseModel;
+    vChewing::UserOverrideModel *newUom;
+
+    if ([value isKindOfClass:[NSString class]]) {
+        
+        if ([value isEqual:kSimpBopomofoModeIdentifier]) {
             
-    if ([value isKindOfClass:[NSString class]] && [value isEqual:kSimpBopomofoModeIdentifier]) {
             newInputMode = kSimpBopomofoModeIdentifier;
             newLanguageModel = &gLanguageModelCHS;
+            newUom = &gUserOverrideModelCHS;
             userPhraseModel = &gUserPhraseLanguageModelCHS;
-    }
-    else {
-        newInputMode = kBopomofoModeIdentifier;
-        newLanguageModel = &gLanguageModelCHT;
-        userPhraseModel = &gUserPhraseLanguageModelCHT;
-    }
 
-    // Only apply the changes if the value is changed
             if (![_inputMode isEqualToString:newInputMode]) {
                 [[NSUserDefaults standardUserDefaults] synchronize];
 
@@ -452,6 +458,47 @@ static double FindHighestScore(const vector<NodeAnchor>& nodes, double epsilon)
                     _builder->setJoinSeparator("-");
                 }
             }
+            _uom = newUom;
+        
+        } else if ([value isEqual:kBopomofoModeIdentifier]) {
+            
+            newInputMode = kBopomofoModeIdentifier;
+            newLanguageModel = &gLanguageModelCHT;
+            userPhraseModel = &gUserPhraseLanguageModelCHT;
+            newUom = &gUserOverrideModelCHT;
+            
+            if (![_inputMode isEqualToString:newInputMode]) {
+                [[NSUserDefaults standardUserDefaults] synchronize];
+
+                // Remember to override the keyboard layout again -- treat this as an activate event
+                NSString *basisKeyboardLayoutID = [[NSUserDefaults standardUserDefaults] stringForKey:kBasisKeyboardLayoutPreferenceKey];
+                if (!basisKeyboardLayoutID) {
+                    basisKeyboardLayoutID = @"com.apple.keylayout.US";
+                }
+                [sender overrideKeyboardWithKeyboardNamed:basisKeyboardLayoutID];
+
+                _inputMode = newInputMode;
+                _languageModel = newLanguageModel;
+                _userPhrasesModel = userPhraseModel;
+
+                if (!_bpmfReadingBuffer->isEmpty()) {
+                    _bpmfReadingBuffer->clear();
+                    [self updateClientComposingBuffer:sender];
+                }
+
+                if ([_composingBuffer length] > 0) {
+                    [self commitComposition:sender];
+                }
+
+                if (_builder) {
+                    delete _builder;
+                    _builder = new BlockReadingBuilder(_languageModel, _userPhrasesModel);
+                    _builder->setJoinSeparator("-");
+                }
+            }
+            _uom = newUom;
+        }
+    }
 }
 
 #pragma mark - IMKServerInput protocol methods
@@ -720,6 +767,20 @@ NS_INLINE size_t max(size_t a, size_t b) { return a > b ? a : b; }
     }
 
     currentMarkedPhrase = [currentMarkedPhrase stringByAppendingString:@"\n"];
+    
+    if (_inputMode == kSimpBopomofoModeIdentifier) {
+        NSString *path = LTUserPhrasesDataPathCHS();
+        NSFileHandle *file = [NSFileHandle fileHandleForUpdatingAtPath:path];
+        if (!file) {
+            return NO;
+        }
+        [file seekToEndOfFile];
+        NSData *data = [currentMarkedPhrase dataUsingEncoding:NSUTF8StringEncoding];
+        [file writeData:data];
+        [file closeFile];
+        LTLoadUserLanguageModelFileCHS();
+        return YES;
+    } else {
         NSString *path = LTUserPhrasesDataPathCHT();
         NSFileHandle *file = [NSFileHandle fileHandleForUpdatingAtPath:path];
         if (!file) {
@@ -729,9 +790,9 @@ NS_INLINE size_t max(size_t a, size_t b) { return a > b ? a : b; }
         NSData *data = [currentMarkedPhrase dataUsingEncoding:NSUTF8StringEncoding];
         [file writeData:data];
         [file closeFile];
-
+        LTLoadUserLanguageModelFileCHT();
-    LTLoadUserLanguageModelFile();
         return YES;
+    }
 }
 
 - (BOOL)handleInputText:(NSString*)inputText key:(NSInteger)keyCode modifiers:(NSUInteger)flags client:(id)client
@@ -1563,6 +1624,17 @@ NS_INLINE size_t max(size_t a, size_t b) { return a > b ? a : b; }
         return;
     }
 
+    if (_inputMode == kSimpBopomofoModeIdentifier) {
+        NSLog(@"editUserPhrases CHS called");
+        NSString *path = LTUserPhrasesDataPathCHS();
+        NSLog(@"Open %@", path);
+        if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
+            [[@"" dataUsingEncoding:NSUTF8StringEncoding] writeToFile:path atomically:YES];
+        }
+        NSURL *url = [NSURL fileURLWithPath:path];
+        [[NSWorkspace sharedWorkspace] openURL:url];
+    } else {
+        NSLog(@"editUserPhrases CHT called");
         NSString *path = LTUserPhrasesDataPathCHT();
         NSLog(@"Open %@", path);
         if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
@@ -1570,12 +1642,20 @@ NS_INLINE size_t max(size_t a, size_t b) { return a > b ? a : b; }
         }
         NSURL *url = [NSURL fileURLWithPath:path];
         [[NSWorkspace sharedWorkspace] openURL:url];
+    }
+
+
 }
 
 - (void)reloadUserPhrases:(id)sender
 {
-	NSLog(@"reloadUserPhrases called");
+    if (_inputMode == kSimpBopomofoModeIdentifier) {
-	LTLoadUserLanguageModelFile();
+        NSLog(@"reloadUserPhrases CHS called");
+        LTLoadUserLanguageModelFileCHS();
+    } else {
+        NSLog(@"reloadUserPhrases CHT called");
+        LTLoadUserLanguageModelFileCHT();
+    }
 }
 
 - (void)showAbout:(id)sender
@@ -1655,7 +1735,7 @@ void LTLoadLanguageModel()
     LTLoadLanguageModelFile(@"data-chs", gLanguageModelCHS);
 }
 
-void LTLoadUserLanguageModelFile()
+void LTLoadUserLanguageModelFileCHT()
 {
     gUserPhraseLanguageModelCHT.close();
     bool result = gUserPhraseLanguageModelCHT.open([LTUserPhrasesDataPathCHT() UTF8String]);
@@ -1663,3 +1743,12 @@ void LTLoadUserLanguageModelFile()
         NSLog(@"Failed opening language model for CHT user phrases.");
     }
 }
+
+void LTLoadUserLanguageModelFileCHS()
+{
+    gUserPhraseLanguageModelCHS.close();
+    bool result = gUserPhraseLanguageModelCHS.open([LTUserPhrasesDataPathCHS() UTF8String]);
+    if (!result) {
+        NSLog(@"Failed opening language model for CHT user phrases.");
+    }
+}

Source/en.lproj/Localizable.strings

@@ -19,7 +19,6 @@
 "Chinese Conversion" = "Convert zh-TW Kanji to KangXi Variants";
 "NotificationSwitchON" = " ON";
 "NotificationSwitchOFF" = " OFF";
-"User Phrases" = "User Phrases";
 "Edit User Phrases" = "Edit User Phrases";
 "Reload User Phrases" = "Reload User Phrases";
 "Unable to create the user phrase file." = "Unable to create the user phrase file.";

Source/zh-Hans.lproj/Localizable.strings

@@ -19,7 +19,6 @@
 "Chinese Conversion" = "优先使用康熙繁体字";
 "NotificationSwitchON" = " 已启用";
 "NotificationSwitchOFF" = " 已停用";
-"User Phrases" = "自订语汇";
 "Edit User Phrases" = "编辑自订语汇";
 "Reload User Phrases" = "重载自订语汇";
 "Unable to create the user phrase file." = "无法创建自订语汇档案。";

Source/zh-Hant.lproj/Localizable.strings

@@ -19,7 +19,6 @@
 "Chinese Conversion" = "優先使用康熙繁體字";
 "NotificationSwitchON" = " 已啟用";
 "NotificationSwitchOFF" = " 已停用";
-"User Phrases" = "自訂語彙";
 "Edit User Phrases" = "編輯自訂語彙";
 "Reload User Phrases" = "重載自訂語彙";
 "Unable to create the user phrase file." = "無法創建自訂語彙檔案。";