[1.25] Enable exclamation intonation for lang=pt

Lang=fr, [o],[O] more open.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@15 d46cf337-b52f-0410-862d-fd96e6ae7743

src/compiledata.cpp

@@ -1825,6 +1825,25 @@ void Compile::Report(void)
 }
 
 
+#ifdef PLATFORM_WINDOWS
+int strcasecmp(const char *s1, const char *s2)
+{
+	int ix=0;
+	int diff;
+
+	for(;;)
+	{
+		if((diff = (tolower(s1[ix]) - tolower(s2[ix]))) != 0)
+			return(diff);
+
+		if((s1[ix] == 0) || (s2[ix] == 0))
+			return(diff);
+
+		ix++;
+	}
+}
+#endif
+
 
 static int ph_sorter(char **a, char **b)
 {//======================================

src/intonation.cpp

@@ -267,9 +267,7 @@ static TONE_TABLE tone_table[N_TONE_TABLE] = {
    {PITCHfrise, 38,10, PITCHfrise2, 36,10,              // comma, or question
    20, 25,   34, 20,  drops_0, 3, 3,   15, 25, 0},
 
-//   {PITCHdrop, 38, 1,  PITCHdrop, 42,25,              // exclamation
-//   20, 25,   34, 22,  drops_0, 3, 3,   12, 8, 0},
-   {PITCHfall, 30, 5,  PITCHfall, 30, 7,              // statement
+   {PITCHdrop, 38, 1,  PITCHdrop, 42,25,              // exclamation
    20, 25,   34, 22,  drops_0, 3, 3,   12, 8, 0},
 
 

src/synthdata.cpp

@@ -35,8 +35,8 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.24.12  18.May.07";
-const int version_phdata  = 0x012201;
+const char *version_string = "1.25  20.May.07";
+const int version_phdata  = 0x012501;
 
 int option_device_number = -1;
 

src/tr_languages.cpp

@@ -433,6 +433,7 @@ Translator *SelectTranslator(const char *name)
 			tr->langopts.stress_rule = 3;        // stress on final syllable
 			tr->langopts.stress_flags =  0x6 | 0x10; 
 			tr->langopts.numbers = 0xa69 + 0x2000;
+			tr->punct_to_tone[0][3] = 2;   // use exclamation intonation
 		}
 		break;
 

src/translate.cpp

@@ -426,6 +426,7 @@ Translator::Translator()
 	langopts.decimal_sep = '.';
 
 	memcpy(punct_to_tone,punctuation_to_tone,sizeof(punct_to_tone));
+	punct_to_tone[0][3] = 0;   // exclamation, use period until we can improve the exclamation intonation 
 }
 
 
@@ -1507,8 +1508,10 @@ int Translator::TranslateChar(char *ptr, int prev_in, int c, int next_in, int *i
 				*insert = (new_c >> 16);
 				new_c &= 0xffff;
 			}
+#ifndef PLATFORM_RISCOS
 			if(upper_case)
 				new_c = towupper(new_c);
+#endif
 			return(new_c);
 		}
 	}