Fix commit d8f4f07 (Issue#17).

engine/skk.py

@@ -866,6 +866,11 @@ def to_zenkaku(letter):
         return letter
     return unicodedata.normalize('NFC', u''.join(map(to_zenkaku, kana)))
 
+def zenkaku_ascii(ascii):
+    def to_zenkaku(letter):
+        return HANKAKU_TO_ZENKAKU_ASCII_TABLE.get(letter, letter)
+    return u''.join(map(to_zenkaku, ascii))
+
 def num_to_latin(num):
     return num
 
@@ -1410,13 +1415,12 @@ def press_key(self, keystr):
 
             # Convert hankaku to zenkaku with ctrl+q in abbrev mode (Issue#17).
             if self.__current_state().abbrev and str(key) == 'ctrl+q':
-                hankaku = self.__current_state().rom_kana_state[0]
-                zenkaku = HANKAKU_TO_ZENKAKU_ASCII_TABLE.get(hankaku, hankaku)
+                ascii = zenkaku_ascii(self.__current_state().rom_kana_state[0])
                 self.kakutei()
                 if self.dict_edit_level() > 0:
-                    self.__current_state().dict_edit_output += zenkaku
+                    self.__current_state().dict_edit_output += ascii
                     return (True, u'')
-                return (True, zenkaku)
+                return (True, ascii)
 
             if str(key) in ('ctrl+j', 'ctrl+m', 'return'):
                 kuten = self.__current_state().kuten

engine/test.py

@@ -685,10 +685,11 @@ def testabbrev(self):
         self.__skk.reset();
         self.__skk.activate_input_mode(skk.INPUT_MODE_HIRAGANA)
         self.__skk.press_key(u'/')
-        handled, output = self.__skk.press_key(u'a')
+        self.__skk.press_key(u'a')
+        self.__skk.press_key(u'a')
         handled, output = self.__skk.press_key(u'ctrl+q')
         self.assertTrue(handled)
-        self.assertEqual(output, u'ａ')
+        self.assertEqual(output, u'ａａ')
 
     def testkuten(self):
         self.__skk.reset()