From 943e8b300ebd35a9ae879f46fa4242c1d708acb1 Mon Sep 17 00:00:00 2001
From: jonsd <jonsd@d46cf337-b52f-0410-862d-fd96e6ae7743>
Date: Tue, 4 Sep 2007 09:20:28 +0000
Subject: [PATCH] [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 |   3 ++-
 phsource/mbrola/cs      |   3 ++-
 phsource/ph_english     |   2 +-
 phsource/vowel/ii_en    | Bin 955 -> 959 bytes
 src/espeakedit.cpp      |   4 ++++
 src/readclause.cpp      |   4 +++-
 src/synthdata.cpp       |   2 +-
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/phsource/compile_report b/phsource/compile_report
index 739b51b1..e0fd7705 100644
--- a/phsource/compile_report
+++ b/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
diff --git a/phsource/mbrola/cs b/phsource/mbrola/cs
index 2566b94a..88b3cd00 100644
--- a/phsource/mbrola/cs
+++ b/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
diff --git a/phsource/ph_english b/phsource/ph_english
index 089cb152..a78703d9 100644
--- a/phsource/ph_english
+++ b/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
 
diff --git a/phsource/vowel/ii_en b/phsource/vowel/ii_en
index aaa1f48ee61e24c725717e8947191755445d0420..504d9e0bb9883a15b8ec9a217e1b55d9f92ca566 100644
GIT binary patch
delta 175
zcmdnZzMow%IKb68B-k~Om4SgFGc!IlZz8Xo<P1g*u_cTjfI<um4eUF(A22>(1hL;t
z%=ziG1;hdZ2iEHgzzhaI1}27hAoJb-0}Kq@4NM$NAn_TD4l)^x8DNbK>>B(qLm0R=
kFK6Up)B)*WU^oD@0HNcDAk5ko>;jxH9U@$l?=sy30K-ovD*ylh

delta 171
zcmdnbzMGvlIKb68B-k~Ok%581bE2S|<Pt^>u_cTjfLsO!UG^Q^4;UYS<QO(gEcofP
z`TGSBo56wg`T{V6!H<E7AqB{M_x}I`19t-x2NOtq2V;lq5=I@cMqPFdewZOQI5)3m
e<YLq*04ZWPz|g>s(D6eMVXXisLdWEXO!okC$|oiO

diff --git a/src/espeakedit.cpp b/src/espeakedit.cpp
index 0c5cbec1..5c8b1a55 100755
--- a/src/espeakedit.cpp
+++ b/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);
diff --git a/src/readclause.cpp b/src/readclause.cpp
index 5f0acdef..5ebcae11 100644
--- a/src/readclause.cpp
+++ b/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
 	}
 
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index b9d478d0..9fd5b180 100755
--- a/src/synthdata.cpp
+++ b/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;