[1.43.10]

Fix --compile-debug option.

Add more syntax checks for --compile option.  Detect empty pre-rule.  Detech missing match-rule.


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

src/Makefile

@@ -6,7 +6,7 @@ INCDIR=$(PREFIX)/include/espeak
 LIBDIR=$(PREFIX)/lib
 DATADIR=$(PREFIX)/share/espeak-data
 
-RELEASE = 1.39
+RELEASE = 1.43
 BIN_NAME = speak
 BIN2_NAME = espeak
 LIB_NAME = libespeak.so
@@ -49,14 +49,14 @@ endif
 
 speak_SOURCES = speak.cpp compiledict.cpp dictionary.cpp intonation.cpp \
 	readclause.cpp setlengths.cpp numbers.cpp synth_mbrola.cpp \
-	synthdata.cpp synthesize.cpp translate.cpp tr_english.cpp \
-	tr_languages.cpp voices.cpp wavegen.cpp phonemelist.cpp
+	synthdata.cpp synthesize.cpp translate.cpp \
+	tr_languages.cpp voices.cpp wavegen.cpp phonemelist.cpp klatt.cpp
 
 libespeak_SOURCES = speak_lib.cpp compiledict.cpp dictionary.cpp intonation.cpp \
 	readclause.cpp setlengths.cpp numbers.cpp synth_mbrola.cpp \
-	synthdata.cpp synthesize.cpp translate.cpp tr_english.cpp \
+	synthdata.cpp synthesize.cpp translate.cpp \
 	tr_languages.cpp voices.cpp wavegen.cpp phonemelist.cpp \
-	espeak_command.cpp event.cpp fifo.cpp $(WAVE) debug.cpp
+	espeak_command.cpp event.cpp fifo.cpp $(WAVE) debug.cpp klatt.cpp
 
 SRCS1=$(speak_SOURCES)
 OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
@@ -88,7 +88,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
 
 
 x_%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
+	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -fvisibility=hidden -pedantic \
 	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
 
 $(LIB_NAME): $(OBJS2)

src/compiledict.cpp

@@ -1046,7 +1046,14 @@ static char *compile_rule(char *input)
 		strcpy(rule_match,group_name);
 
 	if(rule_match[0]==0)
+	{
+		if(rule_post[0] != 0)
+		{
+			fprintf(f_log,"%5d: Syntax error\n",linenum);
+			error_count++;
+		}
 		return(NULL);
+	}
 
 	EncodePhonemes(rule_phonemes,buf,bad_phoneme);
 	for(ix=0;; ix++)

src/dictionary.cpp

@@ -1940,6 +1940,8 @@ static void MatchRule(Translator *tr, char *word[], int group_length, char *rule
 						{
 							if(rb == RULE_CONDITION)
 								match.phonemes++;  // skip over condition number
+							if(rb == RULE_LINENUM)
+								match.phonemes += 2;  // skip over line number
 						}
 					}
 					else

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.43.02  08.Mar.10";
+const char *version_string = "1.43.10  12.Mar.10";
 const int version_phdata  = 0x014300;
 
 int option_device_number = -1;