Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

src/extras.cpp

@@ -136,10 +136,10 @@ int TestSynthCallback(short *wav, int numsamples, espeak_EVENT *events)
 		if(type==espeakEVENT_PHONEME)
 		{
 			char buf[10];
-//			fprintf(f_events,"[%s]\n",WordToString(events->id.number));  //old version, only 4 characters bytes
-			memcpy(buf, events->id.string, 8);
-			buf[8] = 0;
-			fprintf(f_events,"[%s]\n", buf);
+			fprintf(f_events,"[%s]\n",WordToString(events->id.number));  //old version, only 4 characters bytes
+//			memcpy(buf, events->id.string, 8);
+//			buf[8] = 0;
+//			fprintf(f_events,"[%s]\n", buf);
 		}
 		else
 			fprintf(f_events,"%d\n",events->id.number);
@@ -2315,7 +2315,7 @@ if(control==2)
 	fprintf(f_events,"Type             Audio  Text  Length Id\n");
 	fclose(f_events);
 
-	espeak_Initialize(AUDIO_OUTPUT_RETRIEVAL, 1000, NULL, espeakINITIALIZE_PHONEME_IPA);
+	espeak_Initialize(AUDIO_OUTPUT_RETRIEVAL, 1000, NULL, espeakINITIALIZE_PHONEME_EVENTS);
 	espeak_SetSynthCallback(TestSynthCallback);
 	espeak_SetUriCallback(TestUriCallback);
 

src/readclause.cpp

@@ -191,6 +191,7 @@ static int n_param_stack;
 PARAM_STACK param_stack[N_PARAM_STACK];
 
 static int speech_parameters[N_SPEECH_PARAM];     // current values, from param_stack
+int saved_parameters[N_SPEECH_PARAM];             //Parameters saved on synthesis start
 
 const int param_defaults[N_SPEECH_PARAM] = {
    0,     // silence (internal use)

src/setlengths.cpp

@@ -32,6 +32,7 @@
 
 extern int GetAmplitude(void);
 extern void DoSonicSpeed(int value);
+extern int saved_parameters[];
 
 
 // convert from words-per-minute to internal speed factor
@@ -343,6 +344,7 @@ void SetParameter(int parameter, int value, int relative)
 		}
 	}
 	param_stack[0].parameter[parameter] = new_value;
+	saved_parameters[parameter] = new_value;
 
 	switch(parameter)
 	{

src/speak_lib.cpp

@@ -66,6 +66,7 @@ int (* uri_callback)(int, const char *, const char *) = NULL;
 int (* phoneme_callback)(const char *) = NULL;
 
 char path_home[N_PATH_HOME];   // this is the espeak-data directory
+extern int saved_parameters[N_SPEECH_PARAM]; //Parameters saved on synthesis start
 
 
 void WVoiceChanged(voice_t *wvoice)
@@ -575,6 +576,8 @@ void MarkerEvent(int type, unsigned int char_position, int value, int value2, un
 	if((type == espeakEVENT_MARK) || (type == espeakEVENT_PLAY))
 		ep->id.name = &namedata[value];
 	else
+#ifdef deleted
+// temporarily removed, don't introduce until after eSpeak version 1.46.02
 	if(type == espeakEVENT_PHONEME)
 	{
 		int *p;
@@ -583,6 +586,7 @@ void MarkerEvent(int type, unsigned int char_position, int value, int value2, un
 		p[1] = value2;
 	}
 	else
+#endif
 	{
 		ep->id.number = value;
 	}
@@ -607,6 +611,9 @@ espeak_ERROR sync_espeak_Synth(unsigned int unique_identifier, const void *text,
 	my_unique_identifier = unique_identifier;
 	my_user_data = user_data;
 	
+	for (int i=0; i < N_SPEECH_PARAM; i++)
+		saved_parameters[i] = param_stack[0].parameter[i];
+
 	switch(position_type)
 		{
 		case POS_CHARACTER:
@@ -786,7 +793,7 @@ ENTER("espeak_Initialize");
 //	SetVoiceByName("default");
 	
 	for(param=0; param<N_SPEECH_PARAM; param++)
-		param_stack[0].parameter[param] = param_defaults[param];
+		param_stack[0].parameter[param] = saved_parameters[param] = param_defaults[param];
 	
 	SetParameter(espeakRATE,175,0);
 	SetParameter(espeakVOLUME,100,0);
@@ -1168,6 +1175,10 @@ ESPEAK_API espeak_ERROR espeak_Cancel(void)
 	SHOW_TIME("espeak_Cancel > LEAVE");
 #endif
 	embedded_value[EMBED_T] = 0;    // reset echo for pronunciation announcements
+
+	for (int i=0; i < N_SPEECH_PARAM; i++)
+		SetParameter(i, saved_parameters[i], 0);
+
 	return EE_OK;
 }   //  end of espeak_Cancel
 

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.46.11  24.Dec.11";
+const char *version_string = "1.46.02  06.Jan.12";
 const int version_phdata  = 0x014600;
 
 int option_device_number = -1;

src/synthesize.h

@@ -17,6 +17,8 @@
  *               <http://www.gnu.org/licenses/>.                           *
  ***************************************************************************/
 
+#define espeakINITIALIZE_PHONEME_IPA   0x0002   // move this to speak_lib.h, after eSpeak version 1.46.02
+
 
 #define N_PHONEME_LIST  1000    // enough for source[N_TR_SOURCE] full of text, else it will truncate