[1.41.18]

*_list: Changed name to $combine (from $alt2) for the attribute which indicates that a word should combine with the next word.

Voices files: Added attribute "speed", which specified a percentage change to the speaking speeds which are used for this voice.


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

src/voices.cpp

@@ -104,6 +104,7 @@ enum {
 	V_MBROLA,
 	V_KLATT,
 	V_FAST,
+	V_SPEED,
 
 // these need a phoneme table to have been specified
 	V_REPLACE,
@@ -150,6 +151,7 @@ static keywtab_t keyword_tab[] = {
 	{"consonants", V_CONSONANTS},
 	{"klatt",      V_KLATT},
 	{"fast_test",  V_FAST},
+	{"speed",      V_SPEED},
 
 	// these just set a value in langopts.param[]
 	{"l_dieresis", 0x100+LOPT_DIERESES},
@@ -379,6 +381,7 @@ void VoiceReset(int tone_only)
 
 	voice->formant_factor = 256;
 
+	voice->speed_percent = 100;
 	voice->echo_delay = 0;
 	voice->echo_amp = 0;
 	voice->flutter = 64;
@@ -867,6 +870,10 @@ voice_t *LoadVoice(const char *vname, int control)
 			value = sscanf(p,"%d %d",&voice->consonant_amp, &voice->consonant_ampv);
 			break;
 
+		case V_SPEED:
+			sscanf(p,"%d",&voice->speed_percent);
+			break;
+
 		case V_MBROLA:
 			{
 				int srate = 16000;
@@ -911,6 +918,8 @@ voice_t *LoadVoice(const char *vname, int control)
 		new_translator = SelectTranslator(translator_name);
 	}
 
+	SetSpeed(1);   // for speed_percent
+
 	for(ix=0; ix<N_PEAKS; ix++)
 	{
 		voice->freq2[ix] = voice->freq[ix];