[1.39.48]

Fix lettergroups: Sort items to longest first.

Lang en-us: Use rhotic [3] in place of [@] when [r] follows.

Voice files: add attribute "fast-test" to experiment with faster talking speeds.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@212 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-12-20 10:31:00 +00:00
parent 7758b77459
commit eabd70afbf
53 changed files with 442 additions and 329 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
//maintainer: Willem van der Walt
//maintainer: Willem van der Walt
// email: wvdwalt@csir.co.za
// tel: +27 12 8413996
// Meraka Institute, CSIR
@@ -313,6 +313,7 @@ david _^_EN
(da vinci) da||v'intSi
debora d@bo@ra
debussy d@bus'i:
de d@
(de la) d@||la $u // de la Rey/de la Bat, etc.
der d@r
derick dErik
@@ -608,7 +609,6 @@ voor $u $strend2
// misc unstressed
de d@
dat $u $strend
te t@ $verbf
nie $unstressend $verbextend
+9 -5
View File
@@ -84,8 +84,6 @@ _" uvozovki
_, tSa:Rka
_- mi:nus
_; zdR^edn^i:k
_= Rovno
_* hvjezJitSka
_? otazn^i:k
__ pottr-Zen^i:
_` 'obRa:ts,ena:||tS'a:Rka
@@ -99,14 +97,20 @@ _< menSi:
_> vjetSi:
_| sv'isla:||tS'a:Ra
_: dv'ojtetSka
% pRotsento
+ plus
. tetSka $max3
* hvjezJitSka $max3
= Rovno $max3
* hvjezJitSka $max3
% pRotsento $max3
+ plus $max3
! vigR^itSn^i:k $max3
€ eURo
@ zavina:tS
& ampr-sent
# gR^i:Zek
/ lomeno
_\ beksleS
\ beksleS
° stupen^
× kRa:t
-9
View File
@@ -631,18 +631,9 @@ _flegma) ti ti
ü i
$ dola:R
! vigR^itSn^i:k
. tetSka
. (. _:
\.) .
__) - (_D mi:nus
A_) - (_D _
C_) - (_D _
--) -
* hvj'ezJitSka
*) * (*
**
**) * (_ _::
+19 -2
View File
@@ -15,9 +15,19 @@
// spoken when "speak punctuation" option is on.
_. pUnkt
* StE*n $max3
% p@-*o:ts'Ent $max3
+ plUs $max3
= glaIC $max3
# nUm3 $max3
€ OY*o:
£ paUnd
& Unt
@ kl'ame:*,af@
~ tIld@
\ bEkslES
_, kOma
_| paIp
_: d'Op@lp,UNkt
_; St@-*'ICpUNkt
@@ -64,6 +74,13 @@ _rng k@-*'u:Ze:k
_stk S@-*'Egst@-*IC
_tld t'Ild@
æ $accent
é $accent
ç $accent
č $accent
š $accent
ž $accent
// Not Roman numbers
v faU
x Iks
-19
View File
@@ -1150,24 +1150,5 @@
, (D kOma
$ dOl'A:
€ OY*o:
£ paUnd
% p@-*o:ts'Ent
& Unt
@ kl'ame:*,af@
# nUm3
+ plUs
= glaIC
~ tIld@
\ bEkslES
. pUnkt
. (. _:
\.) .
* StE*n
*) * (*
**
**) * (_ _::
+26 -23
View File
@@ -20,6 +20,7 @@ Dictionary bn_dict
& a a: a~ e E e~ i
I i: i:~ i~ l- o O o:
O~ o~ r- U u u: u:~ u~
V
* b B bh c C ch d
d. d.h dh g gh h j J
@@ -46,10 +47,11 @@ Dictionary cs_dict
i i: l- o o: oU r- u
u:
* ; b c d dZ f g
h j J k l l^ m n
N n^ p r R R^ R^/ s
S t tS ts v x z Z
* ; b c d dZ dz f
g h j J k l l^ m
n N n^ p r R R^ R^/
s S t tS ts v x z
Z
Dictionary cy_dict
@@ -180,10 +182,10 @@ Dictionary hbs_dict
E e e: i I i: l- O
o o: oU r* r- u U u:
* ; b d dZ dZ; f g
h j k l l^ m n N
n^ p r R R2 s S t
tS ts tS; v x z Z
* ; b d dZ dz dZ; f
g h j k l l^ m n
N n^ p r R R2 s S
t tS ts tS; v x z Z
Dictionary hi_dict
@@ -323,9 +325,9 @@ i: ie iu o o: u u: ui
uo
: b c d dZ f g h
j J k l l^ m n n^
p r R R2 s S t tS
ts v x z Z
j J k l l^ m n N
n^ p r R R2 s S t
tS ts v z Z
Dictionary mk_dict
@@ -334,10 +336,10 @@ Dictionary mk_dict
e e: i I i: l- o o:
oU r- u u:
* b d dZ dZ; f g h
j k k^ l l^ m n N
n^ p r R s S t tS
ts tS; v x z Z
* b d dZ dz dZ; f g
h j k k^ l l^ m n
N n^ p r R s S t
tS ts tS; v x z Z
Dictionary ml_dict
@@ -411,10 +413,10 @@ a E E# E~ i O O~ u
y
: ; b c C d d; dZ
dz; f g h j k l m
n N n^ p r R s S
s; S; t t; tS ts ts; tS;
v w x z Z Z;
dz dz; f g h j k l
m n N n^ p r R s
S s; S; t t; tS ts ts;
tS; v w x z Z Z;
Dictionary pt_dict
@@ -476,10 +478,11 @@ Dictionary sk_dict
l- l: o o: oU r- r: u
u:
* ; b d d; dZ f g
h j k l l^ m n N
n^ p r R R^ R^/ s S
t t; tS ts v x z Z
* ; b d d; dZ dz f
g h j k l l^ m n
N n^ p r R R^ R^/ s
S t t; tS ts v x z
Z
Dictionary sq_dict
+6 -4
View File
@@ -178,6 +178,8 @@ _‴ trIp@LpraIm
_‼ Ekskla2m'eIS@nz
_₠ jU@roU
@ _at_
& _and
\ bakstroUk $max3
/ stroUk $max3
?3 \ bakslaS $max3
@@ -2279,7 +2281,7 @@ Berlin b3:l'In
Bhutan bu:t'an
Bogota b0g@t'A:
?3 Boston bOst@n
Bucharest bu:k@r'Est
Bucharest bu:ka2r'Est
Budapest bu:d@p'Est
Buenos bweIn0s
Burundi bUr'UndI
@@ -2308,7 +2310,7 @@ Djibouti dZIb'u:tI
Egyptian IdZ'IpS@n
Eire e@r@
Geneva dZ@ni:v@
Harare h@rA:rI
Harare ha2rA:rI
Hanoi han'OI
Hawaii h@w'aIi:
Hawai'i h@w'aIi:
@@ -2327,7 +2329,7 @@ Jakarta $2
Jerusalem dZ@ru:s@l@m
Johannesburg $2
Kalgoorlie kalgU@lI
Karachi k@rA@tSI
Karachi ka2rA@tSI
Kentucky $2
Kiev ki:Ev
Khmer kmi@3
@@ -2413,7 +2415,7 @@ Taipei t,aIp'eI
Taiwan taI'wan
(tel aviv) t,El||a2v'i:v
Tibet tI2b'Et
Totonto t@r0ntoU
Toronto t@r0ntoU
Timor ti:mo@
Tokyo toUkIoU
Toulouse tu:l'u:z
+4 -3
View File
@@ -730,6 +730,7 @@
r) anged (S1 d
perm) an @n
ang (er aNg
h) ang (er aN
m) anoeu (v @nu:
_qu) an 0n
_w) an 0n
@@ -3404,7 +3405,9 @@
cla) ng (er Ng
ta) ngi ndZI
i) ng (er Ng
bi) ng (er ndZ
ri) ng (er N
si) ng (er N
bi) ng (er ndZ
gi) ng (er ndZ
o) ng (er Ng
you) ng (er Ng
@@ -5338,8 +5341,6 @@
: koUl@n
D_) : (_DD_ // omit colon in time, eg: 2:30
$ d0l3
@ at_:
& _!%and
!= n0ti:kw@Lz
>= greIt@O@i:kw@L
<= lEsO@i:kw@L
+4 -4
View File
@@ -61,14 +61,14 @@ _- dividost@-*eko
__ subst@-*eko
~ tildo
° gradoI
% p@-*otsento
% p@-*otsento $max3
@ _tSe_
& kaI
= egala
& _kaI
= egala $max3
\ deklivo
/ oblikvo
| duktosigno
* asteRisko
* asteRisko $max3
© kopiRaIto
_( R'ondak@-*'ampo
_) f'eRmaRondak@-*'ampo
+6 -4
View File
@@ -67,15 +67,17 @@ _< p'ienempIk'uin
_> s'u:*empIk'uin
_- vi:va2
__ ala2vi:va2
+ plus
+ plus $max3
* asteriski $max3
= 'yht&k'uin $max3
% p@-*osent:I $max3
/ kaut:a2
\ keno
€ eu*o
£ punta2
¤ valu:t:a2
& et
@ &t
% p@-*osent:I
& _et
@ _&t
~ tilde
_acu 'aku:t:I
+1 -3
View File
@@ -207,13 +207,11 @@
.group
å o
å o:
åå o:
š S
ž Z
$ dollarin
* asteriski
= 'yht&k'uin
__) - (_D mi:nus
A_) - (_D _
C_) - (_D _
+4 -4
View File
@@ -111,7 +111,6 @@ _# djEz
_' a2postr'Of
_( 'uvR@-parA~t'Ez
_) f'Erm parA~t'Ez
_* asterisk:
_, virgyl
_- tirE
_. _|pw%E~
@@ -142,10 +141,11 @@ _§ sEksj'O~
// symbols that are normally spoken when reading text
@ arobaz
% pursA~
& e $u $brk
% pursA~ $max3
* asterisk: $max3
& _e
_& _e_komErsj'al
+ plys
+ plys $max3
~ tilde
€ @ro
¢ sEnt
+10 -6
View File
@@ -51,7 +51,7 @@ _ú $accent
_lig l'ig&t,UR&
_acu 'akUt
_ac2 dv'ostr**UkI;'akUt
//_brv
_brv br**'Ev // ??
_ced ts'EdIl&
_cir ts'iRkUmflEks
_dia 'uml&Ut
@@ -71,8 +71,12 @@ _tld t'ild&
_cap k'apIt&l // ?? use English until I find the correct word
© 'aUtoRsk&||pr*av&
% p'osto
+ plus
* zvj'ezdits& $max3
= _j'edn&ko $max3
% p'osto $max3
+ plus $max3
. totSk& $max3
?4 . tatSk& $max3
€ 'euRo
?4 € 'evr*o
@ _'at
@@ -82,9 +86,9 @@ _tld t'ild&
?2 ! 'uzvItSnIk
: dv'ototSk&
?4 : dv'ot&tSk&
# br*'oj_
/ kr*'oz_
\\ b'EkslES
# br*'oj_ $max3
/ kr*'oz_ $max3
\ b'EkslES $max3
^ ts'iRkumfleks
~ t'ild&
¤ v'alut&
-15
View File
@@ -148,25 +148,10 @@
$ d'ol&R
. totSk&
?4 . tatSk&
. (. _:
\.) .
__) - (_D minus
A_) - (_D _
C_) - (_D _
--) -
* zvj'ezdits&
*) * (*
**
**) * (_ _::
= _j'edn&ko
= (==
=) = (=
==) = (_ _::
.group 0xce // Greek letters
+42 -3
View File
@@ -50,7 +50,7 @@ _lig ligAtu:R2A
_acu e:lES
_ac2 kEt:Y:S
_brv fe:lkYR2
//_ced // cedilla
_ced tse:dillE
_cir tsiR2kumflEks
_dia tR2e:mA
//_dot // dot above
@@ -343,10 +343,49 @@ ty ce:
ly Ellipsilon
ny En^
_. pont
ä $accent
æ $accent
ç $accent
ñ $accent
ø $accent
ß _^_DE
. pont $max3
* tS'illAg $max3
% sa:zAle:k $max3
+ plus $max3
= EJEnlY:Se:g $max3
@ kukAts
& e:SjEl
€ EuR2o
¶ bEkEzde:S
§ pAR2AgR2AfuS
~ tildE
^ hia:n^
° fokjEl
Ft foR2int
_, vEss2Y:
_; pontoSvEss2Y:
_: kEt:Y:Spont
_! fElkia:lto:
_? ke:R2dY:
_- kYtY:jEl
__ Ala:hu:za:S
_' ApostR2o:f
_– nAJkYtY:
_— kviR2tmi:nus
_" ide:zY:
_( za:R2o:
_) za:R2o:
_[ s'YglEtES||z'a:R2o:
_] s'YglEtES||z'a:R2o:
_{ k'AptSoS||z'a:R2o:
_} k'AptSoS||z'a:R2o:
_# sa:mjEl
_… ha:R2_mASpont
_• di:spont
_\ viss2ApER2
// Main Exceptions List
//=====================
-16
View File
@@ -336,19 +336,3 @@ _szára) zs (ág zS
ç tS
ñ n^
ø Y
% sa:zAle:k
@ kukAts
€ EuR2o
+ plus
§ pAR2AgR2AfuS
. pont
. (. _:
\.) .
* tS'illAg // asterisk
*) * (*
**
**) * (_ _::
-1
View File
@@ -441,7 +441,6 @@ principi $1
tesser tess'ER
uomini $1
// $alt = use ò or è in the stressed syllable
// If the final vowel is omitted, then the rule applies to 'a' 'e' 'i' 'o'
$textmode
+7 -7
View File
@@ -174,21 +174,21 @@ _{ n,av;as||klamROvy
_} pRavy||n,av;as||klamR'Ovy
_' ap'OstROf
. kR'Opka
. kR'Opka $max3
~ t'ylda
= R'uvna||S;E
/ slES
* gv;'astka
\ b'EkslES
= R'uvna||S;E $max3
/ slES $max3
* gv;'astka $max3
\ b'EkslES $max3
| kR,Eska||p;On'Ova
# haS
# haS $max3
_$ d'OlaR
% pR'OtsEnt
^ d'aSEk // what's be better?
& and
` 'aktsEnt
@ m'awpa
+ plus
+ plus $max3
// other characters
+14 -5
View File
@@ -53,11 +53,11 @@ _ô $accent
_õ $accent
_ú $accent
_ü $accent
ß _^_DE
v ve // not Roman numbers
x Sis#
_cap maI'uskulU
_?A l'etR&_
_?? s'imbolU_
@@ -65,21 +65,31 @@ _#32 esp'asU
?1 _#32 Sp'asU
_#9 tab
_. p'oNtU
* &ste*'iskU $max3
= __igw'&l_ $max3
. p'oNtU $max3
+ maIs# $max3
% pors'eINtU $max3
& _'e_
@ &x'ob&
¤ 'eU*U
€ 'eU*U
§ p&*'agRafU
_! ,eskl&mas'&U~
_" 'asp&s#
?1 _# k,ardin'al
?2 _# k,ardZin'aU
_$ s,ifR'&U~
_% pors'eINtU
_& 'e
?1 _' ap'Ostr,ofy
?2 _' &p'OstRofU
_( ,abRipa*'eINtezy
_) f,ES&pa*'eINtezy
_* &ste*'iskU
_+ m'aIs#
_− m'enUs
_, v'irgul&
_- 'ifeIN
@@ -91,7 +101,6 @@ _< men'Or
?2 _= igw'aU
_> maI'Or
_? ,iNtex,ogas'&U~
_@ &x'ob&
_[ ,abRikowS'etSi
_\ b,ax&,iNvertS'id&
_] f,ES&kowS'etSi
-22
View File
@@ -838,39 +838,17 @@
ü u
ß s
% pors'eINtU
$ sifR'&U~
_r_) $
− m'enUs
+ maIs#
& 'e
@ &x'ob&
¤ 'eU*U
€ 'eU*U
§ p&*'agRafU
D_) º %o // ordinal
D_) ª %a // ordinal
// don't speak multiple occurances of these symbols
, (D v'irgul&
. p'oNtU
. (. _:
\.) .
* &ste*'iskU
*) * (*
**
**) * (_ _::
__) - (_D m'enUs
A_) - (_D _
C_) - (_D _
--) -
= __igw'&l_
= (==
=) = (=
==) = (_ _::
+10 -5
View File
@@ -46,6 +46,7 @@ z zet
â ,ydin'a $atend
ă '@ $atend
î ,ydin'i $atend
ö $accent
_?? ka*akt'er
_cap maZusk'ul@
@@ -69,7 +70,7 @@ _tld t'ild@
// punctuation and symbols
_. punkt
_, v'irgul@
_: do'u@p'unkte
_; p'unkt||Siv'irgul@
@@ -93,9 +94,11 @@ _| b'ar@vertik'al@
_#9 t'ab
_#32 sp'atsiU
= eg'al
# dj'ez
+ plus
. punkt $max3
* aste*isk $max3
= eg'al $max3
# dj'ez $max3
+ plus $max3
& ampersand
© k'apiraIt
@ a*'ond
@@ -104,7 +107,6 @@ _#32 sp'atsiU
° g@-*ade
// numeric
//********
_0 z'e*o
@@ -180,6 +182,9 @@ _dpt _v'irgul@
_0Z2 s'utimi
_0Z3 m'iImi
// not Roman numbers
vi vi
vii viI
// Abbreviations
//**************
+2 -11
View File
@@ -7,7 +7,8 @@
.replace
ș ş
ț ţ
Ș ş // because Windows doesn't convert upper-case Ș Ț to lower-case
Ț ţ
.group a
a a
@@ -471,19 +472,9 @@
, (D v'irgul@
. punkt
. (. _:
\.) .
__) - (_D m'inus
A_) - (_D _
C_) - (_D _
--) -
* aste*isk
*) * (*
**
**) * (_ _::
+18 -8
View File
@@ -47,6 +47,8 @@ y ipsilon
_z zet
ž Zet
ě $accent
// accent names
_lig l'igat,u:Rov,ane:
_acu s_d'l:Zn^om
@@ -72,16 +74,19 @@ _#9 t'ab
_#32 'medzeRa
_?A znak
* hviezda $max3
+ plus $max3
= Rovna:sa $max3
@ zavina:tS
& ampeRsand
# kRi:Zik $max3
_! vi:kRitSn^i:k
_" u:vodzovki
_# kRi:Zik
_$ dola:R
_& ampeRsand
_' apostRof
_( za:tvoRka
_) zatvoRit;
_* hviezda
+ plus
_, tSiaRka
_- poml-tSka
__ podtSiaRknutie
@@ -90,10 +95,8 @@ _/ lomeno
_: dvojbodka
_; bodkotSiaRka
_< menSi:
_= Rovna:sa
_> vetSSi:
_? ota:zn^ik
_@ zavina:tS
_[ hRanata:||za:tvoRka
_\ opatSne:||lomeno
_] hRanata:||zatvoRit;
@@ -179,8 +182,15 @@ _2C dv'est'o
_0M1 t;'isi:ts
_1M1 t;'isi:ts
_2M1 dv'et;'isi:ts
_0M2 m'ilio:n
_0M3 m'iljaRda
_0M2 m'ilio:nou // others, 5-9
_0MA2 m'ilio:ni // for 2,3,4 million
_1M2 m'ilio:n // for 1 million
_0M3 m'iljaRt
_0MA3 m'iljaRdi
_1M3 m'iljaRda
_0M4 b'ilio:nou
_0MA4 b'ilio:ni
_1M4 b'ilio:n
_dpt _:tSj,arka_
+6 -4
View File
@@ -44,7 +44,7 @@ _?A haRf
_acu vURg'UimI
_ac2 tS'IftvURg'UimI
_brv ku#s'altmaimI
_ced tSEnJ'El
_ced h'aRf
_cir Sapk'a
_dia Umla'Ut
_dot YstnOkt'a
@@ -75,15 +75,17 @@ _^ IndZ'EltmEiSa*et'I
_& v'EiSa*et'I
_* j'u#ldu#z
_@ kUjRUkl'U'a
_\\ t'ERs||ej,IktSIzg'I
_\ t'ERs||ej,IktSIzg'I
¶ pa*agR'af
§ tSEnJ'El
° de*edZ'E
_# dij'Ez
_~ jaklaS'u#k
__ ,alttSIzg'I
+ aRt'u#
€ avR'O
= ESIt $max3
% jYzdE $max3
+ aRtu# $max3
€ avRO
_0 su#fu#R
+1 -1
View File
@@ -321,5 +321,5 @@
.group
$ dolar
' (Pb % // split a word at ' and translate the first part separately.
' (Pb // split a word at ' and translate the first part separately.