[1.29.02] lang=af: updated af_rules and af_dict

Changes to voice selection code to accept  voice+variant  voice names in SSML tags.
Changes to voice change code to use function DoVoiceChange().
lang=pt: Don't reduce phoneme [&~] to the more open [&] in unstressed syllables.


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

src/speak_lib.cpp

@@ -47,7 +47,7 @@
 #include "wave.h"
 
 unsigned char *outbuf=NULL;
-extern espeak_VOICE *voice_selected;
+extern espeak_VOICE voice_selected;
 
 espeak_EVENT *event_list=NULL;
 int event_list_ix=0;
@@ -65,9 +65,6 @@ int (* phoneme_callback)(const char *) = NULL;
 
 char path_home[N_PATH_HOME];   // this is the espeak-data directory
 
-voice_t voicedata;
-voice_t *voice = &voicedata;
-
 
 #ifdef USE_ASYNC
 
@@ -349,7 +346,7 @@ static int initialise(void)
 			fprintf(stderr,"Wrong version of espeak-data 0x%x (expects 0x%x)\n",result,version_phdata);
 	}
 
-	voice_selected = NULL;
+	memset(&voice_selected,0,sizeof(voice_selected));
 	SetVoiceStack(NULL);
 	SynthesizeInit();
 	InitNamedata();
@@ -711,7 +708,7 @@ ENTER("espeak_Initialize");
 	SetParameter(espeakVOLUME,100,0);
 	SetParameter(espeakCAPITALS,option_capitals,0);
 	SetParameter(espeakPUNCTUATION,option_punctuation,0);
-	WavegenSetVoice(voice);
+	DoVoiceChange(voice);
 	
 #ifdef USE_ASYNC
 	fifo_init();