From t-suwa ＠ users.sourceforge.jp Sat Feb 3 13:04:22 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 13:04:22 +0900 Subject: [aquaskk-changes 290] CVS update: AquaSKK Message-ID: <20070203040422.329632AC0AC@users.sourceforge.jp> Index: AquaSKK/AsciiConversionMode.cpp diff -u AquaSKK/AsciiConversionMode.cpp:1.9 AquaSKK/AsciiConversionMode.cpp:1.10 --- AquaSKK/AsciiConversionMode.cpp:1.9 Sat Jan 27 12:52:30 2007 +++ AquaSKK/AsciiConversionMode.cpp Sat Feb 3 13:04:21 2007 @@ -1,5 +1,5 @@ /* - $Id: AsciiConversionMode.cpp,v 1.9 2007/01/27 03:52:30 t-suwa Exp $ + $Id: AsciiConversionMode.cpp,v 1.10 2007/02/03 04:04:21 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -183,13 +183,21 @@ // ????????????????? } - if(SKKConfig::AbbrevModeKey() == skkchar || SKKConfig::SetHenkanPointKey() == skkchar) { + if(SKKConfig::SetHenkanPointKey() == skkchar) { if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - parent->fix(this->getStringToFix()); + parent->fix(getStringToFix()); return parent->handleInput(skkchar); } } + if(SKKConfig::AbbrevModeKey() == skkchar) { + if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { + parent->fix(getStringToFix()); + parent->setEnabledAsciiConversionMode(true); + return false; + } + } + if(SKKConfig::NextKouhoKey() == skkchar) { if(status == STATUS_WHITE) { if(index.length() == 0) { @@ -455,7 +463,7 @@ word_register_mode->terminate(); } - parent->fix(this->getStringToFix()); // ???? + parent->fix(getStringToFix()); // ???? parent->setEnabledAsciiConversionMode(false); initialize(); } Index: AquaSKK/BIM.cpp diff -u AquaSKK/BIM.cpp:1.15 AquaSKK/BIM.cpp:1.16 --- AquaSKK/BIM.cpp:1.15 Sat Jan 27 12:52:30 2007 +++ AquaSKK/BIM.cpp Sat Feb 3 13:04:21 2007 @@ -1,5 +1,5 @@ /* - $Id: BIM.cpp,v 1.15 2007/01/27 03:52:30 t-suwa Exp $ + $Id: BIM.cpp,v 1.16 2007/02/03 04:04:21 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -335,7 +335,12 @@ case 0x5b: // 8 case 0x5c: // 9 case 0x5f: // , - return (*inSessionHandle)->imsession_input_mode->handleNumKey(event.CharCode()); + if(ClientConfiguration::theInstance().isNumericKeypad_HalfWidth()) { + return (*inSessionHandle)->imsession_input_mode->handleNumKey(event.CharCode()); + } else { + return (*inSessionHandle)->imsession_input_mode->handleInput(event); + } + break; case 0x66: // ?? if(SKKConfig::UseEisuuToSetHenkanPoint()) { return (*inSessionHandle)->imsession_input_mode->handleInput(SKKConfig::SetHenkanPointKey()); Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.38 AquaSKK/ChangeLog:1.39 --- AquaSKK/ChangeLog:1.38 Sat Jan 27 12:52:30 2007 +++ AquaSKK/ChangeLog Sat Feb 3 13:04:21 2007 @@ -1,3 +1,22 @@ +2007-02-03 Tomotaka SUWA + + * tests/TestAquaSKK.scpt: ?域?菴遵???ppleScript ??????????鴻???+ ????????+ +2007-01-28 Tomotaka SUWA + + * KanjiConversionMode.cpp: ?????????????倶????????欠Щ?????? + ?桁???信罩ｃ? + + * AsciiConversionMode.cpp: 紊??賢??'/' ????????????罩ｃ????? + ???????桁???信罩ｃ? + + * Resources/translation-to-hiragana, + Resources/translation-to-katakana: ???????≪???????????????? + ???????????????????桁???信罩ｃ? + + * BIM.cpp: ?????????????激??潟?????帥?????鴻???????????桁???信罩ｃ? + 2007-01-27 Tomotaka SUWA * Makefile: ?????????????合?????若??????申??? Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.14 AquaSKK/Info-AquaSKKInputMethod.plist:1.15 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.14 Sat Jan 27 12:52:30 2007 +++ AquaSKK/Info-AquaSKKInputMethod.plist Sat Feb 3 13:04:21 2007 @@ -19,11 +19,11 @@ CFBundlePackageType thng CFBundleShortVersionString - fix-skkserv 1.0 + fix-skkserv 1.1 CFBundleSignature askk CFBundleVersion - 2007-01-27 + 2007-02-03 CSResourcesFileMapped tsInputMethodIconFileKey Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.14 AquaSKK/Info-AquaSKKServer.plist:1.15 --- AquaSKK/Info-AquaSKKServer.plist:1.14 Sat Jan 27 12:52:30 2007 +++ AquaSKK/Info-AquaSKKServer.plist Sat Feb 3 13:04:21 2007 @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - fix-skkserv 1.0 + fix-skkserv 1.1 CFBundleSignature askk CFBundleVersion - 2007-01-27 + 2007-02-03 NSMainNibFile Principal NSPrincipalClass Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.10 AquaSKK/KanjiConversionMode.cpp:1.11 --- AquaSKK/KanjiConversionMode.cpp:1.10 Sat Jan 27 12:52:30 2007 +++ AquaSKK/KanjiConversionMode.cpp Sat Feb 3 13:04:21 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.10 2007/01/27 03:52:30 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.11 2007/02/03 04:04:21 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -256,9 +256,8 @@ // KanjiConversionMode?STATUS_NULL???? // ??IgnoreThis???? - parent->fix(this->getStringToFix()); - parent->handleInput(skkchar); - return false; + parent->fix(getStringToFix()); + return parent->handleInput(skkchar); } if(SKKConfig::NextKouhoKey() == skkchar) { @@ -344,12 +343,6 @@ return false; } - // ???????????? - if(status == STATUS_BLACK) { - parent->fix(getStringToFix()); - return parent->handleInput(skkchar); - } - // ???????????? if(status == STATUS_BLACK_WITH_WINDOW) { CppCFString labels = CppCFString("asdfjkl").substring(0, candidates_window_cands_per_frame); @@ -434,6 +427,12 @@ return handleInput(' '); // ???????????????continue? } } + else if(status == STATUS_BLACK) { + // ???????????? + parent->fix(getStringToFix()); + parent->setEnabledKanjiMode(true); + return handleInput(skkchar); + } } else { if(status == STATUS_WHITE_ROOT) { // ?????ﾀ?? @@ -463,6 +462,11 @@ return handleInput(' '); // ???????????????continue? } } + else if(status == STATUS_BLACK) { + // ???????????? + parent->fix(getStringToFix()); + return parent->handleInput(skkchar); + } } return false; @@ -741,7 +745,7 @@ root += to_fix; } - parent->fix(this->getStringToFix()); // ???? + parent->fix(getStringToFix()); // ???? parent->setEnabledKanjiMode(false); initialize(); } Index: AquaSKK/Makefile diff -u AquaSKK/Makefile:1.4 AquaSKK/Makefile:1.5 --- AquaSKK/Makefile:1.4 Sat Jan 27 12:52:30 2007 +++ AquaSKK/Makefile Sat Feb 3 13:04:21 2007 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2007/01/27 03:52:30 t-suwa Exp $ +# $Id: Makefile,v 1.5 2007/02/03 04:04:21 t-suwa Exp $ DARWIN = $(firstword $(subst ., ,$(shell uname -r))) TARGET = AquaSKKInputMethod.component @@ -29,6 +29,9 @@ check: all cd tests; make check; cd .. +test: + osascript tests/TestAquaSKK.scpt + beta: check cd Package; make beta; cd .. From t-suwa ＠ users.sourceforge.jp Sat Feb 3 13:04:22 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 13:04:22 +0900 Subject: [aquaskk-changes 291] CVS update: AquaSKK/Resources Message-ID: <20070203040422.595632AC0F9@users.sourceforge.jp> Index: AquaSKK/Resources/translation-to-hiragana diff -u AquaSKK/Resources/translation-to-hiragana:1.2 AquaSKK/Resources/translation-to-hiragana:1.3 --- AquaSKK/Resources/translation-to-hiragana:1.2 Wed Apr 26 22:45:24 2006 +++ AquaSKK/Resources/translation-to-hiragana Sat Feb 3 13:04:22 2007 @@ -1,4 +1,4 @@ -# $Id: translation-to-hiragana,v 1.2 2006/04/26 13:45:24 t-suwa Exp $ +# $Id: translation-to-hiragana,v 1.3 2007/02/03 04:04:22 t-suwa Exp $ # このファイルは改行コードがLF、文字エンコーディングがEUC-JPでなければなりません。 # ,は半角カンマに置換されます。 @@ -178,6 +178,12 @@ ﾕ,ゆ ﾖ,よ +ﾗ,ら +ﾘ,り +ﾙ,る +ﾚ,れ +ﾛ,ろ + ﾜ,わ ｦ,を ﾝ,ん Index: AquaSKK/Resources/translation-to-katakana diff -u AquaSKK/Resources/translation-to-katakana:1.2 AquaSKK/Resources/translation-to-katakana:1.3 --- AquaSKK/Resources/translation-to-katakana:1.2 Wed Apr 26 22:45:24 2006 +++ AquaSKK/Resources/translation-to-katakana Sat Feb 3 13:04:22 2007 @@ -1,4 +1,4 @@ -# $Id: translation-to-katakana,v 1.2 2006/04/26 13:45:24 t-suwa Exp $ +# $Id: translation-to-katakana,v 1.3 2007/02/03 04:04:22 t-suwa Exp $ # このファイルは改行コードがLF、文字エンコーディングがEUC-JPでなければなりません。 # ,は半角カンマに置換されます。 @@ -177,6 +177,12 @@ ﾕ,ユ ﾖ,ヨ +ﾗ,ラ +ﾘ,リ +ﾙ,ル +ﾚ,レ +ﾛ,ロ + ﾜ,ワ ｦ,ヲ ﾝ,ン From t-suwa ＠ users.sourceforge.jp Sat Feb 3 13:04:22 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 13:04:22 +0900 Subject: [aquaskk-changes 292] CVS update: AquaSKK/tests Message-ID: <20070203040422.7D4592AC0AC@users.sourceforge.jp> Index: AquaSKK/tests/TestAquaSKK.scpt From t-suwa ＠ users.sourceforge.jp Sat Feb 3 16:53:30 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 16:53:30 +0900 Subject: [aquaskk-changes 293] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20070203075330.70A622AC0C8@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.10.2.4 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.10.2.5 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.10.2.4 Fri Dec 8 23:38:57 2006 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Sat Feb 3 16:53:30 2007 @@ -78,7 +78,6 @@ 849E10B3055023C8009C3C25 /* ClientConnectionFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5DEF6150357002B01CD0AD3 /* ClientConnectionFactory.h */; }; 849E10B4055023C8009C3C25 /* ServerMessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = F5DEF6190357174401CD0AD3 /* ServerMessageReceiver.h */; }; 849E10B5055023C8009C3C25 /* AquaSKK_Prefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 84C301620471FED8008D3B10 /* AquaSKK_Prefix.h */; }; - 849E10B9055023C8009C3C25 /* Principal.nib in Resources */ = {isa = PBXBuildFile; fileRef = F507431302FFB99D01CD4EB1 /* Principal.nib */; }; 849E10BA055023C8009C3C25 /* AboutBox.nib in Resources */ = {isa = PBXBuildFile; fileRef = F551EC7A030FD24C012D3D1A /* AboutBox.nib */; }; 849E10BB055023C8009C3C25 /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = F551EE1F030FEB44012D3D1A /* Preferences.nib */; }; 849E10BC055023C8009C3C25 /* Candidates.nib in Resources */ = {isa = PBXBuildFile; fileRef = F551EE26030FF4B6012D3D1A /* Candidates.nib */; }; @@ -124,7 +123,9 @@ D3332EFE086DB196001C607D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3332EFD086DB196001C607D /* CoreServices.framework */; }; D3332EFF086DB196001C607D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3332EFD086DB196001C607D /* CoreServices.framework */; }; D33EC09E0970E61C00305791 /* AquaSKK-InputMethod.tif in Resources */ = {isa = PBXBuildFile; fileRef = D33EC09D0970E61C00305791 /* AquaSKK-InputMethod.tif */; }; + D3454AAA0B4E35E100AEEC97 /* SKKPreProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = D3454AA70B4E35E100AEEC97 /* SKKPreProcessor.h */; }; D34ED13109A7862400F0986F /* PreferenceKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = D34ED13009A7862400F0986F /* PreferenceKeys.h */; }; + D35523040B50A8D0007ECFCB /* SKK.h in Headers */ = {isa = PBXBuildFile; fileRef = D35523030B50A8D0007ECFCB /* SKK.h */; }; D35D2BC909A2363D004409C7 /* KotoeriDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D35D2BC709A2363D004409C7 /* KotoeriDictionary.cpp */; }; D35D2BCA09A2363D004409C7 /* KotoeriDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = D35D2BC809A2363D004409C7 /* KotoeriDictionary.h */; }; D35D2BCD09A23931004409C7 /* DictionarySet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D35D2BCB09A23931004409C7 /* DictionarySet.cpp */; }; @@ -143,6 +144,14 @@ D369F6BF0A1A29C800784FF4 /* SKKChar.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6BB0A1A29C800784FF4 /* SKKChar.h */; }; D369F6C00A1A29C800784FF4 /* SKKEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = D369F6BC0A1A29C800784FF4 /* SKKEvent.h */; }; D369F6CE0A1A2D9C00784FF4 /* config in Resources */ = {isa = PBXBuildFile; fileRef = D369F6CD0A1A2D9C00784FF4 /* config */; }; + D385B8890B4E3C2D004203B8 /* keymap.conf in Resources */ = {isa = PBXBuildFile; fileRef = D385B8880B4E3C2D004203B8 /* keymap.conf */; }; + D38706A50B508270004B2C37 /* SKKInputKeymap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D38706A30B508270004B2C37 /* SKKInputKeymap.cpp */; }; + D38706A60B508270004B2C37 /* SKKInputKeymap.h in Headers */ = {isa = PBXBuildFile; fileRef = D38706A40B508270004B2C37 /* SKKInputKeymap.h */; }; + D388F7420B5E66C500848CE8 /* Test.nib in Resources */ = {isa = PBXBuildFile; fileRef = D388F7400B5E66C500848CE8 /* Test.nib */; }; + D398B6D80B50AC450082DEC1 /* SKKConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D398B6D40B50AC450082DEC1 /* SKKConverter.cpp */; }; + D398B6D90B50AC450082DEC1 /* SKKConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = D398B6D50B50AC450082DEC1 /* SKKConverter.h */; }; + D398B6DA0B50AC450082DEC1 /* SKKFrontEnd.h in Headers */ = {isa = PBXBuildFile; fileRef = D398B6D60B50AC450082DEC1 /* SKKFrontEnd.h */; }; + D398B6DB0B50AC450082DEC1 /* SKKFrontEnd.mm in Sources */ = {isa = PBXBuildFile; fileRef = D398B6D70B50AC450082DEC1 /* SKKFrontEnd.mm */; }; D39D4D6409A61FD70075FE25 /* skkserv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D39D4D6109A61FD70075FE25 /* skkserv.cpp */; }; D39D4D6509A61FD70075FE25 /* skkserv.h in Headers */ = {isa = PBXBuildFile; fileRef = D39D4D6209A61FD70075FE25 /* skkserv.h */; }; D39D4D6609A61FD70075FE25 /* socketstream.h in Headers */ = {isa = PBXBuildFile; fileRef = D39D4D6309A61FD70075FE25 /* socketstream.h */; }; @@ -150,6 +159,16 @@ D3A9A94309B0964F00DF29C8 /* ProxyDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = D3A9A94109B0964F00DF29C8 /* ProxyDictionary.h */; }; D3B8C26F099ED66600C08C41 /* DictArrayController.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B8C26D099ED66600C08C41 /* DictArrayController.h */; }; D3B8C270099ED66600C08C41 /* DictArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3B8C26E099ED66600C08C41 /* DictArrayController.m */; }; + D3C19A3E0B478873000FC898 /* SKKContext.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C19A3D0B478873000FC898 /* SKKContext.h */; }; + D3C19A5D0B47E683000FC898 /* GenericStateMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C19A2D0B4777CE000FC898 /* GenericStateMachine.h */; }; + D3C19A5E0B47E683000FC898 /* SKKEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C19A150B47665C000FC898 /* SKKEnvironment.h */; }; + D3C19A5F0B47E683000FC898 /* SKKEnvironment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3C19A140B47665C000FC898 /* SKKEnvironment.cpp */; }; + D3C19A600B47E683000FC898 /* SKKContext.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C19A3D0B478873000FC898 /* SKKContext.h */; }; + D3C19A610B47E683000FC898 /* SKKEventParam.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C19A160B47665C000FC898 /* SKKEventParam.h */; }; + D3C19A640B47E683000FC898 /* SKKBackEnd.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C19A2F0B4777CE000FC898 /* SKKBackEnd.h */; }; + D3C19A650B47E683000FC898 /* SKKBackEnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3C19A2E0B4777CE000FC898 /* SKKBackEnd.cpp */; }; + D3C19ACD0B4B2DED000FC898 /* SKKEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = D3C19ACC0B4B2DED000FC898 /* SKKEngine.h */; }; + D3C7B8AF0B47534900D2B4E0 /* Principal.nib in Resources */ = {isa = PBXBuildFile; fileRef = D3C7B8AD0B47534900D2B4E0 /* Principal.nib */; }; D3D0C6F8086EECA800319954 /* AsciiConversionMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */; }; D3D0C6F9086EECA800319954 /* AsciiConversionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */; }; D3D46F7B0872F755009707C1 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D3D46F790872F755009707C1 /* InfoPlist.strings */; }; @@ -222,7 +241,9 @@ D3332EF8086DB18B001C607D /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; D3332EFD086DB196001C607D /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; D33EC09D0970E61C00305791 /* AquaSKK-InputMethod.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "AquaSKK-InputMethod.tif"; path = "Icons/AquaSKK-InputMethod.tif"; sourceTree = ""; }; + D3454AA70B4E35E100AEEC97 /* SKKPreProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKPreProcessor.h; sourceTree = ""; }; D34ED13009A7862400F0986F /* PreferenceKeys.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = PreferenceKeys.h; sourceTree = ""; }; + D35523030B50A8D0007ECFCB /* SKK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKK.h; sourceTree = ""; }; D35D2BC709A2363D004409C7 /* KotoeriDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.cpp.cpp; path = KotoeriDictionary.cpp; sourceTree = ""; }; D35D2BC809A2363D004409C7 /* KotoeriDictionary.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = KotoeriDictionary.h; sourceTree = ""; }; D35D2BCB09A23931004409C7 /* DictionarySet.cpp */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.cpp.cpp; path = DictionarySet.cpp; sourceTree = ""; }; @@ -236,6 +257,14 @@ D369F6BB0A1A29C800784FF4 /* SKKChar.h */ = {isa = PBXFileReference; fileEncoding = 3; lastKnownFileType = sourcecode.c.h; path = SKKChar.h; sourceTree = ""; }; D369F6BC0A1A29C800784FF4 /* SKKEvent.h */ = {isa = PBXFileReference; fileEncoding = 3; lastKnownFileType = sourcecode.c.h; path = SKKEvent.h; sourceTree = ""; }; D369F6CD0A1A2D9C00784FF4 /* config */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = text; name = config; path = Resources/config; sourceTree = ""; }; + D385B8880B4E3C2D004203B8 /* keymap.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = keymap.conf; path = Resources/keymap.conf; sourceTree = ""; }; + D38706A30B508270004B2C37 /* SKKInputKeymap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SKKInputKeymap.cpp; sourceTree = ""; }; + D38706A40B508270004B2C37 /* SKKInputKeymap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKInputKeymap.h; sourceTree = ""; }; + D388F7410B5E66C500848CE8 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/Test.nib; sourceTree = ""; }; + D398B6D40B50AC450082DEC1 /* SKKConverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SKKConverter.cpp; sourceTree = ""; }; + D398B6D50B50AC450082DEC1 /* SKKConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKConverter.h; sourceTree = ""; }; + D398B6D60B50AC450082DEC1 /* SKKFrontEnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKFrontEnd.h; sourceTree = ""; }; + D398B6D70B50AC450082DEC1 /* SKKFrontEnd.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SKKFrontEnd.mm; sourceTree = ""; }; D39D4D6109A61FD70075FE25 /* skkserv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skkserv.cpp; sourceTree = ""; }; D39D4D6209A61FD70075FE25 /* skkserv.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = skkserv.h; sourceTree = ""; }; D39D4D6309A61FD70075FE25 /* socketstream.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = socketstream.h; sourceTree = ""; }; @@ -243,6 +272,15 @@ D3A9A94109B0964F00DF29C8 /* ProxyDictionary.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = ProxyDictionary.h; sourceTree = ""; }; D3B8C26D099ED66600C08C41 /* DictArrayController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = DictArrayController.h; sourceTree = ""; }; D3B8C26E099ED66600C08C41 /* DictArrayController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; path = DictArrayController.m; sourceTree = ""; }; + D3C19A140B47665C000FC898 /* SKKEnvironment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SKKEnvironment.cpp; sourceTree = ""; }; + D3C19A150B47665C000FC898 /* SKKEnvironment.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = SKKEnvironment.h; sourceTree = ""; }; + D3C19A160B47665C000FC898 /* SKKEventParam.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = SKKEventParam.h; sourceTree = ""; }; + D3C19A2D0B4777CE000FC898 /* GenericStateMachine.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = GenericStateMachine.h; sourceTree = ""; }; + D3C19A2E0B4777CE000FC898 /* SKKBackEnd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SKKBackEnd.cpp; sourceTree = ""; }; + D3C19A2F0B4777CE000FC898 /* SKKBackEnd.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = SKKBackEnd.h; sourceTree = ""; }; + D3C19A3D0B478873000FC898 /* SKKContext.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = SKKContext.h; sourceTree = ""; }; + D3C19ACC0B4B2DED000FC898 /* SKKEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKEngine.h; sourceTree = ""; }; + D3C7B8AE0B47534900D2B4E0 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/Principal.nib; sourceTree = ""; }; D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.cpp.cpp; path = AsciiConversionMode.cpp; sourceTree = ""; }; D3D0C6F7086EECA800319954 /* AsciiConversionMode.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = AsciiConversionMode.h; sourceTree = ""; }; D3D46F7A0872F755009707C1 /* Japanese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -258,7 +296,6 @@ F505D2F4031499D001CD4EB1 /* KanaTreeController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = KanaTreeController.h; sourceTree = ""; }; F5066C4402F3CF1B01CD4EB1 /* KanjiConversionMode.cpp */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.cpp.cpp; path = KanjiConversionMode.cpp; sourceTree = ""; }; F5066C4502F3CF1B01CD4EB1 /* KanjiConversionMode.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = KanjiConversionMode.h; sourceTree = ""; }; - F507431402FFB99D01CD4EB1 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/Principal.nib; sourceTree = ""; }; F507431602FFB9DD01CD4EB1 /* CandidatesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = CandidatesWindowController.h; sourceTree = ""; }; F507431702FFB9DD01CD4EB1 /* CandidatesWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.cpp.objcpp; path = CandidatesWindowController.mm; sourceTree = ""; }; F50A6E4303038EA901CD4EB1 /* WordRegisterMode.cpp */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.cpp.cpp; path = WordRegisterMode.cpp; sourceTree = ""; }; @@ -399,7 +436,7 @@ children = ( D308EC0609DDED2600CCECDD /* DictionarySet.plist */, D308EC0709DDED2600CCECDD /* UserDefaults.plist */, - F507431302FFB99D01CD4EB1 /* Principal.nib */, + D3C7B8AD0B47534900D2B4E0 /* Principal.nib */, F551EE26030FF4B6012D3D1A /* Candidates.nib */, F551EC7A030FD24C012D3D1A /* AboutBox.nib */, F551EE1F030FEB44012D3D1A /* Preferences.nib */, @@ -456,6 +493,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + D385B8880B4E3C2D004203B8 /* keymap.conf */, D369F6CD0A1A2D9C00784FF4 /* config */, D308EC0A09DDED7400CCECDD /* kana-rule-list */, D308EC0B09DDED7400CCECDD /* okuri-list */, @@ -465,6 +503,7 @@ D308EC0F09DDED7400CCECDD /* tut-config */, D308EC1009DDED7400CCECDD /* tut-kana-rule-list */, D3D46F790872F755009707C1 /* InfoPlist.strings */, + D388F7400B5E66C500848CE8 /* Test.nib */, D31FAAC7086E93FD00868187 /* Menu.nib */, 01A38B34005639D21153986C /* BIM.r */, ); @@ -474,6 +513,7 @@ 08FB77ADFE841716C02AAC07 /* Source */ = { isa = PBXGroup; children = ( + D3C19A130B476628000FC898 /* SKKEngine */, D3EDBC060A23611F000C4C11 /* NumericConverter.cpp */, D3EDBC070A23611F000C4C11 /* NumericConverter.h */, D3D0C6F6086EECA800319954 /* AsciiConversionMode.cpp */, @@ -543,6 +583,29 @@ name = Icons; sourceTree = ""; }; + D3C19A130B476628000FC898 /* SKKEngine */ = { + isa = PBXGroup; + children = ( + D35523030B50A8D0007ECFCB /* SKK.h */, + D3C19ACC0B4B2DED000FC898 /* SKKEngine.h */, + D3C19A2D0B4777CE000FC898 /* GenericStateMachine.h */, + D3C19A150B47665C000FC898 /* SKKEnvironment.h */, + D3C19A140B47665C000FC898 /* SKKEnvironment.cpp */, + D3C19A3D0B478873000FC898 /* SKKContext.h */, + D3C19A160B47665C000FC898 /* SKKEventParam.h */, + D3454AA70B4E35E100AEEC97 /* SKKPreProcessor.h */, + D38706A40B508270004B2C37 /* SKKInputKeymap.h */, + D38706A30B508270004B2C37 /* SKKInputKeymap.cpp */, + D398B6D50B50AC450082DEC1 /* SKKConverter.h */, + D398B6D40B50AC450082DEC1 /* SKKConverter.cpp */, + D398B6D60B50AC450082DEC1 /* SKKFrontEnd.h */, + D398B6D70B50AC450082DEC1 /* SKKFrontEnd.mm */, + D3C19A2F0B4777CE000FC898 /* SKKBackEnd.h */, + D3C19A2E0B4777CE000FC898 /* SKKBackEnd.cpp */, + ); + name = SKKEngine; + sourceTree = ""; + }; F51C27800319F9CD01CD4EB1 /* Candidates Window */ = { isa = PBXGroup; children = ( @@ -621,6 +684,18 @@ D369F6BE0A1A29C800784FF4 /* SKKEvent.h in Headers */, D3EDBC090A23611F000C4C11 /* NumericConverter.h in Headers */, D32121960B17D6B5007DEBD0 /* jconv.h in Headers */, + D3C19A3E0B478873000FC898 /* SKKContext.h in Headers */, + D3C19A5D0B47E683000FC898 /* GenericStateMachine.h in Headers */, + D3C19A5E0B47E683000FC898 /* SKKEnvironment.h in Headers */, + D3C19A600B47E683000FC898 /* SKKContext.h in Headers */, + D3C19A610B47E683000FC898 /* SKKEventParam.h in Headers */, + D3C19A640B47E683000FC898 /* SKKBackEnd.h in Headers */, + D3C19ACD0B4B2DED000FC898 /* SKKEngine.h in Headers */, + D3454AAA0B4E35E100AEEC97 /* SKKPreProcessor.h in Headers */, + D38706A60B508270004B2C37 /* SKKInputKeymap.h in Headers */, + D35523040B50A8D0007ECFCB /* SKK.h in Headers */, + D398B6D90B50AC450082DEC1 /* SKKConverter.h in Headers */, + D398B6DA0B50AC450082DEC1 /* SKKFrontEnd.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -744,6 +819,8 @@ D308EC1609DDED7400CCECDD /* tut-config in Resources */, D308EC1709DDED7400CCECDD /* tut-kana-rule-list in Resources */, D369F6CE0A1A2D9C00784FF4 /* config in Resources */, + D385B8890B4E3C2D004203B8 /* keymap.conf in Resources */, + D388F7420B5E66C500848CE8 /* Test.nib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -751,12 +828,12 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 849E10B9055023C8009C3C25 /* Principal.nib in Resources */, 849E10BA055023C8009C3C25 /* AboutBox.nib in Resources */, 849E10BB055023C8009C3C25 /* Preferences.nib in Resources */, 849E10BC055023C8009C3C25 /* Candidates.nib in Resources */, D308EC0809DDED2600CCECDD /* DictionarySet.plist in Resources */, D308EC0909DDED2600CCECDD /* UserDefaults.plist in Resources */, + D3C7B8AF0B47534900D2B4E0 /* Principal.nib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -814,6 +891,11 @@ D369F6B60A1A27ED00784FF4 /* SKKConfig.cpp in Sources */, D3EDBC080A23611F000C4C11 /* NumericConverter.cpp in Sources */, D32121930B17D6A0007DEBD0 /* jconv.cpp in Sources */, + D3C19A5F0B47E683000FC898 /* SKKEnvironment.cpp in Sources */, + D3C19A650B47E683000FC898 /* SKKBackEnd.cpp in Sources */, + D38706A50B508270004B2C37 /* SKKInputKeymap.cpp in Sources */, + D398B6D80B50AC450082DEC1 /* SKKConverter.cpp in Sources */, + D398B6DB0B50AC450082DEC1 /* SKKFrontEnd.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -868,22 +950,30 @@ name = Menu.nib; sourceTree = ""; }; - D3D46F790872F755009707C1 /* InfoPlist.strings */ = { + D388F7400B5E66C500848CE8 /* Test.nib */ = { isa = PBXVariantGroup; children = ( - D3D46F7A0872F755009707C1 /* Japanese */, + D388F7410B5E66C500848CE8 /* Japanese */, ); - name = InfoPlist.strings; + name = Test.nib; sourceTree = ""; }; - F507431302FFB99D01CD4EB1 /* Principal.nib */ = { + D3C7B8AD0B47534900D2B4E0 /* Principal.nib */ = { isa = PBXVariantGroup; children = ( - F507431402FFB99D01CD4EB1 /* Japanese */, + D3C7B8AE0B47534900D2B4E0 /* Japanese */, ); name = Principal.nib; sourceTree = ""; }; + D3D46F790872F755009707C1 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + D3D46F7A0872F755009707C1 /* Japanese */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; F551EC7A030FD24C012D3D1A /* AboutBox.nib */ = { isa = PBXVariantGroup; children = ( @@ -1095,6 +1185,7 @@ GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_PEDANTIC = YES; GCC_WARN_SHADOW = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNKNOWN_PRAGMAS = YES; @@ -1107,12 +1198,14 @@ INFOPLIST_FILE = "Info-AquaSKKInputMethod.plist"; INSTALL_PATH = "$(HOME)/Library/Bundles"; LIBRARY_SEARCH_PATHS = ""; + LINKER_DISPLAYS_MANGLED_NAMES = YES; MACOSX_DEPLOYMENT_TARGET = ""; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = "-rd -d ppc_$(ppc) -d i386_$(i386)"; + PREBINDING = NO; PRODUCT_NAME = AquaSKKInputMethod; SDKROOT = "$(SDKROOT)"; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; From t-suwa ＠ users.sourceforge.jp Sat Feb 3 16:53:30 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 16:53:30 +0900 Subject: [aquaskk-changes 294] CVS update: AquaSKK/Japanese.lproj/Menu.nib Message-ID: <20070203075330.9A3092AC0F9@users.sourceforge.jp> Index: AquaSKK/Japanese.lproj/Menu.nib/info.nib diff -u AquaSKK/Japanese.lproj/Menu.nib/info.nib:1.2 AquaSKK/Japanese.lproj/Menu.nib/info.nib:1.2.2.1 --- AquaSKK/Japanese.lproj/Menu.nib/info.nib:1.2 Wed Apr 26 22:36:14 2006 +++ AquaSKK/Japanese.lproj/Menu.nib/info.nib Sat Feb 3 16:53:30 2007 @@ -3,14 +3,14 @@ IBDocumentLocation - 371 86 356 240 0 0 1280 1002 + 390 165 356 240 0 0 1280 1002 IBEditorPositions 180 - 460 457 170 68 0 0 1280 1002 + 468 497 157 99 0 0 1280 1002 IBFramework Version - 443.0 + 446.1 IBOldestOS 3 IBOpenObjects @@ -18,7 +18,7 @@ 180 IBSystem Version - 8H1619 + 8L2127 targetFramework IBCarbonFramework Index: AquaSKK/Japanese.lproj/Menu.nib/objects.xib diff -u AquaSKK/Japanese.lproj/Menu.nib/objects.xib:1.2 AquaSKK/Japanese.lproj/Menu.nib/objects.xib:1.2.2.1 --- AquaSKK/Japanese.lproj/Menu.nib/objects.xib:1.2 Wed Apr 26 22:36:14 2006 +++ AquaSKK/Japanese.lproj/Menu.nib/objects.xib Sat Feb 3 16:53:30 2007 @@ -4,20 +4,34 @@ NSApplication - + Menu 16384 - + TRUE ?医?荐??... - PREF + pref TRUE AquaSKK ?????? - ABOU + abou + + + TRUE + TRUE + + + TRUE + ????吾???? Web ?泣???/string> + sfjp + + + TRUE + 箴水?????純?Tips ??? + tips TRUE @@ -25,11 +39,17 @@ + + + - + + + + AquaSKK @@ -41,5 +61,5 @@ IBCarbonMenuItem1 - 186 + 189 From t-suwa ＠ users.sourceforge.jp Sat Feb 3 16:53:30 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 16:53:30 +0900 Subject: [aquaskk-changes 295] CVS update: AquaSKK/Japanese.lproj/Principal.nib Message-ID: <20070203075330.C96082AC0C8@users.sourceforge.jp> Index: AquaSKK/Japanese.lproj/Principal.nib/info.nib diff -u AquaSKK/Japanese.lproj/Principal.nib/info.nib:1.2 AquaSKK/Japanese.lproj/Principal.nib/info.nib:1.2.2.1 --- AquaSKK/Japanese.lproj/Principal.nib/info.nib:1.2 Wed Apr 26 22:36:14 2006 +++ AquaSKK/Japanese.lproj/Principal.nib/info.nib Sat Feb 3 16:53:30 2007 @@ -4,21 +4,12 @@ IBDocumentLocation 357 271 356 240 0 0 1280 1002 - IBEditorPositions - - 29 - 106 585 338 44 0 0 1280 1002 - IBFramework Version - 443.0 + 446.1 IBOldestOS 3 - IBOpenObjects - - 29 - IBSystem Version - 8G32 + 8L2127 IBUsesTextArchiving Index: AquaSKK/Japanese.lproj/Principal.nib/keyedobjects.nib diff -u AquaSKK/Japanese.lproj/Principal.nib/keyedobjects.nib:1.2 AquaSKK/Japanese.lproj/Principal.nib/keyedobjects.nib:1.2.2.1 --- AquaSKK/Japanese.lproj/Principal.nib/keyedobjects.nib:1.2 Wed Apr 26 22:36:14 2006 +++ AquaSKK/Japanese.lproj/Principal.nib/keyedobjects.nib Sat Feb 3 16:53:30 2007 @@ -11,32 +11,32 @@ $class CF$UID - 364 + 32 NSAccessibilityConnectors CF$UID - 361 + 29 NSAccessibilityOidsKeys CF$UID - 362 + 30 NSAccessibilityOidsValues CF$UID - 363 + 31 NSClassesKeys CF$UID - 266 + 22 NSClassesValues CF$UID - 267 + 23 NSConnections @@ -56,34 +56,34 @@ NSNamesKeys CF$UID - 244 + 19 NSNamesValues CF$UID - 245 + 20 NSNextOid 241 NSObjectsKeys CF$UID - 144 + 16 NSObjectsValues CF$UID - 243 + 18 NSOidsKeys CF$UID - 268 + 24 NSOidsValues CF$UID - 269 + 25 NSRoot @@ -168,7 +168,7 @@ $class CF$UID - 143 + 15 NS.objects @@ -176,311 +176,137 @@ CF$UID 10 - - CF$UID - 24 - - - CF$UID - 29 - - - CF$UID - 35 - - - CF$UID - 40 - - - CF$UID - 46 - - - CF$UID - 51 - - - CF$UID - 57 - - - CF$UID - 61 - - - CF$UID - 65 - - - CF$UID - 70 - - - CF$UID - 74 - - - CF$UID - 79 - - - CF$UID - 84 - - - CF$UID - 90 - - - CF$UID - 95 - - - CF$UID - 100 - - - CF$UID - 105 - - - CF$UID - 110 - - - CF$UID - 115 - - - CF$UID - 119 - - - CF$UID - 124 - - - CF$UID - 129 - - - CF$UID - 134 - - - CF$UID - 138 - $class CF$UID - 23 - - NSLabel - - CF$UID - 22 - - NSSource - - CF$UID - 11 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID 14 - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 12 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage + NSDestination CF$UID - 15 + 11 - NSTitle + NSLabel CF$UID 13 - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 191 - - NSName - - CF$UID - 193 - - NSTitle + NSSource CF$UID - 190 + 2 - Minimize - m $class CF$UID - 18 + 5 NSClassName CF$UID - 16 - - NSResourceName - - CF$UID - 17 + 12 - NSImage - NSMenuCheckmark + AquaSKKServer + delegate $classes - NSCustomResource - %NSCustomResource + NSNibOutletConnector + NSNibConnector NSObject $classname - NSCustomResource - - - $class - - CF$UID - 18 - - NSClassName - - CF$UID - 16 - - NSResourceName - - CF$UID - 20 - + NSNibOutletConnector - NSMenuMixedState $classes - NSMenuItem + NSMutableArray + NSArray NSObject $classname - NSMenuItem + NSMutableArray $class CF$UID - 4 + 17 - NS.string - performMiniaturize: + NS.objects + + + CF$UID + 11 + + $classes - NSNibControlConnector - NSNibConnector + NSArray NSObject $classname - NSNibControlConnector + NSArray $class CF$UID - 23 - - NSLabel - - CF$UID - 28 - - NSSource - - CF$UID - 25 + 17 + NS.objects + + + CF$UID + 2 + + $class CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 12 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 + 17 - NSTitle + NS.objects + + + CF$UID + 2 + + + CF$UID + 11 + + + + + $class CF$UID - 26 + 17 + NS.objects + + + CF$UID + 21 + + + CF$UID + 12 + + - Bring All to Front - $class @@ -488,5007 +314,78 @@ 4 NS.string - arrangeInFront: + File's Owner $class CF$UID - 23 - - NSLabel - - CF$UID - 34 - - NSSource - - CF$UID - 30 + 17 + NS.objects + $class CF$UID - 21 + 17 - NSKeyEquiv + NS.objects + + + + $class CF$UID - 33 + 17 - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 32 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 198 - - NSTitle - - CF$UID - 197 - - - Print... - p - - $class - - CF$UID - 4 - - NS.string - print: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 39 - - NSSource - - CF$UID - 36 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 38 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 37 - - - Page Setup... - P - - $class - - CF$UID - 4 - - NS.string - runPageLayout: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 45 - - NSSource - - CF$UID - 41 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 44 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 42 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 43 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 223 - - NSTitle - - CF$UID - 222 - - - NewApplication Help - ? - - $class - - CF$UID - 4 - - NS.string - showHelp: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 50 - - NSSource - - CF$UID - 47 - - - - $class - - CF$UID - 21 - - NSIsDisabled - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 48 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 49 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 209 - - NSName - - CF$UID - 210 - - NSTitle - - CF$UID - 208 - - - Clear Menu - - $class - - CF$UID - 4 - - NS.string - clearRecentDocuments: - - - $class - - CF$UID - 23 - - NSDestination - - CF$UID - 2 - - NSLabel - - CF$UID - 56 - - NSSource - - CF$UID - 52 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 55 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 54 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 232 - - NSName - - CF$UID - 240 - - NSTitle - - CF$UID - 230 - - - Quit NewApplication - q - - $class - - CF$UID - 4 - - NS.string - terminate: - - - $class - - CF$UID - 23 - - NSDestination - - CF$UID - 2 - - NSLabel - - CF$UID - 60 - - NSSource - - CF$UID - 58 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 59 - - - About NewApplication - - $class - - CF$UID - 4 - - NS.string - orderFrontStandardAboutPanel: - - - $class - - CF$UID - 23 - - NSDestination - - CF$UID - 2 - - NSLabel - - CF$UID - 64 - - NSSource - - CF$UID - 62 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 63 - - - Hide Others - hideOtherApplications: - - $class - - CF$UID - 23 - - NSDestination - - CF$UID - 2 - - NSLabel - - CF$UID - 69 - - NSSource - - CF$UID - 66 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 68 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 67 - - - Hide NewApplication - h - hide: - - $class - - CF$UID - 23 - - NSDestination - - CF$UID - 2 - - NSLabel - - CF$UID - 73 - - NSSource - - CF$UID - 71 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 72 - - - Show All - unhideAllApplications: - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 78 - - NSSource - - CF$UID - 75 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 77 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 76 - - - Close - w - performClose: - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 83 - - NSSource - - CF$UID - 80 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 81 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 82 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 184 - - NSTitle - - CF$UID - 182 - - - Check Spelling As You Type - toggleContinuousSpellChecking: - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 89 - - NSSource - - CF$UID - 85 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 88 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 87 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 161 - - NSTitle - - CF$UID - 160 - - - Undo - z - - $class - - CF$UID - 4 - - NS.string - undo: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 94 - - NSSource - - CF$UID - 91 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 93 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 92 - - - Copy - c - - $class - - CF$UID - 4 - - NS.string - copy: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 99 - - NSSource - - CF$UID - 96 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 98 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 81 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 97 - - - Check Spelling - ; - - $class - - CF$UID - 4 - - NS.string - checkSpelling: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 104 - - NSSource - - CF$UID - 101 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 103 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 102 - - - Paste - v - - $class - - CF$UID - 4 - - NS.string - paste: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 109 - - NSSource - - CF$UID - 106 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 107 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 108 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 155 - - NSTitle - - CF$UID - 154 - - - Stop speaking - stopSpeaking: - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 114 - - NSSource - - CF$UID - 111 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 113 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 112 - - - Cut - x - - $class - - CF$UID - 4 - - NS.string - cut: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 118 - - NSSource - - CF$UID - 116 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 117 - - - Clear - - $class - - CF$UID - 4 - - NS.string - clear: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 123 - - NSSource - - CF$UID - 120 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 122 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 81 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 121 - - - Spelling... - : - - $class - - CF$UID - 4 - - NS.string - showGuessPanel: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 128 - - NSSource - - CF$UID - 125 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 127 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 126 - - - Redo - Z - - $class - - CF$UID - 4 - - NS.string - redo: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 133 - - NSSource - - CF$UID - 130 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 132 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 131 - - - Select All - a - - $class - - CF$UID - 4 - - NS.string - selectAll: - - - $class - - CF$UID - 23 - - NSLabel - - CF$UID - 137 - - NSSource - - CF$UID - 135 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 107 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 136 - - - Start speaking - startSpeaking: - - $class - - CF$UID - 142 - - NSDestination - - CF$UID - 139 - - NSLabel - - CF$UID - 141 - - NSSource - - CF$UID - 2 - - - - $class - - CF$UID - 5 - - NSClassName - - CF$UID - 140 - - - AquaSKKServer - delegate - - $classes - - NSNibOutletConnector - NSNibConnector - NSObject - - $classname - NSNibOutletConnector - - - $classes - - NSMutableArray - NSArray - NSObject - - $classname - NSMutableArray - - - $class - - CF$UID - 242 - - NS.objects - - - CF$UID - 145 - - - CF$UID - 150 - - - CF$UID - 107 - - - CF$UID - 156 - - - CF$UID - 187 - - - CF$UID - 194 - - - CF$UID - 215 - - - CF$UID - 163 - - - CF$UID - 75 - - - CF$UID - 41 - - - CF$UID - 80 - - - CF$UID - 192 - - - CF$UID - 221 - - - CF$UID - 125 - - - CF$UID - 25 - - - CF$UID - 164 - - - CF$UID - 91 - - - CF$UID - 42 - - - CF$UID - 205 - - - CF$UID - 101 - - - CF$UID - 162 - - - CF$UID - 218 - - - CF$UID - 52 - - - CF$UID - 224 - - - CF$UID - 199 - - - CF$UID - 81 - - - CF$UID - 135 - - - CF$UID - 157 - - - CF$UID - 211 - - - CF$UID - 120 - - - CF$UID - 151 - - - CF$UID - 53 - - - CF$UID - 235 - - - CF$UID - 48 - - - CF$UID - 106 - - - CF$UID - 169 - - - CF$UID - 175 - - - CF$UID - 116 - - - CF$UID - 220 - - - CF$UID - 202 - - - CF$UID - 185 - - - CF$UID - 62 - - - CF$UID - 85 - - - CF$UID - 47 - - - CF$UID - 236 - - - CF$UID - 178 - - - CF$UID - 36 - - - CF$UID - 130 - - - CF$UID - 111 - - - CF$UID - 172 - - - CF$UID - 86 - - - CF$UID - 12 - - - CF$UID - 31 - - - CF$UID - 239 - - - CF$UID - 139 - - - CF$UID - 58 - - - CF$UID - 181 - - - CF$UID - 71 - - - CF$UID - 212 - - - CF$UID - 11 - - - CF$UID - 30 - - - CF$UID - 96 - - - CF$UID - 229 - - - CF$UID - 233 - - - CF$UID - 66 - - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 147 - - NSName - - CF$UID - 148 - - NSTitle - - CF$UID - 146 - - - - $class - - CF$UID - 4 - - NS.string - Services - - - $class - - CF$UID - 143 - - NS.objects - - - _NSServicesMenu - - $classes - - NSMenu - NSObject - - $classname - NSMenu - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 153 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 151 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 152 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 168 - - NSTitle - - CF$UID - 167 - - - Scroll to Selection - j - Speech - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 135 - - - CF$UID - 106 - - - - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 159 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 157 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 86 - - NSTitle - - CF$UID - 158 - - - - $class - - CF$UID - 149 - - NSMenuItems - - CF$UID - 228 - - NSName - - CF$UID - 241 - - NSTitle - - CF$UID - 227 - - - Edit - submenuAction: - - $class - - CF$UID - 4 - - NS.string - Edit - - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 85 - - - CF$UID - 125 - - - CF$UID - 162 - - - CF$UID - 111 - - - CF$UID - 91 - - - CF$UID - 101 - - - CF$UID - 116 - - - CF$UID - 130 - - - CF$UID - 163 - - - CF$UID - 164 - - - CF$UID - 181 - - - CF$UID - 185 - - - - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 166 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 151 - - NSTitle - - CF$UID - 165 - - - Find - submenuAction: - - $class - - CF$UID - 4 - - NS.string - Find - - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 169 - - - CF$UID - 172 - - - CF$UID - 175 - - - CF$UID - 178 - - - CF$UID - 150 - - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 171 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 151 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 170 - - - Find... - f - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 174 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 151 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 173 - - - Find Next - g - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 177 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 151 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 176 - - - Find Previous - d - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 180 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 151 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 179 - - - Use Selection for Find - e - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 183 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 81 - - NSTitle - - CF$UID - 182 - - - Spelling - submenuAction: - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 120 - - - CF$UID - 96 - - - CF$UID - 80 - - - - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 186 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 86 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 107 - - NSTitle - - CF$UID - 154 - - - submenuAction: - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 189 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 157 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 12 - - NSTitle - - CF$UID - 188 - - - Window - submenuAction: - - $class - - CF$UID - 4 - - NS.string - Window - - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 11 - - - CF$UID - 192 - - - CF$UID - 25 - - - - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 12 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - _NSWindowsMenu - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 196 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 157 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 31 - - NSTitle - - CF$UID - 195 - - - File - submenuAction: - - $class - - CF$UID - 4 - - NS.string - File - - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 199 - - - CF$UID - 202 - - - CF$UID - 205 - - - CF$UID - 211 - - - CF$UID - 75 - - - CF$UID - 212 - - - CF$UID - 215 - - - CF$UID - 218 - - - CF$UID - 220 - - - CF$UID - 36 - - - CF$UID - 30 - - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 201 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 200 - - - New - n - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 204 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 203 - - - Open... - o - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 207 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 48 - - NSTitle - - CF$UID - 206 - - - Open Recent - submenuAction: - - $class - - CF$UID - 4 - - NS.string - Open Recent - - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 47 - - - - _NSRecentDocumentsMenu - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 214 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 213 - - - Save - s - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 217 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 216 - - - Save As... - S - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 219 - - - Revert - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 31 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - - $class - - CF$UID - 4 - - NS.string - Help - - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 41 - - - - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 226 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 157 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 42 - - NSTitle - - CF$UID - 225 - - - Help - submenuAction: - Principal - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 229 - - - CF$UID - 194 - - - CF$UID - 156 - - - CF$UID - 187 - - - CF$UID - 224 - - - - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 231 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 157 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 53 - - NSTitle - - CF$UID - 230 - - - NewApplication - submenuAction: - - $class - - CF$UID - 143 - - NS.objects - - - CF$UID - 58 - - - CF$UID - 233 - - - CF$UID - 235 - - - CF$UID - 236 - - - CF$UID - 239 - - - CF$UID - 66 - - - CF$UID - 62 - - - CF$UID - 71 - - - CF$UID - 221 - - - CF$UID - 52 - - - - - $class - - CF$UID - 21 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 234 - - - Preferences... - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - - $class - - CF$UID - 21 - - NSAction - - CF$UID - 238 - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSSubmenu - - CF$UID - 145 - - NSTitle - - CF$UID - 237 - - - Services - submenuAction: - - $class - - CF$UID - 21 - - NSIsDisabled - - NSIsSeparator - - NSKeyEquiv - - CF$UID - 27 - - NSKeyEquivModMask - 1048576 - NSMenu - - CF$UID - 53 - - NSMixedImage - - CF$UID - 19 - - NSMnemonicLoc - 2147483647 - NSOnImage - - CF$UID - 15 - - NSTitle - - CF$UID - 27 - - - _NSAppleMenu - _NSMainMenu - - $classes - - NSArray - NSObject - - $classname - NSArray - - - $class - - CF$UID - 242 - - NS.objects - - - CF$UID - 236 - - - CF$UID - 151 - - - CF$UID - 185 - - - CF$UID - 157 - - - CF$UID - 157 - - - CF$UID - 157 - - - CF$UID - 31 - - - CF$UID - 86 - - - CF$UID - 31 - - - CF$UID - 42 - - - CF$UID - 81 - - - CF$UID - 12 - - - CF$UID - 53 - - - CF$UID - 86 - - - CF$UID - 12 - - - CF$UID - 86 - - - CF$UID - 86 - - - CF$UID - 224 - - - CF$UID - 31 - - - CF$UID - 86 - - - CF$UID - 86 - - - CF$UID - 31 - - - CF$UID - 53 - - - CF$UID - 157 - - - CF$UID - 31 - - - CF$UID - 181 - - - CF$UID - 107 - - - CF$UID - 2 - - - CF$UID - 31 - - - CF$UID - 81 - - - CF$UID - 164 - - - CF$UID - 229 - - - CF$UID - 53 - - - CF$UID - 205 - - - CF$UID - 107 - - - CF$UID - 151 - - - CF$UID - 151 - - - CF$UID - 86 - - - CF$UID - 31 - - - CF$UID - 31 - - - CF$UID - 86 - - - CF$UID - 53 - - - CF$UID - 86 - - - CF$UID - 48 - - - CF$UID - 53 - - - CF$UID - 151 - - - CF$UID - 31 - - - CF$UID - 86 - - - CF$UID - 86 - - - CF$UID - 151 - - - CF$UID - 156 - - - CF$UID - 187 - - - CF$UID - 194 - - - CF$UID - 53 - - - CF$UID - 2 - - - CF$UID - 53 - - - CF$UID - 86 - - - CF$UID - 53 - - - CF$UID - 31 - - - CF$UID - 12 - - - CF$UID - 31 - - - CF$UID - 81 - - - CF$UID - 157 - - - CF$UID - 53 - - - CF$UID - 53 - - - - - $class - - CF$UID - 242 - - NS.objects - - - CF$UID - 233 - - - CF$UID - 96 - - - CF$UID - 192 - - - CF$UID - 31 - - - CF$UID - 139 - - - CF$UID - 75 - - - CF$UID - 211 - - - CF$UID - 81 - - - CF$UID - 220 - - - CF$UID - 202 - - - CF$UID - 181 - - - CF$UID - 2 - - - CF$UID - 36 - - - CF$UID - 42 - - - CF$UID - 120 - - - CF$UID - 212 - - - CF$UID - 52 - - - CF$UID - 80 - - - CF$UID - 30 - - - CF$UID - 199 - - - CF$UID - 157 - - - CF$UID - 218 - - - CF$UID - 224 - - - CF$UID - 194 - - - CF$UID - 215 - - - CF$UID - 41 - - - - - $class - - CF$UID - 242 - - NS.objects - - - CF$UID - 246 - - - CF$UID - 247 - - - CF$UID - 248 - - - CF$UID - 248 - - - CF$UID - 140 - - - CF$UID - 249 - - - CF$UID - 250 - - - CF$UID - 251 - - - CF$UID - 252 - - - CF$UID - 248 - - - CF$UID - 247 - - - CF$UID - 253 - - - CF$UID - 254 - - - CF$UID - 255 - - - CF$UID - 256 - - - CF$UID - 257 - - - CF$UID - 258 - - - CF$UID - 259 - - - CF$UID - 260 - - - CF$UID - 261 - - - CF$UID - 262 - - - CF$UID - 263 - - - CF$UID - 264 - - - CF$UID - 248 - - - CF$UID - 265 - - - CF$UID - 248 - - - - 121 - NSMenuItem - - $class - - CF$UID - 4 - - NS.string - - - - $class - - CF$UID - 4 - - NS.string - 1 - - - $class - - CF$UID - 4 - - NS.string - 7 - - NSMenu - - $class - - CF$UID - 4 - - NS.string - 2 - - - $class - - CF$UID - 4 - - NS.string - File's Owner - - - $class - - CF$UID - 4 - - NS.string - 5 - - - $class - - CF$UID - 4 - - NS.string - 2 - - NSMenuItem1 - - $class - - CF$UID - 4 - - NS.string - 3 - - 1111 - NSMenuItem2 - - $class - - CF$UID - 4 - - NS.string - 6 - - - $class - - CF$UID - 4 - - NS.string - 9 - - - $class - - CF$UID - 4 - - NS.string - MainMenu - - - $class - - CF$UID - 4 - - NS.string - 10 - - - $class - - CF$UID - 4 - - NS.string - 1 - - - $class - - CF$UID - 4 - - NS.string - 8 - - - $class - - CF$UID - 242 - - NS.objects - - - - $class - - CF$UID - 242 - - NS.objects - - - - $class - - CF$UID - 242 - - NS.objects - - - CF$UID - 66 - - - CF$UID - 29 - - - CF$UID - 81 - - - CF$UID - 221 - - - CF$UID - 199 - - - CF$UID - 124 - - - CF$UID - 86 - - - CF$UID - 41 - - - CF$UID - 40 - - - CF$UID - 100 - - - CF$UID - 145 - - - CF$UID - 229 - - - CF$UID - 31 - - - CF$UID - 205 - - - CF$UID - 111 - - - CF$UID - 138 - - - CF$UID - 218 - - - CF$UID - 116 - - - CF$UID - 151 - - - CF$UID - 30 - - - CF$UID - 211 - - - CF$UID - 47 - - - CF$UID - 91 - - - CF$UID - 120 - - - CF$UID - 224 - - - CF$UID - 107 - - - CF$UID - 212 - - - CF$UID - 163 - - - CF$UID - 95 - - - CF$UID - 178 - - - CF$UID - 74 - - - CF$UID - 169 - - - CF$UID - 185 - - - CF$UID - 187 - - - CF$UID - 79 - - - CF$UID - 42 - - - CF$UID - 157 - - - CF$UID - 61 - - - CF$UID - 46 - - - CF$UID - 11 - - - CF$UID - 129 - - - CF$UID - 80 - - - CF$UID - 84 - - - CF$UID - 156 - - - CF$UID - 71 - - - CF$UID - 105 - - - CF$UID - 65 - - - CF$UID - 236 - - - CF$UID - 125 - - - CF$UID - 52 - - - CF$UID - 215 - - - CF$UID - 101 - - - CF$UID - 70 - - - CF$UID - 110 - - - CF$UID - 164 - - - CF$UID - 202 - - - CF$UID - 58 - - - CF$UID - 24 - - - CF$UID - 90 - - - CF$UID - 115 - - - CF$UID - 135 - - - CF$UID - 119 - - - CF$UID - 35 - - - CF$UID - 51 - - - CF$UID - 48 - - - CF$UID - 220 - - - CF$UID - 130 - - - CF$UID - 239 - - - CF$UID - 75 - - - CF$UID - 96 - - - CF$UID - 194 - - - CF$UID - 85 - - - CF$UID - 10 - - - CF$UID - 12 - - - CF$UID - 25 - - - CF$UID - 139 - - - CF$UID - 150 - - - CF$UID - 162 - - - CF$UID - 134 - - - CF$UID - 172 - - - CF$UID - 53 - - - CF$UID - 181 - - - CF$UID - 2 - - - CF$UID - 36 - - - CF$UID - 62 - - - CF$UID - 233 - - - CF$UID - 192 - - - CF$UID - 57 - - - CF$UID - 235 - - - CF$UID - 106 - - - CF$UID - 175 - - - - - $class - - CF$UID - 242 - - NS.objects - - - CF$UID - 270 - - - CF$UID - 271 - - - CF$UID - 272 - - - CF$UID - 273 - - - CF$UID - 274 - - - CF$UID - 275 - - - CF$UID - 276 - - - CF$UID - 277 - - - CF$UID - 278 - - - CF$UID - 279 - - - CF$UID - 280 - - - CF$UID - 281 - - - CF$UID - 282 - - - CF$UID - 283 - - - CF$UID - 284 - - - CF$UID - 285 - - - CF$UID - 286 - - - CF$UID - 287 - - - CF$UID - 288 - - - CF$UID - 289 - - - CF$UID - 290 - - - CF$UID - 291 - - - CF$UID - 292 - - - CF$UID - 293 - - - CF$UID - 294 - - - CF$UID - 295 - - - CF$UID - 296 - - - CF$UID - 297 - - - CF$UID - 298 - - - CF$UID - 299 - - - CF$UID - 300 - - - CF$UID - 301 - - - CF$UID - 302 - - - CF$UID - 303 - - - CF$UID - 304 - - - CF$UID - 305 - - - CF$UID - 306 - - - CF$UID - 307 - - - CF$UID - 308 - - - CF$UID - 309 - - - CF$UID - 310 - - - CF$UID - 311 - - - CF$UID - 312 - - - CF$UID - 313 - - - CF$UID - 314 - - - CF$UID - 315 - - - CF$UID - 316 - - - CF$UID - 317 - - - CF$UID - 318 - - - CF$UID - 319 - - - CF$UID - 320 - - - CF$UID - 321 - - - CF$UID - 322 - - - CF$UID - 323 - - - CF$UID - 324 - - - CF$UID - 325 - - - CF$UID - 326 - - - CF$UID - 327 - - - CF$UID - 328 - - - CF$UID - 329 - - - CF$UID - 330 - - - CF$UID - 331 - - - CF$UID - 332 - - - CF$UID - 333 - - - CF$UID - 334 - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - CF$UID - 338 - - - CF$UID - 339 - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - CF$UID - 347 - - - CF$UID - 348 - - - CF$UID - 349 - - - CF$UID - 350 - - - CF$UID - 351 - - - CF$UID - 352 - - - CF$UID - 353 - - - CF$UID - 354 - + NS.objects + CF$UID - 355 + 2 CF$UID - 356 + 10 CF$UID - 357 + 11 + + + + $class + + CF$UID + 17 + + NS.objects + CF$UID - 358 + 26 CF$UID - 359 + 27 CF$UID - 360 + 28 - 134 - 86 - 200 - 149 - 82 - 231 - 205 - 111 - 122 - 226 - 130 - 56 - 81 - 124 - 199 + 1 240 - 112 - 202 - 220 - 78 - 79 - 126 - 197 - 204 - 103 - 212 - 75 - 214 - 225 - 221 - 193 - 209 - 211 - 19 - 222 - 106 - 29 - 146 - 127 - 23 - 232 - 219 - 223 - 217 - 150 - 227 - 152 - 131 - 215 - 136 - 80 - 203 - 153 - 228 - 218 - 72 - 58 - 39 - 224 - 229 - 196 - 230 - 87 - 139 - 125 - 74 - 198 - 144 - 73 - 201 - 83 - 207 - 37 - 24 - 5 239 - 210 - 206 - 233 - 208 - 57 - 216 - 1 - 77 - 145 - 129 - 92 - 142 - 143 - 195 - 213 $class CF$UID - 143 + 15 NS.objects @@ -5497,7 +394,7 @@ $class CF$UID - 242 + 17 NS.objects @@ -5506,7 +403,7 @@ $class CF$UID - 242 + 17 NS.objects From t-suwa ＠ users.sourceforge.jp Sat Feb 3 16:53:30 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 16:53:30 +0900 Subject: [aquaskk-changes 296] CVS update: AquaSKK/Package Message-ID: <20070203075331.01D192AC0F9@users.sourceforge.jp> Index: AquaSKK/Package/Makefile diff -u AquaSKK/Package/Makefile:1.1.6.3 AquaSKK/Package/Makefile:1.1.6.4 --- AquaSKK/Package/Makefile:1.1.6.3 Sat Dec 30 15:52:55 2006 +++ AquaSKK/Package/Makefile Sat Feb 3 16:53:30 2007 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.6.3 2006/12/30 06:52:55 t-suwa Exp $ +# $Id: Makefile,v 1.1.6.4 2007/02/03 07:53:30 t-suwa Exp $ # # Makefile for build installer From t-suwa ＠ users.sourceforge.jp Sat Feb 3 16:53:31 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 16:53:31 +0900 Subject: [aquaskk-changes 297] CVS update: AquaSKK/Resources Message-ID: <20070203075331.2A05C2AC0C8@users.sourceforge.jp> Index: AquaSKK/Resources/keymap.conf diff -u /dev/null AquaSKK/Resources/keymap.conf:1.1.2.1 --- /dev/null Sat Feb 3 16:53:31 2007 +++ AquaSKK/Resources/keymap.conf Sat Feb 3 16:53:31 2007 @@ -0,0 +1,42 @@ +### +### keymap.conf +### + +# ====================================================================== +# event section +# ====================================================================== + +SKK_JMODE ctrl::j +SKK_ENTER group::ascii::0x03,0x0a,0x0d||ctrl::m +SKK_TAB ascii::0x09||ctrl::i +SKK_BACKSPACE ascii::0x08 +SKK_BACKSPACE ctrl::h +SKK_CANCEL ctrl::g +SKK_PASTE ctrl::y +SKK_LEFT ascii::0x1c||ctrl::b +SKK_RIGHT ascii::0x1d||ctrl::f +SKK_UP ascii::0x1e||ctrl::p +SKK_DOWN ascii::0x1f||ctrl::n + +# ====================================================================== +# attribute section(for SKK_CHAR) +# ====================================================================== + +ToggleKana q +ToggleJisx0201Kana ctrl::q +SwitchToAscii l +SwitchToJisx0208Latin L + +EnterAbbrev / +EnterJapanese Q +#EnterJapanese keycode::0x66 # EISU +#EnterJapanese keycode::0x68 # KANA +NextCompletion . +PrevCompletion , +NextCandidate ascii::0x20 +PrevCandidate x +RemoveTrigger X + +UpperCases group::A-K,M-P,R-W,Z + +Direct group::keycode::0x41,0x43,0x45,0x4b,0x4e,0x51-0x59,0x5b,0x5c,0x5f From t-suwa ＠ users.sourceforge.jp Sat Feb 3 16:53:31 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 16:53:31 +0900 Subject: [aquaskk-changes 298] CVS update: AquaSKK/tests Message-ID: <20070203075331.92DBB2AC0C8@users.sourceforge.jp> Index: AquaSKK/tests/Makefile diff -u AquaSKK/tests/Makefile:1.1.2.1 AquaSKK/tests/Makefile:1.1.2.2 --- AquaSKK/tests/Makefile:1.1.2.1 Sat Dec 30 15:52:55 2006 +++ AquaSKK/tests/Makefile Sat Feb 3 16:53:31 2007 @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.1.2.1 2006/12/30 06:52:55 t-suwa Exp $ +# $Id: Makefile,v 1.1.2.2 2007/02/03 07:53:31 t-suwa Exp $ # # Makefile for Unit Test # -TARGET = SKKCandidateTEST SKKOkuriHintTEST SKKEntryTEST +TARGET = SKKCandidateTEST SKKOkuriHintTEST SKKEntryTEST SKKInputKeymapTEST SKKConverterTEST \ + utf8iteratorTEST CXXFLAGS= -I.. -g all: $(TARGET) @@ -28,4 +29,19 @@ SKKEntryTEST: SKKEntryTEST.o $(CXX) -o $@ $< +SKKInputKeymapTEST: SKKInputKeymapTEST.o + $(CXX) -o $@ $< + +SKKConverterTEST: SKKConverterTEST.o + $(CXX) -o $@ $< + +utf8iteratorTEST: utf8iteratorTEST.o + $(CXX) -o $@ $< + SKKCandidateTEST.o SKKOkuriHintTEST.o SKKEntryTEST.o: ../Dictionary.h + +SKKInputKeymapTEST.o: ../SKKInputKeymap.h ../SKKInputKeymap.cpp + +SKKConverterTEST.o: ../SKKConverter.h ../SKKConverter.cpp + +utf8iteratorTEST.o: ../utf8iterator.h \ No newline at end of file Index: AquaSKK/tests/SKKConverterTEST.cpp diff -u /dev/null AquaSKK/tests/SKKConverterTEST.cpp:1.1.2.1 --- /dev/null Sat Feb 3 16:53:31 2007 +++ AquaSKK/tests/SKKConverterTEST.cpp Sat Feb 3 16:53:31 2007 @@ -0,0 +1,69 @@ +#include "SKKConverter.cpp" +#include "jconv.cpp" + +int main() { + SKKConverter& conv = SKKConverter::theInstance(); + + conv.Initialize("kana-rule-list"); + + std::string in; + std::string out; + std::string next; + + out = conv.Execute(SKK::Hirakana, "a", next); + assert(next == "" && out == "??); + out = conv.Execute(SKK::Katakana, "a", next); + assert(next == "" && out == "??); + out = conv.Execute(SKK::Jisx0201Kana, "a", next); + assert(next == "" && out == "鐔?); + + out = conv.Execute(SKK::Hirakana, "gg", next); + assert(next == "g" && out == "??); + + out = conv.Execute(SKK::Hirakana, ",", next); + assert(next == "" && out == "??); + + out = conv.Execute(SKK::Hirakana, "#", next); + assert(next == "" && out == "鐚?); + + out = conv.Execute(SKK::Hirakana, " ", next); + assert(next == "" && out == "??); + + out = conv.Execute(SKK::Hirakana, "z,", next); + assert(next == "" && out == "??); + + out = conv.Execute(SKK::Hirakana, "co", next); + assert(next == "" && out == "??); + + out = conv.Execute(SKK::Hirakana, "'", next); + assert(next == "" && out == "'"); + + out = conv.Execute(SKK::Hirakana, "k1", next); + assert(next == "" && out == "1"); + + out = conv.Execute(SKK::Hirakana, "kgya", next); + assert(next == "" && out == "???"); + + out = conv.Execute(SKK::Hirakana, "k1234gya", next); + assert(next == "" && out == "1234???"); + + out = conv.Execute(SKK::Hirakana, "gyagyugyo", next); + assert(next == "" && out == "?????????"); + + out = conv.Execute(SKK::Hirakana, "chho", next); + assert(next == "" && out == "??); + + out = conv.Execute(SKK::Hirakana, "c", next); + assert(next == "c" && out == ""); + + out = conv.Execute(SKK::Hirakana, "pmp", next); + assert(next == "p" && out == ""); + + out = conv.Execute(SKK::Hirakana, "pmpo", next); + assert(next == "" && out == "??); + + out = conv.Execute(SKK::Hirakana, "kanji", next); + assert(next == "" && out == "?????); + + return 0; +} Index: AquaSKK/tests/SKKInputKeymapTEST.cpp diff -u /dev/null AquaSKK/tests/SKKInputKeymapTEST.cpp:1.1.2.1 --- /dev/null Sat Feb 3 16:53:31 2007 +++ AquaSKK/tests/SKKInputKeymapTEST.cpp Sat Feb 3 16:53:31 2007 @@ -0,0 +1,34 @@ +#include +#include "SKKInputKeymap.cpp" + +int main() { + SKKInputKeymap keymap; + SKKEventParam param; + + keymap.Initialize("keymap.conf"); + + assert(keymap.Fetch(0, 0, 0) == SKKEventParam(SKK_CHAR, 0, 0)); + assert(keymap.Fetch('j', 0, true) == SKKEventParam(SKK_JMODE, 'j', 0)); + assert(keymap.Fetch(0x03, 0, 0) == SKKEventParam(SKK_ENTER, 0x03, 0)); + assert(keymap.Fetch(0x09, 0, 0) == SKKEventParam(SKK_TAB, 0x09, 0)); + assert(keymap.Fetch('i', 0, true) == SKKEventParam(SKK_TAB, 'i', 0)); + assert(keymap.Fetch('g', 0, true) == SKKEventParam(SKK_CANCEL, 'g', 0)); + assert(keymap.Fetch(0x1c, 0, 0) == SKKEventParam(SKK_LEFT, 0x1c, 0)); + + param = keymap.Fetch('b', 0, 0); + assert(param == SKKEventParam(SKK_CHAR, 'b', None)); + + param = keymap.Fetch('q', 0, 0); + assert(param == SKKEventParam(SKK_CHAR, 'q', ToggleKana)); + + param = keymap.Fetch('q', 0, true); + assert(param == SKKEventParam(SKK_CHAR, 'q', ToggleJisx0201Kana)); + + param = keymap.Fetch('A', 0, 0); + assert(param == SKKEventParam(SKK_CHAR, 'A', UpperCases)); + + param = keymap.Fetch('1', 0x51, 0); + assert(param == SKKEventParam(SKK_CHAR, '1', Direct)); + + return 0; +} Index: AquaSKK/tests/kana-rule-list diff -u /dev/null AquaSKK/tests/kana-rule-list:1.1.2.1 --- /dev/null Sat Feb 3 16:53:31 2007 +++ AquaSKK/tests/kana-rule-list Sat Feb 3 16:53:31 2007 @@ -0,0 +1,289 @@ +# $Id: kana-rule-list,v 1.1.2.1 2007/02/03 07:53:31 t-suwa Exp $ + +# このファイルは改行コードがLF、文字エンコーディングがEUC-JPでなければなりません。 +# 五つ目の項目は次状態です。無ければ項目自体を省略します。 +# エントリの順序には気を付けて下さい。例えば「ba」というエントリに出会うと、 +# AquaSKKはまず「b」という枝を探しますが、ここではまだ存在しないので +# 「b」という空の枝を作成します。この後に「b」というエントリが現れると +# そのエントリ「b」は既に定義されているのでどうなるか分かりません。 + +# 最初の項目の,は半角カンマに置換されます。 + +invalid1 +invalid2,data +invalid3,data,test +invalid4,data,test, +invalid5,,test,fail +invalid6,,,fail +invalid7,,, +,,,,invalid8 + +#,,、,、,, +&space;,　,　,&space; +♯,＃,＃,♯ + +a,あ,ア,ｱ + +bb,っ,ッ,ｯ,b +ba,ば,バ,ﾊﾞ +bi,び,ビ,ﾋﾞ +bu,ぶ,ブ,ﾌﾞ +be,べ,ベ,ﾍﾞ +bo,ぼ,ボ,ﾎﾞ +bya,びゃ,ビャ,ﾋﾞｬ +byi,びぃ,ビィ,ﾋﾞｨ +byu,びゅ,ビュ,ﾋﾞｭ +bye,びぇ,ビェ,ﾋﾞｪ +byo,びょ,ビョ,ﾋﾞｮ + +cc,っ,ッ,ｯ,c +cha,ちゃ,チャ,ﾁｬ +chi,ち,チ,ﾁ +chu,ちゅ,チュ,ﾁｭ +che,ちぇ,チェ,ﾁｪ +cho,ちょ,チョ,ﾁｮ +cya,ちゃ,チャ,ﾁｬ +cyi,ちぃ,チィ,ﾁｨ +cyu,ちゅ,チュ,ﾁｭ +cye,ちぇ,チェ,ﾁｪ +cyo,ちょ,チョ,ﾁｮ + +dd,っ,ッ,ｯ,d +da,だ,ダ,ﾀﾞ +di,ぢ,ヂ,ﾁﾞ +du,づ,ヅ,ﾂﾞ +de,で,デ,ﾃﾞ +do,ど,ド,ﾄﾞ +dha,でゃ,デャ,ﾃﾞｬ +dhi,でぃ,ディ,ﾃﾞｨ +dhu,でゅ,デュ,ﾃﾞｭ +dhe,でぇ,デェ,ﾃﾞｪ +dho,でょ,デョ,ﾃﾞｮ +dya,ぢゃ,ヂャ,ﾁﾞｬ +dyi,ぢぃ,ヂィ,ﾁﾞｨ +dyu,ぢゅ,ヂュ,ﾁﾞｭ +dye,ぢぇ,ヂェ,ﾁﾞｪ +dyo,ぢょ,ヂョ,ﾁﾞｮ + +e,え,エ,ｴ + +ff,っ,ッ,ｯ,f +fa,ふぁ,ファ,ﾌｧ +fi,ふぃ,フィ,ﾌｨ +fu,ふ,フ,ﾌ +fe,ふぇ,フェ,ﾌｪ +fo,ふぉ,フォ,ﾌｫ +fya,ふゃ,フャ,ﾌｬ +fyi,ふぃ,フィ,ﾌｨ +fyu,ふゅ,フュ,ﾌｭ +fye,ふぇ,フェ,ﾌｪ +fyo,ふょ,フョ,ﾌｮ + +gg,っ,ッ,ｯ,g +ga,が,ガ,ｶﾞ +gi,ぎ,ギ,ｷﾞ +gu,ぐ,グ,ｸﾞ +ge,げ,ゲ,ｹﾞ +go,ご,ゴ,ｺﾞ +gya,ぎゃ,ギャ,ｷﾞｬ +gyi,ぎぃ,ギィ,ｷﾞｨ +gyu,ぎゅ,ギュ,ｷﾞｭ +gye,ぎぇ,ギェ,ｷﾞｪ +gyo,ぎょ,ギョ,ｷﾞｮ + +hh,っ,ッ,ｯ,h +ha,は,ハ,ﾊ +hi,ひ,ヒ,ﾋ +hu,ふ,フ,ﾌ +he,へ,ヘ,ﾍ +ho,ほ,ホ,ﾎ +hya,ひゃ,ヒャ,ﾋｬ +hyi,ひぃ,ヒィ,ﾋｨ +hyu,ひゅ,ヒュ,ﾋｭ +hye,ひぇ,ヒェ,ﾋｪ +hyo,ひょ,ヒョ,ﾋｮ + +i,い,イ,ｲ + +jj,っ,ッ,ｯ,j +ja,じゃ,ジャ,ｼﾞｬ +ji,じ,ジ,ｼﾞ +ju,じゅ,ジュ,ｼﾞｭ +je,じぇ,ジェ,ｼﾞｪ +jo,じょ,ジョ,ｼﾞｮ +jya,じゃ,ジャ,ｼﾞｬ +jyi,じぃ,ジィ,ｼﾞｨ +jyu,じゅ,ジュ,ｼﾞｭ +jye,じぇ,ジェ,ｼﾞｪ +jyo,じょ,ジョ,ｼﾞｮ + +kk,っ,ッ,ｯ,k +ka,か,カ,ｶ +ki,き,キ,ｷ +ku,く,ク,ｸ +ke,け,ケ,ｹ +ko,こ,コ,ｺ +kya,きゃ,キャ,ｷｬ +kyi,きぃ,キィ,ｷｨ +kyu,きゅ,キュ,ｷｭ +kye,きぇ,キェ,ｷｪ +kyo,きょ,キョ,ｷｮ + +mm,っ,ッ,ｯ,m +ma,ま,マ,ﾏ +mi,み,ミ,ﾐ +mu,む,ム,ﾑ +me,め,メ,ﾒ +mo,も,モ,ﾓ +mya,みゃ,ミャ,ﾐｬ +myi,みぃ,ミィ,ﾐｨ +myu,みゅ,ミュ,ﾐｭ +mye,みぇ,ミェ,ﾐｪ +myo,みょ,ミョ,ﾐｮ + +n,ん,ン,ﾝ +n',ん,ン,ﾝ +nn,ん,ン,ﾝ +na,な,ナ,ﾅ +ni,に,ニ,ﾆ +nu,ぬ,ヌ,ﾇ +ne,ね,ネ,ﾈ +no,の,ノ,ﾉ +nya,にゃ,ニャ,ﾆｬ +nyi,にぃ,ニィ,ﾆｨ +nyu,にゅ,ニュ,ﾆｭ +nye,にぇ,ニェ,ﾆｪ +nyo,にょ,ニョ,ﾆｮ + +o,お,オ,ｵ + +pp,っ,ッ,ｯ,p +pa,ぱ,パ,ﾊﾟ +pi,ぴ,ピ,ﾋﾟ +pu,ぷ,プ,ﾌﾟ +pe,ぺ,ペ,ﾍﾟ +po,ぽ,ポ,ﾎﾟ +pya,ぴゃ,ピャ,ﾋﾟｬ +pyi,ぴぃ,ピィ,ﾋﾟｨ +pyu,ぴゅ,ピュ,ﾋﾟｭ +pye,ぴぇ,ピェ,ﾋﾟｪ +pyo,ぴょ,ピョ,ﾋﾟｮ + +rr,っ,ッ,ｯ,r +ra,ら,ラ,ﾗ +ri,り,リ,ﾘ +ru,る,ル,ﾙ +re,れ,レ,ﾚ +ro,ろ,ロ,ﾛ +rya,りゃ,リャ,ﾘｬ +ryi,りぃ,リィ,ﾘｨ +ryu,りゅ,リュ,ﾘｭ +rye,りぇ,リェ,ﾘｪ +ryo,りょ,リョ,ﾘｮ + +ss,っ,ッ,ｯ,s +sa,さ,サ,ｻ +si,し,シ,ｼ +su,す,ス,ｽ +se,せ,セ,ｾ +so,そ,ソ,ｿ +sha,しゃ,シャ,ｼｬ +shi,し,シ,ｼ +shu,しゅ,シュ,ｼｭ +she,しぇ,シェ,ｼｪ +sho,しょ,ショ,ｼｮ +sya,しゃ,シャ,ｼｬ +syi,しぃ,シィ,ｼｨ +syu,しゅ,シュ,ｼｭ +sye,しぇ,シェ,ｼｪ +syo,しょ,ショ,ｼｮ + +tt,っ,ッ,ｯ,t +ta,た,タ,ﾀ +ti,ち,チ,ﾁ +tu,つ,ツ,ﾂ +te,て,テ,ﾃ +to,と,ト,ﾄ +tha,てぁ,テァ,ﾃｧ +thi,てぃ,ティ,ﾃｨ +thu,てゅ,テュ,ﾃｭ +the,てぇ,テェ,ﾃｪ +tho,てょ,テョ,ﾃｮ +tsu,つ,ツ,ﾂ +tya,ちゃ,チャ,ﾁｬ +tyi,ちぃ,チィ,ﾁｨ +tyu,ちゅ,チュ,ﾁｭ +tye,ちぇ,チェ,ﾁｪ +tyo,ちょ,チョ,ﾁｮ + +u,う,ウ,ｳ + +vv,っ,ッ,ｯ,v +va,う゛ぁ,ヴァ,ｳﾞｧ +vi,う゛ぃ,ヴィ,ｳﾞｨ +vu,う゛,ヴ,ｳﾞ +ve,う゛ぇ,ヴェ,ｳﾞｪ +vo,う゛ぉ,ヴォ,ｳﾞｫ + +ww,っ,ッ,ｯ,w +wa,わ,ワ,ﾜ +wi,うぃ,ウィ,ｳｨ +wu,う,ウ,ｳ +we,うぇ,ウェ,ｳｪ +wo,を,ヲ,ｦ + +xx,っ,ッ,ｯ,x +xa,ぁ,ァ,ｧ +xi,ぃ,ィ,ｨ +xu,ぅ,ゥ,ｩ +xe,ぇ,ェ,ｪ +xo,ぉ,ォ,ｫ +xka,ヵ,ヵ,ｶ +xke,ヶ,ヶ,ｹ +xtsu,っ,ッ,ｯ +xtu,っ,ッ,ｯ +xu,ぅ,ゥ,ｩ +xwa,ゎ,ヮ,ﾜ +xwe,ゑ,ヱ,ｴ +xwi,ゐ,ヰ,ｲ +xya,ゃ,ャ,ｬ +xyo,ょ,ョ,ｮ +xyu,ゅ,ュ,ｭ + +yy,っ,ッ,ｯ,y +ya,や,ヤ,ﾔ +yi,い,イ,ｲ +yu,ゆ,ユ,ﾕ +ye,いぇ,イェ,ｲｪ +yo,よ,ヨ,ﾖ + +zz,っ,ッ,ｯ,z +za,ざ,ザ,ｻﾞ +zi,じ,ジ,ｼﾞ +zu,ず,ズ,ｽﾞ +ze,ぜ,ゼ,ｾﾞ +zo,ぞ,ゾ,ｿﾞ +zya,じゃ,ジャ,ｼﾞｬ +zyi,じぃ,ジィ,ｼﾞｨ +zyu,じゅ,ジュ,ｼﾞｭ +zye,じぇ,ジェ,ｼﾞｪ +zyo,じょ,ジョ,ｼﾞｮ +z,,‥,‥,‥ +z-,〜,〜,〜 +z.,…,…,… +z/,・,・,･ +z[,『,『,『 +z],』,』,』 +zh,←,←,← +zj,↓,↓,↓ +zk,↑,↑,↑ +zl,→,→,→ + +-,ー,ー,ｰ +:,：,：,： +;,；,；,； +[,「,「,｢ +],」,」,｣ + +.,。,。,｡ +,,、,、,､ Index: AquaSKK/tests/keymap.conf diff -u /dev/null AquaSKK/tests/keymap.conf:1.1.2.1 --- /dev/null Sat Feb 3 16:53:31 2007 +++ AquaSKK/tests/keymap.conf Sat Feb 3 16:53:31 2007 @@ -0,0 +1,42 @@ +### +### keymap.conf +### + +# ====================================================================== +# event section +# ====================================================================== + +SKK_JMODE ctrl::j +SKK_ENTER group::ascii::0x03,0x0a,0x0d||ctrl::m +SKK_TAB ascii::0x09||ctrl::i +SKK_BACKSPACE ascii::0x08 +SKK_BACKSPACE ctrl::h +SKK_CANCEL ctrl::g +SKK_PASTE ctrl::y +SKK_LEFT ascii::0x1c||ctrl::b +SKK_RIGHT ascii::0x1d||ctrl::f +SKK_UP ascii::0x1e||ctrl::p +SKK_DOWN ascii::0x1f||ctrl::n + +# ====================================================================== +# attribute section(for SKK_CHAR) +# ====================================================================== + +ToggleKana q +ToggleJisx0201Kana ctrl::q +SwitchToAscii l +SwitchToJisx0208Latin L + +EnterAbbrev / +EnterJapanese Q +#EnterJapanese keycode::0x66 # EISU +#EnterJapanese keycode::0x68 # KANA +NextCompletion . +PrevCompletion , +NextCandidate ascii::0x20 +PrevCandidate x +RemoveTrigger X + +UpperCases group::A-K,M-P,R-W,Z + +Direct group::keycode::0x41,0x43,0x45,0x4b,0x4e,0x51-0x59,0x5b,0x5c,0x5f Index: AquaSKK/tests/utf8iteratorTEST.cpp diff -u /dev/null AquaSKK/tests/utf8iteratorTEST.cpp:1.1.2.1 --- /dev/null Sat Feb 3 16:53:31 2007 +++ AquaSKK/tests/utf8iteratorTEST.cpp Sat Feb 3 16:53:31 2007 @@ -0,0 +1,66 @@ +#include +#include +#include "utf8iterator.h" + +int main() { + std::string utf1("abc鐚￥滋鐚ｃ?????≪???襲鐔駕蹴羲√?留硫粒"); + utf8iterator iter(utf1); + + assert(*iter.first() == "a"); + assert(iter.charsize() == 1); + assert(*iter.next() == "b"); + assert(*iter.next() == "c"); + assert(*iter.next() == "鐚?); + assert(iter.charsize() == 3); + assert(*iter.next() == "鐚?); + assert(*iter.next() == "鐚?); + assert(*iter.next() == "??); + assert(iter.charsize() == 3); + assert(*iter.next() == "??); + assert(*iter.next() == "??); + assert(*iter.next() == "??); + assert(iter.charsize() == 3); + assert(*iter.next() == "??); + assert(*iter.next() == "??); + assert(*iter.next() == "鐔?); + assert(iter.charsize() == 3); + assert(*iter.next() == "鐔?); + assert(*iter.next() == "鐔?); + assert(*iter.next() == "羲?); + assert(iter.charsize() == 3); + assert(*iter.next() == "絖?); + assert(*iter.next() == "留"); + assert(iter.charsize() == 2); + assert(*iter.next() == "硫"); + assert(*iter.next() == "粒"); + assert(*iter.next() == ""); + assert(*iter.next() == ""); + assert(iter.eof()); + + assert(*iter.last() == "粒"); + assert(*iter.prev() == "硫"); + assert(*iter.prev() == "留"); + assert(utf1.substr(iter) == "留硫粒"); + assert(*iter.prev() == "絖?); + assert(*iter.prev() == "羲?); + assert(*iter.prev() == "鐔?); + assert(*iter.prev() == "鐔?); + assert(*iter.prev() == "鐔?); + assert(*iter.prev() == "??); + assert(*iter.prev() == "??); + assert(*iter.prev() == "??); + assert(*iter.prev() == "??); + assert(*iter.prev() == "??); + assert(*iter.prev() == "??); + assert(*iter.prev() == "鐚?); + assert(*iter.prev() == "鐚?); + assert(*iter.prev() == "鐚?); + assert(*iter.prev() == "c"); + assert(*iter.prev() == "b"); + assert(*iter.prev() == "a"); + assert(*iter.prev() == ""); + assert(*iter.prev() == ""); + assert(iter.eof()); + + return 0; +} From t-suwa ＠ users.sourceforge.jp Sat Feb 3 17:52:48 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 17:52:48 +0900 Subject: [aquaskk-changes 299] CVS update: AquaSKK Message-ID: <20070203085248.DCA8C2AC0AB@users.sourceforge.jp> Index: AquaSKK/AquaSKKServer.mm diff -u AquaSKK/AquaSKKServer.mm:1.2.2.3 AquaSKK/AquaSKKServer.mm:1.2.2.4 --- AquaSKK/AquaSKKServer.mm:1.2.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/AquaSKKServer.mm Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: AquaSKKServer.mm,v 1.2.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: AquaSKKServer.mm,v 1.2.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/AsciiConversionMode.cpp diff -u AquaSKK/AsciiConversionMode.cpp:1.7.2.3 AquaSKK/AsciiConversionMode.cpp:1.7.2.4 --- AquaSKK/AsciiConversionMode.cpp:1.7.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/AsciiConversionMode.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: AsciiConversionMode.cpp,v 1.7.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: AsciiConversionMode.cpp,v 1.7.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -183,13 +183,21 @@ // ????????????????? } - if(SKKConfig::AbbrevModeKey() == skkchar || SKKConfig::SetHenkanPointKey() == skkchar) { + if(SKKConfig::SetHenkanPointKey() == skkchar) { if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { - parent->fix(this->getStringToFix()); + parent->fix(getStringToFix()); return parent->handleInput(skkchar); } } + if(SKKConfig::AbbrevModeKey() == skkchar) { + if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) { + parent->fix(getStringToFix()); + parent->setEnabledAsciiConversionMode(true); + return false; + } + } + if(SKKConfig::NextKouhoKey() == skkchar) { if(status == STATUS_WHITE) { if(index.length() == 0) { @@ -455,7 +463,7 @@ word_register_mode->terminate(); } - parent->fix(this->getStringToFix()); // ???? + parent->fix(getStringToFix()); // ???? parent->setEnabledAsciiConversionMode(false); initialize(); } Index: AquaSKK/BIM.cpp diff -u AquaSKK/BIM.cpp:1.14.2.1 AquaSKK/BIM.cpp:1.14.2.2 --- AquaSKK/BIM.cpp:1.14.2.1 Sat Feb 3 16:53:29 2007 +++ AquaSKK/BIM.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: BIM.cpp,v 1.14.2.1 2007/02/03 07:53:29 t-suwa Exp $ + $Id: BIM.cpp,v 1.14.2.2 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -357,7 +357,12 @@ case 0x5b: // 8 case 0x5c: // 9 case 0x5f: // , - return (*inSessionHandle)->imsession_input_mode->handleNumKey(event.CharCode()); + if(ClientConfiguration::theInstance().isNumericKeypad_HalfWidth()) { + return (*inSessionHandle)->imsession_input_mode->handleNumKey(event.CharCode()); + } else { + return (*inSessionHandle)->imsession_input_mode->handleInput(event); + } + break; case 0x66: // ?? if(SKKConfig::UseEisuuToSetHenkanPoint()) { return (*inSessionHandle)->imsession_input_mode->handleInput(SKKConfig::SetHenkanPointKey()); Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.33.2.7 AquaSKK/ChangeLog:1.33.2.8 --- AquaSKK/ChangeLog:1.33.2.7 Sat Feb 3 16:53:29 2007 +++ AquaSKK/ChangeLog Sat Feb 3 17:52:48 2007 @@ -1,3 +1,22 @@ +2007-02-03 Tomotaka SUWA + + * tests/TestAquaSKK.scpt: ?域?菴遵???ppleScript ??????????鴻???+ ????????+ +2007-01-28 Tomotaka SUWA + + * KanjiConversionMode.cpp: ?????????????倶????????欠Щ?????? + ?桁???信罩ｃ? + + * AsciiConversionMode.cpp: 紊??賢??'/' ????????????罩ｃ????? + ???????桁???信罩ｃ? + + * Resources/translation-to-hiragana, + Resources/translation-to-katakana: ???????≪???????????????? + ???????????????????桁???信罩ｃ? + + * BIM.cpp: ?????????????激??潟?????帥?????鴻???????????桁???信罩ｃ? + 2007-01-27 Tomotaka SUWA * Makefile: ?????????????合?????若??????申??? Index: AquaSKK/CppCFString.cpp diff -u AquaSKK/CppCFString.cpp:1.5.2.3 AquaSKK/CppCFString.cpp:1.5.2.4 --- AquaSKK/CppCFString.cpp:1.5.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/CppCFString.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: CppCFString.cpp,v 1.5.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: CppCFString.cpp,v 1.5.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/Dictionary.h diff -u AquaSKK/Dictionary.h:1.4.2.5 AquaSKK/Dictionary.h:1.4.2.6 --- AquaSKK/Dictionary.h:1.4.2.5 Sat Feb 3 16:53:29 2007 +++ AquaSKK/Dictionary.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* -*- C++ -*- - $Id: Dictionary.h,v 1.4.2.5 2007/02/03 07:53:29 t-suwa Exp $ + $Id: Dictionary.h,v 1.4.2.6 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/DictionarySet.cpp diff -u AquaSKK/DictionarySet.cpp:1.5.2.6 AquaSKK/DictionarySet.cpp:1.5.2.7 --- AquaSKK/DictionarySet.cpp:1.5.2.6 Sat Feb 3 16:53:29 2007 +++ AquaSKK/DictionarySet.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: DictionarySet.cpp,v 1.5.2.6 2007/02/03 07:53:29 t-suwa Exp $ + $Id: DictionarySet.cpp,v 1.5.2.7 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/DictionarySet.h diff -u AquaSKK/DictionarySet.h:1.2.2.5 AquaSKK/DictionarySet.h:1.2.2.6 --- AquaSKK/DictionarySet.h:1.2.2.5 Sat Feb 3 16:53:29 2007 +++ AquaSKK/DictionarySet.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: DictionarySet.h,v 1.2.2.5 2007/02/03 07:53:29 t-suwa Exp $ + $Id: DictionarySet.h,v 1.2.2.6 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/Info-AquaSKKInputMethod.plist diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.10.2.4 AquaSKK/Info-AquaSKKInputMethod.plist:1.10.2.5 --- AquaSKK/Info-AquaSKKInputMethod.plist:1.10.2.4 Sat Dec 30 15:52:54 2006 +++ AquaSKK/Info-AquaSKKInputMethod.plist Sat Feb 3 17:52:48 2007 @@ -19,7 +19,7 @@ CFBundlePackageType thng CFBundleShortVersionString - 3.3 + brand-new-engine 0.1 CFBundleSignature askk CFBundleVersion Index: AquaSKK/Info-AquaSKKServer.plist diff -u AquaSKK/Info-AquaSKKServer.plist:1.10.2.5 AquaSKK/Info-AquaSKKServer.plist:1.10.2.6 --- AquaSKK/Info-AquaSKKServer.plist:1.10.2.5 Sat Feb 3 16:53:29 2007 +++ AquaSKK/Info-AquaSKKServer.plist Sat Feb 3 17:52:48 2007 @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.3 + brand-new-engine 0.1 CFBundleSignature askk CFBundleVersion - 2006-12-29 + 2007-02-03 NSMainNibFile Principal NSPrincipalClass Index: AquaSKK/KanaTreeController.cpp diff -u AquaSKK/KanaTreeController.cpp:1.4.2.1 AquaSKK/KanaTreeController.cpp:1.4.2.2 --- AquaSKK/KanaTreeController.cpp:1.4.2.1 Sat Feb 3 16:53:29 2007 +++ AquaSKK/KanaTreeController.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: KanaTreeController.cpp,v 1.4.2.1 2007/02/03 07:53:29 t-suwa Exp $ + $Id: KanaTreeController.cpp,v 1.4.2.2 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/KanaTreeController.h diff -u AquaSKK/KanaTreeController.h:1.4.2.1 AquaSKK/KanaTreeController.h:1.4.2.2 --- AquaSKK/KanaTreeController.h:1.4.2.1 Sat Feb 3 16:53:29 2007 +++ AquaSKK/KanaTreeController.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: KanaTreeController.h,v 1.4.2.1 2007/02/03 07:53:29 t-suwa Exp $ + $Id: KanaTreeController.h,v 1.4.2.2 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.8.2.4 AquaSKK/KanjiConversionMode.cpp:1.8.2.5 --- AquaSKK/KanjiConversionMode.cpp:1.8.2.4 Sat Feb 3 16:53:29 2007 +++ AquaSKK/KanjiConversionMode.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.8.2.4 2007/02/03 07:53:29 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.8.2.5 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -256,9 +256,8 @@ // KanjiConversionMode?STATUS_NULL???? // ??IgnoreThis???? - parent->fix(this->getStringToFix()); - parent->handleInput(skkchar); - return false; + parent->fix(getStringToFix()); + return parent->handleInput(skkchar); } if(SKKConfig::NextKouhoKey() == skkchar) { @@ -344,12 +343,6 @@ return false; } - // ???????????? - if(status == STATUS_BLACK) { - parent->fix(getStringToFix()); - return parent->handleInput(skkchar); - } - // ???????????? if(status == STATUS_BLACK_WITH_WINDOW) { CppCFString labels = CppCFString("asdfjkl").substring(0, candidates_window_cands_per_frame); @@ -434,6 +427,12 @@ return handleInput(' '); // ???????????????continue? } } + else if(status == STATUS_BLACK) { + // ???????????? + parent->fix(getStringToFix()); + parent->setEnabledKanjiMode(true); + return handleInput(skkchar); + } } else { if(status == STATUS_WHITE_ROOT) { // ?????ﾀ?? @@ -463,6 +462,11 @@ return handleInput(' '); // ???????????????continue? } } + else if(status == STATUS_BLACK) { + // ???????????? + parent->fix(getStringToFix()); + return parent->handleInput(skkchar); + } } return false; @@ -741,7 +745,7 @@ root += to_fix; } - parent->fix(this->getStringToFix()); // ???? + parent->fix(getStringToFix()); // ???? parent->setEnabledKanjiMode(false); initialize(); } Index: AquaSKK/KanjiConversionMode.h diff -u AquaSKK/KanjiConversionMode.h:1.6.2.3 AquaSKK/KanjiConversionMode.h:1.6.2.4 --- AquaSKK/KanjiConversionMode.h:1.6.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/KanjiConversionMode.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.h,v 1.6.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: KanjiConversionMode.h,v 1.6.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/KotoeriDictionary.cpp diff -u AquaSKK/KotoeriDictionary.cpp:1.3.2.3 AquaSKK/KotoeriDictionary.cpp:1.3.2.4 --- AquaSKK/KotoeriDictionary.cpp:1.3.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/KotoeriDictionary.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: KotoeriDictionary.cpp,v 1.3.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: KotoeriDictionary.cpp,v 1.3.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/KotoeriDictionary.h diff -u AquaSKK/KotoeriDictionary.h:1.2.2.3 AquaSKK/KotoeriDictionary.h:1.2.2.4 --- AquaSKK/KotoeriDictionary.h:1.2.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/KotoeriDictionary.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: KotoeriDictionary.h,v 1.2.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: KotoeriDictionary.h,v 1.2.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/Makefile diff -u AquaSKK/Makefile:1.3.2.1 AquaSKK/Makefile:1.3.2.2 --- AquaSKK/Makefile:1.3.2.1 Sat Feb 3 16:53:29 2007 +++ AquaSKK/Makefile Sat Feb 3 17:52:48 2007 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3.2.1 2007/02/03 07:53:29 t-suwa Exp $ +# $Id: Makefile,v 1.3.2.2 2007/02/03 08:52:48 t-suwa Exp $ DARWIN = $(firstword $(subst ., ,$(shell uname -r))) TARGET = AquaSKKInputMethod.component @@ -29,6 +29,9 @@ check: all cd tests; make check; cd .. +test: + osascript tests/TestAquaSKK.scpt + beta: check cd Package; make beta; cd .. Index: AquaSKK/NumericConverter.cpp diff -u AquaSKK/NumericConverter.cpp:1.3.2.3 AquaSKK/NumericConverter.cpp:1.3.2.4 --- AquaSKK/NumericConverter.cpp:1.3.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/NumericConverter.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: NumericConverter.cpp,v 1.3.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: NumericConverter.cpp,v 1.3.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/NumericConverter.h diff -u AquaSKK/NumericConverter.h:1.1.2.3 AquaSKK/NumericConverter.h:1.1.2.4 --- AquaSKK/NumericConverter.h:1.1.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/NumericConverter.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: NumericConverter.h,v 1.1.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: NumericConverter.h,v 1.1.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/PreferencesController.mm diff -u AquaSKK/PreferencesController.mm:1.8.2.3 AquaSKK/PreferencesController.mm:1.8.2.4 --- AquaSKK/PreferencesController.mm:1.8.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/PreferencesController.mm Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: PreferencesController.mm,v 1.8.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: PreferencesController.mm,v 1.8.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/ProxyDictionary.cpp diff -u AquaSKK/ProxyDictionary.cpp:1.2.2.3 AquaSKK/ProxyDictionary.cpp:1.2.2.4 --- AquaSKK/ProxyDictionary.cpp:1.2.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/ProxyDictionary.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: ProxyDictionary.cpp,v 1.2.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: ProxyDictionary.cpp,v 1.2.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/ProxyDictionary.h diff -u AquaSKK/ProxyDictionary.h:1.2.2.3 AquaSKK/ProxyDictionary.h:1.2.2.4 --- AquaSKK/ProxyDictionary.h:1.2.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/ProxyDictionary.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: ProxyDictionary.h,v 1.2.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: ProxyDictionary.h,v 1.2.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/SKKDictionary.cpp diff -u AquaSKK/SKKDictionary.cpp:1.12.2.4 AquaSKK/SKKDictionary.cpp:1.12.2.5 --- AquaSKK/SKKDictionary.cpp:1.12.2.4 Sat Feb 3 16:53:29 2007 +++ AquaSKK/SKKDictionary.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: SKKDictionary.cpp,v 1.12.2.4 2007/02/03 07:53:29 t-suwa Exp $ + $Id: SKKDictionary.cpp,v 1.12.2.5 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/SKKDictionary.h diff -u AquaSKK/SKKDictionary.h:1.9.2.3 AquaSKK/SKKDictionary.h:1.9.2.4 --- AquaSKK/SKKDictionary.h:1.9.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/SKKDictionary.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: SKKDictionary.h,v 1.9.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: SKKDictionary.h,v 1.9.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/ServerMessageReceiver.mm diff -u AquaSKK/ServerMessageReceiver.mm:1.7.2.3 AquaSKK/ServerMessageReceiver.mm:1.7.2.4 --- AquaSKK/ServerMessageReceiver.mm:1.7.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/ServerMessageReceiver.mm Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* -*- objc -*- - $Id: ServerMessageReceiver.mm,v 1.7.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: ServerMessageReceiver.mm,v 1.7.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/WordRegisterMode.cpp diff -u AquaSKK/WordRegisterMode.cpp:1.5.2.4 AquaSKK/WordRegisterMode.cpp:1.5.2.5 --- AquaSKK/WordRegisterMode.cpp:1.5.2.4 Sat Feb 3 16:53:29 2007 +++ AquaSKK/WordRegisterMode.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: WordRegisterMode.cpp,v 1.5.2.4 2007/02/03 07:53:29 t-suwa Exp $ + $Id: WordRegisterMode.cpp,v 1.5.2.5 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/skkserv.cpp diff -u AquaSKK/skkserv.cpp:1.3.2.5 AquaSKK/skkserv.cpp:1.3.2.6 --- AquaSKK/skkserv.cpp:1.3.2.5 Sat Feb 3 16:53:29 2007 +++ AquaSKK/skkserv.cpp Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* - $Id: skkserv.cpp,v 1.3.2.5 2007/02/03 07:53:29 t-suwa Exp $ + $Id: skkserv.cpp,v 1.3.2.6 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. Index: AquaSKK/socketstream.h diff -u AquaSKK/socketstream.h:1.2.2.3 AquaSKK/socketstream.h:1.2.2.4 --- AquaSKK/socketstream.h:1.2.2.3 Sat Feb 3 16:53:29 2007 +++ AquaSKK/socketstream.h Sat Feb 3 17:52:48 2007 @@ -1,5 +1,5 @@ /* -*- c++ -*- - $Id: socketstream.h,v 1.2.2.3 2007/02/03 07:53:29 t-suwa Exp $ + $Id: socketstream.h,v 1.2.2.4 2007/02/03 08:52:48 t-suwa Exp $ MacOS X implementation of the SKK input method. From t-suwa ＠ users.sourceforge.jp Sat Feb 3 17:52:49 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 17:52:49 +0900 Subject: [aquaskk-changes 300] CVS update: AquaSKK/Package Message-ID: <20070203085249.114C72AC0CC@users.sourceforge.jp> Index: AquaSKK/Package/Makefile diff -u AquaSKK/Package/Makefile:1.1.6.4 AquaSKK/Package/Makefile:1.1.6.5 --- AquaSKK/Package/Makefile:1.1.6.4 Sat Feb 3 16:53:30 2007 +++ AquaSKK/Package/Makefile Sat Feb 3 17:52:48 2007 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.6.4 2007/02/03 07:53:30 t-suwa Exp $ +# $Id: Makefile,v 1.1.6.5 2007/02/03 08:52:48 t-suwa Exp $ # # Makefile for build installer From t-suwa ＠ users.sourceforge.jp Sat Feb 3 17:52:49 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 17:52:49 +0900 Subject: [aquaskk-changes 301] CVS update: AquaSKK/Resources Message-ID: <20070203085249.3A5AE2AC0AB@users.sourceforge.jp> Index: AquaSKK/Resources/translation-to-hiragana diff -u AquaSKK/Resources/translation-to-hiragana:1.2 AquaSKK/Resources/translation-to-hiragana:1.2.2.1 --- AquaSKK/Resources/translation-to-hiragana:1.2 Wed Apr 26 22:45:24 2006 +++ AquaSKK/Resources/translation-to-hiragana Sat Feb 3 17:52:49 2007 @@ -1,4 +1,4 @@ -# $Id: translation-to-hiragana,v 1.2 2006/04/26 13:45:24 t-suwa Exp $ +# $Id: translation-to-hiragana,v 1.2.2.1 2007/02/03 08:52:49 t-suwa Exp $ # このファイルは改行コードがLF、文字エンコーディングがEUC-JPでなければなりません。 # ,は半角カンマに置換されます。 @@ -178,6 +178,12 @@ ﾕ,ゆ ﾖ,よ +ﾗ,ら +ﾘ,り +ﾙ,る +ﾚ,れ +ﾛ,ろ + ﾜ,わ ｦ,を ﾝ,ん Index: AquaSKK/Resources/translation-to-katakana diff -u AquaSKK/Resources/translation-to-katakana:1.2 AquaSKK/Resources/translation-to-katakana:1.2.2.1 --- AquaSKK/Resources/translation-to-katakana:1.2 Wed Apr 26 22:45:24 2006 +++ AquaSKK/Resources/translation-to-katakana Sat Feb 3 17:52:49 2007 @@ -1,4 +1,4 @@ -# $Id: translation-to-katakana,v 1.2 2006/04/26 13:45:24 t-suwa Exp $ +# $Id: translation-to-katakana,v 1.2.2.1 2007/02/03 08:52:49 t-suwa Exp $ # このファイルは改行コードがLF、文字エンコーディングがEUC-JPでなければなりません。 # ,は半角カンマに置換されます。 @@ -177,6 +177,12 @@ ﾕ,ユ ﾖ,ヨ +ﾗ,ラ +ﾘ,リ +ﾙ,ル +ﾚ,レ +ﾛ,ロ + ﾜ,ワ ｦ,ヲ ﾝ,ン From t-suwa ＠ users.sourceforge.jp Sat Feb 3 17:52:49 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 17:52:49 +0900 Subject: [aquaskk-changes 302] CVS update: AquaSKK/tests Message-ID: <20070203085249.5FA602AC0CC@users.sourceforge.jp> Index: AquaSKK/tests/TestAquaSKK.scpt From t-suwa ＠ users.sourceforge.jp Sat Feb 3 18:03:54 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 18:03:54 +0900 Subject: [aquaskk-changes 303] CVS update: AquaSKK Message-ID: <20070203090354.08CA42AC0AB@users.sourceforge.jp> Index: AquaSKK/SKKInputKeymap.cpp diff -u AquaSKK/SKKInputKeymap.cpp:1.1.2.1 AquaSKK/SKKInputKeymap.cpp:1.1.2.2 --- AquaSKK/SKKInputKeymap.cpp:1.1.2.1 Sat Feb 3 16:53:29 2007 +++ AquaSKK/SKKInputKeymap.cpp Sat Feb 3 18:03:53 2007 @@ -1,5 +1,5 @@ /* -*- C++ -*- - $Id: SKKInputKeymap.cpp,v 1.1.2.1 2007/02/03 07:53:29 t-suwa Exp $ + $Id: SKKInputKeymap.cpp,v 1.1.2.2 2007/02/03 09:03:53 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -84,20 +84,20 @@ int code = 0; int labels = 0; while(buf >> str) { - if(str == "group") labels += group; - if(str == "ctrl") labels += ctrl; - if(str == "ascii") labels += ascii; - if(str == "keycode") labels += keycode; + if(str == "group") labels += LABEL_GROUP; + if(str == "ctrl") labels += LABEL_CTRL; + if(str == "ascii") labels += LABEL_ASCII; + if(str == "keycode") labels += LABEL_KEYCODE; } - if(labels & ascii && labels & keycode) { + if(labels & LABEL_ASCII && labels & LABEL_KEYCODE) { std::cerr << "SKKInputKeymap::parse(): invalid syntax ignored [" << values[index].name << "]" << std::endl; return; } // ????潟???? - if(!(labels & group)) { + if(!(labels & LABEL_GROUP)) { code = get_code(str, labels); store_state(code, labels, index); } else { @@ -144,7 +144,7 @@ std::stringstream buf(str); int result; - if(labels & (ascii | keycode)) { + if(labels & (LABEL_ASCII | LABEL_KEYCODE)) { buf >> std::hex >> result; } else { result = str[0]; @@ -156,10 +156,10 @@ void SKKInputKeymap::store_state(int code, int labels, int index) { int state; - if(labels & keycode) { - state = KeyState::Keycode(code, labels & ctrl); + if(labels & LABEL_KEYCODE) { + state = KeyState::Keycode(code, labels & LABEL_CTRL); } else { - state = KeyState::Ascii(code, labels & ctrl); + state = KeyState::Ascii(code, labels & LABEL_CTRL); } if(values[index].type == TYPE_EVENT) { Index: AquaSKK/SKKInputKeymap.h diff -u AquaSKK/SKKInputKeymap.h:1.1.2.1 AquaSKK/SKKInputKeymap.h:1.1.2.2 --- AquaSKK/SKKInputKeymap.h:1.1.2.1 Sat Feb 3 16:53:29 2007 +++ AquaSKK/SKKInputKeymap.h Sat Feb 3 18:03:53 2007 @@ -1,5 +1,5 @@ /* -*- C++ -*- - $Id: SKKInputKeymap.h,v 1.1.2.1 2007/02/03 07:53:29 t-suwa Exp $ + $Id: SKKInputKeymap.h,v 1.1.2.2 2007/02/03 09:03:53 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -53,7 +53,7 @@ Keymap events_; Keymap attributes_; - enum label { group = 1, ctrl = 2, ascii = 4, keycode = 8 }; + enum { LABEL_GROUP = 1, LABEL_CTRL = 2, LABEL_ASCII = 4, LABEL_KEYCODE = 8 }; void parse(const std::string& value, int index); int get_code(const std::string& str, int labels); From t-suwa ＠ users.sourceforge.jp Sat Feb 3 18:03:54 2007 From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA) Date: Sat, 3 Feb 2007 18:03:54 +0900 Subject: [aquaskk-changes 304] CVS update: AquaSKK/AquaSKK.xcodeproj Message-ID: <20070203090354.33D782AC0F9@users.sourceforge.jp> Index: AquaSKK/AquaSKK.xcodeproj/project.pbxproj diff -u AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.10.2.5 AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.10.2.6 --- AquaSKK/AquaSKK.xcodeproj/project.pbxproj:1.10.2.5 Sat Feb 3 16:53:30 2007 +++ AquaSKK/AquaSKK.xcodeproj/project.pbxproj Sat Feb 3 18:03:54 2007 @@ -147,7 +147,6 @@ D385B8890B4E3C2D004203B8 /* keymap.conf in Resources */ = {isa = PBXBuildFile; fileRef = D385B8880B4E3C2D004203B8 /* keymap.conf */; }; D38706A50B508270004B2C37 /* SKKInputKeymap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D38706A30B508270004B2C37 /* SKKInputKeymap.cpp */; }; D38706A60B508270004B2C37 /* SKKInputKeymap.h in Headers */ = {isa = PBXBuildFile; fileRef = D38706A40B508270004B2C37 /* SKKInputKeymap.h */; }; - D388F7420B5E66C500848CE8 /* Test.nib in Resources */ = {isa = PBXBuildFile; fileRef = D388F7400B5E66C500848CE8 /* Test.nib */; }; D398B6D80B50AC450082DEC1 /* SKKConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D398B6D40B50AC450082DEC1 /* SKKConverter.cpp */; }; D398B6D90B50AC450082DEC1 /* SKKConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = D398B6D50B50AC450082DEC1 /* SKKConverter.h */; }; D398B6DA0B50AC450082DEC1 /* SKKFrontEnd.h in Headers */ = {isa = PBXBuildFile; fileRef = D398B6D60B50AC450082DEC1 /* SKKFrontEnd.h */; }; @@ -260,7 +259,6 @@ D385B8880B4E3C2D004203B8 /* keymap.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = keymap.conf; path = Resources/keymap.conf; sourceTree = ""; }; D38706A30B508270004B2C37 /* SKKInputKeymap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SKKInputKeymap.cpp; sourceTree = ""; }; D38706A40B508270004B2C37 /* SKKInputKeymap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKInputKeymap.h; sourceTree = ""; }; - D388F7410B5E66C500848CE8 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/Test.nib; sourceTree = ""; }; D398B6D40B50AC450082DEC1 /* SKKConverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SKKConverter.cpp; sourceTree = ""; }; D398B6D50B50AC450082DEC1 /* SKKConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKConverter.h; sourceTree = ""; }; D398B6D60B50AC450082DEC1 /* SKKFrontEnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKKFrontEnd.h; sourceTree = ""; }; @@ -503,7 +501,6 @@ D308EC0F09DDED7400CCECDD /* tut-config */, D308EC1009DDED7400CCECDD /* tut-kana-rule-list */, D3D46F790872F755009707C1 /* InfoPlist.strings */, - D388F7400B5E66C500848CE8 /* Test.nib */, D31FAAC7086E93FD00868187 /* Menu.nib */, 01A38B34005639D21153986C /* BIM.r */, ); @@ -820,7 +817,6 @@ D308EC1709DDED7400CCECDD /* tut-kana-rule-list in Resources */, D369F6CE0A1A2D9C00784FF4 /* config in Resources */, D385B8890B4E3C2D004203B8 /* keymap.conf in Resources */, - D388F7420B5E66C500848CE8 /* Test.nib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -950,14 +946,6 @@ name = Menu.nib; sourceTree = ""; }; - D388F7400B5E66C500848CE8 /* Test.nib */ = { - isa = PBXVariantGroup; - children = ( - D388F7410B5E66C500848CE8 /* Japanese */, - ); - name = Test.nib; - sourceTree = ""; - }; D3C7B8AD0B47534900D2B4E0 /* Principal.nib */ = { isa = PBXVariantGroup; children = (