From 5e95c9c795e3ebeaa4df7a60f706328613cb63d5 Mon Sep 17 00:00:00 2001
From: Ali Gholami Rudi <ali@rudi.ir>
Date: Fri, 30 Jan 2015 09:29:43 +0330
Subject: [PATCH] trfn: check for agl_exceptions[] later in trfn_name()

---
 trfn.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/trfn.c b/trfn.c
index c4f8a6d..046aff1 100644
--- a/trfn.c
+++ b/trfn.c
@@ -194,12 +194,6 @@ static int trfn_name(char *dst, char *src, int codepoint)
 			*s++ = *src++;
 		*s = '\0';
 		if (!agl_map(d, ch)) {
-			for (i = 0; i < LEN(agl_exceptions); i++) {
-				if (!strcmp(agl_exceptions[i][0], d)) {
-					strcpy(d, agl_exceptions[i][1]);
-					break;
-				}
-			}
 			d = strchr(d, '\0');
 		} else if (ch[0] == 'u' && ch[1] == 'n' &&
 				ch[2] == 'i' && hexval(ch + 3, 4) > 0) {
@@ -213,6 +207,12 @@ static int trfn_name(char *dst, char *src, int codepoint)
 			return 1;
 		}
 	}
+	for (i = 0; i < LEN(agl_exceptions); i++) {
+		if (!strcmp(agl_exceptions[i][0], dst)) {
+			strcpy(dst, agl_exceptions[i][1]);
+			break;
+		}
+	}
 	ashape(dst, src);
 	return *src && strcmp(src, ".medi") && strcmp(src, ".fina") &&
 			strcmp(src, ".init") && strcmp(src, ".isol");
-- 
2.11.4.GIT