sortfunc = operator.itemgetter(0)
#begin sort
content_table = sorted(content_table, key=sortfunc)
- #prepend zero item
+ #prepend zero item to reserve the invalid item
content_table.insert(0, ("", "", "ChewingKey()"))
#sort index
pinyin_index = sorted(pinyin_index, key=sortfunc)
#handle shengmu
if pinyin not in pinyin_list:
if pinyin in shengmu_list:
- (initial, middle, final) = get_shengmu_chewing(pinyin)
+ chewing_key = get_shengmu_chewing(pinyin)
else:
assert False, "Un-expected pinyin string."
else:
- (initial, middle, final) = get_chewing(pinyin)
- chewing_str = 'ChewingKey({0}, {1}, {2})'.format(initial, middle, final)
+ chewing_key = get_chewing(pinyin)
+ chewing_str = 'ChewingKey({0})'.format(', '.join(chewing_key))
return chewing_str
flags = ['IS_PINYIN', 'PINYIN_CORRECT_{0}_{1}'.format(wrong.upper(),
correct.upper())]
for pinyin_key in pinyin_list:
+ #fixes partial pinyin instead of the whole pinyin
if pinyin_key.endswith(correct) and pinyin_key != correct:
chewing_key = bopomofo.PINYIN_BOPOMOFO_MAP[pinyin_key]
new_pinyin_key = pinyin_key.replace(correct, wrong)