[1.40.01]

Fix mbrola translation for "r" in Spanish and some other languages.


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

src/extras.cpp

@@ -1178,7 +1178,7 @@ void TestTest(int control)
 //CharsetToUnicode("ISO-8859-4");
 //CharsetToUnicode("ISCII");
 
-TestCompile2();
+//TestCompile2();
 return;
 
 if(control==2)

src/formantdlg.cpp

@@ -168,6 +168,8 @@ FormantDlg::FormantDlg(wxWindow *parent) : wxPanel(parent,-1,wxDefaultPosition,w
 
 	t_pitch = new wxStaticText(this,-1,_T(""),wxPoint(4,520),wxSize(192,24));
 
+	HideFields(0);
+
 	pitchgraph = new ByteGraph(this,wxPoint(0,538),wxSize(200,140));
 	pitchgraph->SetData(128,env_fall);
 	pitchgraph->ShowSpectrum(1);

src/spectseq.cpp

@@ -34,7 +34,6 @@
 
 #define MAX_HARMONIC  400           // 400 * 50Hz = 20 kHz, more than enough
 
-#define KLATT_TEST
 
 extern void SetSynth_Klatt(int length, int modn, frame_t *fr1, frame_t *fr2, voice_t *v, int control);
 extern int Wavegen_Klatt(int resume);
@@ -1027,7 +1026,9 @@ void SpectSeq::MakeWave(int start, int end, PitchEnvelope &pitch)
 	peak_t peaks1[N_PEAKS];
 	peak_t peaks2[N_PEAKS];
 
+#ifdef KLATT_TEST
 KlattInit();
+#endif
 	SpeakNextClause(NULL,NULL,2);  // stop speaking file
 
 	if(numframes==0) return;
@@ -1158,7 +1159,9 @@ void SpectFrame::MakeWaveF(int control, PitchEnvelope &pitche, int amplitude, in
 	int pbase;
 	char *fname_speech;
 
+#ifdef KLATT_TEST
 KlattInit();
+#endif
 	SpeakNextClause(NULL,NULL,2);  // stop speaking file
 
 	length = duration;

src/speech.h

@@ -21,7 +21,7 @@
 #include <sys/types.h>
 
 // conditional compilation options
-#define INCLUDE_KLATT
+//#define INCLUDE_KLATT
 
 #if defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN
 #define ARCH_BIG

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.39.49  21.Dec.08";
+const char *version_string = "1.40  22.Dec.08";
 const int version_phdata  = 0x014000;
 
 int option_device_number = -1;

src/transldlg.cpp

@@ -249,7 +249,9 @@ void MakeWave2(PHONEME_LIST *p, int n_phonemes)
 	char *fname_speech;
 	int n_ph;
 
+#ifdef KLATT_TEST
 	KlattInit();
+#endif
 	n_ph = n_phonemes;
 	fname_speech = WavFileName();
 	OpenWaveFile2(fname_speech);