From 2315736555448d43cf84d5832c68eabbfeb4e980 Mon Sep 17 00:00:00 2001
From: jonsd <jonsd@d46cf337-b52f-0410-862d-fd96e6ae7743>
Date: Sun, 10 Aug 2014 10:48:54 +0000
Subject: [PATCH] [1.48.10a] Fix: missing updates for mbrola US voices. Fixes
 for language: ta.

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@384 d46cf337-b52f-0410-862d-fd96e6ae7743
---
 dictsource/dict_phonemes |  2 +-
 dictsource/en_list       | 21 +++++++++++----------
 dictsource/en_rules      |  6 +++---
 dictsource/ta_rules      |  2 +-
 phsource/ph_tamil        | 19 ++-----------------
 src/compiledict.cpp      | 21 ++++++++++++++++++---
 6 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes
index d7000a0c..3cc8b2ae 100644
--- a/dictsource/dict_phonemes
+++ b/dictsource/dict_phonemes
@@ -115,7 +115,7 @@ s    S    t    tS   ts   v    x    z
 Z    
 
 
-Dictionary ta_dict  2014-08-02
+Dictionary ta_dict  2014-08-10
 
 a    a:   aI   aU   e    E    e:   i    
 I    i:   o    o:   u    U    u2   u:   
diff --git a/dictsource/en_list b/dictsource/en_list
index aeae8476..09e4ec1b 100644
--- a/dictsource/en_list
+++ b/dictsource/en_list
@@ -500,16 +500,16 @@ _17	s'Ev@nti:n
 ?7 _17  s'@v@nti:n
 _18	'eIti:n
 _19	n'aInti:n
-_2X	tw'Ent2i
-_3X	T'3:ti
-?5 _3X	T'IRti
-_4X	f'o@ti
-_5X	f'Ifti
-_6X	s'Iksti
-_7X	s'Ev@nti
-?7 _7X  s'@v@nti
-_8X	'eIti
-_9X	n'aInti
+_2X	tw'Ent2i||
+_3X	T'3:ti||
+?5 _3X	T'IRti||
+_4X	f'o@ti||
+_5X	f'Ifti||
+_6X	s'Iksti||
+_7X	s'Ev@nti||
+?7 _7X  s'@v@nti||
+_8X	'eIti||
+_9X	n'aInti||
 
 _0C	h'Vndr@d
 _0M1	T'aUz@nd
@@ -4735,6 +4735,7 @@ Zoë		zoUi
 Acura		akjUr@
 Advil		advIl
 Allgemeine	alg@maIm@
+Andagakavi	anda#ga#kka#v%i  // a Tamil keyboard
 Andromeda	andr'0mId@
 Aquino		a#ki:noU
 Asimov		azI#m0f
diff --git a/dictsource/en_rules b/dictsource/en_rules
index cd132d00..5d6086b7 100644
--- a/dictsource/en_rules
+++ b/dictsource/en_rules
@@ -3293,8 +3293,8 @@ _it_separ) ate (_  @t
     _t) ia         i:@
     XC) ia (_      i@
      &) iac (_     =Iak
-     &) ian (_S1   n
-     &) ians (_S2  nz
+     &) ian (_NS1  n
+     &) ians (_NS2 nz
 
      C) iar        aI3
 ?8   C) iar        aIa#
@@ -4842,7 +4842,7 @@ multip) ly         laI
 ?!3 _h) or (o      0r
         orr (_     o@
         or (r      0
-?3      or (r      O:
+?3      or (r      O@
     bb) or (n      3
      f) oreign     0r@n
      f) or (ever   3
diff --git a/dictsource/ta_rules b/dictsource/ta_rules
index 0e4a3500..2ab35568 100644
--- a/dictsource/ta_rules
+++ b/dictsource/ta_rules
@@ -3966,6 +3966,7 @@ _பெனசீர்_) ப (ுட்டோ	b
 
 
 //sort
+ _மனோ) ப்ப (ல		bbV
    _குங்) ப		fV#
    _நீர்) ப		pV#
    _ப்ரூ) ப		fV#
@@ -4756,7 +4757,6 @@ _கூட்டு) ப்பி (ரார்த்தனை	pp
  _வடை) ப்பி (ரிய	pp
    _கஜ) ப்ப (ிருஷ்ட	bb
    L03) ப்பி (ரேத	pp
-   L03) ப்பி (ரேத	pp
    L03) ப்பி (ரேரணை	pp
    _ஹ) ப்ப (ிள		bb
    _க்ள) ப்ப (ுகள	bb
diff --git a/phsource/ph_tamil b/phsource/ph_tamil
index 33317f7e..e12d9775 100644
--- a/phsource/ph_tamil
+++ b/phsource/ph_tamil
@@ -165,22 +165,7 @@ phoneme z.
 endphoneme
 
 phoneme r
-  liquid rhotic
-  lengthmod 3
-  
-  IF thisPh(isWordEnd) THEN
-    CALL base/r/
-  ENDIF
-    
-  IF prevPhW(isVowel) THEN
-    IF nextPhW(isNotVowel) THEN
-      ChangePhoneme(**)
-    ENDIF
-
-    ChangePhoneme(*)
-  ENDIF
-    
-  CALL base/r
-  ipa ɾ
+  import_phoneme base/r
 endphoneme
 
+
diff --git a/src/compiledict.cpp b/src/compiledict.cpp
index 90d0d85f..4c389670 100644
--- a/src/compiledict.cpp
+++ b/src/compiledict.cpp
@@ -915,7 +915,7 @@ static char rule_phonemes[80];
 static char group_name[LEN_GROUP_NAME+1];
 static int group3_ix;
 
-#define N_RULES 2000		// max rules for each group
+#define N_RULES 3000		// max rules for each group
 
 
 
@@ -1681,6 +1681,7 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
 	int count=0;
 	int different;
 	int wc;
+	int err_n_rules=0;
 	const char *prev_rgroup_name;
 	unsigned int char_code;
 	int compile_mode=0;
@@ -1726,6 +1727,7 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
 				count += n_rules;
 			}
 			n_rules = 0;
+			err_n_rules = 0;
 
 			if(compile_mode == 2)
 			{
@@ -1808,9 +1810,22 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
 		{
 		case 1:    //  .group
 			prule = compile_rule(buf);
-			if((prule != NULL) && (n_rules < N_RULES))
+			if(prule != NULL)
 			{
-				rules[n_rules++] = prule;
+				if(n_rules < N_RULES)
+				{
+					rules[n_rules++] = prule;
+				}
+				else
+				{
+					if(err_n_rules == 0)
+					{
+						fprintf(stderr, "\nExceeded limit of rules (%d) in group '%s'\n", N_RULES, group_name);
+						error_count++;
+						err_n_rules = 1;
+					}
+				}
+
 			}
 			break;