Tomotaka SUWA
t-suw****@users*****
2006年 6月 5日 (月) 21:27:01 JST
Index: AquaSKK/ChangeLog diff -u AquaSKK/ChangeLog:1.26 AquaSKK/ChangeLog:1.27 --- AquaSKK/ChangeLog:1.26 Sat Jun 3 10:23:18 2006 +++ AquaSKK/ChangeLog Mon Jun 5 21:27:01 2006 @@ -1,3 +1,10 @@ +2006-06-05 Tomotaka SUWA <t.suw****@mac*****> + + * SKKDictionary.cpp: •âŠ®Žž‚Ɉê‰ñu‹óU‚èv‚·‚錻ۂðC³B + + * KanjiConversionMode.cpp: ”’l•ÏŠ·‚ª—LŒø‚Å‚àA•ÏŠ·Œ‹‰Ê‚ª”’l•ÏŠ·‚É + ‚æ‚ç‚È‚¢ê‡‚É‚ÍAŒ©o‚µŒê‚ð³‹K‰»‚¹‚¸‚É‚»‚Ì‚Ü‚Ü“o˜^‚·‚é‚悤‚ÉC³B + 2006-06-03 Tomotaka SUWA <t.suw****@mac*****> * NumericConverter.h, NumericConverter.cpp: V‹K’ljÁB”’l•ÏŠ·‚ðƒT Index: AquaSKK/KanjiConversionMode.cpp diff -u AquaSKK/KanjiConversionMode.cpp:1.6 AquaSKK/KanjiConversionMode.cpp:1.7 --- AquaSKK/KanjiConversionMode.cpp:1.6 Sat Jun 3 10:23:18 2006 +++ AquaSKK/KanjiConversionMode.cpp Mon Jun 5 21:27:01 2006 @@ -1,5 +1,5 @@ /* - $Id: KanjiConversionMode.cpp,v 1.6 2006/06/03 01:23:18 t-suwa Exp $ + $Id: KanjiConversionMode.cpp,v 1.7 2006/06/05 12:27:01 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -1104,7 +1104,12 @@ NumericConverter conv; if(ClientConfiguration::theInstance().useNumericConversion() && conv.Setup(index)) { - str = conv.NormalizedKey(); + CppCFString applied = conv.Apply(kanji); + if(applied != kanji) { + str = conv.NormalizedKey(); + } else { + str = index; + } } else { str = index; } Index: AquaSKK/SKKDictionary.cpp diff -u AquaSKK/SKKDictionary.cpp:1.8 AquaSKK/SKKDictionary.cpp:1.9 --- AquaSKK/SKKDictionary.cpp:1.8 Wed May 17 01:13:10 2006 +++ AquaSKK/SKKDictionary.cpp Mon Jun 5 21:27:01 2006 @@ -1,5 +1,5 @@ /* - $Id: SKKDictionary.cpp,v 1.8 2006/05/16 16:13:10 t-suwa Exp $ + $Id: SKKDictionary.cpp,v 1.9 2006/06/05 12:27:01 t-suwa Exp $ MacOS X implementation of the SKK input method. @@ -402,7 +402,7 @@ for(EntryIterator i = okuriNasi_.begin(); i != okuriNasi_.end(); ++ i) { // 擪•”•ª‚ªˆê’v‚µ‚Ä‚¢‚é‚©H - if(i->first.find(index) == 0) { + if(i->first.find(index) == 0 && i->first.size() > index.size()) { result.push_back(CppCFString(i->first.c_str(), kCFStringEncodingEUC_JP)); } }
Fork