From t-suwa ＠ users.sourceforge.jp  Sat Jun  9 10:53:53 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Sat,  9 Jun 2007 10:53:53 +0900
Subject: [aquaskk-changes 311]  CVS update: AquaSKK
Message-ID: <20070609015356.6981D2AC016@users.sourceforge.jp>

Index: AquaSKK/Info-AquaSKKInputMethod.plist
diff -u AquaSKK/Info-AquaSKKInputMethod.plist:1.15 AquaSKK/Info-AquaSKKInputMethod.plist:1.16
--- AquaSKK/Info-AquaSKKInputMethod.plist:1.15	Sat Feb  3 13:04:21 2007
+++ AquaSKK/Info-AquaSKKInputMethod.plist	Sat Jun  9 10:53:53 2007
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>thng</string>
 	<key>CFBundleShortVersionString</key>
-	<string>fix-skkserv 1.1</string>
+	<string>3.4</string>
 	<key>CFBundleSignature</key>
 	<string>askk</string>
 	<key>CFBundleVersion</key>
-	<string>2007-02-03</string>
+	<string>2007-06-09</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>tsInputMethodIconFileKey</key>
Index: AquaSKK/Info-AquaSKKServer.plist
diff -u AquaSKK/Info-AquaSKKServer.plist:1.15 AquaSKK/Info-AquaSKKServer.plist:1.16
--- AquaSKK/Info-AquaSKKServer.plist:1.15	Sat Feb  3 13:04:21 2007
+++ AquaSKK/Info-AquaSKKServer.plist	Sat Jun  9 10:53:53 2007
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>fix-skkserv 1.1</string>
+	<string>3.4</string>
 	<key>CFBundleSignature</key>
 	<string>askk</string>
 	<key>CFBundleVersion</key>
-	<string>2007-02-03</string>
+	<string>2007-06-09</string>
 	<key>NSMainNibFile</key>
 	<string>Principal</string>
 	<key>NSPrincipalClass</key>

From t-suwa ＠ users.sourceforge.jp  Sat Jun  9 10:59:16 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Sat,  9 Jun 2007 10:59:16 +0900
Subject: [aquaskk-changes 312]  CVS update: AquaSKK
Message-ID: <20070609015916.5B28F2AC031@users.sourceforge.jp>

Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.39 AquaSKK/ChangeLog:1.40
--- AquaSKK/ChangeLog:1.39	Sat Feb  3 13:04:21 2007
+++ AquaSKK/ChangeLog	Sat Jun  9 10:59:16 2007
@@ -1,3 +1,7 @@
+2007-06-09  Tomotaka SUWA  <t.suwa ＠ mac.com>
+
+	* AquaSKK 3.4 ????若???+
 2007-02-03  Tomotaka SUWA  <t.suwa ＠ mac.com>
 
 	* tests/TestAquaSKK.scpt: ?域?菴遵???ppleScript ??????????鴻???
From t-suwa ＠ users.sourceforge.jp  Sat Jun  9 11:43:45 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Sat,  9 Jun 2007 11:43:45 +0900
Subject: [aquaskk-changes 313]  CVS update: htdocs
Message-ID: <20070609024345.3393A2AC00F@users.sourceforge.jp>

Index: htdocs/index.html
diff -u htdocs/index.html:1.25 htdocs/index.html:1.26
--- htdocs/index.html:1.25	Sat Dec 30 10:42:06 2006
+++ htdocs/index.html	Sat Jun  9 11:43:44 2007
@@ -41,6 +41,8 @@
   <h2>最近の出来事</h2>
 
   <ul>
+    <li>2006/06/09 - AquaSKK 3.4 リリース<br /> 
+      skkserv 経由で abbrev 変換できない不具合を修正しました。</li>
     <li>2006/12/29 - AquaSKK 3.3 リリース<br /> 
       送りありエントリが正しく保存されない不具合を修正しました。</li>
     <li>2006/12/23 - AquaSKK 3.2 リリース<br /> 
@@ -51,9 +53,9 @@
       Intel Mac を正式にサポート。複数辞書にも対応し、使い勝手を向上させました。</li>
     <li>2005/12/19 - AquaSKK 2.5 リリース<br />
       ASCII モードと U.S. の互換性を向上させました。多数のバグ修正と機能改善も盛り込んでます。</li>
+<!--
     <li>2005/10/08 - AquaSKK 2.4 リリース<br />
       Safari/Camino で落ちる頻度を減らしました。候補ウィンドウのフォントも変更可能になっています。</li>
-<!--
     <li>2005/09/23 - AquaSKK 2.3 リリース<br />
       候補ウィンドウのフォントサイズを変更できるようにしました。</li>
     <li>2005/09/06 - AquaSKK 2.2 リリース<br />
@@ -104,12 +106,12 @@
 </div>
 
 <div class="sidebar">
-  <script type="text/javascript">lastupdate("$Date: 2006/12/30 01:42:06 $");</script>
+  <script type="text/javascript">lastupdate("$Date: 2007/06/09 02:43:44 $");</script>
   <script type="text/javascript" src="./sidebar.js"></script>
 </div>
 
 <div class="footer">
-  <p>Copyright &copy; 2005-2006 AquaSKK Project All Rights Reserved.</p>
+  <p>Copyright &copy; 2005-2007 AquaSKK Project All Rights Reserved.</p>
   <p class="figure"><a href="http://www.apple.com/jp/" target="_blank"><img class="art" src="./images/madeonamac.gif" /></a></p>
   <p>Mac、Macロゴは、米国およびその他の国で登録されているApple Computer, Inc.の商標です。</p>
   <p>Made on a MacバッジはApple Computer Inc.の商標であり、同社の許可により使用しています。</p>

From t-suwa ＠ users.sourceforge.jp  Sat Jun  9 11:44:59 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Sat,  9 Jun 2007 11:44:59 +0900
Subject: [aquaskk-changes 314]  CVS update: htdocs
Message-ID: <20070609024459.9D8FF2AC016@users.sourceforge.jp>

Index: htdocs/index.html
diff -u htdocs/index.html:1.26 htdocs/index.html:1.27
--- htdocs/index.html:1.26	Sat Jun  9 11:43:44 2007
+++ htdocs/index.html	Sat Jun  9 11:44:59 2007
@@ -41,7 +41,7 @@
   <h2>最近の出来事</h2>
 
   <ul>
-    <li>2006/06/09 - AquaSKK 3.4 リリース<br /> 
+    <li>2007/06/09 - AquaSKK 3.4 リリース<br /> 
       skkserv 経由で abbrev 変換できない不具合を修正しました。</li>
     <li>2006/12/29 - AquaSKK 3.3 リリース<br /> 
       送りありエントリが正しく保存されない不具合を修正しました。</li>
@@ -106,7 +106,7 @@
 </div>
 
 <div class="sidebar">
-  <script type="text/javascript">lastupdate("$Date: 2007/06/09 02:43:44 $");</script>
+  <script type="text/javascript">lastupdate("$Date: 2007/06/09 02:44:59 $");</script>
   <script type="text/javascript" src="./sidebar.js"></script>
 </div>
 

From t-suwa ＠ users.sourceforge.jp  Tue Jun 12 23:25:09 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Tue, 12 Jun 2007 23:25:09 +0900
Subject: [aquaskk-changes 315]  CVS update: AquaSKK
Message-ID: <20070612142509.1DD5B2AC043@users.sourceforge.jp>

Index: AquaSKK/BIMClientServer.h
diff -u AquaSKK/BIMClientServer.h:1.6 AquaSKK/BIMClientServer.h:1.7
--- AquaSKK/BIMClientServer.h:1.6	Sat Jun  3 10:23:18 2006
+++ AquaSKK/BIMClientServer.h	Tue Jun 12 23:25:08 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: BIMClientServer.h,v 1.6 2006/06/03 01:23:18 t-suwa Exp $
+  $Id: BIMClientServer.h,v 1.7 2007/06/12 14:25:08 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2005-2006 Tomotaka SUWA <t.suwa ＠ mac.com>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suwa ＠ mac.com>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,29 +24,27 @@
 #ifndef INC__BIMClientServer__
 #define INC__BIMClientServer__
 
-// ?????????????
+// ?潟?????????????????? #define kIMBundleIdentifier "jp.sourceforge.AquaSKKInputMethod"
 
-// ?????
-//#define kBasicServerName "\pAquaSKKServer.app"
+// ?泣?????? #define kCSTR_SKKServerName "AquaSKKServer.app"
 
-// ????????
+// ?泣??????????
 #define kBasicServerPortName "jp.sourceforge.AquaSKKServer"
 
-// ????? RunLoopMode
+// ?泣??????RunLoopMode
 #define	kAquaSKKServerRunLoopMode	CFSTR("AquaSKK::ServerRunLoopMode")
 
-// ??????? RunLoopMode
+// ????ゃ??潟???RunLoopMode
 #define	kAquaSKKClientRunLoopMode	CFSTR("AquaSKK::ClientRunLoopMode")
 
-// ????????????????????content??????????
+// ????ゃ??潟?????吾??＜??祉??吾???拭?с?content??????篁????????
 struct BasicMessageHeader {
     ProcessSerialNumber		fProcessSerialNumber;
 };
-typedef struct BasicMessageHeader BasicMessageHeader;
 
-// TSM???????o???????????
+// TSM?????????????????戎??????????? struct OffsetToPosParams {
     long			fRefCon;
     long			fTextOffset;
@@ -70,51 +68,82 @@
 
 typedef SInt32 BasicMessageID;
 
-// ???????????
-#define	SKK_MSG_DELIMITER	(0x0b) /* ???? */
+// ?＜??祉??吾??阪????絖?+#define	SKK_MSG_DELIMITER	(0x0b) // ????帥?
 
-enum { // ????????????????
-    kBasicMessageActivated			= 100,	// SKK???????????
-    kBasicMessageDeactivated			= 101,	// SKK?????????????
-    kBasicMessageHidePalettes			= 102,	// ??????????TSM??ｦ???
-	
-    kSKKMessageSearch = 200, // ????????ｮ?UniChar????????+??e ????-??????
-    // ???????????+?????-????????????p?????????????
-    // ???????????? ?????? ??????????????????????
-    kSKKCreateCandidatesWindow = 201, // ????????ｦ?
-    // ?????ｮ?
-    // +0	?ｦ???x??(QuickDraw??)	????2?????
-    // +2	?ｦ???y??(QuickDraw??)	????2?????
-    // +4	??(??						UniChar??
-    // ??:?? ? ? ?????????????????????????????
+enum { // ????ゃ??潟????薇?????????若?
+    // SKK???????ｃ?????ｃ?
+    kBasicMessageActivated = 100,
+
+    // SKK???????ｃ??с???????+    kBasicMessageDeactivated = 101,
+
+    // ???????????????TSM???腓冴????
+    kBasicMessageHidePalettes = 102,
+
+    // 罎?刈鐚???????就綣??niChar??????箴???違?+???e ??????-????????+    // ???篁?????????????????????
+    // ???篁??????????? SKK_MSG_DELIMITER ?у??????????
+    // ???????鴻?箴???違???? ???????????SKK_MSG_DELIMITER ?у??????????
+    kSKKMessageSearch = 200,
+
+    // ????御??脂???；腓?+    // ??????綵√???+    // +0	茵?ず?????綺ф?(QuickDraw綺ф?)	膃?垬???????????+    // +2	茵?ず?????綺ф?(QuickDraw綺ф?)	膃?垬???????????+    // +4	???(緇?唇)			UniChar???
+    // ???:??? 篋?篋??????????羲√??????? SKK_MSG_DELIMITER ?у??????研?鴻??????     //
-    // ??????
-    // +0	??????ID				????2?????
-    // +2	1??????ｦ??????	????2?????
-    // +4	?????					????2?????
-    // ?6????
-    kSKKCandidatesWindowNext = 202, // ???????????????????????2??????????ID?????????
-    kSKKCandidatesWindowPrev = 203, // ??????????Next????
-    kSKKCloseCandidatesWindow = 204, // ??????Next????
-    kSKKRegisterThisToUserDic = 205, // ????ｫ???o???????ｮ?UniChar?????
-    // ????+??e ? ???-???? ???????????????????
-    kSKKRemoveThisFromUserDic = 206, // ????ｫ?????B?????ｮ?kSKKRegisterThisToUserDic????
+    // ???????鴻?
+    // +0	????御??脂?ID			膃?埇???????????+    // +2	1????若???；腓冴????茖????膃?埇???????????+    // +4	????若???		膃?埇???????????+    kSKKCreateCandidatesWindow = 201,
+
+    // ??????????御??脂?????吾?????若?
+    // ??????2??????????御??脂? ID
+    kSKKCandidatesWindowNext = 202,
+
+    // ????鴻??????+    kSKKCandidatesWindowPrev = 203,
+
+    // ?????+    kSKKCloseCandidatesWindow = 204,
+
+    // ????吟?莨???吾??脂?
+    // ??????綵√???niChar????????+    // 箴???違?+???e ??箴?????????? ??????????????+    kSKKRegisterThisToUserDic = 205,
+
+    // ????吟?莨????????
+    // ??????綵√???SKKRegisterThisToUserDic?????+    kSKKRemoveThisFromUserDic = 206,
 	
-    kSKKShowAboutBox = 300, // AboutBox??ｦ????????????
-    kSKKShowPreferencesBox = 301, // ???????????ｦ????????????
-    kSKKShowWordRegistrationBox = 302, // ???????????ｦ????????????
+    // AboutBox??；腓冴??????????合?)
+    kSKKShowAboutBox = 300,
+
+    // ?医?荐??????潟????茵?ず(???????合?)
+    kSKKShowPreferencesBox = 301,
+
+    // ????脂?????潟????茵?ず(???????合?)
+    kSKKShowWordRegistrationBox = 302,
 	
-    kSKKFetchCompletions = 400, // ??????????????ｮ?UniChar?????
-    // ???????????????? ??????????????????????????X??
+    // 茖?????茖??罎?刈
+    // ??????綵√???niChar??????箴???違??祉????
+    // ???????鴻???????祉?????????? SKK_MSG_DELIMITER ?у???????荀?????????鴻?
+    kSKKFetchCompletions = 400,
+
+    // ?????????荀??????????+    kSKKRegisterToggleEntry = 401,
 
-    kBasicMessageIsSkkEggLikeNewline = 500,	// 
+    kBasicMessageIsSkkEggLikeNewline = 500,
     kBasicMessageIsNumericKeypad_HalfWidth = 501,
     kBasicMessageIsAsciiModeStartup = 502,
     kBasicMessageUseNumericConversion = 503,
     kBasicMessageKbdLayoutId = 504,
 };
 
-// ?????????????????????
+// ?泣???????????ゃ??潟??吾?????＜??祉??? enum {
     kSKKClientConfigurationModified = 100,
 };
Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.40 AquaSKK/ChangeLog:1.41
--- AquaSKK/ChangeLog:1.40	Sat Jun  9 10:59:16 2007
+++ AquaSKK/ChangeLog	Tue Jun 12 23:25:08 2007
@@ -1,3 +1,18 @@
+2007-06-12  Tomotaka SUWA  <t.suwa ＠ mac.com>
+
+	* ServerMessageReceiver.* (registerToggleEntry): ?????????腟????+	????吟?莨??????蚊????紊???茖??腥冴?
+
+	* KanjiConversionMode.* (registerToggleEntry): ?域?菴遵??∽??????+	??????腟?????膺?????
+
+	* DictionarySet.cpp (RegisterOkuriNasi): entry.empty() ?????????
+	????????信罩ｃ??????????絖??????翫???ntry ?????????
+
+	* Dictionary.h: SKKEntry ?х???????茖??絲上???+
+	* BIMClientServer.h: kSKKRegisterToggleEntry ??申????潟????綵≪?
+
 2007-06-09  Tomotaka SUWA  <t.suwa ＠ mac.com>
 
 	* AquaSKK 3.4 ????若???Index: AquaSKK/Dictionary.h
diff -u AquaSKK/Dictionary.h:1.7 AquaSKK/Dictionary.h:1.8
--- AquaSKK/Dictionary.h:1.7	Fri Dec 29 00:37:03 2006
+++ AquaSKK/Dictionary.h	Tue Jun 12 23:25:08 2007
@@ -1,10 +1,10 @@
 /* -*- C++ -*-
-  $Id: Dictionary.h,v 1.7 2006/12/28 15:37:03 t-suwa Exp $
+  $Id: Dictionary.h,v 1.8 2007/06/12 14:25:08 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2005-2006 Tomotaka SUWA <t.suwa ＠ mac.com>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suwa ＠ mac.com>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -354,6 +354,9 @@
     }
 
     void addCandidate(const SKKCandidate& theCandidate) {
+	// ?????????篏???????+	if(theCandidate.IsEmpty()) return;
+
 	// 荐脂??????????????????｢?? 	SKKCandidateIterator i = getCandidateIterator(theCandidate);
 
@@ -367,6 +370,9 @@
     }
 
     void updateCandidate(const SKKCandidate& theCandidate) {
+	// ?????????篏???????+	if(theCandidate.IsEmpty()) return;
+
 	SKKCandidate target;
 
 	// 荐脂??????????????????｢??Index: AquaSKK/DictionarySet.cpp
diff -u AquaSKK/DictionarySet.cpp:1.8 AquaSKK/DictionarySet.cpp:1.9
--- AquaSKK/DictionarySet.cpp:1.8	Fri Dec 29 00:37:03 2006
+++ AquaSKK/DictionarySet.cpp	Tue Jun 12 23:25:08 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: DictionarySet.cpp,v 1.8 2006/12/28 15:37:03 t-suwa Exp $
+  $Id: DictionarySet.cpp,v 1.9 2007/06/12 14:25:08 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002-2004 phonohawk
-  Copyright (C) 2005-2006 Tomotaka SUWA <t.suwa ＠ mac.com>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suwa ＠ mac.com>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -273,7 +273,8 @@
 }
 
 void DictionarySet::RegisterOkuriNasi(const std::string& key, const std::string& entry) {
-    if(key.empty() || entry.empty()) {
+    // key ????????????(??????????脂???? entry ???)
+    if(key.empty()) {
 	std::cerr << "AquaSKK: Invalid registration received" << std::endl;
     } else {
 	userdict_->registerOkuriNasi(key, entry);
Index: AquaSKK/KanjiConversionMode.cpp
diff -u AquaSKK/KanjiConversionMode.cpp:1.11 AquaSKK/KanjiConversionMode.cpp:1.12
--- AquaSKK/KanjiConversionMode.cpp:1.11	Sat Feb  3 13:04:21 2007
+++ AquaSKK/KanjiConversionMode.cpp	Tue Jun 12 23:25:08 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: KanjiConversionMode.cpp,v 1.11 2007/02/03 04:04:21 t-suwa Exp $
+  $Id: KanjiConversionMode.cpp,v 1.12 2007/06/12 14:25:08 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -41,17 +41,17 @@
 #endif
 
 /*
-  ??????????????????????????
-  ?????????????????????handleInput??????
+  ????ュ??≪????紊ф?絖???≪???????????ュ???????
+  羲√??ュ??≪????????帥???????????????andleInput??検??????
   
-  handleInput????????????????????iraganaInputMode????
-  ?????????????????????????
+  handleInput?????????????ャ???????絨????????iraganaInputMode??検???
+  ?鴻??若???????紊??????篁?????????????????
   
-  Oku   ? ???
-  OkuR  ? ???*r
-  OkuRi ? ???*? ? ???
+  Oku   ???純???  OkuR  ???純???
+  OkuRi ???純???? ???守???   
-  ???????????????????????KanjiConversionMode??????
+  羲√??ュ??≪???????????????????????????anjiConversionMode??検??????
 */
 
 KanjiConversionMode::KanjiConversionMode(ParentInputMode& src)
@@ -80,12 +80,12 @@
 bool KanjiConversionMode::handleInputChar(SKKChar skkchar) {
     if(word_register_mode) {
 	word_register_mode->handleInput(skkchar);
-	return false; // WordRegisterMode::handleInput()???????????????
+	return false; // WordRegisterMode::handleInput()????????????腆阪?????????     }
 
     if(SKKConfig::AbbrevNextKey() == skkchar) {
 	if(status == STATUS_WHITE_ROOT && completion_mode) {
-	    // ???????????????????B
+	    // 罨＜?????吾?????障?茵??????????????
 	    current_completion_index++;
 	    if(current_completion_index >= completions.size()) {
 		current_completion_index = 0;
@@ -98,7 +98,7 @@
 
     if(SKKConfig::AbbrevPrevKey() == skkchar) {
 	if(status == STATUS_WHITE_ROOT && completion_mode) {
-	    // ??????????s?????????
+	    // ???????吾?????障?茵??????????????
 	    if(current_completion_index == 0) {
 		current_completion_index = completions.size() - 1;
 	    } else {
@@ -110,20 +110,20 @@
 	}
     }
 
-    // tab,????,?????????????????????????????
+    // tab,??????,?????札紊???????????????????????絎???若?????????     completion_mode = false;
 
     if(SKKConfig::ToggleKanaKey() == skkchar) {
 	if(status == STATUS_WHITE_ROOT || status == STATUS_WHITE_OKURI) {
-	    // currenInputMode?terminate???root?getStringToFix()??????????
+	    // currenInputMode??erminate?????oot??etStringToFix()????????申??????
 	    parent->getCurrentInputMode().terminate();
 	    CppCFString to_fix(parent->getCurrentInputMode().getStringToFix());
 	    if (status == STATUS_WHITE_ROOT) {
 		root += to_fix;
 	    }
 
-	    // root???????????????????B
-	    // ????????????????????????
+	    // root???茹??篁?????????????∈絎?????篋??
+	    // ??????茹??篁???≪?????ｃ???抗篁???後???????
 	    CppCFString cand;
 	    if(parent->isZenKataInputMode()) {
 		cand = HiraganaInputMode::convert(root);
@@ -131,8 +131,8 @@
 		cand = ZenKataInputMode::convert(root);
 	    }
 
-	    // ??ｫ??o???
-	    sendWordToServerToRegister(root, cand);
+	    // ?????????腟??????蚊???+	    registerToggleEntry(root);
 
 	    parent->fix(cand);
 	    parent->setEnabledKanjiMode(false);
@@ -141,9 +141,9 @@
 	    return false;
 	}
 	else if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	    // ?????????
-	    // 1) ?????????????????
-	    // 2) ???????????????
+	    // ?上????茖??腆阪???+	    // 1) ?????皿????若????綛割皿????若???+	    // 2) ???篁ュ?????????皿????若??? 
 	    parent->setEnabledKanjiMode(false);
 	    if(parent->isZenKataInputMode()) {
@@ -157,7 +157,7 @@
 
     if(SKKConfig::PrevKouhoKey() == skkchar) {
 	if(status == STATUS_BLACK) {
-	    // ???????????????????[?????
+	    // 筝?????????吾???????茖???ｃ?????≪?????祉??? 	    if(current_candidate_index > 0) {
 		current_candidate_index--;
 	    } else {
@@ -169,17 +169,17 @@
 	    return false;
 	}
 	else if(status == STATUS_BLACK_WITH_WINDOW) {
-	    // delete???????????
+	    // delete????????????荀???? 	    handleBackSpace();
 	    return false;
 	}
-	// ?????????
+	// ???篁ュ????膣????     }
 
     if(SKKConfig::PurgeFromJisyoKey() == skkchar) {
 	if(status == STATUS_BLACK) {
-	    // ??v???????B?????ﾀ?????ｫ??????????????-	    // ??????????????????????????????
+	    // ???????潟?????冴??????????絎??????吟?莨??????ｃ???????????????+	    // ?√?????с????????????∈茯??????????????????ャ????
 	    status = STATUS_PROMPT;
 	    prompt_type = PROMPT_DELETE_FROM_USER_DIC;
 	    prompt_input.clear();
@@ -199,28 +199,31 @@
 
     if(SKKConfig::ToggleKatakanaKey() == skkchar) {
 	if(status == STATUS_WHITE_ROOT || status == STATUS_WHITE_OKURI) {
-	    // currenInputMode?terminate???root?getStringToFix()??????????
+	    // currenInputMode??erminate?????oot??etStringToFix()????????申??????
 	    parent->getCurrentInputMode().terminate();
 	    CppCFString to_fix(parent->getCurrentInputMode().getStringToFix());
 	    if (status == STATUS_WHITE_ROOT) {
 		root += to_fix;
 	    }
-	    // root???????????????????B
-	    // ????????????????????????
+	    // root???茹??篁?????????????∈絎?????篋??
+	    // ??????茹??篁???≪?????ｃ???抗篁???????????
 	    if(parent->isHanKataInputMode()) {
 		parent->fix(HiraganaInputMode::convert(root));
 	    } else {
 		parent->fix(HanKataInputMode::convert(root));
 	    }
 
+	    // ?????????腟??????蚊???+	    registerToggleEntry(root);
+
 	    parent->setEnabledKanjiMode(false);
 	    initialize();
 	    return false;
 	}
 	else if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	    // ?????????????
-	    // 1) ?????????????????
-	    // 2) ?????????????????
+	    // ?上????茖??腆阪?????????+	    // 1) ?????皿????若????綛割皿????若???+	    // 2) ???篁ュ?????????皿??皿????若??? 	    
 	    parent->setEnabledKanjiMode(false);
 	    if(parent->isHanKataInputMode()) {
@@ -233,12 +236,12 @@
     }
 
     if(SKKConfig::KakuteiKey() == skkchar) {
-	return true; // ????
+	return true; // 腆阪????
     }
 
     if(SKKConfig::LatinModeKey() == skkchar || SKKConfig::Jisx0208LatinModeKey() == skkchar) {
 	if(status == STATUS_WHITE_ROOT || status == STATUS_WHITE_OKURI || status == STATUS_BLACK) {
-	    // ???????????/??????????
+	    // ????????∈絎?????茹?????掩?絖???若??吾?
 	    if(SKKConfig::LatinModeKey() == skkchar) {
 		parent->goHanAscInputMode();
 	    } else {
@@ -246,15 +249,15 @@
 	    }
 	    return true;
 	}
-	// ????????????
+	// ????御??脂????膣?????
     }
 
     if(SKKConfig::AbbrevModeKey() == skkchar) {
-	// ?????????????????I?????
-	// ???????ｦ/fix????????????
-	// ???????????????arent?handleInput????
-	// KanjiConversionMode?STATUS_NULL????
-	// ??IgnoreThis????
+	// ?上????茖??腆阪????緇???????????篋???????+	// ?????????茵?ず/fix??????????????????+	// 羲√?紊????若????篋????????parent??andleInput??検???
+	// KanjiConversionMode??TATUS_NULL??????
+	// 絽吾?kIgnoreThis??????
 
 	parent->fix(getStringToFix());
 	return parent->handleInput(skkchar);
@@ -262,14 +265,14 @@
 
     if(SKKConfig::NextKouhoKey() == skkchar) {
 	if(status == STATUS_WHITE_ROOT || status == STATUS_WHITE_OKURI) {
-	    // currenInputMode?terminate???root????okuri?getStringToFix()??????????
+	    // currenInputMode??erminate?????oot??????kuri??etStringToFix()????????申??????
 	    parent->getCurrentInputMode().terminate();
 	    if(status == STATUS_WHITE_ROOT) {
 		root += parent->getCurrentInputMode().getStringToFix();
 		root_to_display.clear().append(root).append(parent->getCurrentInputMode().getStringToDisplay());
 
 		if(root.length() == 0) {
-		    // ??+		    // 腟??
 		    parent->setEnabledKanjiMode(false);
 		    parent->display(CppCFString());
 		    initialize();
@@ -285,33 +288,33 @@
 	    }
 
 	    if(candidates.size() > 0) {
-		// ??????????????
+		// ?????????????若??若??吾?
 		status = STATUS_BLACK;
-		current_candidate_index = 0; // ?????B
+		current_candidate_index = 0; // ??????茖??
 	    } else {
-		// ????????????????
+		// 筝?????茖???＜????茯???臥?紮??
 		startRegisteringWord();
 	    }
 	}
 	else if(status == STATUS_BLACK) {
-	    // ?????
+	    // 罨＜?????? 	    current_candidate_index++;
 
-	    if(current_candidate_index >= candidates.size()) { // ?????s??????????
+	    if(current_candidate_index >= candidates.size()) { // 腟??????ц??ｃ????茯???臥?紮??
 		startRegisteringWord();
 	    }
 	    else if(current_candidate_index >= show_cands_window_after_Nth_cand - 1) {
-		// ????????????????????????ｦ???
+		// ???篁ラ?????若??若??с??у?茖??????ゃ??????；腓冴????
 		status = STATUS_BLACK_WITH_WINDOW;
 		openCandidatesWindow();
 	    }
 	}
 	else if(status == STATUS_BLACK_WITH_WINDOW) {
 	    if(candidates_window_current_frame < candidates_window_num_of_frames - 1) {
-		// ???????????????????????
+		// ??????????????????????????????茵???? 		goToNextCandidatesFrame();
 	    } else {
-		// ????????????????????
+		// ?????????????ｃ????????脂????紮??
 		closeCandidatesWindow();
 		startRegisteringWord();
 	    }
@@ -319,17 +322,17 @@
 	return false;
     }
 
-    // ?????????????????
+    // 紊????ゃ?????若?????????????
     if(SKKConfig::SetHenkanPointKey() == skkchar) {
 	if(status == STATUS_NULL || (status == STATUS_WHITE_ROOT && root.length() == 0)) {
-	    status = STATUS_WHITE_ROOT; // ??????
+	    status = STATUS_WHITE_ROOT; // ?純??若??吾?
 
-	    // ???ｦ?
+	    // ?脂?茵?ず?? 	    root_to_display.clear().append(root).append(parent->getCurrentInputMode().getStringToDisplay());
 	    return false;
 	}
 
-	// ??????
+	// 腆阪????膓??
 	if(status == STATUS_WHITE_ROOT || status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
 	    parent->fix(getStringToFix());
 	    parent->setEnabledKanjiMode(true);
@@ -337,13 +340,13 @@
 	}
     }
 
-    // ????????
+    // ????潟????菴遵?
     if(status == STATUS_PROMPT) {
 	prompt_input += skkchar;
 	return false;
     }
 
-    // ????????????
+    // ?御???????茖??腆阪????
     if(status == STATUS_BLACK_WITH_WINDOW) {
 	CppCFString labels = CppCFString("asdfjkl").substring(0, candidates_window_cands_per_frame);
 	int cand_index = labels.indexOf(std::tolower(skkchar));
@@ -351,7 +354,7 @@
 	if(cand_index != -1) {
 	    unsigned new_index = current_candidate_index + cand_index;
 	    if(new_index < candidates.size()) {
-		// ???????????????????
+		// ????ゃ????????鴻?荐宴???????腆阪??? 		current_candidate_index = new_index;
 		return true;
 	    }
@@ -361,109 +364,109 @@
 
     if('A' <= skkchar && skkchar <= 'Z') {
 	if(status == STATUS_NULL || status == STATUS_WHITE_ROOT && root.length() == 0) {
-	    status = STATUS_WHITE_ROOT; // ??????
+	    status = STATUS_WHITE_ROOT; // ?純??若??吾?
 
-	    // ????????????s?
+	    // 絨????????皿??????絎???? 	    parent->getCurrentInputMode().handleInput(skkchar + 0x20);
 
-	    // ????????fix?????root????
+	    // 篁???ュ??≪????fix????????oot?梧申???
 	    root += parent->getCurrentInputMode().getStringToFix();
 
-	    // ???ｦ?
+	    // ?脂?茵?ず?? 	    root_to_display.clear().append(root).append(parent->getCurrentInputMode().getStringToDisplay());
 
-	    // okuri??????B?????m?????????
+	    // okuri??????????????????腆阪?????????????
 	    okuri.clear();
 	}
 	else if(status == STATUS_WHITE_ROOT) {
-	    // terminate???????????????
-	    // ????????KesSite??????????????
-	    // ????????????A?????????????????-	    // (??I???????n)??????????
+	    // terminate??????篁?????????若?莨若???+	    // ????????????KesSite?????????????ｃ???????
+	    // 篏???????????絨??????筝??絖??????阪???????????????+	    // (罔?????????潟????n)??????篏????????
 	    CppCFString tmp_queue(skkchar + 0x20);
 	    CppCFString result =
 		KanaTreeController::defaultTreeController().trace(KanaTreeController::OUTPUT_HIRAGANA, tmp_queue);
 	    if(result.length() == 0 && tmp_queue != "n") {
-		parent->getCurrentInputMode().handleInput(skkchar + 0x20); // ???+		parent->getCurrentInputMode().handleInput(skkchar + 0x20); // 絨???
 	    }
 
-	    // currentInputMode?terminate???root?getStringToFix()??????????
+	    // currentInputMode??erminate?????oot??etStringToFix()????????申??????
 	    parent->getCurrentInputMode().terminate();
 	    root += parent->getCurrentInputMode().getStringToFix();
 	    root_to_display.clear().append(root).append(parent->getCurrentInputMode().getStringToDisplay());
 
-	    status = STATUS_WHITE_OKURI; // ??????????
+	    status = STATUS_WHITE_OKURI; // ?初???皿????若??吾?
 
-	    okuri_head = skkchar + 0x20; // ???+	    okuri_head = skkchar + 0x20; // 絨???
 
-	    // ????????????s?
+	    // 絨????????皿??????絎???? 	    bool fix = parent->getCurrentInputMode().handleInput(okuri_head);
 
-	    // ????????fix?????okuri?????
+	    // 篁???ュ??≪????fix????????kuri?吾?????? 	    okuri += parent->getCurrentInputMode().getStringToFix();
 
-	    // ???ｦ?
+	    // ?脂?茵?ず?? 	    okuri_to_display.clear().append(okuri).append(parent->getCurrentInputMode().getStringToDisplay());
 
-	    // ??????????????????????
+	    // ????若?腥冴????????障?紊???????障?????? 	    if(fix && parent->getCurrentInputMode().isQueueEmpty()) {
-		// ?????
-		return handleInput(' '); // ???????????????continue?
+		// 紊??????
+		return handleInput(' '); // ????ャ???括??????鍵?с????continue?? 	    }
 	}
 	else if(status == STATUS_WHITE_OKURI) {
-	    // ????????????s?
+	    // 絨????????皿??????絎???? 	    bool fix = parent->getCurrentInputMode().handleInput(skkchar + 0x20);
 
-	    // ????????fix?????okuri?????
+	    // 篁???ュ??≪????fix????????kuri?吾?????? 	    okuri += parent->getCurrentInputMode().getStringToFix();
 
-	    // ???ｦ?
+	    // ?脂?茵?ず?? 	    okuri_to_display.clear().append(okuri).append(parent->getCurrentInputMode().getStringToDisplay());
 
-	    // ??????????????????????
+	    // ????若?腥冴????????障?紊???????障?????? 	    if(fix && parent->getCurrentInputMode().isQueueEmpty()) {
-		// ?????
-		return handleInput(' '); // ???????????????continue?
+		// 紊??????
+		return handleInput(' '); // ????ャ???括??????鍵?с????continue?? 	    }
 	}
 	else if(status == STATUS_BLACK) {
-	    // ????????????
+	    // ?上????茖??腆阪????膓??
 	    parent->fix(getStringToFix());
 	    parent->setEnabledKanjiMode(true);
 	    return handleInput(skkchar);
 	}
     } else {
 	if(status == STATUS_WHITE_ROOT) {
-	    // ?????ﾀ??
+	    // 篁???ュ????茵??
 	    parent->getCurrentInputMode().handleInput(skkchar);
 
-	    // root????
+	    // root??申???
 	    root += parent->getCurrentInputMode().getStringToFix();
 
-	    // ???ｦ?
+	    // ?脂?茵?ず?? 	    root_to_display.clear().append(root).append(parent->getCurrentInputMode().getStringToDisplay());
 	}
 	else if(status == STATUS_WHITE_OKURI) {
-	    // currentInputMode::handleInput()????true?????????????????
-	    // ????????currentInputMode::handleInput()??????
+	    // currentInputMode::handleInput()??????true菴?????????????皿??????紊???
+	    // ????с?????違?currentInputMode::handleInput()??検??????
 	    bool fix = parent->getCurrentInputMode().handleInput(skkchar);
 	    const CppCFString& kanainput_result = parent->getCurrentInputMode().getStringToFix();
 
-	    // okuri????
+	    // okuri??申???
 	    okuri += kanainput_result;
 
-	    // ???ｦ?
+	    // ?脂?茵?ず?? 	    okuri_to_display.clear().append(okuri).append(parent->getCurrentInputMode().getStringToDisplay());
 
-	    // ??????????????????
+	    // ????若?腥冴????????障?紊???????? 	    if(fix && parent->getCurrentInputMode().isQueueEmpty()) {
-		// ?????
-		return handleInput(' '); // ???????????????continue?
+		// 紊??????
+		return handleInput(' '); // ????ャ???括??????鍵?с????continue?? 	    }
 	}
 	else if(status == STATUS_BLACK) {
-	    // ????????????
+	    // ?上????茖??腆阪????膓??
 	    parent->fix(getStringToFix());
 	    return parent->handleInput(skkchar);
 	}
@@ -480,7 +483,7 @@
     else {
 	register_title = root;
     }
-    register_title = HiraganaInputMode::convert(register_title); // ??????????
+    register_title = HiraganaInputMode::convert(register_title); // ??皿???綛割皿???紊?? 	
     word_register_mode = new WordRegisterMode(*this,register_title);
     word_register_mode->redisplay();
@@ -490,7 +493,7 @@
 bool KanjiConversionMode::handleBackSpace() {
     if (word_register_mode) {
 	word_register_mode->handleBackSpace();
-	return true; // WordRegisterMode::handleBackSpace()???????????????B
+	return true; // WordRegisterMode::handleBackSpace()????????????????????????
     }
     
     if (status == STATUS_NULL) {
@@ -498,10 +501,10 @@
     }
     
     if (status == STATUS_WHITE_ROOT) {
-	// hiraganaInputMode->handleBackSpace()?true?????root_to_display??????
-	// false?????
-	//		root?????????I??
-	//		??????root?????????B
+	// hiraganaInputMode->handleBackSpace()??rue????????oot_to_display????違????
+	// false????????+	//		root???????????????篋??
+	//		腥冴???????root???緇???????????
 	if (parent->getCurrentInputMode().handleBackSpace()) {
 	    root_to_display.clear().append(root).append(parent->getCurrentInputMode().getStringToDisplay());
 	}
@@ -512,20 +515,20 @@
 		initialize();
 	    }
 	    else {
-		completion_mode = false; // ??????????????[??????
+		completion_mode = false; // 茖???≪?????ｃ??翫????絎???若????????? 		root.eraseLast(1);
 		root_to_display = root;
 	    }
 	}
     }
     else if (status == STATUS_WHITE_OKURI) {
-	// hiraganaInputMode->handleBackSpace()?
-	// true?????
-	//      okuri_to_display??????
-	//      ????okuri??????????STATUS_WHITE_ROOT????
-	// false?????
-	//		okuri??????????STATUS_WHITE_ROOT????
-	//		?????????kuri?????????B
+	// hiraganaInputMode->handleBackSpace()??+	// true????????+	//      okuri_to_display????違????
+	//      ??????okuri??????????＜????STATUS_WHITE_ROOT?御????
+	// false????????+	//		okuri??????????＜????STATUS_WHITE_ROOT?御????
+	//		篋??絖?札筝???ｃ???kuri???緇???????????
 	if (parent->getCurrentInputMode().handleBackSpace()) {
 	    okuri_to_display.clear().append(okuri).append(parent->getCurrentInputMode().getStringToDisplay());
 	    if (okuri.length() <= 1) {
@@ -545,20 +548,20 @@
 	}
     }
     else if (status == STATUS_BLACK) {
-	// ???????????????+	// ?上????茖??腆阪????筝??絖???? 	CppCFString str(getStringToFix());
 	str.eraseLast(1);
 	parent->fix(str);
 	parent->display(CppCFString());
     }
     else if (status == STATUS_BLACK_WITH_WINDOW) {
-	// ???t?????????????
-	// ???????????????
+	// ????????????????≪?????祉???+	// ????с?????医???????????? 	if (candidates_window_current_frame == 0) {
-	    // ????????????
+	    // ????潟???????????祉?
 	    current_candidate_index = show_cands_window_after_Nth_cand - 2;
 	    
-	    // ??????????
+	    // ????潟??????????
 	    closeCandidatesWindow();
 	    
 	    status = STATUS_BLACK;
@@ -568,7 +571,7 @@
 	}
     }
     else if (status == STATUS_PROMPT) {
-	// prompt_input???????????????B
+	// prompt_input????с?????井?緇???????????
 	if (prompt_input.length() > 0) {
 	    prompt_input.eraseLast(1);
 	}
@@ -581,23 +584,23 @@
 	word_register_mode->handleReturn();
 	
 	if (word_register_mode) {
-	    // handleReturn??wordRegistrationFinished??????word_register_mode?????????
+	    // handleReturn???wordRegistrationFinished????違????word_register_mode???罍?????????? 	    word_register_mode->redisplay();
 	}
 	
-	return true; // ??rue????
+	return true; // 絽吾?true??????
     }
     
     if (status == STATUS_PROMPT) {
 	switch (prompt_type) {
 	case PROMPT_DELETE_FROM_USER_DIC: {
-	    // prompt_input?yes??????TATUS_WHITE_ROOT????
-	    // ??????STATUS_BLACK????
+	    // prompt_input??es?????????STATUS_WHITE_ROOT??????
+	    // ???篁ュ????STATUS_BLACK??????
 	    if (prompt_input == "yes") {
-		// ??+		// ???
 		makeServerRemoveWord();
 		
-		// STATUS_WHITE_ROOT?
+		// STATUS_WHITE_ROOT?? 		if (okuri.length() > 0) {
 		    root += okuri;
 		    root_to_display = root;
@@ -620,9 +623,9 @@
     }
     
     if (ClientConfiguration::theInstance().isSkkEggLikeNewline()) {
-	// skk-egglike-newline??????ｩ??????????????rue????
+	// skk-egglike-newline?≪???????????х∈絎????????????????rue??????
 	
-	// ???????A??????????
+	// ??エ?????????綣桁????腆阪???????
 	parent->fix(getStringToFix());
 	return true;
     }
@@ -633,19 +636,19 @@
 
 bool KanjiConversionMode::handleArrow(SKKChar skkchar) {
     if (word_register_mode) {
-	return word_register_mode->handleArrow(skkchar); // ??+	return word_register_mode->handleArrow(skkchar); // 紮??
     }
     
-    // ????????????handleArrow????getStringToFix()??????????
+    // 綛割皿????潟?????≪????handleArrow????潟?getStringToFix()????吟?????吟????
     parent->getCurrentInputMode().handleArrow(skkchar);
     parent->getCurrentInputMode().getStringToFix();
     
     if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	// ????????
+	// ?上????茖??腆阪?
 	parent->fix(getStringToFix());
     }
     
-    // ????????????B
+    // 羲√?紊????若????篋?????
     parent->setEnabledKanjiMode(false);
     initialize();
     return false;
@@ -656,18 +659,18 @@
 	return word_register_mode->handleCg();
     }
     
-    // ????????????handleCg????getStringToFix()??????????
+    // 綛割皿????潟?????≪????handleCg????潟?getStringToFix()????吟?????吟????
     parent->getCurrentInputMode().handleCg();
     parent->getCurrentInputMode().getStringToFix();
     
     if (status == STATUS_WHITE_ROOT || status == STATUS_WHITE_OKURI) {
-	// ?????????+	// 羲√?紊????若?腟??
 	parent->setEnabledKanjiMode(false);
 	initialize();
     }
     else if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	// root?okuri??????STATUS_WHITE_ROOT?
-	// ?????????????????
+	// root??kuri????ｃ????STATUS_WHITE_ROOT??+	// ????潟????????????????????? 	if (status == STATUS_BLACK_WITH_WINDOW) {
 	    closeCandidatesWindow();
 	}
@@ -699,7 +702,7 @@
     
     if (status == STATUS_WHITE_ROOT) {
 	if (completion_mode) {
-	    // ???????????????????B
+	    // 罨＜?????吾?????障?茵??????????????
 	    current_completion_index++;
 	    if (current_completion_index >= completions.size()) {
 		current_completion_index = 0;
@@ -708,15 +711,15 @@
 	    root_to_display = root;
 	}
 	else {
-	    // currentInputMode?terminate???root?getStringToFix()??????????
+	    // currentInputMode??erminate?????oot??etStringToFix()????????申??????
 	    parent->getCurrentInputMode().terminate();
 	    root += parent->getCurrentInputMode().getStringToFix();
 	    root_to_display.clear().append(root).append(parent->getCurrentInputMode().getStringToDisplay());
 	    
-	    // ?????????
+	    // 薇???????????? 	    askServerTheCompletions();
 	    
-	    // ??????????????????????????
+	    // 茖?????茖??????域?絎??紮???＜????篏???????????
 	    if (completions.size() > 0) {
 		completion_mode = true;
 		root = completions[0];
@@ -738,14 +741,14 @@
 	word_register_mode = NULL;
     }
 
-    // currenInputMode?terminate???root?getStringToFix()??????????
+    // currenInputMode??erminate?????oot??etStringToFix()????????申??????
     parent->getCurrentInputMode().terminate();
     CppCFString to_fix(parent->getCurrentInputMode().getStringToFix());
     if (status == STATUS_WHITE_ROOT) {
 	root += to_fix;
     }
     
-    parent->fix(getStringToFix()); // ????
+    parent->fix(getStringToFix()); // 腆阪????
     parent->setEnabledKanjiMode(false);
     initialize();
 }
@@ -754,7 +757,7 @@
     if(word_register_mode) {
 	CppCFString content = word_register_mode->getContent();
 	if(content.length() > 0) {
-	    // ?????
+	    // 薇????拭?? 	    if(okuri.length() > 0) {
 		if(SKKConfig::UseKanaToOkuri()) {
 #ifdef DEBUG
@@ -768,14 +771,14 @@
 		sendWordToServerToRegister(root, content);
 	    }
 
-	    // ???
-	    parent->fix(content + okuri); // ????????
+	    // 腆阪???+	    parent->fix(content + okuri); // ???篁????????
 
-	    // ??B
+	    // 腟???? 	    parent->setEnabledKanjiMode(false);
 	    initialize();
 	} else {
-	    if(okuri.length() > 0) { // ????????
+	    if(okuri.length() > 0) { // ???篁????????
 		status = STATUS_WHITE_OKURI;
 	    } else {
 		status = STATUS_WHITE_ROOT;
@@ -794,7 +797,7 @@
     parent->updatePencilMenuIcon();
     
     if (status == STATUS_WHITE_ROOT || status == STATUS_WHITE_OKURI) {
-	// root?okuri??????STATUS_WHITE_ROOT?
+	// root??kuri????ｃ????STATUS_WHITE_ROOT?? 	root += okuri;
 	okuri.clear();
 	
@@ -804,36 +807,36 @@
 	status = STATUS_WHITE_ROOT;
     }
     else if (status == STATUS_BLACK) {
-	current_candidate_index = candidates.size() - 1; // ???????
+	current_candidate_index = candidates.size() - 1; // ??????茖????     }
     else if (status == STATUS_BLACK_WITH_WINDOW) {
-	// ???????????????????-	current_candidate_index = show_cands_window_after_Nth_cand - 1; // goToNextCandidatesFrame()?????
+	// ????潟??????????緇??????若??????+	current_candidate_index = show_cands_window_after_Nth_cand - 1; // goToNextCandidatesFrame()?с?????? 	openCandidatesWindow(OpenReverse);
     }
 }
 
 CppCFString KanjiConversionMode::getStringToDisplay() {
     if (word_register_mode) {
-	// ?????????????WordRegisterMode???????????????
+	// ?∴????????????????茹?ordRegisterMode??┃絎?????絖??羹違?????障??? 	return CppCFString().append(kIgnoreThis);
     }
     
     if (status == STATUS_WHITE_ROOT) {
-	// ?root
+	// ??oot
 	return CppCFString().append(0x25bd).append(root_to_display);
     }
     else if (status == STATUS_WHITE_OKURI) {
-	// ?root*okuri
+	// ??oot*okuri
 	return CppCFString().append(0x25bd).append(root_to_display).append('*').append(okuri_to_display);
     }
     else if (status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
 	CppCFString str = convertNumeric(numconv_, candidates[current_candidate_index]);
-	// ??????
+	// ?主憜????茖? 	return CppCFString().append(0x25bc).append(str);
     }
     else if (status == STATUS_PROMPT) {
-	// [?????][??]
+	// [????潟???[?ュ?]
 	return CppCFString('[').append(prompt).append("][").append(prompt_input).append(kCaret).append(']');
     }
     else {
@@ -852,16 +855,16 @@
     else if (status == STATUS_BLACK) {
 	result = convertNumeric(numconv_, candidates[current_candidate_index]);
 
-	// ????
+	// 薇????拭
 	sendCurrentCandidateToServerToRegister();
     }
     else if (status == STATUS_BLACK_WITH_WINDOW) {
 	result = convertNumeric(numconv_, candidates[current_candidate_index]);
 
-	// ????
+	// 薇????拭
 	sendCurrentCandidateToServerToRegister();
 
-	// ??????????
+	// ????潟??????????
 	closeCandidatesWindow();
     }
     else /* if (status == STATUS_NULL) */ {
@@ -869,8 +872,8 @@
 	result = CppCFString().append(kIgnoreThis);
     }
 	
-    // ?????????????fix??????????????????B
-    // ?????B
+    // ???????違????????????ix????????????????ф滋絖???若?腟????+    // ?????????
     parent->setEnabledKanjiMode(false);
     initialize();
     
@@ -891,8 +894,8 @@
 }
 
 void KanjiConversionMode::sendCurrentCandidateToServerToRegister() {
-    // ?????
-    // ?????????????
+    // 薇????拭??+    // ??皿???綛割皿???紊??????
     if(okuri.length() > 0) {
 	if(SKKConfig::UseKanaToOkuri()) {
 #ifdef DEBUG
@@ -901,12 +904,12 @@
 	    sendWordToServerToRegister(
 		HiraganaInputMode::convert(root) + SKKConfig::ConvertKanaToOkuri(okuri[0]), 
 		HiraganaInputMode::convert(okuri),
-		candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???????B
+		candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???篁????????
 	} else {
 	    sendWordToServerToRegister(
 		HiraganaInputMode::convert(root) + okuri_head,
 		HiraganaInputMode::convert(okuri),
-		candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???????B
+		candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???篁????????
 	}
     } else {
 	sendWordToServerToRegister(HiraganaInputMode::convert(root), candidates[current_candidate_index]);
@@ -914,41 +917,41 @@
 }
 
 void KanjiConversionMode::askServerTheCandidates(bool hasOkuri) {
-    // ???????????+?????-?????
+    // ???篁?????????????????????????????     CppCFString query;
     if(hasOkuri) {
 	query.append('+').append(root);
 	if(SKKConfig::UseKanaToOkuri()) {
 	    query.append(SKKConfig::ConvertKanaToOkuri(okuri[0])).append(SKK_MSG_DELIMITER).append(okuri);
 	} else {
-	    // ??????+??r ?
+	    // ?????????+???r ?? 	    query.append(okuri_head).append(SKK_MSG_DELIMITER).append(okuri);
 	}
     } else {
-	// ?????-??
+	// ???????????
 	query = CppCFString().append('-').append(root);
     }
 
-    // ????????????????
+    // ???篁?????茹?皿???綛割皿???紊??     query = HiraganaInputMode::convert(query);
 
     D_PRINTF("query: %s\n",query.toCString(kCFStringEncodingEUC_JP));
 
-    // ?????
+    // 薇??絨????     CppCFData cfdata_query;
     cfdata_query.own(query.toCFData());
 
     current_candidate_index = 0;
     ::askServerTheCandidates(cfdata_query, candidates);
 
-    // ?????????
+    // ???篁?????筝????     if(hasOkuri) {
 	for(unsigned i = 0; i < candidates.size(); ++ i) {
 	    candidates[i] += okuri;
 	}
     }
 
-    // ?????????
+    // ?医?紊?????????
     if(!hasOkuri && ClientConfiguration::theInstance().useNumericConversion() &&
        numconv_.Setup(root.toStdString(kCFStringEncodingUTF8))) {
 	CppCFString normalized(numconv_.NormalizedKey().c_str(), kCFStringEncodingUTF8);
@@ -963,7 +966,7 @@
     }
 }
 
-// ????
+// ????潟?
 void askServerTheCandidates(const CppCFData& query, std::vector<CppCFString>& candidates) {
     CppCFString reply(ServerConnectionFactory::theInstance().newConnection().
 		      send(kSKKMessageSearch, query, kAquaSKKServerRunLoopMode).getData());
@@ -978,8 +981,8 @@
 void KanjiConversionMode::makeServerRemoveWord() {
     CppCFString query;
     if(okuri.length() > 0) {
-	// ??? ?????+??r ? ?
-	// ???????????????????????
+	// ????????????????r ????+	// 茯???????????茹?皿??????篁????抗篁??????? 	query.append('+');
 	if (SKKConfig::UseKanaToOkuri()) {
 #ifdef DEBUG
@@ -990,30 +993,30 @@
 	    query.append(HiraganaInputMode::convert(root)).append(okuri_head);
 	}
 	query.append(SKK_MSG_DELIMITER).append(
-	    candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???????B
+	    candidates[current_candidate_index].clone().eraseLast(okuri.length())); // ???篁????????
     } else {
-	// ?? ?????-?? ??
-	// ???????????????????????
+	// ??? 篁?????????? 篁??
+	// 茯???????????茹?皿??????篁????抗篁??????? 	query.append('-').append(HiraganaInputMode::convert(root)).append(SKK_MSG_DELIMITER);
 	query.append(candidates[current_candidate_index]);
     }
 
-    // ????
+    // 薇??羝＜?
     CppCFData cfdata_query;
     cfdata_query.own(query.toCFData());
     ::makeServerRemoveWord(cfdata_query);
 }
 
-// ????
+// ????潟?
 void makeServerRemoveWord(const CppCFData& query) {
     ServerConnectionFactory::theInstance().newConnection().send(kSKKRemoveThisFromUserDic, query);
 }
 
 void KanjiConversionMode::askServerTheCompletions() {
-    // ????????????????
+    // ???篁?????茹?皿???綛割皿???紊??     CppCFString query = HiraganaInputMode::convert(root);
 
-    // ?????
+    // 薇??絨????     CppCFData cfdata_query;
     cfdata_query.own(query.toCFData());
 
@@ -1028,7 +1031,7 @@
     completions = reply.split(SKK_MSG_DELIMITER);
 }
 
-// ????
+// ????潟?
 void sendWordToServerToRegister(const CppCFString& index,const CppCFString& okuri,const CppCFString& kanji) {
     CppCFData query;
 
@@ -1060,6 +1063,15 @@
     ServerConnectionFactory::theInstance().newConnection().send(kSKKRegisterThisToUserDic, query);
 }
 
+// ?????????腟??????蚊???+void registerToggleEntry(const CppCFString& entry) {
+    CppCFData query;
+
+    query.own(HiraganaInputMode::convert(entry).toCFData());
+
+    ServerConnectionFactory::theInstance().newConnection().send(kSKKRegisterToggleEntry, query);
+}
+
 void KanjiConversionMode::openCandidatesWindow(OpenDirection mode) {
     std::vector<CppCFString> cands_without_okuri;
     unsigned okuri_length = okuri.length();
@@ -1083,7 +1095,7 @@
 			   current_candidate_index, candidates.size(), mode);
 }
 
-// ????
+// ????潟?
 void openCandidatesWindow(const CppCFString& str_candidates,
 			  unsigned& window_id,
 			  unsigned& cands_per_frame,
@@ -1092,7 +1104,7 @@
 			  unsigned& current_index,
 			  size_t num_of_candidates,
 			  SInt16 open_direction) {
-    // ???????????????????
+    // ?ゃ?????喝????茵????????臀???????     struct OffsetToPosParams offset_to_pos_params;
     offset_to_pos_params.fRefCon = 0;
     offset_to_pos_params.fTextOffset = 0;
@@ -1103,7 +1115,7 @@
     SInt16 qd_x = offset_to_pos_params.fReplyPoint.h;
     SInt16 qd_y = offset_to_pos_params.fReplyPoint.v;
 
-    // ??????????CFData????
+    // ?泣?????????????CFData??????
     CppCFData cands_to_be_attached;
     cands_to_be_attached.own(str_candidates.toCFData());
     CppCFData attachment;
@@ -1112,14 +1124,14 @@
     attachment.append(CFSwapInt16HostToBig(open_direction));
     attachment.append(cands_to_be_attached);
 
-    // ???
+    // ???拭
     CppCFData reply(ServerConnectionFactory::theInstance().newConnection().
 		    send(kSKKCreateCandidatesWindow, attachment, kAquaSKKServerRunLoopMode));
 
-    // ????????????????
-    // +0  ??????ID             ????2?????
-    // +2  1??????ｦ??????  ????2?????
-    // +4  ?????                 ????2?????
+    // 菴?????????若????茹ｃ????絖??
+    // +0  ????御??脂?ID             膃?埇???????????+    // +2  1????若???；腓冴????茖???? 膃?埇???????????+    // +4  ????若???                膃?埇???????????     //CppCFData reply(reply_data);
     window_id = CFSwapInt16BigToHost(reply.getUInt16(0));
     cands_per_frame = CFSwapInt16BigToHost(reply.getUInt16(2));
@@ -1133,7 +1145,7 @@
     }
 }
 
-// ????
+// ????潟?
 CppCFData newCFDataRefWithWindowID(unsigned window_id) {
     CppCFData result;
     result.append(static_cast<UInt16>(CFSwapInt16HostToBig(window_id)));
@@ -1142,35 +1154,35 @@
 }
 
 void KanjiConversionMode::goToNextCandidatesFrame() {
-    // ?????ID(UInt16)???CFData??????????
+    // ????潟???D(UInt16)?????FData??????????檎????
     CppCFData reply(ServerConnectionFactory::theInstance().newConnection().
 		    send(kSKKCandidatesWindowNext, newCFDataRefWithWindowID(candidates_window_id),
 			 kAquaSKKServerRunLoopMode));
 
-    // ?????????????????
+    // ?上???????????激??ゃ?????＜???     ++ candidates_window_current_frame;
 
-    // ????????????????????????
+    // ?上????茖???激?????若?綵?????????医?紜?????
     current_candidate_index += candidates_window_cands_per_frame;
     candidates_window_cands_per_frame = CFSwapInt16BigToHost(reply.getUInt16(0));
 }
 
 void KanjiConversionMode::goToPrevCandidatesFrame() {
-    // ?????ID(UInt16)???CFData??????????
+    // ????潟???D(UInt16)?????FData??????????檎????
     CppCFData reply(ServerConnectionFactory::theInstance().newConnection().
 		    send(kSKKCandidatesWindowPrev, newCFDataRefWithWindowID(candidates_window_id),
 			 kAquaSKKServerRunLoopMode));
 
-    // ????????????????
+    // ?上???????????激????????潟?
     -- candidates_window_current_frame;
 
-    // ????????????????????????
+    // ?上????茖???激?????若?綵?????????医?羝?????
     candidates_window_cands_per_frame = CFSwapInt16BigToHost(reply.getUInt16(0));
     current_candidate_index -= candidates_window_cands_per_frame;
 }
 
 void KanjiConversionMode::closeCandidatesWindow() {
-    // ?????ID(UInt16)???CFData??????????
+    // ????潟???D(UInt16)?????FData??????????檎????
     ServerConnectionFactory::theInstance().newConnection().
 	send(kSKKCloseCandidatesWindow, newCFDataRefWithWindowID(candidates_window_id));
 }
@@ -1182,7 +1194,7 @@
 
     check.insert(CppCFString(numconv.OriginalKey().c_str(), kCFStringEncodingUTF8));
 
-    // ??+    // 羣??
     for(std::vector<CppCFString>::iterator iter = master.begin(); iter != master.end(); ++ iter) {
 	if(check.find(*iter) != check.end()) continue;
 
@@ -1190,7 +1202,7 @@
 	result.push_back(*iter);
     }
 
-    // ???
+    // ?????     for(std::vector<CppCFString>::iterator iter = cands.begin(); iter != cands.end(); ++ iter) {
 	CppCFString target(convertNumeric(numconv, *iter));
 	if(check.find(target) != check.end()) continue;
Index: AquaSKK/KanjiConversionMode.h
diff -u AquaSKK/KanjiConversionMode.h:1.7 AquaSKK/KanjiConversionMode.h:1.8
--- AquaSKK/KanjiConversionMode.h:1.7	Mon Dec 18 00:05:41 2006
+++ AquaSKK/KanjiConversionMode.h	Tue Jun 12 23:25:08 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: KanjiConversionMode.h,v 1.7 2006/12/17 15:05:41 t-suwa Exp $
+  $Id: KanjiConversionMode.h,v 1.8 2007/06/12 14:25:08 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2006 Tomotaka SUWA <t.suwa ＠ mac.com>
+  Copyright (C) 2006-2007 Tomotaka SUWA <t.suwa ＠ mac.com>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,41 +39,41 @@
     NumericConverter numconv_;
 
 protected:
-    static const int STATUS_NULL = 0; // ????????????????B??????????
-    static const int STATUS_WHITE_ROOT = 1; // ???????????????
-    static const int STATUS_WHITE_OKURI = 2; // ???????????????
-    static const int STATUS_BLACK = 3; // ????
-    static const int STATUS_BLACK_WITH_WINDOW = 4; // ??????????????????????
-    static const int STATUS_PROMPT = 5; // ???????????B
+    static const int STATUS_NULL = 0; // 羲√?紊????若?????ｃ?????????????????????????
+    static const int STATUS_WHITE_ROOT = 1; // ?純??若??с????篁??????????+    static const int STATUS_WHITE_OKURI = 2; // ?純??若??с????篁????????緇?+    static const int STATUS_BLACK = 3; // ?若??若?
+    static const int STATUS_BLACK_WITH_WINDOW = 4; // ?若??若??с?????御?????潟?????????????
+    static const int STATUS_PROMPT = 5; // ????潟?????冴???????
 
-    WordRegisterMode* word_register_mode; // NULL?????????????????
+    WordRegisterMode* word_register_mode; // NULL?с???????茯???蚊??若???儀??賢?? 
     int status;
-    CppCFString root; // ??????????????????????
-    CppCFString okuri; // ???????????????????
-    UniChar okuri_head; // ????????????????????????r?
-    CppCFString root_to_display,okuri_to_display; // ???ｦ????????????????????
-
-    static const int PROMPT_DELETE_FROM_USER_DIC = 1; // ????ｫ???P????-    int prompt_type; // ?????????
-    CppCFString prompt; // ?????
-    CppCFString prompt_input; // ??????????????????
-
-    std::vector<CppCFString> candidates; // ?????
-    unsigned current_candidate_index; // ???????
-
-    unsigned show_cands_window_after_Nth_cand; // ????????????????????ｦ????
-
-    unsigned candidates_window_id; // status?STATUS_BLACK_WITH_WINDOW??????????????ID?
-    unsigned candidates_window_current_frame; // ?????????????????
-    unsigned candidates_window_cands_per_frame; // ??????????1???????????
-    unsigned candidates_window_num_of_frames; // ???????????????
-
-    bool completion_mode; // ???????[?????????????????????????????
-    std::vector<CppCFString> completions; // ?????
-    unsigned current_completion_index; // ??????????
+    CppCFString root; // ???篁???????????箴?????????????????+    CppCFString okuri; // ???篁????????箴????????????????+    UniChar okuri_head; // ???篁????????????＜???????鐚???????????r??+    CppCFString root_to_display,okuri_to_display; // ?脂?茵?ず????ュ???賢???????＜?????????????
+
+    static const int PROMPT_DELETE_FROM_USER_DIC = 1; // ????吟?莨?????????????+    int prompt_type; // ????潟????腮????+    CppCFString prompt; // ????潟???+    CppCFString prompt_input; // ????潟????????吟??????????絖??
+
+    std::vector<CppCFString> candidates; // ??????茖?+    unsigned current_candidate_index; // ?上????茖????+
+    unsigned show_cands_window_after_Nth_cand; // 篏????札?????????茖??????ゃ??????；腓冴??????+
+    unsigned candidates_window_id; // status??TATUS_BLACK_WITH_WINDOW??????????御?????潟????ID??+    unsigned candidates_window_current_frame; // ????御?????潟?????上?????????+    unsigned candidates_window_cands_per_frame; // ????御?????潟????1????若?綵??????????+    unsigned candidates_window_num_of_frames; // ????御?????潟????????若???+
+    bool completion_mode; // 荀?????茖???≪????????≪???????????????????茖?????篏??篏帥??????+    std::vector<CppCFString> completions; // 茖?????茖?+    unsigned current_completion_index; // ?上????絎???????? 
-    bool henkanModeStatus;	//?????????????B
+    bool henkanModeStatus;	//?上?紊????????????????? 
     virtual void startRegisteringWord();
     virtual void askServerTheCandidates(bool hasOkuri);
@@ -101,14 +101,15 @@
     virtual CppCFString getStringToDisplay();
     virtual CppCFString getStringToFix();
 
-    virtual void wordRegistrationFinished(); // WordRegisterMode???
-    virtual void wordRegistrationCanceled(); // WordRegisterMode???
+    virtual void wordRegistrationFinished(); // WordRegisterMode絨????+    virtual void wordRegistrationCanceled(); // WordRegisterMode絨???? };
 
 void askServerTheCandidates(const CppCFData& query, std::vector<CppCFString>& candidates);
 void addCandidate(const CppCFString& candidate, std::vector<CppCFString>& candidates);
 void sendWordToServerToRegister(const CppCFString& index,const CppCFString& okuri,const CppCFString& kanji);
 void sendWordToServerToRegister(const CppCFString& index,const CppCFString& kanji);
+void registerToggleEntry(const CppCFString& entry);
 void askServerTheCompletions(const CppCFData& query, std::vector<CppCFString>& completions);
 void makeServerRemoveWord(const CppCFData& query);
 void openCandidatesWindow(const CppCFString& str_candidates,
Index: AquaSKK/ServerMessageReceiver.h
diff -u AquaSKK/ServerMessageReceiver.h:1.5 AquaSKK/ServerMessageReceiver.h:1.6
--- AquaSKK/ServerMessageReceiver.h:1.5	Wed Apr 26 22:36:12 2006
+++ AquaSKK/ServerMessageReceiver.h	Tue Jun 12 23:25:08 2007
@@ -1,10 +1,10 @@
 /*
-  $Id: ServerMessageReceiver.h,v 1.5 2006/04/26 13:36:12 t-suwa Exp $
+  $Id: ServerMessageReceiver.h,v 1.6 2007/06/12 14:25:08 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2005 Tomotaka SUWA <t.suwa ＠ mac.com>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suwa ＠ mac.com>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,7 +21,8 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#pragma once
+#ifndef INC__ServerMessageReceiver__
+#define INC__ServerMessageReceiver__
 
 #include <Carbon/Carbon.h>
 #include <exception>
@@ -30,7 +31,7 @@
 class CppCFData;
 
 /*
-  ?????????????????????????
+  ????ゃ??潟???????????若????????????鴻????
 */
 
 class ServerMessageReceiver: public CppMessagePortServer {
@@ -44,6 +45,7 @@
     CppCFData candidatesWindowPrev(const CppCFData& attachment);
     void closeCandidatesWindow(const CppCFData& attachment);
     void registerThisToUserDic(const CppCFData& attachment);
+    void registerToggleEntry(const CppCFData& attachment);
     void removeThisFromUserDic(const CppCFData& attachment);
     void showAboutBox();
     void showPreferencesBox();
@@ -53,3 +55,5 @@
 public:
     static void start(const CFStringRef loopMode);
 };
+
+#endif
Index: AquaSKK/ServerMessageReceiver.mm
diff -u AquaSKK/ServerMessageReceiver.mm:1.8 AquaSKK/ServerMessageReceiver.mm:1.9
--- AquaSKK/ServerMessageReceiver.mm:1.8	Mon Dec 18 00:05:41 2006
+++ AquaSKK/ServerMessageReceiver.mm	Tue Jun 12 23:25:08 2007
@@ -1,10 +1,10 @@
 /* -*- objc -*-
-  $Id: ServerMessageReceiver.mm,v 1.8 2006/12/17 15:05:41 t-suwa Exp $
+  $Id: ServerMessageReceiver.mm,v 1.9 2007/06/12 14:25:08 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
   Copyright (C) 2002 phonohawk
-  Copyright (C) 2005-2006 Tomotaka SUWA <t.suwa ＠ mac.com>
+  Copyright (C) 2005-2007 Tomotaka SUWA <t.suwa ＠ mac.com>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -51,13 +51,13 @@
 CppCFData ServerMessageReceiver::messageReceived(SInt32 msgid, const CppCFData& packet) {
     CppCFData reply;
 
-    // ????????B???????PSN???????
+    // ??????????冴????????≪????PSN????ｃ??????     BasicMessageHeader header;
     if(packet.getLength() > 0) {
 	packet.copyData(0, sizeof(BasicMessageHeader), &header);
     }
 
-    // PSN ? Host Endian ???
+    // PSN ??Host Endian ????? #define Big2Host32(arg)	arg = CFSwapInt32BigToHost(arg)
     Big2Host32(header.fProcessSerialNumber.highLongOfPSN);
     Big2Host32(header.fProcessSerialNumber.lowLongOfPSN);
@@ -68,10 +68,10 @@
     }
 
     switch(msgid) {
-    case kBasicMessageActivated: // ????????????????
+    case kBasicMessageActivated: // ????ゃ??潟????????ｃ?????ｃ?
 	ClientConnectionFactory::theInstance().setDefaultTarget(header.fProcessSerialNumber);
 	break;
-    case kBasicMessageDeactivated: { // ??????????????????
+    case kBasicMessageDeactivated: { // ????ゃ??潟????????ｃ??с??????? 	ProcessSerialNumber psn;
 	psn.highLongOfPSN = 0;
 	psn.lowLongOfPSN = kNoProcess;
@@ -79,7 +79,7 @@
 	ClientConnectionFactory::theInstance().setDefaultTarget(psn);
 	break;
     }
-    case kBasicMessageHidePalettes: // ?????????TSM???ｦ????
+    case kBasicMessageHidePalettes: // ??????????????SM?????ず????ｃ?
 	break;
     case kSKKMessageSearch:
 	reply = searchWord(body);
@@ -99,6 +99,9 @@
     case kSKKRegisterThisToUserDic:
 	registerThisToUserDic(body);
 	break;
+    case kSKKRegisterToggleEntry:
+	registerToggleEntry(body);
+	break;
     case kSKKRemoveThisFromUserDic:
 	removeThisFromUserDic(body);
 	break;
@@ -141,7 +144,7 @@
     std::string query = data.toStdString(kCFStringEncodingUTF8).substr(1);
     std::string result;
 
-    // ?????
+    // ??????鐚?     if(data[0] == '+') {
 	int pos = query.find_first_of(SKK_MSG_DELIMITER);
 
@@ -159,7 +162,7 @@
 }
 
 CppCFData ServerMessageReceiver::createCandidatesWindow(const CppCFData& attachment) {
-    // ????????QuickDraw???UniChar???????
+    // 菴遵?????帥????QuickDraw綺ф???niChar???????????     SInt16 qd_x = CFSwapInt16BigToHost(attachment.getSInt16(0));
     SInt16 qd_y = CFSwapInt16BigToHost(attachment.getSInt16(2));
     int showLast = CFSwapInt16BigToHost(attachment.getSInt16(4));
@@ -217,7 +220,7 @@
 
     std::string query = data.toStdString(kCFStringEncodingUTF8).substr(1);
 
-    // ?????
+    // ??????鐚?     if(data[0] == '+') {
 	int pos1 = query.find_first_of(SKK_MSG_DELIMITER);
 	int pos2 = query.find_first_of(SKK_MSG_DELIMITER, pos1 + 1);
@@ -237,6 +240,15 @@
     }
 }
 
+void ServerMessageReceiver::registerToggleEntry(const CppCFData& attachment) {
+    CppCFString data(attachment.getData());
+
+    std::string key = data.toStdString(kCFStringEncodingUTF8);
+
+    // 荀?????????脂????
+    DictionarySet::theInstance().RegisterOkuriNasi(key, "");
+}
+
 void ServerMessageReceiver::removeThisFromUserDic(const CppCFData& attachment) {
     CppCFString data(attachment.getData());
 
@@ -247,7 +259,7 @@
     std::string key = query.substr(0, pos);
     std::string kanji = query.substr(pos + 1);
 
-    // ?????
+    // ??????鐚?     if(data[0] == '+') {
 	DictionarySet::theInstance().RemoveOkuriAri(key, kanji);
     } else {

From t-suwa ＠ users.sourceforge.jp  Thu Jun 14 21:00:17 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Thu, 14 Jun 2007 21:00:17 +0900
Subject: [aquaskk-changes 316]  CVS update: AquaSKK
Message-ID: <20070614120017.35B892AC018@users.sourceforge.jp>

Index: AquaSKK/AsciiConversionMode.cpp
diff -u AquaSKK/AsciiConversionMode.cpp:1.10 AquaSKK/AsciiConversionMode.cpp:1.11
--- AquaSKK/AsciiConversionMode.cpp:1.10	Sat Feb  3 13:04:21 2007
+++ AquaSKK/AsciiConversionMode.cpp	Thu Jun 14 21:00:16 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: AsciiConversionMode.cpp,v 1.10 2007/02/03 04:04:21 t-suwa Exp $
+  $Id: AsciiConversionMode.cpp,v 1.11 2007/06/14 12:00:16 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -33,7 +33,8 @@
 
 AsciiConversionMode::AsciiConversionMode(ParentInputMode& src)
     :ChildInputMode(src),
-     word_register_mode(NULL),
+     word_register_mode(0),
+     old_word_register_mode(0),
      status(STATUS_NULL),
      show_cands_window_after_Nth_cand(5),
      completion_mode(false),
@@ -42,9 +43,8 @@
 }
 
 AsciiConversionMode::~AsciiConversionMode() {
-    if(word_register_mode) {
-	delete word_register_mode;
-    }
+    delete word_register_mode;
+    delete old_word_register_mode;
 }
 
 void AsciiConversionMode::start() {
@@ -61,12 +61,12 @@
 bool AsciiConversionMode::handleInputChar(SKKChar skkchar) {
     if(word_register_mode) {
 	word_register_mode->handleInput(skkchar);
-	return false; // WordRegisterMode::handleInput()???????????????
+	return false; // WordRegisterMode::handleInput()????????????腆阪?????????     }
 
     if(SKKConfig::AbbrevNextKey() == skkchar) {
 	if(status == STATUS_WHITE && completion_mode) {
-	    // ???????????????????B
+	    // 罨＜?????吾?????障?茵??????????????
 	    current_completion_index++;
 	    if (current_completion_index >= completions.size()) {
 		current_completion_index = 0;
@@ -78,7 +78,7 @@
 
     if(SKKConfig::AbbrevPrevKey() == skkchar) {
 	if(status == STATUS_WHITE && completion_mode) {
-	    // ??????????s?????????
+	    // ???????吾?????障?茵??????????????
 	    if(current_completion_index == 0) {
 		current_completion_index = completions.size() - 1;
 	    } else {
@@ -89,14 +89,14 @@
 	}
     }
 
-    // tab,????,?????????????????????????????
+    // tab,??????,?????札紊???????????????????????絎???若?????????     completion_mode = false;
 
     if(SKKConfig::ToggleKanaKey() == skkchar) {
 	if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	    // ?????????
-	    // 1) ?????????????????
-	    // 2) ?????????????
+	    // ?上????茖??腆阪???+	    // 1) 綛割皿????若?????????皿????若???+	    // 2) ???篁ュ????綛割皿????若??? 	    parent->setEnabledKanjiMode(false);
 	    if(parent->isHiraganaInputMode()) {
 		parent->goZenKataInputMode();
@@ -109,7 +109,7 @@
 
     if(SKKConfig::PrevKouhoKey() == skkchar) {
 	if(status == STATUS_BLACK) {
-	    // ???????????????????[?????
+	    // 筝?????????吾???????茖???ｃ?????≪?????祉??? 	    if(current_candidate_index > 0) {
 		current_candidate_index--;
 	    } else {
@@ -118,17 +118,17 @@
 	    return false;
 	}
 	else if(status == STATUS_BLACK_WITH_WINDOW) {
-	    // delete???????????
+	    // delete????????????荀???? 	    handleBackSpace();
 	    return false;
 	}
-	// ?????????
+	// ???篁ュ????膣????     }
 
     if(SKKConfig::PurgeFromJisyoKey() == skkchar) {
 	if(status == STATUS_BLACK) {
-	    // ??v???????B?????ﾀ?????ｫ??????????????-	    // ??????????????????????????????
+	    // ???????潟?????冴??????????絎??????吟?莨??????ｃ???????????????+	    // ?√?????с????????????∈茯??????????????????ャ????
 	    status = STATUS_PROMPT;
 	    prompt_type = PROMPT_DELETE_FROM_USER_DIC;
 	    prompt_input.clear();
@@ -144,7 +144,7 @@
 
     if(SKKConfig::ToggleKatakanaKey() == skkchar) {
 	if(status == STATUS_WHITE) {
-	    // ????????????????????????+	    // ????掩?絖??????掩?絖??紊????????∈絎?????篋? 	    parent->fix(ZenAscInputMode::convert(index));
 
 	    parent->setEnabledAsciiConversionMode(false);
@@ -153,9 +153,9 @@
 	    return false;
 	}
 	if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	    // ?????????????
-	    // 1) ?????????????????
-	    // 2) ?????????????????
+	    // ?上????茖??腆阪?????????+	    // 1) ?????皿????若????綛割皿????若???+	    // 2) ???篁ュ?????????皿??皿????若??? 	    parent->setEnabledAsciiConversionMode(false);
 	    if (parent->isHanKataInputMode()) {
 		parent->goHiraganaInputMode();
@@ -167,12 +167,12 @@
     }
 
     if(SKKConfig::KakuteiKey() == skkchar) {
-	return true; // ????
+	return true; // 腆阪????
     }
 
     if(SKKConfig::LatinModeKey() == skkchar || SKKConfig::Jisx0208LatinModeKey() == skkchar) {
 	if(status == STATUS_BLACK) {
-	    // ???????????/??????????
+	    // ????????∈絎?????茹?????掩?絖???若??吾?
 	    if(SKKConfig::LatinModeKey() == skkchar) {
 		parent->goHanAscInputMode();
 	    } else {
@@ -180,7 +180,7 @@
 	    }
 	    return true;
 	}
-	// ?????????????????
+	// ?純??若????茖??????≪?????????     }
 
     if(SKKConfig::SetHenkanPointKey() == skkchar) {
@@ -201,67 +201,67 @@
     if(SKKConfig::NextKouhoKey() == skkchar) {
 	if(status == STATUS_WHITE) {
 	    if(index.length() == 0) {
-		// ??+		// 腟??
 		parent->setEnabledAsciiConversionMode(false);
 		parent->display(CppCFString());
 		initialize();
 		return false;
 	    }
 
-	    // ???????
+	    // 薇????????? 	    askServerTheCandidates();
 
 	    if(candidates.size() > 0) {
-		// ??????????????
+		// ?????????????若??若??吾?
 		status = STATUS_BLACK;
-		current_candidate_index = 0; // ?????B
+		current_candidate_index = 0; // ??????茖??
 	    } else {
-		// ????????????????
+		// 筝?????茖???＜????茯???臥?紮??
 		startRegisteringWord();
 	    }
 	}
 	else if(status == STATUS_BLACK) {
-	    // ?????
+	    // 罨＜?????? 	    current_candidate_index++;
 
-	    if(current_candidate_index >= candidates.size()) { // ?????s??????????
+	    if(current_candidate_index >= candidates.size()) { // 腟??????ц??ｃ????茯???臥?紮??
 		startRegisteringWord();
 	    }
 	    else if(current_candidate_index >= show_cands_window_after_Nth_cand - 1) {
-		// ????????????????????????ｦ???
+		// ???篁ラ?????若??若??с??у?茖??????ゃ??????；腓冴????
 		status = STATUS_BLACK_WITH_WINDOW;
 		openCandidatesWindow();
 	    }
 	}
 	else if(status == STATUS_BLACK_WITH_WINDOW) {
 	    if(candidates_window_current_frame < candidates_window_num_of_frames - 1) {
-		// ???????????????????????
+		// ??????????????????????????????茵???? 		goToNextCandidatesFrame();
 	    } else {
-		// ????????????????????
+		// ?????????????ｃ????????脂????紮??
 		closeCandidatesWindow();
 		startRegisteringWord();
 	    }
 	}
     } else {
 	if(status == STATUS_WHITE) {
-	    // index??????
+	    // index?????申???
 	    index += skkchar;
 	}
 	else if(status == STATUS_BLACK) {
-	    // ?????????????p?
+	    // ?上????茖??腆阪??????????膓? 	    parent->fix(getStringToFix());
 	    return parent->handleInput(skkchar);
 	}
 	else if(status == STATUS_BLACK_WITH_WINDOW) {
-	    // asdfjkl?1????????????7????????????B????????
-	    // ????????????
-	    // ????????????????????
+	    // asdfjkl鐚?????若?綵?????????違?7???絨??????違????羝????????絖???????+	    // ???????????∈絎?????
+	    // ????с?????亥憜????茖?????腆阪?????? 	    int cand_index = CppCFString("asdfjkl").substring(0, candidates_window_cands_per_frame).indexOf(skkchar);
 	    if(cand_index != -1) {
 		unsigned new_index = current_candidate_index + cand_index;
 		if(new_index < candidates.size()) {
-		    // ???????????????????
+		    // ????ゃ????????鴻?荐宴???????腆阪??? 		    current_candidate_index = new_index;
 		    return true;
 		}
@@ -269,7 +269,7 @@
 	    return false;
 	}
 	else if(status == STATUS_PROMPT) {
-	    // ????prompt_input????
+	    // ????障?prompt_input??申???
 	    prompt_input += skkchar;
 	}
     }
@@ -284,7 +284,7 @@
 bool AsciiConversionMode::handleBackSpace() {
     if(word_register_mode) {
 	word_register_mode->handleBackSpace();
-	return true; // WordRegisterMode::handleBackSpace()???????????????B
+	return true; // WordRegisterMode::handleBackSpace()????????????????????????
     }
 
     if(status == STATUS_NULL) {
@@ -292,32 +292,32 @@
     }
 
     if(status == STATUS_WHITE) {
-	// index?????????I?
-	// ??????index?????????B
+	// index???????????????篋?+	// 腥冴???????index???緇???????????
 	if(index.length() == 0) {
 	    parent->setEnabledAsciiConversionMode(false);
 	    parent->display(CppCFString());
 	    initialize();
 	} else {
-	    completion_mode = false; // ??????????????[??????
+	    completion_mode = false; // 茖???≪?????ｃ??翫????絎???若????????? 	    index.eraseLast(1);
 	}
     }
     else if(status == STATUS_BLACK) {
-	// ???????????????+	// ?上????茖??腆阪????筝??絖???? 	CppCFString str(getStringToFix());
 	str.eraseLast(1);
 	parent->fix(str);
 	parent->display(CppCFString());
     }
     else if(status == STATUS_BLACK_WITH_WINDOW) {
-	// ???t?????????????
-	// ???????????????
+	// ????????????????若??若??御???+	// ????с?????医???????????? 	if(candidates_window_current_frame == 0) {
-	    // ????????????
+	    // ????潟???????????祉?
 	    current_candidate_index = show_cands_window_after_Nth_cand - 2;
 
-	    // ??????????
+	    // ????潟??????????
 	    closeCandidatesWindow();
 
 	    status = STATUS_BLACK;
@@ -326,7 +326,7 @@
 	}
     }
     else if(status == STATUS_PROMPT) {
-	// prompt_input???????????????B
+	// prompt_input????с?????井?緇???????????
 	if(prompt_input.length() > 0) {
 	    prompt_input.eraseLast(1);
 	}
@@ -339,23 +339,23 @@
 	word_register_mode->handleReturn();
 
 	if(word_register_mode) {
-	    // handleReturn??wordRegistrationFinished??????word_register_mode?????????
+	    // handleReturn???wordRegistrationFinished????違????word_register_mode???罍?????????? 	    word_register_mode->redisplay();
 	}
 
-	return true; // ??rue????
+	return true; // 絽吾?true??????
     }
 
     if(status == STATUS_PROMPT) {
 	switch(prompt_type) {
 	case PROMPT_DELETE_FROM_USER_DIC: {
-	    // prompt_input?yes??????TATUS_WHITE????
-	    // ??????STATUS_BLACK????
+	    // prompt_input??es?????????STATUS_WHITE??????
+	    // ???篁ュ????STATUS_BLACK??????
 	    if(prompt_input == "yes") {
-		// ??+		// ???
 		makeServerRemoveWord();
 
-		// STATUS_WHITE?
+		// STATUS_WHITE?? 		status = STATUS_WHITE;
 	    } else {
 		status = STATUS_BLACK;
@@ -370,8 +370,8 @@
     }
 
     if(ClientConfiguration::theInstance().isSkkEggLikeNewline()) {
-	// skk-egglike-newline??????ｩ??????????????rue????
-	// ????
+	// skk-egglike-newline?≪???????????х∈絎????????????????rue??????
+	// 薇????拭
 	parent->fix(getStringToFix());
 	return true;
     } else {
@@ -381,15 +381,15 @@
 
 bool AsciiConversionMode::handleArrow(SKKChar skkchar) {
     if(word_register_mode) {
-	return word_register_mode->handleArrow(skkchar); // ??+	return word_register_mode->handleArrow(skkchar); // 紮??
     }
     
     if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	// ??????????
+	// ?上????茖??腆阪????
 	parent->fix(getStringToFix());
     }
     
-    // ??????????????B
+    // ?≪????紊????若????篋?????
     parent->setEnabledAsciiConversionMode(false);
     initialize();
     return false;
@@ -400,18 +400,18 @@
 	return word_register_mode->handleCg();
     }
     
-    // ????????????handleCg????getStringToFix()??????????
+    // 綛割皿????潟?????≪????handleCg????潟?getStringToFix()????吟?????吟????
     parent->getCurrentInputMode().handleCg();
     parent->getCurrentInputMode().getStringToFix();
     
     if(status == STATUS_WHITE) {
-	// ???????????+	// ?≪????紊????若?腟??
 	parent->setEnabledAsciiConversionMode(false);
 	initialize();
     }
     else if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
-	// okuri????STATUS_WHITE_ROOT?????????STATUS_WHITE_OKURI??
-	// ?????????????????
+	// okuri??????STATUS_WHITE_ROOT?吾?????с??????TATUS_WHITE_OKURI?吾?
+	// ????潟????????????????????? 	if(status == STATUS_BLACK_WITH_WINDOW) {
 	    closeCandidatesWindow();
 	}
@@ -436,17 +436,17 @@
     
     if(status == STATUS_WHITE) {
 	if(completion_mode) {
-	    // ???????????????????B
+	    // 罨＜?????吾?????障?茵??????????????
 	    current_completion_index++;
 	    if(current_completion_index >= completions.size()) {
 		current_completion_index = 0;
 	    }
 	    index = completions[current_completion_index];
 	} else {
-	    // ?????????
+	    // 薇???????????? 	    askServerTheCompletions();
 
-	    // ??????????????????????????
+	    // 茖?????茖??????域?絎??紮???＜????篏???????????
 	    if(completions.size() > 0) {
 		completion_mode = true;
 		index = completions[0];
@@ -461,72 +461,78 @@
 void AsciiConversionMode::terminate() {
     if(word_register_mode) {
 	word_register_mode->terminate();
+	resetRegistrationMode();
     }
 
-    parent->fix(getStringToFix()); // ????
+    parent->fix(getStringToFix()); // 腆阪????
     parent->setEnabledAsciiConversionMode(false);
     initialize();
 }
 
+// ?翫????茯???蚊??若?????ゃ???憜????茯???蚊??若?????帥???+void AsciiConversionMode::resetRegistrationMode() {
+    delete old_word_register_mode;
+    old_word_register_mode = word_register_mode;
+    word_register_mode = 0;
+}
+
 void AsciiConversionMode::wordRegistrationFinished() {
     if(word_register_mode) {
 	CppCFString content = word_register_mode->getContent();
 	if(content.length() > 0) {
-	    // ????
+	    // 薇????拭
 	    sendWordToServerToRegister(index,content);
 
-	    // ??
+	    // 腆阪?
 	    parent->fix(content);
 
-	    // ??+	    // 腟??
 	    parent->setEnabledAsciiConversionMode(false);
 	    initialize();
 	} else {
 	    status = STATUS_WHITE;
 	}
 
-	delete word_register_mode;
-	word_register_mode = NULL;
+	resetRegistrationMode();
 	parent->updatePencilMenuIcon();
     }
 }
 
 void AsciiConversionMode::wordRegistrationCanceled() {
-    delete word_register_mode;
-    word_register_mode = NULL;
+    resetRegistrationMode();
     parent->updatePencilMenuIcon();
     
     if(status == STATUS_WHITE) {
 	// do nothing
     }
     else if(status == STATUS_BLACK) {
-	current_candidate_index = candidates.size() - 1; // ???????
+	current_candidate_index = candidates.size() - 1; // ??????茖????     }
     else if(status == STATUS_BLACK_WITH_WINDOW) {
-	// ???????????????????-	current_candidate_index = show_cands_window_after_Nth_cand - 1; // goToNextCandidatesFrame()?????
+	// ????潟??????????緇??????若??????+	current_candidate_index = show_cands_window_after_Nth_cand - 1; // goToNextCandidatesFrame()?с?????? 	openCandidatesWindow(OpenReverse);
     }
 }
 
 CppCFString AsciiConversionMode::getStringToDisplay() {
     if(word_register_mode) {
-	// ?????????????WordRegisterMode???????????????
+	// ?∴????????????????茹?ordRegisterMode??┃絎?????絖??羹違?????障??? 	return CppCFString().append(kIgnoreThis);
     }
     
     if(status == STATUS_WHITE) {
-	// ?index
+	// ??ndex
 	return CppCFString().append(0x25bd).append(index);
     }
     else if(status == STATUS_BLACK || status == STATUS_BLACK_WITH_WINDOW) {
 	CppCFString str(convertNumeric(numconv_, candidates[current_candidate_index]));
 
-	// ??????
+	// ?主憜????茖? 	return CppCFString().append(0x25bc).append(str);
     }
     else if(status == STATUS_PROMPT) {
-	// [?????][??]
+	// [????潟???[?ュ?]
 	return CppCFString('[').append(prompt).append("][").append(prompt_input).append(kCaret).append(']');
     } else {
 	return CppCFString().append(kIgnoreThis);
@@ -541,24 +547,24 @@
     else if(status == STATUS_BLACK) {
 	result = convertNumeric(numconv_, candidates[current_candidate_index]);
 
-	// ????
+	// 薇????拭
 	sendCurrentCandidateToServerToRegister();
     }
     else if(status == STATUS_BLACK_WITH_WINDOW) {
 	result = convertNumeric(numconv_, candidates[current_candidate_index]);
 
-	// ????
+	// 薇????拭
 	sendCurrentCandidateToServerToRegister();
 
-	// ??????????
+	// ????潟??????????
 	closeCandidatesWindow();
     }
     else /* if (status == STATUS_NULL) */ {
 	result = CppCFString().append(kIgnoreThis);
     }
     
-    // ?????????????fix??????????????????????B
-    // ?????B
+    // ???????違????????????ix????????????????с??鴻??弱?????若?腟????+    // ?????????
     parent->setEnabledAsciiConversionMode(false);
     initialize();
     
@@ -580,14 +586,14 @@
 
     str.append(index);
 
-    // ahya???-ahya
+    // ahya?????ahya
     CppCFData query;
     query.own(str.toCFData());
 
     current_candidate_index = 0;
     ::askServerTheCandidates(query, candidates);
 
-    // ?????????
+    // ?医?紊?????????
     if(ClientConfiguration::theInstance().useNumericConversion() &&
        numconv_.Setup(index.toStdString(kCFStringEncodingUTF8))) {
 	CppCFString normalized(numconv_.NormalizedKey().c_str(), kCFStringEncodingUTF8);
@@ -603,7 +609,7 @@
 }
 
 void AsciiConversionMode::askServerTheCompletions() {
-    // ?????
+    // 薇??絨????     CppCFData cfdata_query;
     cfdata_query.own(index.toCFData());
 
@@ -612,16 +618,16 @@
 }
 
 void AsciiConversionMode::sendCurrentCandidateToServerToRegister() {
-    // ????
+    // 薇????拭
     sendWordToServerToRegister(index,candidates[current_candidate_index]);
 }
 
 void AsciiConversionMode::makeServerRemoveWord() {
     CppCFString query;
-    // ahya ??欲????-ahya ??欲?
+    // ahya 鐚?????鐚?????-ahya 鐚?????鐚?     query.append('-').append(index).append(SKK_MSG_DELIMITER).append(candidates[current_candidate_index]);
     
-    // ????
+    // 薇??羝＜?
     CppCFData cfdata_query;
     cfdata_query.own(query.toCFData());
     ::makeServerRemoveWord(cfdata_query);
@@ -645,35 +651,35 @@
 }
 
 void AsciiConversionMode::goToNextCandidatesFrame() {
-    // ?????ID(UInt16)???CFData??????????
+    // ????潟???D(UInt16)?????FData??????????檎????
     CppCFData reply(ServerConnectionFactory::theInstance().newConnection().
 		    send(kSKKCandidatesWindowNext, newCFDataRefWithWindowID(candidates_window_id),
 			 kAquaSKKServerRunLoopMode));
 
-    // ?????????????????
+    // ?上???????????激??ゃ?????＜???     ++ candidates_window_current_frame;
 
-    // ????????????????????????
+    // ?上????茖???激?????若?綵?????????医?紜?????
     current_candidate_index += candidates_window_cands_per_frame;
     candidates_window_cands_per_frame = CFSwapInt16BigToHost(reply.getUInt16(0));
 }
 
 void AsciiConversionMode::goToPrevCandidatesFrame() {
-    // ?????ID(UInt16)???CFData??????????
+    // ????潟???D(UInt16)?????FData??????????檎????
     CppCFData reply(ServerConnectionFactory::theInstance().newConnection().
 		    send(kSKKCandidatesWindowPrev, newCFDataRefWithWindowID(candidates_window_id),
 			 kAquaSKKServerRunLoopMode));
 
-    // ????????????????
+    // ?上???????????激????????潟?
     -- candidates_window_current_frame;
 
-    // ????????????????????????
+    // ?上????茖???激?????若?綵?????????医?羝?????
     candidates_window_cands_per_frame = CFSwapInt16BigToHost(reply.getUInt16(0));
     current_candidate_index -= candidates_window_cands_per_frame;
 }
 
 void AsciiConversionMode::closeCandidatesWindow() {
-    // ?????ID(UInt16)???CFData??????????
+    // ????潟???D(UInt16)?????FData??????????檎????
     ServerConnectionFactory::theInstance().newConnection().
 	send(kSKKCloseCandidatesWindow, newCFDataRefWithWindowID(candidates_window_id));
 }
Index: AquaSKK/AsciiConversionMode.h
diff -u AquaSKK/AsciiConversionMode.h:1.5 AquaSKK/AsciiConversionMode.h:1.6
--- AquaSKK/AsciiConversionMode.h:1.5	Sat Jun  3 10:23:18 2006
+++ AquaSKK/AsciiConversionMode.h	Thu Jun 14 21:00:16 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: AsciiConversionMode.h,v 1.5 2006/06/03 01:23:18 t-suwa Exp $
+  $Id: AsciiConversionMode.h,v 1.6 2007/06/14 12:00:16 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -38,35 +38,36 @@
     NumericConverter numconv_;
 
 protected:
-    static const int STATUS_NULL = 0; // ??????????????????B??????????
-    static const int STATUS_WHITE = 1; // ????
-    static const int STATUS_BLACK = 2; // ????
-    static const int STATUS_BLACK_WITH_WINDOW = 3; // ??????????????????????
-    static const int STATUS_PROMPT = 4; // ???????????B
+    static const int STATUS_NULL = 0; // ?≪????紊????若?????ｃ?????????????????????????
+    static const int STATUS_WHITE = 1; // ?純??若?
+    static const int STATUS_BLACK = 2; // ?若??若?
+    static const int STATUS_BLACK_WITH_WINDOW = 3; // ?若??若??с?????御?????潟?????????????
+    static const int STATUS_PROMPT = 4; // ????潟?????冴???????
 
-    WordRegisterMode* word_register_mode; // NULL?????????????????
+    WordRegisterMode* word_register_mode; // NULL?с???????茯???蚊??若???儀??賢??+    WordRegisterMode* old_word_register_mode; // ?翫??障??????????茯???蚊??若?
 
     int status;
-    CppCFString index; // ????+    CppCFString index; // 荀?????
 
-    static const int PROMPT_DELETE_FROM_USER_DIC = 1; // ????ｫ???P????-    int prompt_type; // ?????????
-    CppCFString prompt; // ?????
-    CppCFString prompt_input; // ??????????????????
-
-    std::vector<CppCFString> candidates; // ?????
-    unsigned current_candidate_index; // ???????
-
-    unsigned show_cands_window_after_Nth_cand; // ????????????????????ｦ????
-
-    unsigned candidates_window_id; // status?STATUS_BLACK_WITH_WINDOW??????????????ID?
-    unsigned candidates_window_current_frame; // ?????????????????
-    unsigned candidates_window_cands_per_frame; // ??????????1???????????
-    unsigned candidates_window_num_of_frames; // ???????????????
-
-    bool completion_mode; // ???????[?????????????????????????????
-    std::vector<CppCFString> completions; // ?????
-    unsigned current_completion_index; // ??????????
+    static const int PROMPT_DELETE_FROM_USER_DIC = 1; // ????吟?莨?????????????+    int prompt_type; // ????潟????腮????+    CppCFString prompt; // ????潟???+    CppCFString prompt_input; // ????潟????????吟??????????絖??
+
+    std::vector<CppCFString> candidates; // ??????茖?+    unsigned current_candidate_index; // ?上????茖????+
+    unsigned show_cands_window_after_Nth_cand; // 篏????札?????????茖??????ゃ??????；腓冴??????+
+    unsigned candidates_window_id; // status??TATUS_BLACK_WITH_WINDOW??????????御?????潟????ID??+    unsigned candidates_window_current_frame; // ????御?????潟?????上?????????+    unsigned candidates_window_cands_per_frame; // ????御?????潟????1????若?綵??????????+    unsigned candidates_window_num_of_frames; // ????御?????潟????????若???+
+    bool completion_mode; // 荀?????茖???≪????????≪???????????????????茖?????篏??篏帥??????+    std::vector<CppCFString> completions; // 茖?????茖?+    unsigned current_completion_index; // ?上????絎???????? 
     bool henkanModeStatus;
 
@@ -80,12 +81,13 @@
     virtual void goToNextCandidatesFrame();
     virtual void closeCandidatesWindow();
     virtual void initialize();
+    virtual void resetRegistrationMode();
 	
 public:
     AsciiConversionMode(class ParentInputMode& parent);
     virtual ~AsciiConversionMode();
 
-    virtual void start(); // ????????????????
+    virtual void start(); // ???????違?????純??若???????
     virtual bool handleInput(SKKChar skkchar);
     virtual bool handleBackSpace();
     virtual bool handleReturn();
@@ -97,8 +99,8 @@
     virtual CppCFString getStringToDisplay();
     virtual CppCFString getStringToFix();
 
-    virtual void wordRegistrationFinished(); // WordRegisterMode???
-    virtual void wordRegistrationCanceled(); // WordRegisterMode???
+    virtual void wordRegistrationFinished(); // WordRegisterMode絨????+    virtual void wordRegistrationCanceled(); // WordRegisterMode絨???? };
 
 #endif	// INC__AsciiConversionMode__
Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.41 AquaSKK/ChangeLog:1.42
--- AquaSKK/ChangeLog:1.41	Tue Jun 12 23:25:08 2007
+++ AquaSKK/ChangeLog	Thu Jun 14 21:00:16 2007
@@ -1,3 +1,12 @@
+2007-06-14  Tomotaka SUWA  <t.suwa ＠ mac.com>
+
+	* *ConversionMode.*: ????脂??≪????絎??????ゃ???????篆????+
+	* KanjiConversionMode.*:
+	(1) 茖??腟????憜????絖?┏?ャ????????????信罩?+	(2) ????脂????荀?????????蚊???????罩ｈ???????????桁???信罩?+	(3) ????脂?????ュ??≪????緇????????筝?????篆??
+
 2007-06-12  Tomotaka SUWA  <t.suwa ＠ mac.com>
 
 	* ServerMessageReceiver.* (registerToggleEntry): ?????????腟????Index: AquaSKK/KanjiConversionMode.cpp
diff -u AquaSKK/KanjiConversionMode.cpp:1.12 AquaSKK/KanjiConversionMode.cpp:1.13
--- AquaSKK/KanjiConversionMode.cpp:1.12	Tue Jun 12 23:25:08 2007
+++ AquaSKK/KanjiConversionMode.cpp	Thu Jun 14 21:00:16 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: KanjiConversionMode.cpp,v 1.12 2007/06/12 14:25:08 t-suwa Exp $
+  $Id: KanjiConversionMode.cpp,v 1.13 2007/06/14 12:00:16 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -56,18 +56,19 @@
 
 KanjiConversionMode::KanjiConversionMode(ParentInputMode& src)
     :ChildInputMode(src),
-     word_register_mode(NULL),
+     word_register_mode(0),
+     old_word_register_mode(0),
      status(STATUS_NULL),
      show_cands_window_after_Nth_cand(5),
      completion_mode(false),
-     henkanModeStatus(false) {
-    
+     henkanModeStatus(false),
+     priorInputMode_(Hirakana) {
+    // empty
 }
 
 KanjiConversionMode::~KanjiConversionMode() {
-    if(word_register_mode) {
-	delete word_register_mode;
-    }
+    delete word_register_mode;
+    delete old_word_register_mode;
 }
 
 bool KanjiConversionMode::handleInput(SKKChar skkchar) {
@@ -477,15 +478,25 @@
 
 void KanjiConversionMode::startRegisteringWord() {
     CppCFString register_title;
-    if (okuri.length() > 0) {
+
+    if(okuri.length() > 0) {
 	register_title.append(root).append('*').append(okuri);
-    }
-    else {
+    } else {
 	register_title = root;
     }
-    register_title = HiraganaInputMode::convert(register_title); // ??皿???綛割皿???紊??-	
-    word_register_mode = new WordRegisterMode(*this,register_title);
+
+    // ?上????????若????絖???????    if(parent->isHiraganaInputMode()) {
+	priorInputMode_ = Hirakana;
+    }
+    if(parent->isZenKataInputMode()) {
+	priorInputMode_ = Katakana;
+    }
+    if(parent->isHanKataInputMode()) {
+	priorInputMode_ = Jisx0201Kana;
+    }
+
+    word_register_mode = new WordRegisterMode(*this, HiraganaInputMode::convert(register_title));
     word_register_mode->redisplay();
     word_register_mode->updatePencilMenuIcon();
 }
@@ -737,8 +748,7 @@
     
     if (word_register_mode) {
 	word_register_mode->terminate();
-	delete word_register_mode;
-	word_register_mode = NULL;
+	resetRegistrationMode();
     }
 
     // currenInputMode??erminate?????oot??etStringToFix()????????申??????
@@ -753,6 +763,30 @@
     initialize();
 }
 
+// ?翫????茯???蚊??若?????ゃ???憜????茯???蚊??若?????帥???+void KanjiConversionMode::resetRegistrationMode() {
+    delete old_word_register_mode;
+    old_word_register_mode = word_register_mode;
+    word_register_mode = 0;
+}
+
+// ????脂?????ュ??≪????緇?????
+void KanjiConversionMode::restoreInputMode() {
+    switch(priorInputMode_) {
+    case Hirakana:
+	parent->goHiraganaInputMode();
+	break;
+    case Katakana:
+	parent->goZenKataInputMode();
+	break;
+    case Jisx0201Kana:
+	parent->goHanKataInputMode();
+	break;
+    }
+
+    parent->updatePencilMenuIcon();
+}
+
 void KanjiConversionMode::wordRegistrationFinished() {
     if(word_register_mode) {
 	CppCFString content = word_register_mode->getContent();
@@ -760,15 +794,16 @@
 	    // 薇????拭?? 	    if(okuri.length() > 0) {
 		if(SKKConfig::UseKanaToOkuri()) {
-#ifdef DEBUG
-		    cerr << "(A)OKURI-HEAD: " << okuri[0] << " - " << SKKConfig::ConvertKanaToOkuri(okuri[0]) << endl;
-#endif
-		    sendWordToServerToRegister(root + SKKConfig::ConvertKanaToOkuri(okuri[0]), okuri, content);
+		    sendWordToServerToRegister(
+			HiraganaInputMode::convert(root) + SKKConfig::ConvertKanaToOkuri(okuri[0]),
+			HiraganaInputMode::convert(okuri), content);
 		} else {
-		    sendWordToServerToRegister(root + okuri_head, okuri, content);
+		    sendWordToServerToRegister(
+			HiraganaInputMode::convert(root) + okuri_head,
+			HiraganaInputMode::convert(okuri), content);
 		}
 	    } else {
-		sendWordToServerToRegister(root, content);
+		sendWordToServerToRegister(HiraganaInputMode::convert(root), content);
 	    }
 
 	    // 腆阪???@@ -785,17 +820,15 @@
 	    }
 	}
 
-	delete word_register_mode;
-	word_register_mode = NULL;
-	parent->updatePencilMenuIcon();
+	resetRegistrationMode();
+	restoreInputMode();
     }
 }
 
 void KanjiConversionMode::wordRegistrationCanceled() {
-    delete word_register_mode;
-    word_register_mode = NULL;
-    parent->updatePencilMenuIcon();
-    
+    resetRegistrationMode();
+    restoreInputMode();
+
     if (status == STATUS_WHITE_ROOT || status == STATUS_WHITE_OKURI) {
 	// root??kuri????ｃ????STATUS_WHITE_ROOT?? 	root += okuri;
@@ -898,9 +931,6 @@
     // ??皿???綛割皿???紊??????
     if(okuri.length() > 0) {
 	if(SKKConfig::UseKanaToOkuri()) {
-#ifdef DEBUG
-	    cerr << "(B)OKURI-HEAD: " << okuri[0] << " - " << SKKConfig::ConvertKanaToOkuri(okuri[0]) << endl;
-#endif
 	    sendWordToServerToRegister(
 		HiraganaInputMode::convert(root) + SKKConfig::ConvertKanaToOkuri(okuri[0]), 
 		HiraganaInputMode::convert(okuri),
@@ -1022,6 +1052,24 @@
 
     current_completion_index = 0;
     ::askServerTheCompletions(cfdata_query, completions);
+
+    // 紊???????潟???+    struct convert {
+	static void ToZenKana(CppCFString& str) {
+	    str = ZenKataInputMode::convert(str);
+	}
+	static void ToHanKana(CppCFString& str) {
+	    str = HanKataInputMode::convert(str);
+	}
+    };
+
+    // ?????????茹??????翫?????冴?茯?????腮??紊?????+    if(parent->isZenKataInputMode()) {
+	std::for_each(completions.begin(), completions.end(), &convert::ToZenKana);
+    }
+    if(parent->isHanKataInputMode()) {
+	std::for_each(completions.begin(), completions.end(), &convert::ToHanKana);
+    }
 }
 
 void askServerTheCompletions(const CppCFData& query, std::vector<CppCFString>& completions) {
Index: AquaSKK/KanjiConversionMode.h
diff -u AquaSKK/KanjiConversionMode.h:1.8 AquaSKK/KanjiConversionMode.h:1.9
--- AquaSKK/KanjiConversionMode.h:1.8	Tue Jun 12 23:25:08 2007
+++ AquaSKK/KanjiConversionMode.h	Thu Jun 14 21:00:16 2007
@@ -1,5 +1,5 @@
 /*
-  $Id: KanjiConversionMode.h,v 1.8 2007/06/12 14:25:08 t-suwa Exp $
+  $Id: KanjiConversionMode.h,v 1.9 2007/06/14 12:00:16 t-suwa Exp $
 
   MacOS X implementation of the SKK input method.
 
@@ -37,6 +37,9 @@
 class KanjiConversionMode: public ChildInputMode, public RegistrationStarter {
     bool handleInputChar(SKKChar skkchar);
     NumericConverter numconv_;
+    int priorInputMode_;
+
+    enum { Hirakana, Katakana, Jisx0201Kana };
 
 protected:
     static const int STATUS_NULL = 0; // 羲√?紊????若?????ｃ?????????????????????????
@@ -47,6 +50,7 @@
     static const int STATUS_PROMPT = 5; // ????潟?????冴???????
 
     WordRegisterMode* word_register_mode; // NULL?с???????茯???蚊??若???儀??賢??+    WordRegisterMode* old_word_register_mode; // ?翫??障??????????茯???蚊??若?
 
     int status;
     CppCFString root; // ???篁???????????箴?????????????????@@ -85,6 +89,8 @@
     virtual void goToNextCandidatesFrame();
     virtual void closeCandidatesWindow();
     virtual void initialize();
+    virtual void resetRegistrationMode();
+    virtual void restoreInputMode();
 
 public:
     KanjiConversionMode(class ParentInputMode& parent);

From t-suwa ＠ users.sourceforge.jp  Fri Jun 15 22:18:29 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Fri, 15 Jun 2007 22:18:29 +0900
Subject: [aquaskk-changes 317]  CVS update: AquaSKK
Message-ID: <20070615131829.2C1152AC046@users.sourceforge.jp>

Index: AquaSKK/ChangeLog
diff -u AquaSKK/ChangeLog:1.42 AquaSKK/ChangeLog:1.43
--- AquaSKK/ChangeLog:1.42	Thu Jun 14 21:00:16 2007
+++ AquaSKK/ChangeLog	Fri Jun 15 22:18:28 2007
@@ -1,3 +1,8 @@
+2007-06-15  Tomotaka SUWA  <t.suwa ＠ mac.com>
+
+	* AquaSKK.pbproj/project.pbxproj: Panther ?с?????с???????篆?+	罩?OkuriganaEntry ???????+
 2007-06-14  Tomotaka SUWA  <t.suwa ＠ mac.com>
 
 	* *ConversionMode.*: ????脂??≪????絎??????ゃ???????篆????
From t-suwa ＠ users.sourceforge.jp  Fri Jun 15 22:18:33 2007
From: t-suwa ＠ users.sourceforge.jp (Tomotaka SUWA)
Date: Fri, 15 Jun 2007 22:18:33 +0900
Subject: [aquaskk-changes 318]  CVS update: AquaSKK/AquaSKK.pbproj
Message-ID: <20070615131833.0E4D32AC042@users.sourceforge.jp>

Index: AquaSKK/AquaSKK.pbproj/project.pbxproj
diff -u AquaSKK/AquaSKK.pbproj/project.pbxproj:1.9 AquaSKK/AquaSKK.pbproj/project.pbxproj:1.10
--- AquaSKK/AquaSKK.pbproj/project.pbxproj:1.9	Mon Dec 18 00:05:41 2006
+++ AquaSKK/AquaSKK.pbproj/project.pbxproj	Fri Jun 15 22:18:32 2007
@@ -54,8 +54,6 @@
 				F5DEF61A0357174401CD0AD3,
 				F5DEF6150357002B01CD0AD3,
 				F5DEF6160357002B01CD0AD3,
-				F522695402FB791D01CD4EB1,
-				F522695302FB791D01CD4EB1,
 				F50D1141034C4ED001CD4EB1,
 				F5BADAD302F4D02501CD4EB1,
 				F5BADAD202F4D02501CD4EB1,
@@ -964,7 +962,6 @@
 				849E109E055023C8009C3C25,
 				849E109F055023C8009C3C25,
 				849E10A3055023C8009C3C25,
-				849E10A4055023C8009C3C25,
 				849E10A6055023C8009C3C25,
 				849E10A7055023C8009C3C25,
 				849E10A8055023C8009C3C25,
@@ -1016,12 +1013,6 @@
 			settings = {
 			};
 		};
-		849E10A4055023C8009C3C25 = {
-			fileRef = F522695402FB791D01CD4EB1;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		849E10A6055023C8009C3C25 = {
 			fileRef = F5FDA61702FF7DA801CD4EB1;
 			isa = PBXBuildFile;
@@ -1142,7 +1133,6 @@
 			files = (
 				849E10BF055023C8009C3C25,
 				849E10C3055023C8009C3C25,
-				849E10C4055023C8009C3C25,
 				849E10C6055023C8009C3C25,
 				849E10C7055023C8009C3C25,
 				849E10C8055023C8009C3C25,
@@ -1182,12 +1172,6 @@
 			settings = {
 			};
 		};
-		849E10C4055023C8009C3C25 = {
-			fileRef = F522695302FB791D01CD4EB1;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		849E10C6055023C8009C3C25 = {
 			fileRef = F5FDA61802FF7DA801CD4EB1;
 			isa = PBXBuildFile;
@@ -2312,22 +2296,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F522695302FB791D01CD4EB1 = {
-			fileEncoding = "-2147483647";
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = OkuriganaEntry.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		F522695402FB791D01CD4EB1 = {
-			fileEncoding = "-2147483647";
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = OkuriganaEntry.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5238B2802F2EFCC01CD4EB1 = {
 			fileEncoding = "-2147483647";
 			isa = PBXFileReference;