[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.cpp

@@ -98,9 +98,7 @@ static const char *help_text =
 
 void DisplayVoices(FILE *f_out, char *language);
 
-voice_t voice_data;
 USHORT voice_pcnt[N_PEAKS+1][3];
-voice_t *voice;
 
 
 
@@ -591,7 +589,7 @@ int main (int argc, char **argv)
 	{
 		PitchAdjust(pitch_adjustment);
 	}
-	WavegenSetVoice(voice);
+	DoVoiceChange(voice);
 
 	if(filename[0]==0)
 	{