Oh yes I forgot. You will also need to map not merely those places where hyphens are used by the language, but also those circumstances where, wondering how to state it abstractly, anyway in string literals and such where substitutions should not occur.