From 7fa68cab0be368e6d4885d6b328b23187e659170 Mon Sep 17 00:00:00 2001
From: jonsd <jonsd@d46cf337-b52f-0410-862d-fd96e6ae7743>
Date: Thu, 6 Mar 2008 16:30:43 +0000
Subject: [PATCH] git-svn-id:
 https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@160
 d46cf337-b52f-0410-862d-fd96e6ae7743

---
 dictsource/fr_list  |  4 ++--
 dictsource/sk_list  | 52 ++++++++++++++++++++++-----------------------
 src/Makefile        |  4 ++--
 src/compiledict.cpp |  3 ++-
 src/dictionary.cpp  |  7 +++---
 src/synthdata.cpp   |  4 ++--
 6 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/dictsource/fr_list b/dictsource/fr_list
index 1ef955f4..5d09fefc 100755
--- a/dictsource/fr_list
+++ b/dictsource/fr_list
@@ -338,7 +338,7 @@ du	$u+ $nounf
 des	dez2 $u $nounf
 
 
-à	$u
+à	$u a
 au	$u $brk
 aux	$u $brk
 
@@ -403,7 +403,7 @@ tout	t'ut2 $u
 // Letters which can be words
 //===========================
 à	$atend $accent
-y       $atend $accent
+y       $atend
 
 
 
diff --git a/dictsource/sk_list b/dictsource/sk_list
index 06ce9d1b..9b091af4 100644
--- a/dictsource/sk_list
+++ b/dictsource/sk_list
@@ -103,44 +103,44 @@ _{	zloZena:||za:tvoRka
 _|	zvisla:||tSiaRa
 _}	zloZena:||zatvoRit;
 _~	vl-novka
-_     tvRda:medzeRa    // U+00A0  no-break-space
-_¡    obra:t;eni:vi:kRitSn^i:k
-_¦    pReRuSena:||tSiaRa
-_ª    hoRni:indeks_a:
+_     tvr-da:m'edzeRa    // U+00A0  no-break-space
+_¡    obra:t;eni:v'i:kRitSn^i:k
+_¦    pReRuSena:'tSiaRa
+_ª    hoRni:indeks'a:
 _«    dvojita:lomena:||za:tvoRka
 _­    mekka:poml-tSka
-_²    na_dRuhu:
-_³    na_tRetju
+_²    nadRuhu:
+_³    natRetju
 _´    dl:Zen^
-_·    bodka_vpRostRjedku
-_¸    cedila
-_¹    na_pRvu:
+_·    bodka'vpRostRjedku
+_¸    tsedila
+_¹    napRvu:
 _»    dvojita:lomena:||zatvoRit;
-_¿    obra:t;eni:ota:zn^ik
-_–    dl:ha:poml-tSka
-_‘    l^ava:u:vodzovka
-_’    prava:u:vodzovka
-_“    horne:u:vodzovki
-_”    dolne:u:vodzovki
-_‡    dvojiti:kri:Z
-_•    odra:Zka
-_‣    trojuholni:kova:odra:Zka
-‰	promile
+_¿    obRa:t;eni:'ota:zn^ik
+_–    dl-ha:'poml-tSka
+_‘    l^ava:'u:vodzovka
+_’    prava:'u:vodzovka
+_“    horne:'u:vodzovki
+_”    dolne:'u:vodzovki
+_‡    dvojiti:kRi:Z
+_•    odRa:Zka
+_‣    tRojuholni:kova:'odRa:Zka
+‰	pRomile
 €	euRo
 §	paRagRaf
 ÷	d;eleno
 ×	kRa:t
 °	stupn^ou
-¢	centou
-£	libjer
+¢	tsentou
+£	libjeR
 ¤	znatSkameni
 −	mi:nus
-±	plusmi:nus
+±	plus'mi:nus
 µ	mu:
-¼	Stvrtina
-½	polovica
-¾	tri_Stvrtini
-¬	logicke:not
+¼	Stvr-tina
+½	polovitsa
+¾	tri_Stvr-tini
+¬	logitske:not
 æ	a'e:
 þ	poml-tSkanad
 
diff --git a/src/Makefile b/src/Makefile
index 3e5132ab..e86df162 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-# remove -fno-exceptions  because it caused problems with stdio library on some platforms (ARM)
+# remove -fno-exceptions  if it causes problems with stdio library on some platforms (ARM)
 
 PREFIX=/
 BINDIR=$(PREFIX)/usr/bin
@@ -6,7 +6,7 @@ INCDIR=$(PREFIX)/usr/include/espeak
 LIBDIR=$(PREFIX)/usr/lib
 DATADIR=$(PREFIX)/usr/share/espeak-data
 
-RELEASE = 1.33
+RELEASE = 1.34
 BIN_NAME = speak
 BIN2_NAME = espeak
 LIB_NAME = libespeak.so
diff --git a/src/compiledict.cpp b/src/compiledict.cpp
index 3c48d360..c011195e 100755
--- a/src/compiledict.cpp
+++ b/src/compiledict.cpp
@@ -396,6 +396,7 @@ static char nullstring[] = {0};
 	else
 	{
 		EncodePhonemes(phonetic,encoded_ph,bad_phoneme);
+printf("Encode: [%s] = %.2x %.2x %.2x\n",phonetic,encoded_ph[0],encoded_ph[1],encoded_ph[2]);
 		if(strchr(encoded_ph,phonSWITCH) != 0)
 		{
 			flag_codes[n_flag_codes++] = BITNUM_FLAG_ONLY_S;  // don't match on suffixes (except 's') when switching languages
@@ -1544,7 +1545,7 @@ int CompileDictionary(const char *dsource, const char *dict_name, FILE *log, cha
 	fclose(f_in);
 
 	fseek(f_out,4,SEEK_SET);
-	fwrite(&offset_rules,4,1,f_out);
+	Write4Bytes(f_out,offset_rules);
 	fclose(f_out);
 
 	translator->LoadDictionary(dict_name,0);
diff --git a/src/dictionary.cpp b/src/dictionary.cpp
index 195bb31b..89597e2f 100755
--- a/src/dictionary.cpp
+++ b/src/dictionary.cpp
@@ -103,8 +103,8 @@ void strncpy0(char *to,const char *from, int size)
 
 #else
 
-#  define FIX_ENDIAN_USHORT(val) (val)
-#  define FIX_ENDIAN_UINT(val) (val)
+#define FIX_ENDIAN_USHORT(val) (val)
+#define FIX_ENDIAN_UINT(val) (val)
 #endif
 
 
@@ -180,6 +180,7 @@ int Translator::LoadDictionary(const char *name, int no_error)
 
 	pw = (int *)data_dictlist;
 	length = FIX_ENDIAN_UINT(pw[1]);
+
 	if(size <= (N_HASH_DICT + sizeof(int)*2))
 	{
 		fprintf(stderr,"Empty _dict file: '%s\n",fname);
@@ -189,7 +190,7 @@ int Translator::LoadDictionary(const char *name, int no_error)
 	if((FIX_ENDIAN_UINT(pw[0]) != N_HASH_DICT) ||
 	   (length <= 0) || (length > 0x8000000))
 	{
-		fprintf(stderr,"Bad data: '%s'\n",fname);
+		fprintf(stderr,"Bad data: '%s' (%x %x)\n",fname,FIX_ENDIAN_UINT(pw[0]),length);
 		return(2);
 	}
 	data_dictrules = &data_dictlist[length];
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index c1582467..5e7ef2d8 100755
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,8 +35,8 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.33  06.Mar.08";
-const int version_phdata  = 0x013200;
+const char *version_string = "1.34  06.Mar.08";
+const int version_phdata  = 0x013400;
 
 int option_device_number = -1;