en-n
@@ -68,7 +68,7 @@ To make alternative voices for a language, you can make additional voice files i
Alternatively there are some preset voice variants which can be applied to any of the language voices, by appending + and a variant name. Their effects are defined by files in espeak-data/voices/!v.
-The variants are +m1 +m2 +m3 +m4 +m5 for male voices, +f1 +f2 +f3 +f4 for female voices, and +croak +wisper for other effects. For example:
+The variants are +m1 +m2 +m3 +m4 +m5 +m6 +m7 for male voices, +f1 +f2 +f3 +f4 +f5 for female voices, and +croak +whisper for other effects. For example:
espeak -ven+m3
The available voice variants can be listed with:
espeak --voices=variant
@@ -96,6 +96,11 @@ The eSpeak speech synthesizer does text to speech for the following additional l
+da Danish
+Usable.
+
+
+
de German
This has improved from easlier versions. A problem is stress placement (which like English is irregular), prosody, and the use of compound words where correct detection of the sub-word boundaries would probably be needed for accurate pronunciation.
@@ -143,6 +148,11 @@ This contains a few changes from es, notably the pronunciation
This has had some feedback from a native speaker but more work is needed. Spelling is fairly regular, but stress marks and vowel accents are often omitted from text, so for some words the dictionary/exceptions list will need to determine the stress position or whether to use open/close [e] or [E] and [o] or [O].
+kn Kannada
+Not much feedback yet, but I'm told that it sounds reasonable.
+
+
+
ku Kurdish
Not much work yet, but Kurdish has good spelling rules so it should be OK.
@@ -154,6 +164,11 @@ Not much work yet, but Kurdish has good spelling rules so it should be OK.
+nl Dutch
+Needs improvement of the spelling-to-phoneme rules.
+
+
+
pl Polish
Usable.
@@ -176,7 +191,7 @@ Usable.
sk Slovak
-This has had assistance from a nativ speaker, so it should be OK.
+This has had assistance from a native speaker, so it should be OK.
@@ -196,8 +211,7 @@ Usable.
ta Tamil
-
-Not much work yet, but I'm told it sounds reasonable.
+This has had assistance from a native speaker, so it should be OK.
@@ -255,6 +269,11 @@ These languages are only initial naive implementations which have had little or
+ka Georgian
+An initial guess, awaiting feedback.
+
+
+
la Latin
Stress rules are implemented, but it needs text where long vowels are marked with macrons.
@@ -265,11 +284,6 @@ These languages are only initial naive implementations which have had little or
-nl Dutch
-Needs improvement of the spelling-to-phoneme rules.
-
-
-
no Norwegian
An initial guess, awaiting feedback.
diff --git a/phsource/compile_report b/phsource/compile_report
index b6f2961a..d740115a 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -360,7 +360,7 @@ l/l_ [l] base
[l/] fr
l/l_@ [l/3] base
[l/] fr
-l/l@ [hp] base
+l/l@ [hx] base
[l#] base
[l] fr
[l/2] fr
@@ -394,7 +394,7 @@ l/L2_oL [l/2] base
l/L2_uL [l/2] base
l/l_3 [l/] de
l/l_4 [ll] sq
-l/la [hp] base
+l/la [hx] base
[l#] base
[l] fr
[l/2] fr
@@ -402,7 +402,7 @@ l/la [h
[K] tn
l/l_a [l/3] base
[l/] fr
-l/le [hp] base
+l/le [hx] base
[l#] base
[l] fr
[l/2] fr
@@ -414,7 +414,7 @@ l/L_eL_af [&] af
[&:] af
l/l_front [L] sq
l/l_front_ [l/4] sq
-l/li [hp] base
+l/li [hx] base
[l#] base
[l] fr
[l/2] fr
@@ -428,7 +428,7 @@ ll/ll [L] bg
ll/_ll [L] bg
l/l_long [l] base
[l] fr
-l/lo [hp] base
+l/lo [hx] base
[l#] base
[l/2] fr
[K] nso
@@ -438,7 +438,7 @@ l/l_o [l/3] base
l^/l_rfx [l.] base
[l] ru
[l^] ru
-l/lu [hp] base
+l/lu [hx] base
[l#] base
[l] fr
[l/2] fr
diff --git a/phsource/mbrola/de4 b/phsource/mbrola/de4
index 6a566ab3..d387559f 100644
--- a/phsource/mbrola/de4
+++ b/phsource/mbrola/de4
@@ -41,7 +41,6 @@
0 Y: NULL 0 2:
0 OI NULL 0 OY
0 3 NULL 0 6
-0 _| NULL 0 ?
0 pF NULL 0 pf
0 r NULL 0 R
@@ -51,6 +50,9 @@
0 A~ NULL 0 a~
0 O~ NULL 0 o~
+16 _| VWL 0 ?
+16 _! VWL 0 ?
+
// phonemes for English words
0 @L NULL 0 L
0 @2 NULL 0 @
diff --git a/phsource/mbrola/nl b/phsource/mbrola/nl
index fddcd05b..4bc1d3ee 100644
--- a/phsource/mbrola/nl
+++ b/phsource/mbrola/nl
@@ -16,7 +16,7 @@
0 d; NULL 0 dj
0 J NULL 0 dj
0 n^ NULL 0 nj
-0 v2 NULL 0 v
+0 v# NULL 0 w
0 s; NULL 0 S
0 C NULL 0 x
0 Q NULL 0 G
@@ -33,6 +33,8 @@
0 Wy NULL 0 9y
0 VU NULL 0 Au
0 eU NULL 70 e W
+0 yU NULL 70 y W
+0 E2 NULL 0 E
// phonemes for English words
@@ -48,7 +50,7 @@
0 a# NULL 0 @
0 I2 NULL 0 I
0 aa NULL 0 a
-0 V NULL 0 @
+0 V NULL 0 2
0 U NULL 0 u
0 0 NULL 0 O
0 3: NULL 0 2
@@ -67,7 +69,8 @@
0 aI@ NULL 70 a @
0 aU@ NULL 70 Au @
-0 dZ NULL 0 dj
+0 dZ VWL 0 dj
+0 dZ NULL 0 tj
0 tS NULL 0 tj
0 T NULL 0 t
0 D NULL 0 z
diff --git a/phsource/ph_spanish b/phsource/ph_spanish
index c70d6b2c..613d3d2c 100644
--- a/phsource/ph_spanish
+++ b/phsource/ph_spanish
@@ -98,7 +98,7 @@ phoneme s
ELIF nextPh(p) OR nextPh(t) OR nextPh(k) THEN
WAV(ufric/s!)
ENDIF
- WAV(ufric/s)
+ WAV(ufric/s, 80)
endphoneme
diff --git a/phsource/vdiph/ai_5 b/phsource/vdiph/ai_5
index 44dcf547..9eff28a0 100644
Binary files a/phsource/vdiph/ai_5 and b/phsource/vdiph/ai_5 differ
diff --git a/platforms/windows/make_espeak.iss b/platforms/windows/make_espeak.iss
index 97b215c3..379ab49f 100755
--- a/platforms/windows/make_espeak.iss
+++ b/platforms/windows/make_espeak.iss
@@ -2,7 +2,7 @@
[Setup]
AppName=eSpeak
-AppVerName=eSpeak version 1.44.01
+AppVerName=eSpeak version 1.45.01
AppCopyright=Licensed under GNU General Public License version 3. (See file License.txt for details).
WindowVisible=yes
@@ -13,9 +13,13 @@ Compression=lzma
SolidCompression=yes
ShowLanguageDialog=auto
+[Icons]
+Name: "{group}\TTSApp"; Filename: "{app}\TTSApp.exe"; WorkingDir: "{app}"
+
[InstallDelete]
Type: files; Name: "{app}\espeak.dll"
Type: filesandordirs; Name: "{app}\espeak-data\voices\test"
+Type: filesandordirs; Name: "{app}\docs"
[Dirs]
Name: "{app}\espeak-data\soundicons"
@@ -30,6 +34,7 @@ Source: "docs\*"; DestDir: "{app}\docs"; Flags: recursesubdirs
Source: "command_line\*"; DestDir: "{app}\command_line"
Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme
Source: "License.txt"; DestDir: "{app}";
+Source: "ChangeLog.txt"; DestDir: "{app}";
[Registry]
Root: HKLM; Subkey: "Software\Microsoft\Speech\PhoneConverters\Tokens\eSpeak"; Flags: deletekey uninsdeletekey
@@ -57,7 +62,7 @@ Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl"
Name: "ro"; MessagesFile: "compiler:Languages\Romanian.isl"
Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl"
-Name: "sq"; MessagesFile: "compiler:Languages\Albanian-2-5.1.11.isl"
+;Name: "sq"; MessagesFile: "compiler:Languages\Albanian-2-5.1.11.isl"
Name: "sr"; MessagesFile: "compiler:Languages\Serbian.isl"
Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl"
Name: "zh"; MessagesFile: "compiler:Languages\ChineseSimp-12-5.1.11.isl"
@@ -150,11 +155,13 @@ begin
$39: Result := 'hi';
$41: Result := 'sw';
$49: Result := 'ta';
- //$4b: Result := 'kn';
+ $4b: Result := 'kn';
//$50: Result := 'mn';
$52: Result := 'cy';
+ //$5e: Result := 'am';
//$61: Result := 'ne';
//$87: Result := 'rw';
+ //$88: Result := 'wo';
end;
// is there a match on the full language code?
@@ -191,6 +198,7 @@ begin
// when a SAPI5 voice is installed.
case lang1 of
'af': value := $436;
+ 'am': value := $45e;
'az': value := $42c;
'bg': value := $402;
'bs': value := $41a; // should be $141a but Jaws crashes on startup
@@ -199,12 +207,15 @@ begin
'cy': value := $452;
'da': value := $406;
'de': value := $407;
+ 'dv': value := $465;
'el': value := $408;
'en': value := $409;
'es': value := $40a;
+ 'et': value := $425;
'eu': value := $42d;
'fi': value := $40b;
'fr': value := $40c;
+ 'gu': value := $447;
'hi': value := $439;
'hr': value := $41a;
'hu': value := $40e;
@@ -212,10 +223,12 @@ begin
'id': value := $421;
'is': value := $40f;
'it': value := $410;
+ 'ka': value := $437;
'kn': value := $44b;
'ko': value := $412;
'lv': value := $426;
'mk': value := $42f;
+ 'ml': value := $44c;
'mn': value := $450;
'ne': value := $461;
'nl': value := $413;
@@ -231,8 +244,11 @@ begin
'sv': value := $41d;
'sw': value := $441;
'ta': value := $449;
+ 'te': value := $44a;
+ 'tn': value := $432;
'tr': value := $41f;
'vi': value := $42a;
+ 'wo': value := $488;
'zh': value := $804;
// mbrola voices
'-af': value := $436;
diff --git a/platforms/windows/make_espeakedit.iss b/platforms/windows/make_espeakedit.iss
index 848b5b3c..66034eeb 100755
--- a/platforms/windows/make_espeakedit.iss
+++ b/platforms/windows/make_espeakedit.iss
@@ -1,7 +1,7 @@
[Setup]
AppName=eSpeakEdit
-AppVerName=eSpeakEdit version 1.44.01
+AppVerName=eSpeakEdit version 1.45.01
DefaultDirName={pf}\eSpeak
DefaultGroupName=eSpeak
OutputBaseFilename=setup_espeakedit
@@ -50,7 +50,7 @@ Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl"
Name: "ro"; MessagesFile: "compiler:Languages\Romanian.isl"
Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl"
-Name: "sq"; MessagesFile: "compiler:Languages\Albanian-2-5.1.11.isl"
+;Name: "sq"; MessagesFile: "compiler:Languages\Albanian-2-5.1.11.isl"
Name: "sr"; MessagesFile: "compiler:Languages\Serbian.isl"
Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl"
Name: "zh"; MessagesFile: "compiler:Languages\ChineseSimp-12-5.1.11.isl"
diff --git a/platforms/windows/windows_sapi/version.rc2 b/platforms/windows/windows_sapi/version.rc2
index 1a6e80c8..89a1b110 100755
--- a/platforms/windows/windows_sapi/version.rc2
+++ b/platforms/windows/windows_sapi/version.rc2
@@ -5,8 +5,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,44,00
- PRODUCTVERSION 1,0,44,00
+ FILEVERSION 1,0,45,00
+ PRODUCTVERSION 1,0,45,00
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -24,14 +24,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Jonathan Duddington\0"
VALUE "FileDescription", "Text to Speech\0"
- VALUE "FileVersion", "1, 0,44,00\0"
- VALUE "InternalName", "espeak1.44\0"
+ VALUE "FileVersion", "1, 0,45,00\0"
+ VALUE "InternalName", "espeak1.45\0"
VALUE "LegalCopyright", "Copyright (c) Jonathan Duddington\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "espeak_sapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "espeak TTS\0"
- VALUE "ProductVersion", "1, 0, 44, 00\0"
+ VALUE "ProductVersion", "1, 0, 45, 00\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/src/Makefile b/src/Makefile
index 27c36683..a184e85d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@ BINDIR=$(PREFIX)/bin
INCDIR=$(PREFIX)/include/espeak
LIBDIR=$(PREFIX)/lib
-RELEASE = 1.44
+RELEASE = 1.45
BIN_NAME = speak
BIN2_NAME = espeak
LIB_NAME = libespeak.so
diff --git a/src/readclause.cpp b/src/readclause.cpp
index 143aea22..18bc8ec2 100644
--- a/src/readclause.cpp
+++ b/src/readclause.cpp
@@ -202,18 +202,18 @@ const int param_defaults[N_SPEECH_PARAM] = {
0, // voice type
};
-
#ifdef NEED_WCHAR_FUNCTIONS
// additional Latin characters beyond the Latin1 character set
#define MAX_WALPHA 0x233
// indexed by character - 0x100
-// 0=not alphabetic, 0xff=lower case, other=value to add to upper case to convert to lower case
+// 0=not alphabetic, 0xff=lower case, 0xfe=special case
+// other=value to add to upper case to convert to lower case
static unsigned char walpha_tab[MAX_WALPHA-0xff] = {
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 100
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 110
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 120
- 0xff,0xff, 1,0xff, 1,0xff, 1,0xff,0xff, 1,0xff, 1,0xff, 1,0xff, 1, // 130
+ 0xfe,0xff, 1,0xff, 1,0xff, 1,0xff,0xff, 1,0xff, 1,0xff, 1,0xff, 1, // 130
0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff,0xff, 1,0xff, 1,0xff, 1,0xff, // 140
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 150
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 160
@@ -264,6 +264,12 @@ int towlower(int c)
return(tolower(c));
if((c > MAX_WALPHA) || ((x = walpha_tab[c-0x100])==0xff))
return(c); // already lower case
+ if(x == 0xfe)
+ {
+ // special cases
+ if(c == 0x130) // uppercase i-dot
+ return('i');
+ }
return(c + x); // convert to lower case
}
@@ -358,7 +364,11 @@ int towlower2(unsigned int c)
{
c = 0x131; // I -> ı
}
- }
+ }
+#ifdef __WIN32__
+ if(c == 0x130) // uppercase i-dot
+ return('i');
+#endif
return(towlower(c));
}
diff --git a/src/synth_mbrola.cpp b/src/synth_mbrola.cpp
index 245778b7..a8459a36 100644
--- a/src/synth_mbrola.cpp
+++ b/src/synth_mbrola.cpp
@@ -109,7 +109,7 @@ void unload_MBR()
static MBROLA_TAB *mbrola_tab = NULL;
static int mbrola_control = 0;
-
+static int mbr_name_prefix = 0;
espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int srate)
{//===================================================================================
@@ -123,6 +123,7 @@ espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int
mbrola_name[0] = 0;
mbrola_delay = 0;
+ mbr_name_prefix = 0;
if(mbrola_voice == NULL)
{
@@ -200,16 +201,22 @@ static int GetMbrName(PHONEME_LIST *plist, PHONEME_TAB *ph, PHONEME_TAB *ph_prev
{//==========================================================================================================================================
// Look up a phoneme in the mbrola phoneme name translation table
// It may give none, 1, or 2 mbrola phonemes
- int mnem = ph->mnemonic;
MBROLA_TAB *pr;
PHONEME_TAB *other_ph;
int found = 0;
+ static int mnem;
// control
// bit 0 skip the next phoneme
// bit 1 match this and Previous phoneme
// bit 2 only at the start of a word
// bit 3 don't match two phonemes across a word boundary
+ // bit 4 add this phoneme name as a prefix to the next phoneme name (used for de4 phoneme prefix '?')
+
+ *name2=0;
+ *split=0;
+ *control=0;
+ mnem = ph->mnemonic;
pr = mbrola_tab;
while(pr->name != 0)
@@ -249,15 +256,25 @@ static int GetMbrName(PHONEME_LIST *plist, PHONEME_TAB *ph, PHONEME_TAB *ph_prev
*name2 = pr->mbr_name2;
*split = pr->percent;
*control = pr->control;
- return(pr->mbr_name);
+
+ if(pr->control & 0x10)
+ {
+ mbr_name_prefix = pr->mbr_name;
+ return(0);
+ }
+ mnem = pr->mbr_name;
+ break;
}
}
pr++;
}
- *name2=0;
- *split=0;
- *control=0;
+
+ if(mbr_name_prefix != 0)
+ {
+ mnem = (mnem << 8) | (mbr_name_prefix & 0xff);
+ }
+ mbr_name_prefix = 0;
return(mnem);
}
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index 77e03966..df8ca526 100644
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,8 +35,8 @@
#include "translate.h"
#include "wave.h"
-const char *version_string = "1.44.42 12.Mar.11";
-const int version_phdata = 0x014415;
+const char *version_string = "1.45.02 15.Mar.11";
+const int version_phdata = 0x014500;
int option_device_number = -1;
FILE *f_logespeak = NULL;
diff --git a/src/voices.cpp b/src/voices.cpp
index 13a137e2..ae00a656 100644
--- a/src/voices.cpp
+++ b/src/voices.cpp
@@ -411,7 +411,7 @@ void VoiceReset(int tone_only)
voice->samplerate = 22050;
memset(voice->klattv,0,sizeof(voice->klattv));
- speed.fast_settings[0] = 400;
+ speed.fast_settings[0] = 450;
speed.fast_settings[1] = 800;
speed.fast_settings[2] = 175;