AquaSKK

Fork

[aquaskk-changes 290] CVS update: AquaSKK

Tomotaka SUWA t-suw****@users*****
2007年 2月 3日 (土) 13:04:22 JST

• 次の記事 [aquaskk-changes 291] CVS update: AquaSKK/Resources
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

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 @@
 	// ¤ƒ‚[ƒh‚âŒó•â‘I‘ð‰æ–Ê‚È‚ç‘f’Ê‚èB
     }
 
-    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()); // Šm’è‚·‚é
+    parent->fix(getStringToFix()); // Šm’è‚·‚é
     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:			// ‰p”
 	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  <t.suw****@mac*****>
+
+	* tests/TestAquaSKK.scpt: 新規追加。AppleScript による自動テストス
+	クリプト。
+
+2007-01-28  Tomotaka SUWA  <t.suw****@mac*****>
+
+	* KanjiConversionMode.cpp: 暗黙の変換後、次状態に正しく遷移しない不
+	具合を修正。
+
+	* AsciiConversionMode.cpp: 変換中に '/' が押された時に、正しく再入
+	しない不具合を修正。
+
+	* Resources/translation-to-hiragana,
+	Resources/translation-to-katakana: 半角カナモードで「ラリルレロ」を
+	トグル変換できなかった不具合を修正。
+
+	* BIM.cpp: テンキー半角オプションの切り替えが無効になっていた不具合を修正。
+
 2007-01-27  Tomotaka SUWA  <t.suw****@mac*****>
 
 	* 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 @@
 	<key>CFBundlePackageType</key>
 	<string>thng</string>
 	<key>CFBundleShortVersionString</key>
-	<string>fix-skkserv 1.0</string>
+	<string>fix-skkserv 1.1</string>
 	<key>CFBundleSignature</key>
 	<string>askk</string>
 	<key>CFBundleVersion</key>
-	<string>2007-01-27</string>
+	<string>2007-02-03</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>tsInputMethodIconFileKey</key>
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 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>fix-skkserv 1.0</string>
+	<string>fix-skkserv 1.1</string>
 	<key>CFBundleSignature</key>
 	<string>askk</string>
 	<key>CFBundleVersion</key>
-	<string>2007-01-27</string>
+	<string>2007-02-03</string>
 	<key>NSMainNibFile</key>
 	<string>Principal</string>
 	<key>NSPrincipalClass</key>
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‚ÌŽž‚É‚Í
 	// í‚ÉkIgnoreThis‚ð•Ô‚·B
 
-	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;
     }
 
-    // Œ»Ý‚ÌŒó•â‚ðŠm’肵‚ÄŒp‘±
-    if(status == STATUS_BLACK) {
-	parent->fix(getStringToFix());
-	return parent->handleInput(skkchar);
-    }
-
     // ‘I‘ð‚³‚ê‚½Œó•â‚ÅŠm’è‚·‚é
     if(status == STATUS_BLACK_WITH_WINDOW) {
 	CppCFString labels = CppCFString("asdfjkl").substring(0, candidates_window_cands_per_frame);
@@ -434,6 +427,12 @@
 		return handleInput(' '); // Ä“Ë“üBˆÓ–¡“I‚ɂ͍ċA‚Å‚Í‚È‚­continueB
 	    }
 	}
+	else if(status == STATUS_BLACK) {
+	    // Œ»Ý‚ÌŒó•â‚ðŠm’肵‚ÄŒp‘±
+	    parent->fix(getStringToFix());
+	    parent->setEnabledKanjiMode(true);
+	    return handleInput(skkchar);
+	}
     } else {
 	if(status == STATUS_WHITE_ROOT) {
 	    // ‰¼–¼“ü—Í‚ðŽÀsB
@@ -463,6 +462,11 @@
 		return handleInput(' '); // Ä“Ë“üBˆÓ–¡“I‚ɂ͍ċA‚Å‚Í‚È‚­continueB
 	    }
 	}
+	else if(status == STATUS_BLACK) {
+	    // Œ»Ý‚ÌŒó•â‚ðŠm’肵‚ÄŒp‘±
+	    parent->fix(getStringToFix());
+	    return parent->handleInput(skkchar);
+	}
     }
 
     return false;
@@ -741,7 +745,7 @@
 	root += to_fix;
     }
     
-    parent->fix(this->getStringToFix()); // Šm’è‚·‚é
+    parent->fix(getStringToFix()); // Šm’è‚·‚é
     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 ..
 

• 次の記事 [aquaskk-changes 291] CVS update: AquaSKK/Resources
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]