Fix merge issues.

scriptshifter/tables/data/greek_classical.yml

@@ -32,10 +32,7 @@ script_to_roman:
       - "\u1FB4"
       - "\u1FB7"
     "\u0391":
-<<<<<<< HEAD
-=======
       - "\u0386"
->>>>>>> greek_alt
       - "\u1F08"
       - "\u1F0A"
       - "\u1F0C"
@@ -332,11 +329,6 @@ script_to_roman:
     # \u0383 reserved
     "\u0384": " \u0301"
     "\u0385": " \u0308\u0301"
-<<<<<<< HEAD
-    "\u0386\u0314": "Ha\u0301"
-    "\u0386\u1F31": "Hai"
-=======
->>>>>>> greek_alt
     "\u0386": "A\u0301"
     "\u0387": ";\u0333"
     "\u0388\u0314": "He\u0301"
@@ -355,12 +347,9 @@ script_to_roman:
     "\u038F": "\u014C\u0301"
     "\u0390": "i\u0308\u0301"
     "\u1F09": "Ha"
-<<<<<<< HEAD
-=======
     "\u0391\u1F31": "Hai"
     "\u0391\u1F51": "Hau"
     "\u0391\u1F61": "Ha\u014D"
->>>>>>> greek_alt
     "\u0391\u03C5": "Au"
     "\u0391": "A"
     "\u0392": "B"
@@ -418,12 +407,9 @@ script_to_roman:
     "\u1F01": "ha"
     "\u1F01\u1F31": "hai"
     "\u1F01\u03C5": "hau"
-<<<<<<< HEAD
-=======
     "\u03B1\u1F31": "hai"
     "\u03B1\u1F51": "hau"
     "\u03B1\u1F61": "ha\u014D"
->>>>>>> greek_alt
     "\u03B1\u03C5": "au"
     "\u03B1": "a"
     "\u03B2": "b"

scriptshifter/trans.py

@@ -110,6 +110,12 @@ def transliterate(src, lang, t_dir="s2r", capitalize=False, options={}):
     if _run_hook("post_config", ctx, langsec_hooks) == BREAK:
         return getattr(ctx, "dest", ""), ctx.warnings
 
+    if "normalize" in ctx.langsec:
+        _normalize_src(ctx)
+
+    if _run_hook("post_normalize", ctx, langsec_hooks) == BREAK:
+        return getattr(ctx, "dest", ""), ctx.warnings
+
     # Loop through source characters. The increment of each loop depends on
     # the length of the token that eventually matches.
     ignore_list = langsec.get("ignore", [])  # Only present in R2S
@@ -281,6 +287,12 @@ def transliterate(src, lang, t_dir="s2r", capitalize=False, options={}):
     return ctx.dest, ctx.warnings
 
 
+def _normalize_src(ctx):
+    for nk, nv in ctx.langsec.get("normalize", {}).items():
+        ctx._src = ctx.src.replace(nk, nv)
+    logger.debug(f"Normalized source: {ctx.src}")
+
+
 def _run_hook(hname, ctx, hooks):
     ret = None
     for hook_def in hooks.get(hname, []):