[1.29.01] <prosody pitch> when specified as semitones had no effect.

lang cs: mbrola phoneme translation was missing phoneme [R^]


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

phsource/compile_report

@@ -469,8 +469,9 @@
  10  vowel/ii       en_wm cy de fr_ca nl is zhy
   3  vowel/ii#      cy pl ru
   1  vowel/ii_2     la
-  8  vowel/ii_3     en en_rp fi hi sk hr sv no
+  7  vowel/ii_3     en_rp fi hi sk hr sv no
   7  vowel/ii_4     en en_n en_rp
+  1  vowel/ii_en    en
   5  vowel/@_low    hi ro no
  11  vowel/o        base2 en en_wm de hi it la pt_pt sv
   4  vowel/o_2      cy hi hu no

phsource/mbrola/cs

@@ -13,7 +13,8 @@
 0  J  NULL   0  d'
 0  h  NULL   0  h\
 0  n^ NULL   0  n'
-0  R  NULL   0  r'
+0  R^ NULL   0  r'
+0  R^/ NULL  0  r'
 0  c  NULL   0  t'
 0  oU NULL   0  o
 0  aU NULL  60  a u

phsource/ph_english

@@ -152,7 +152,7 @@ endphoneme
 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype (i)  endtype (i)
   length 140
-  formants vowel/ii_3
+  formants vowel/ii_en
   linkout ;
 endphoneme
 

src/espeakedit.cpp

@@ -222,6 +222,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
 
 	int error_flag = 0;
 	int result;
+	int param;
 
   // Create some dummy layout windows
 wxSashLayoutWindow *win;
@@ -278,6 +279,9 @@ wxSashLayoutWindow *win;
 	}
 	WavegenSetVoice(voice);
 
+	for(param=0; param<N_SPEECH_PARAM; param++)
+		param_stack[0].parameter[param] = param_defaults[param];
+	
 	SetParameter(espeakRATE,option_speed,0);
 
 	SetSpeed(3);

src/readclause.cpp

@@ -1004,8 +1004,10 @@ static int attr_prosody_value(int param_type, const wchar_t *pw, int *value_out)
 
 	if((tail[0]=='s') && (tail[1]=='t'))
 	{
+		double x;
 		// convert from semitones to a  frequency percentage
-		*value_out = (int)(pow(double(2.0),double((value*sign)/12) * 100));
+		x = pow(double(2.0),double((value*sign)/12)) * 100;
+		*value_out = (int)x;
 		return(2);   // percentage
 	}
 

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.29  27.Aug.07";
+const char *version_string = "1.29.01  04.Sep.07";
 const int version_phdata  = 0x012901;
 
 int option_device_number = -1;