Tone-mark reordering and improved Old Hangul support