Merge branch 'master' into build

Conflicts:
	src/synthdata.cpp
	src/voices.cpp

src/Makefile.espeakedit

@@ -20,7 +20,7 @@ CPPFLAGS =  -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6
 	-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
 	-D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
 
-CXXFLAGS = -O2 -g0 -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 \
+CXXFLAGS = -O2  -Wall -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 \
    -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
 
 all: espeakedit

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.45.44  16.Sep.11";
+const char *version_string = "1.45.43  16.Sep.11";
 const int version_phdata  = 0x014500;
 
 int option_device_number = -1;
@@ -644,6 +644,13 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
 			if(plist[0].sourceix)
 				return(false);
 		}
+//		if(which==7)
+//		{
+//			// nextPh2 not word boundary
+//			if((plist[1].sourceix) || (plist[2].sourceix))
+//				return(false);
+//		}
+
 		if(which==6)
 		{
 			// nextVowel, not word boundary
@@ -679,7 +686,7 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
 		}
 		ph = plist->ph;
 
-		if(instn2 < 7)
+		if(instn2 < 8)
 		{
 			// 'data' is a phoneme number
 			if((phoneme_tab[data]->mnemonic == ph->mnemonic) == true)

src/voices.cpp

@@ -1744,6 +1744,7 @@ espeak_ERROR SetVoiceByProperties(espeak_VOICE *voice_selector)
 	return(EE_OK);
 }  //  end of SetVoiceByProperties
 
+
 void FreeVoiceList()
 {//=================
 	for(int ix=0; ix<n_voices_list; ix++)