diff --git a/Source/Data b/Source/Data index 6b661baa..eee02342 160000 --- a/Source/Data +++ b/Source/Data @@ -1 +1 @@ -Subproject commit 6b661baacf89c776663160bba3ca76f19c36cd3d +Subproject commit eee02342402f8f20d51e211361c47d066ac16764 diff --git a/Source/Images/Bopomofo.png b/Source/Images/Bopomofo.png deleted file mode 100644 index 081080a6..00000000 Binary files a/Source/Images/Bopomofo.png and /dev/null differ diff --git a/Source/Images/Bopomofo@2x.png b/Source/Images/Bopomofo@2x.png deleted file mode 100644 index f4396220..00000000 Binary files a/Source/Images/Bopomofo@2x.png and /dev/null differ diff --git a/Source/Images/PlainBopomofo.png b/Source/Images/PlainBopomofo.png deleted file mode 100644 index b94a3f5c..00000000 Binary files a/Source/Images/PlainBopomofo.png and /dev/null differ diff --git a/Source/Images/PlainBopomofo.tiff b/Source/Images/PlainBopomofo.tiff deleted file mode 100644 index 0fe65959..00000000 Binary files a/Source/Images/PlainBopomofo.tiff and /dev/null differ diff --git a/Source/Images/PlainBopomofo@2x.png b/Source/Images/PlainBopomofo@2x.png deleted file mode 100644 index a259d615..00000000 Binary files a/Source/Images/PlainBopomofo@2x.png and /dev/null differ diff --git a/Source/Images/PlainBopomofo@2x.tiff b/Source/Images/PlainBopomofo@2x.tiff deleted file mode 100644 index a303b85a..00000000 Binary files a/Source/Images/PlainBopomofo@2x.tiff and /dev/null differ diff --git a/Source/Images/SimpBopomofo.tiff b/Source/Images/SimpBopomofo.tiff new file mode 100644 index 00000000..d7c30e65 Binary files /dev/null and b/Source/Images/SimpBopomofo.tiff differ diff --git a/Source/Images/SimpBopomofo@2x.tiff b/Source/Images/SimpBopomofo@2x.tiff new file mode 100644 index 00000000..2fdf8c43 Binary files /dev/null and b/Source/Images/SimpBopomofo@2x.tiff differ diff --git a/Source/InputMethodController.mm b/Source/InputMethodController.mm index 570fae43..d0ad6f74 100644 --- a/Source/InputMethodController.mm +++ b/Source/InputMethodController.mm @@ -87,7 +87,7 @@ static NSString *const kCandidateKeys = @"CandidateKeys"; // input modes static NSString *const kBopomofoModeIdentifier = @"org.openvanilla.inputmethod.vChewing.Bopomofo"; -static NSString *const kPlainBopomofoModeIdentifier = @"org.openvanilla.inputmethod.vChewing.PlainBopomofo"; +static NSString *const kSimpBopomofoModeIdentifier = @"org.openvanilla.inputmethod.vChewing.SimpBopomofo"; // key code enums enum { @@ -116,7 +116,7 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot"; // shared language model object that stores our phrase-term probability database FastLM gLanguageModel; -FastLM gLanguageModelPlainBopomofo; +FastLM gLanguageModelSimpBopomofo; // https://clang-analyzer.llvm.org/faq.html __attribute__((annotate("returns_localized_nsstring"))) @@ -345,9 +345,9 @@ public: NSString *newInputMode; Formosa::Gramambular::FastLM *newLanguageModel; - if ([value isKindOfClass:[NSString class]] && [value isEqual:kPlainBopomofoModeIdentifier]) { - newInputMode = kPlainBopomofoModeIdentifier; - newLanguageModel = &gLanguageModelPlainBopomofo; + if ([value isKindOfClass:[NSString class]] && [value isEqual:kSimpBopomofoModeIdentifier]) { + newInputMode = kSimpBopomofoModeIdentifier; + newLanguageModel = &gLanguageModelSimpBopomofo; } else { newInputMode = kBopomofoModeIdentifier; @@ -714,10 +714,6 @@ public: _bpmfReadingBuffer->clear(); [self updateClientComposingBuffer:client]; - if (_inputMode == kPlainBopomofoModeIdentifier) { - [self _showCandidateWindowUsingVerticalMode:useVerticalMode client:client]; - } - // and tells the client that the key is consumed return YES; } @@ -943,16 +939,6 @@ public: } [self updateClientComposingBuffer:client]; - if (_inputMode == kPlainBopomofoModeIdentifier && _bpmfReadingBuffer->isEmpty()) { - [self collectCandidates]; - if ([_candidates count] == 1) { - [self commitComposition:client]; - } - else { - [self _showCandidateWindowUsingVerticalMode:useVerticalMode client:client]; - } - } - return YES; } @@ -968,16 +954,6 @@ public: } [self updateClientComposingBuffer:client]; - if (_inputMode == kPlainBopomofoModeIdentifier && _bpmfReadingBuffer->isEmpty()) { - [self collectCandidates]; - if ([_candidates count] == 1) { - [self commitComposition:client]; - } - else { - [self _showCandidateWindowUsingVerticalMode:useVerticalMode client:client]; - } - } - return YES; } @@ -995,29 +971,14 @@ public: - (BOOL)handleCandidateEventWithInputText:(NSString *)inputText charCode:(UniChar)charCode keyCode:(NSUInteger)keyCode { -// if (_inputMode == kPlainBopomofoModeIdentifier) { -// if (charCode == '<') { -// keyCode = kPageUpKeyCode; -// } -// else if (charCode == '>') { -// keyCode = kPageDownKeyCode; -// } -// } - BOOL cancelCandidateKey = - (charCode == 27) || - ((_inputMode == kPlainBopomofoModeIdentifier) && - (charCode == 8 || keyCode == kDeleteKeyCode)); + BOOL cancelCandidateKey = (charCode == 27); + if (cancelCandidateKey) { gCurrentCandidateController.visible = NO; [_candidates removeAllObjects]; - if (_inputMode == kPlainBopomofoModeIdentifier) { - _builder->clear(); - _walkedNodes.clear(); - [_composingBuffer setString:@""]; - } [self updateClientComposingBuffer:_currentCandidateClient]; return YES; } @@ -1154,23 +1115,6 @@ public: } } - if (_inputMode == kPlainBopomofoModeIdentifier) { - string layout = [self currentLayout]; - string customPunctuation = string("_punctuation_") + layout + string(1, (char)charCode); - string punctuation = string("_punctuation_") + string(1, (char)charCode); - - BOOL shouldAutoSelectCandidate = _bpmfReadingBuffer->isValidKey((char)charCode) || _languageModel->hasUnigramsForKey(customPunctuation) || - _languageModel->hasUnigramsForKey(punctuation); - - if (shouldAutoSelectCandidate) { - NSUInteger candidateIndex = [gCurrentCandidateController candidateIndexAtKeyLabelIndex:0]; - if (candidateIndex != NSUIntegerMax) { - [self candidateController:gCurrentCandidateController didSelectCandidateAtIndex:candidateIndex]; - return [self handleInputText:inputText key:keyCode modifiers:0 client:_currentCandidateClient]; - } - } - } - [self beep]; [self updateClientComposingBuffer:_currentCandidateClient]; return YES; @@ -1400,11 +1344,6 @@ public: gCurrentCandidateController.keyLabels = keyLabels; [self collectCandidates]; - if (_inputMode == kPlainBopomofoModeIdentifier && [_candidates count] == 1) { - [self commitComposition:client]; - return; - } - gCurrentCandidateController.delegate = self; [gCurrentCandidateController reloadData]; @@ -1518,15 +1457,11 @@ public: [self walk]; [self updateClientComposingBuffer:_currentCandidateClient]; - if (_inputMode == kPlainBopomofoModeIdentifier) { - [self commitComposition:_currentCandidateClient]; - return; - } } - (void)handleChineseConversionStatusDidChanged:(NSNotification *)notification { - // Do not post the notification if status doesn't change. + // Do not post the notification if status doesn't change. // This is because the input method can be initiated by multiple applications, then all of them would post the notification. if (_previousChineseConversionEnabledStatus == _chineseConversionEnabled) { return; @@ -1556,7 +1491,7 @@ static void LTLoadLanguageModelFile(NSString *filenameWithoutExtension, FastLM & void LTLoadLanguageModel() { LTLoadLanguageModelFile(@"data", gLanguageModel); - LTLoadLanguageModelFile(@"data-plain-bpmf", gLanguageModelPlainBopomofo); + LTLoadLanguageModelFile(@"data-chs", gLanguageModelSimpBopomofo); // initialize the singleton learning dictionary diff --git a/Source/en.lproj/InfoPlist.strings b/Source/en.lproj/InfoPlist.strings index dddeda74..a5c0514d 100644 --- a/Source/en.lproj/InfoPlist.strings +++ b/Source/en.lproj/InfoPlist.strings @@ -1,6 +1,5 @@ CFBundleName = "vChewing"; CFBundleDisplayName = "vChewing"; NSHumanReadableCopyright = "Copyright © 2011-2021 Mengjuei Hsieh et al.\nAll Rights Reserved."; -"org.openvanilla.inputmethod.vChewing.Bopomofo" = "vChewing"; -"org.openvanilla.inputmethod.vChewing.PlainBopomofo" = "Plain vChewing"; - +"org.openvanilla.inputmethod.vChewing.Bopomofo" = "vChewing-CHT"; +"org.openvanilla.inputmethod.vChewing.SimpBopomofo" = "vChewing-CHS"; diff --git a/Source/vChewing-Info.plist b/Source/vChewing-Info.plist index 28d16f61..7e5e7510 100644 --- a/Source/vChewing-Info.plist +++ b/Source/vChewing-Info.plist @@ -32,7 +32,6 @@ Bopomofo.tiff tsInputModeCharacterRepertoireKey - Hans Hant Han @@ -50,25 +49,17 @@ tsInputModeScriptKey smTradChinese - TISIntendedLanguage - zh-Hans - tsInputModeCharacterRepertoireKey - - Hant - Han - - tsInputModeKeyEquivalentModifiersKey - 4608 + TISIntendedLanguage + zh-Hant - org.openvanilla.inputmethod.vChewing.PlainBopomofo + org.openvanilla.inputmethod.vChewing.SimpBopomofo TISDoubleSpaceSubstitution 。 tsInputModeAlternateMenuIconFileKey - PlainBopomofo.tiff + SimpBopomofo.tiff tsInputModeCharacterRepertoireKey - Hans Hant Han @@ -79,28 +70,21 @@ tsInputModeKeyEquivalentModifiersKey 4608 tsInputModeMenuIconFileKey - PlainBopomofo.tiff + SimpBopomofo.tiff tsInputModePaletteIconFileKey - PlainBopomofo.tiff + SimpBopomofo.tiff tsInputModePrimaryInScriptKey tsInputModeScriptKey smTradChinese - TISIntendedLanguage - zh-Hans - tsInputModeCharacterRepertoireKey - - Hant - Han - - tsInputModeKeyEquivalentModifiersKey - 4608 + TISIntendedLanguage + zh-Hans tsVisibleInputModeOrderedArrayKey org.openvanilla.inputmethod.vChewing.Bopomofo - org.openvanilla.inputmethod.vChewing.PlainBopomofo + org.openvanilla.inputmethod.vChewing.SimpBopomofo InputMethodConnectionName diff --git a/Source/zh-Hans.lproj/InfoPlist.strings b/Source/zh-Hans.lproj/InfoPlist.strings index 83b9178f..512bfd97 100644 --- a/Source/zh-Hans.lproj/InfoPlist.strings +++ b/Source/zh-Hans.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ CFBundleName = "威注音"; CFBundleDisplayName = "威注音"; NSHumanReadableCopyright = "Copyright © 2011-2021 Mengjuei Hsieh et al.\nAll Rights Reserved."; -"org.openvanilla.inputmethod.vChewing.Bopomofo" = "威注音"; -"org.openvanilla.inputmethod.vChewing.PlainBopomofo" = "ㄅ半全注"; +"org.openvanilla.inputmethod.vChewing.Bopomofo" = "威註音"; +"org.openvanilla.inputmethod.vChewing.SimpBopomofo" = "威注音"; diff --git a/Source/zh-Hant.lproj/InfoPlist.strings b/Source/zh-Hant.lproj/InfoPlist.strings index 83b9178f..512bfd97 100644 --- a/Source/zh-Hant.lproj/InfoPlist.strings +++ b/Source/zh-Hant.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ CFBundleName = "威注音"; CFBundleDisplayName = "威注音"; NSHumanReadableCopyright = "Copyright © 2011-2021 Mengjuei Hsieh et al.\nAll Rights Reserved."; -"org.openvanilla.inputmethod.vChewing.Bopomofo" = "威注音"; -"org.openvanilla.inputmethod.vChewing.PlainBopomofo" = "ㄅ半全注"; +"org.openvanilla.inputmethod.vChewing.Bopomofo" = "威註音"; +"org.openvanilla.inputmethod.vChewing.SimpBopomofo" = "威注音"; diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj index 9825a06c..3b62dbf6 100644 --- a/vChewing.xcodeproj/project.pbxproj +++ b/vChewing.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 5B000FC3278495AD004F02AC /* SimpBopomofo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 5B000FC1278495AD004F02AC /* SimpBopomofo.tiff */; }; + 5B000FC4278495AD004F02AC /* SimpBopomofo@2x.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 5B000FC2278495AD004F02AC /* SimpBopomofo@2x.tiff */; }; + 5BC3FB83278492DE0022E99A /* data-chs.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5BC3FB82278492DE0022E99A /* data-chs.txt */; }; 6A0421A815FEF3F50061ED63 /* FastLM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A0421A615FEF3F50061ED63 /* FastLM.cpp */; }; 6A0D4EA715FC0D2D00ABF4B3 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A0D4EA615FC0D2D00ABF4B3 /* Cocoa.framework */; }; 6A0D4ED015FC0D6400ABF4B3 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A0D4EC415FC0D6400ABF4B3 /* AppDelegate.m */; }; @@ -42,9 +45,6 @@ 6ACA41FD15FC1D9000935EF6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6ACA41F015FC1D9000935EF6 /* MainMenu.xib */; }; 6ACA41FF15FC1D9000935EF6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ACA41F415FC1D9000935EF6 /* main.m */; }; 6ACA420215FC1E5200935EF6 /* vChewing.app in Resources */ = {isa = PBXBuildFile; fileRef = 6A0D4EA215FC0D2D00ABF4B3 /* vChewing.app */; }; - 6AD7CBC815FE555000691B5B /* data-plain-bpmf.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6AD7CBC715FE555000691B5B /* data-plain-bpmf.txt */; }; - 6AE210B215FC63CC003659FE /* PlainBopomofo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6AE210B015FC63CC003659FE /* PlainBopomofo.tiff */; }; - 6AE210B315FC63CC003659FE /* PlainBopomofo@2x.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 6AE210B115FC63CC003659FE /* PlainBopomofo@2x.tiff */; }; 6AFF97F2253B299E007F1C49 /* OVNonModalAlertWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF97F0253B299E007F1C49 /* OVNonModalAlertWindowController.xib */; }; 6AFF97F3253B299E007F1C49 /* OVNonModalAlertWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6AFF97F1253B299E007F1C49 /* OVNonModalAlertWindowController.m */; }; D427A9C125ED28CC005D43E0 /* OpenCCBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = D427A9C025ED28CC005D43E0 /* OpenCCBridge.swift */; }; @@ -69,6 +69,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 5B000FC1278495AD004F02AC /* SimpBopomofo.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = SimpBopomofo.tiff; sourceTree = ""; }; + 5B000FC2278495AD004F02AC /* SimpBopomofo@2x.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "SimpBopomofo@2x.tiff"; sourceTree = ""; }; 5B9781D32763850700897999 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; 5B9781D42763850700897999 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "zh-Hans"; path = "zh-Hans.lproj/License.rtf"; sourceTree = ""; }; 5B9781D52763850700897999 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; @@ -77,6 +79,7 @@ 5B9781D82763850700897999 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "Source/zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; 5B9781D92763850700897999 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/MainMenu.xib"; sourceTree = ""; }; 5B9781DA2763850700897999 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "Source/zh-Hans.lproj/preferences.xib"; sourceTree = ""; }; + 5BC3FB82278492DE0022E99A /* data-chs.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "data-chs.txt"; sourceTree = ""; }; 6A0421A615FEF3F50061ED63 /* FastLM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FastLM.cpp; sourceTree = ""; }; 6A0421A715FEF3F50061ED63 /* FastLM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastLM.h; sourceTree = ""; }; 6A0D4EA215FC0D2D00ABF4B3 /* vChewing.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = vChewing.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -166,9 +169,6 @@ 6A225A212367A1D700F685C6 /* ArchiveUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArchiveUtil.h; sourceTree = ""; }; 6A225A222367A1D700F685C6 /* ArchiveUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArchiveUtil.m; sourceTree = ""; }; 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 6A38BBDE15FC117A00A8A51F /* 4_in_5.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 4_in_5.txt; sourceTree = ""; }; - 6A38BBDF15FC117A00A8A51F /* 4_in_6.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 4_in_6.txt; sourceTree = ""; }; - 6A38BBE015FC117A00A8A51F /* 5_in_6.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5_in_6.txt; sourceTree = ""; }; 6A38BBE215FC117A00A8A51F /* BIG5toUTF8.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = BIG5toUTF8.pl; sourceTree = ""; }; 6A38BBE315FC117A00A8A51F /* build4wlist.bash */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build4wlist.bash; sourceTree = ""; }; 6A38BBE415FC117A00A8A51F /* buildFreq.bash */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildFreq.bash; sourceTree = ""; }; @@ -185,18 +185,8 @@ 6A38BBEF15FC117A00A8A51F /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; 6A38BBF015FC117A00A8A51F /* typocorrection.bash */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = typocorrection.bash; sourceTree = ""; }; 6A38BBF115FC117A00A8A51F /* utf8length.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = utf8length.pl; sourceTree = ""; }; - 6A38BBF215FC117A00A8A51F /* blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = blacklist.txt; sourceTree = ""; }; - 6A38BBF315FC117A00A8A51F /* BPMFBase.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BPMFBase.txt; sourceTree = ""; }; - 6A38BBF415FC117A00A8A51F /* BPMFMappings.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BPMFMappings.txt; sourceTree = ""; }; - 6A38BBF515FC117A00A8A51F /* BPMFPunctuations.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BPMFPunctuations.txt; sourceTree = ""; }; 6A38BBF615FC117A00A8A51F /* data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = data.txt; sourceTree = ""; }; - 6A38BBF715FC117A00A8A51F /* heterophony1.list */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = heterophony1.list; sourceTree = ""; }; - 6A38BBF815FC117A00A8A51F /* heterophony2.list */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = heterophony2.list; sourceTree = ""; }; - 6A38BBF915FC117A00A8A51F /* heterophony3.list */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = heterophony3.list; sourceTree = ""; }; 6A38BBFA15FC117A00A8A51F /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 6A38BBFB15FC117A00A8A51F /* phrase.occ */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = phrase.occ; sourceTree = ""; }; - 6A38BBFC15FC117A00A8A51F /* PhraseFreq.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PhraseFreq.txt; sourceTree = ""; }; - 6A38BBFD15FC117A00A8A51F /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; 6A38BC2715FC158A00A8A51F /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/InputMethodKit.framework; sourceTree = DEVELOPER_DIR; }; 6ACA41CB15FC1D7500935EF6 /* vChewingInstaller.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = vChewingInstaller.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6ACA41E815FC1D9000935EF6 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/Installer/AppDelegate.h; sourceTree = SOURCE_ROOT; }; @@ -211,9 +201,6 @@ 6ACA41F615FC1D9000935EF6 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "zh-Hant"; path = "zh-Hant.lproj/License.rtf"; sourceTree = ""; }; 6ACA41F715FC1D9000935EF6 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = ""; }; 6ACA41F815FC1D9000935EF6 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/MainMenu.xib"; sourceTree = ""; }; - 6AD7CBC715FE555000691B5B /* data-plain-bpmf.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "data-plain-bpmf.txt"; sourceTree = ""; }; - 6AE210B015FC63CC003659FE /* PlainBopomofo.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = PlainBopomofo.tiff; sourceTree = ""; }; - 6AE210B115FC63CC003659FE /* PlainBopomofo@2x.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "PlainBopomofo@2x.tiff"; sourceTree = ""; }; 6AFF97EF253B299E007F1C49 /* OVNonModalAlertWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OVNonModalAlertWindowController.h; sourceTree = ""; }; 6AFF97F0253B299E007F1C49 /* OVNonModalAlertWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OVNonModalAlertWindowController.xib; sourceTree = ""; }; 6AFF97F1253B299E007F1C49 /* OVNonModalAlertWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OVNonModalAlertWindowController.m; sourceTree = ""; }; @@ -325,8 +312,8 @@ 6A2E40F5253A69DA00D1AE1D /* Images.xcassets */, 6A0D4EEF15FC0DA600ABF4B3 /* Bopomofo.tiff */, 6A0D4EF015FC0DA600ABF4B3 /* Bopomofo@2x.tiff */, - 6AE210B015FC63CC003659FE /* PlainBopomofo.tiff */, - 6AE210B115FC63CC003659FE /* PlainBopomofo@2x.tiff */, + 5B000FC1278495AD004F02AC /* SimpBopomofo.tiff */, + 5B000FC2278495AD004F02AC /* SimpBopomofo@2x.tiff */, ); path = Images; sourceTree = ""; @@ -427,22 +414,9 @@ isa = PBXGroup; children = ( 6A38BBE115FC117A00A8A51F /* bin */, - 6A38BBDE15FC117A00A8A51F /* 4_in_5.txt */, - 6A38BBDF15FC117A00A8A51F /* 4_in_6.txt */, - 6A38BBE015FC117A00A8A51F /* 5_in_6.txt */, - 6A38BBF215FC117A00A8A51F /* blacklist.txt */, - 6A38BBF315FC117A00A8A51F /* BPMFBase.txt */, - 6A38BBF415FC117A00A8A51F /* BPMFMappings.txt */, - 6A38BBF515FC117A00A8A51F /* BPMFPunctuations.txt */, 6A38BBF615FC117A00A8A51F /* data.txt */, - 6AD7CBC715FE555000691B5B /* data-plain-bpmf.txt */, - 6A38BBF715FC117A00A8A51F /* heterophony1.list */, - 6A38BBF815FC117A00A8A51F /* heterophony2.list */, - 6A38BBF915FC117A00A8A51F /* heterophony3.list */, + 5BC3FB82278492DE0022E99A /* data-chs.txt */, 6A38BBFA15FC117A00A8A51F /* Makefile */, - 6A38BBFB15FC117A00A8A51F /* phrase.occ */, - 6A38BBFC15FC117A00A8A51F /* PhraseFreq.txt */, - 6A38BBFD15FC117A00A8A51F /* README */, ); path = Data; sourceTree = ""; @@ -494,7 +468,7 @@ /* Begin PBXLegacyTarget section */ 6A38BC2115FC12FD00A8A51F /* Data */ = { isa = PBXLegacyTarget; - buildArgumentsString = "$(ACTION) CHSBuild"; + buildArgumentsString = "$(ACTION) tsi-chs tsi-cht"; buildConfigurationList = 6A38BC2215FC12FD00A8A51F /* Build configuration list for PBXLegacyTarget "Data" */; buildPhases = ( ); @@ -596,14 +570,14 @@ 6A0D4F0915FC0DA600ABF4B3 /* Bopomofo@2x.tiff in Resources */, 6A0D4F5315FC0EE100ABF4B3 /* preferences.xib in Resources */, 6A0D4F5715FC0EF900ABF4B3 /* InfoPlist.strings in Resources */, + 5B000FC3278495AD004F02AC /* SimpBopomofo.tiff in Resources */, 6A0D4F5815FC0EF900ABF4B3 /* Localizable.strings in Resources */, 6A2E40F6253A69DA00D1AE1D /* Images.xcassets in Resources */, 6A38BC1515FC117A00A8A51F /* data.txt in Resources */, 6AFF97F2253B299E007F1C49 /* OVNonModalAlertWindowController.xib in Resources */, - 6AE210B215FC63CC003659FE /* PlainBopomofo.tiff in Resources */, - 6AE210B315FC63CC003659FE /* PlainBopomofo@2x.tiff in Resources */, - 6AD7CBC815FE555000691B5B /* data-plain-bpmf.txt in Resources */, 6A187E2616004C5900466B2E /* MainMenu.xib in Resources */, + 5BC3FB83278492DE0022E99A /* data-chs.txt in Resources */, + 5B000FC4278495AD004F02AC /* SimpBopomofo@2x.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };