Merge commit '4634aa43a5' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vdiph/eei_5
	phsource/vdiph2/i@_3
	phsource/vietnam/_c.wav
	phsource/vietnam/a
	phsource/vietnam/ch.wav
	phsource/vietnam/dd.wav
	phsource/vietnam/ie_2
	phsource/vietnam/oe
	phsource/vietnam/th.wav
	phsource/vietnam/tr.wav
	platforms/windows/make_espeakedit.iss
	src/Makefile
This commit is contained in:
Reece H. Dunn
2013-03-18 11:43:32 +00:00
18 changed files with 406 additions and 58 deletions
+301 -10
View File
@@ -14,7 +14,7 @@ _acu akT'ento aQ'uDo
_ac2 d'Ople||aQ'uDo
_brv br'eu
_ced TeD'il^a
_cir Tirkumfl'ekso
_cir Tirkumfl'eSo
_dia djEr'esi
_dac d'Ople||aQ'uDo
_dot p'unto
@@ -30,6 +30,7 @@ _tld t'il^a
// letter names
b be
c Te
ç Te||TetjEl^a
d de
f Efe
g ge
@@ -59,7 +60,7 @@ ll 'El^e
á 'a||akTEntw'aDa
é 'e||akTEntw'aDa
í 'i||akTEntw'aDa
_ó 'o||akTEntw'aDa
ó 'o||akTEntw'aDa
ú 'u||akTEntw'aDa
ü ,uDjEr'Esi
@@ -169,16 +170,39 @@ _1M1 mil'en
_0M2o mil^on'en
_1M2o mil^on'en
// characters
$ d'olar
€ eUros
£ liBras
* asterisko
& ampers'an
@ aRRoBa
# sin^'alDenum'ero
% porTj'En
+ mas
= iQwal
/ baRRa
\ kontraBaRRa
| b'aRRaBertik'al
_- gj'on
! TaRR'ar||eksklamaTj'on
_¡ uBr'ir||eksklamaTj'on
_? TaRR'ar||interroQaTj'on
_¿ uBr'ir||interroQaTj'on
_[ uBr'ir||Qaf'et
_] TaRR'ar||Qaf'et
_( uBr'ir||parent'esi
_) TaRR'ar||parent'esi
_{ uBr'ir||kl'aU
_} TaRR'ar||kl'aU
// unstressed words
o $u
o $atend
a $u
a $atend
os $u
os $atend
as $u
as $atend
o $u+
a $u+
os $u+
as $u+
lo $u
la $u
@@ -199,7 +223,270 @@ os $u
les $u
lis $u
con $u
de $u
en $u $brk
mi $u
pa $u
por $u $brk
pues $u
pos $u
ta $u $brk
tu $u
sin $u
su $u
ye $u
ro $u
ra $u
ros $u
ras $u
el $u
es $u
els $u
mis $u
tus $u
sus $u
bell $u
bel $u
bella $u
bells $u
bellas $u
bellos $u
que $u
qui $u
quien $u
como $u
quan $u
quando $u
on $u
aon $u
porque $u
dende $u
entre $u
contra $u
enta $u
sinde $u
per $u
pus $u
dica $u
sino $u
ni $u
pero $u
bi $u
i $u+
ie $u
hu $u
sant $u
donya $u
don $u
he $u
has $u
ha $u
han $u
heba $u
hebas $u
heban $u
se'n sen $u
//abbreviations
abs $abbrev
ac $abbrev
acb $abbrev
acm $abbrev
acs $abbrev
acup $abbrev
adn $abbrev
adsl $abbrev
aea $abbrev
aeci $abbrev
aek $abbrev
aepd $abbrev
afp $abbrev
ai $abbrev
akp $abbrev
amd $abbrev
anb $abbrev
anp $abbrev
anv $abbrev
ap $abbrev
apec $abbrev
aqu $abbrev
atp $abbrev
ats $abbrev
avl $abbrev
avs $abbrev
avt $abbrev
avv $abbrev
bbva $abbrev
bce $abbrev
bme $abbrev
bop $abbrev
bopv $abbrev
ca $abbrev
cav $abbrev
cbuc $abbrev
ccaa $abbrev
ccoo $abbrev
ccuc $abbrev
cee $abbrev
ceoe $abbrev
cepyme $abbrev
cesid $abbrev
cicr $abbrev
cidui $abbrev
ciemat $abbrev
cis $abbrev
cne $abbrev
cni $abbrev
csic $abbrev
csif $abbrev
dgaia $abbrev
dlsi $abbrev
dni $abbrev
dogc $abbrev
dogv $abbrev
dya $abbrev
eads $abbrev
eaed $abbrev
eb $abbrev
ebb $abbrev
eees $abbrev
eei $abbrev
egb $abbrev
eln $abbrev
emt $abbrev
eoc $abbrev
epsv $abbrev
erc $abbrev
ets $abbrev
euia $abbrev
facua $abbrev
fao $abbrev
fapae $abbrev
fbi $abbrev
fci $abbrev
feb $abbrev
fed $abbrev
fib $abbrev
finul $abbrev
fmi $abbrev
fuoc $abbrev
gatt $abbrev
iaaf $abbrev
ibm $abbrev
icaa $abbrev
icde $abbrev
icv $abbrev
iec $abbrev
iee $abbrev
ieo $abbrev
imc $abbrev
ims $abbrev
in3 $abbrev
inc $abbrev
inem $abbrev
ing $abbrev
inm $abbrev
ip $abbrev
ipc $abbrev
ipca $abbrev
iqua $abbrev
isaf $abbrev
itcat $abbrev
itv $abbrev
iu $abbrev
iun $abbrev
ko $abbrev
lotc $abbrev
mibor $abbrev
mit $abbrev
mnac $abbrev
nba $abbrev
nyse $abbrev
ocde $abbrev
ocu $abbrev
oea $abbrev
oiea $abbrev
olp $abbrev
omc $abbrev
omg $abbrev
oms $abbrev
ong $abbrev
op $abbrev
pce $abbrev
pda $abbrev
pde $abbrev
pdi $abbrev
pec $abbrev
pga $abbrev
pge $abbrev
pgou $abbrev
pib $abbrev
pid $abbrev
pse $abbrev
psoe $abbrev
psuc $abbrev
racc $abbrev
raf $abbrev
rba $abbrev
ree $abbrev
rfec $abbrev
rne $abbrev
rsa $abbrev
rtve $abbrev
samu $abbrev
sdat $abbrev
sec $abbrev
smi $abbrev
sod $abbrev
sos $abbrev
summa $abbrev
tor $abbrev
tpi $abbrev
tse $abbrev
tsja $abbrev
tve $abbrev
ua $abbrev
uab $abbrev
uaw $abbrev
udc $abbrev
udg $abbrev
udl $abbrev
ue $abbrev
uem $abbrev
ugt $abbrev
uhf $abbrev
uib $abbrev
uicn $abbrev
uimp $abbrev
uji $abbrev
um $abbrev
umd $abbrev
ump $abbrev
upc $abbrev
upd $abbrev
upf $abbrev
upn $abbrev
ups $abbrev
upv $abbrev
url $abbrev
urss $abbrev
urv $abbrev
usb $abbrev
usfp $abbrev
uss $abbrev
uv $abbrev
uveg $abbrev
uz $abbrev
vih $abbrev
vpo $abbrev
wap $abbrev
witsa $abbrev
// exceptions
barça b'arsa
holio x'olio
jazz dZ'as
@@ -220,6 +507,7 @@ iphone 'aIfon
(i pod) 'aIpod
ipod 'aIpod
hardware x'ardwer
linux $1
live l'aIB
messenger m'esendZer
mozilla moT'ila
@@ -229,5 +517,8 @@ skype esk'aIp
software s'oftwer
thunderbird Tanderb'ird
twitter tw'iter
unix j'uniks
whatsapp was'app
windows w'indows
mobile _^_EN
+35 -4
View File
@@ -17,6 +17,8 @@
au aU
au (X 'aU
_) a' %a
.group b
b b
@@ -38,6 +40,10 @@
ch tS
.group ç
ç T
.group d
d d
_) d d // phoneme definition may change it to [D]
@@ -52,6 +58,9 @@
n) d (_ = // silent, but stress on last vowel
_) d' (AP2 d
_) de' d%e
.group e
e e
@@ -66,6 +75,9 @@
u) e E
y) e E
_) ent' (AP4 ent
_) enta' ,ent%a
.group f
f f
@@ -92,11 +104,12 @@
.group h
h // silent
hu (e gw
hu (i gw
.group i
i i
i (u i
i (u_ i
i (A j
@@ -116,6 +129,9 @@
.group m
m m
_) m' (AP2 m
_) mo' m%o
.group n
n n
@@ -141,10 +157,15 @@
u) o O
y) o O
.group p
p p
_) ps s
_) p' (AP2 p
_) pa' p%a
_) pe' p%e
.group q
qu (A kw
@@ -174,6 +195,8 @@
s s
&) s (_S1 s
_) s' (AP2 s
.group t
t t
@@ -186,15 +209,20 @@
ui) t (_ t#
s) t (_ = // silent, but stress on last vowel
_) t' (AP2 t
_) ta' t%a
_) to' t%o
.group u
u u
uix uS
u (u u
u (i u
r) uix uS
r) u (A u
u (A w
_) u (A gw
uix uS
.group v // same as 'b'
@@ -234,3 +262,6 @@
ó ''o
ú ''u
__) - (_D m'enos
D_) - (_D m'enos
+4
View File
@@ -254,6 +254,10 @@
@) es (_S2qd 'Es // double the previous vowel
@) es (_$w_alt2S1 s // just remove 's'
KAC) es (_S2e @s
mb) es (_S1 s
nd) es (_S1 s
rd) es (_S1 s
gt) es (_S1 s
es (ie_ e:z
@) essen (_S5qd 'Es@n
@) eres (_S4qd @r'Es
+8 -5
View File
@@ -369,7 +369,7 @@ sua $u+ $nounf
?2 nossas $u+ $nounf n'Os&s
dele dely $u1+
dela $u+
deles $u+
deles delys $u1+
delas $u+
nele nely $u1+
@@ -654,7 +654,7 @@ apego $alt2 $noun
apelo $alt $verb
aposto $alt $verb
aperto $alt2 $noun
apoio $alt $verb
apoio $alt2 $noun
aprovo $alt
arredores $alt
arremesso $alt2 $noun
@@ -717,7 +717,6 @@ chovesse $alt2
chupeta $alt2
clamores $alt2
clero $alt
crepe $alt
coco $alt2
cofre $alt
cogumelo $alt
@@ -732,6 +731,7 @@ colore $alt
começo $alt2 $noun
comodo $alt2
concerto $alt2 $noun
concertos $alt2
concordo $alt
conforto $alt $verb
congelo $alt
@@ -739,6 +739,7 @@ consolo $alt2 $noun
controle $alt2 $noun
controlo $alt2 $noun
coreia $alt
coreto $alt2
corneta $alt2
cornos $alt
corpos $alt
@@ -748,6 +749,7 @@ corvos $alt
coto $alt2
cratera $alt
crede $alt2
crepe $alt
decore $alt
desapego $alt2 $noun
descabelo $alt
@@ -775,6 +777,7 @@ dueto $alt2
elixir eliSir
elo $alt
emprego $alt2 $noun
empregos $alt2
encosto $alt $verb
endereço $alt2
endereço $alt $verb
@@ -793,6 +796,7 @@ erros $alt2
esboço $alt $verb
escopeta $alt2
escova $alt2 $noun
escovas $alt2
escovo $alt
escroto $alt2
esforço $alt $verb
@@ -834,9 +838,7 @@ forca $alt2
força $alt2 $noun
forças $alt2
forço $alt
fossem $alt2
forro $alt $verb
fosse $alt2
frevo $alt2
galera $alt
galileia $alt
@@ -1019,6 +1021,7 @@ topo $alt $verb
torno $alt $verb
torre $alt2 $noun
torres $alt2
torro $alt
tortos $alt
traqueia $alt
travesso $alt2
+16 -4
View File
@@ -353,20 +353,22 @@
tiv) e (L05_ E // es-
_com) e (L05_ e
_pud) e (L05_ E
_tem) e (L05_ e
_coub) e (L05_ E
_exag) e (L05_ E
_houv) e (L05_ E
_perd) e (L05_ e
_quis) e (L05_ E
_soub) e (L05_ E
_trem) e (L05_ e
diss) e (L06_ E // contra-
fend) e (L06_ e // de- o-
tend) e (L06_ e // a- con- en- es-
vend) e (L06_ e // re-
_mord) e (L06_ e
_rend) e (L06_ e
prend) e (L06_ e // a- rea- des- desa-
_arrepend) e (L06_ e
_defend) e (L06_ e
_depend) e (L06_ e
_escond) e (L06_ e
preend) e (L06_ e // com- a- re- sur-
@@ -383,6 +385,7 @@ respond) e (L06_ e // cor-
colh) e (L07_ e // & es-
corr) e (L07_ e // per- con- in- so- dis-
ench) e (L07_ e // pre-
fend) e (L07_ e // de- o-
nasc) e (L07_ e // re-
tend) e (L07_ e // en- con- a- es-
torc) e (L07_ e // con-
@@ -396,6 +399,7 @@ respond) e (L06_ e // cor-
_morr) e (L07_ e
_perd) e (L07_ e
_sofr) e (L07_ e
_trem) e (L07_ e
merec) e (L07_ e // des-
padec) e (L07_ e // com-
parec) e (L07_ e // a- rea- com- desa-
@@ -410,8 +414,8 @@ _amanhec) e (L07_ e
_amolec) e (L07_ e
_anoitec) e (L07_ e
_arrepend) e (L07_ e
_atrev) e (L07_ e
_cresc) e (L07_ e
_defend) e (L07_ e
_depend) e (L07_ e
_desguarnec) e (L07_ e
_emagrec) e (L07_ e
@@ -442,6 +446,7 @@ preend) e (L07_ e // sur- com-
proteg) e (L07_ e // des-
respond) e (L07_ e // cor-
qu) e (brL04_ E
_cel) e (brL04_ E
_hosp) e (dL03_ E
_gr) e (gL03_ e
_gal) e (gL03_ e
@@ -837,7 +842,8 @@ estabel) e (çL03_ e // re-
?1 v) o (lt O
//sort
_f) o (L06_ o
_f) o (L05_ o
_f) o (L07_ o
_engl) o (bL01_ O
_s) o (bL02_ O
_esn) o (bL04_ O
@@ -849,7 +855,7 @@ _desabr) o (chL04_ O
_af) o (gL04_ O
_adv) o (gL04_ O
_ref) o (gL04_ O
_ap) oi (L01_ OI
_ap) oi (L04_ OI
_t) o (lL03_ o
c) o (lhL02_ O // es- en- re-
_t) o (lhL02_ O
@@ -869,14 +875,19 @@ _inson) o (rL03_ O
_comem) o (rL04 O
_remem) o (rL04_ O
_enf) o (rquL02_ O
_ext) o (rquL02_ O
c) o (rrL01_ o // escorra, incorra, corra, recorra
_m) o (rrL01_ o
p) o (rtL03_ O // im- trans- de- re- com- a- ex-
t) o (rçL01_ O // con-
_r) o (snL04_ O
_c) o (spL02_ O
p) ostos (_ Ost=Us# // dispostos etc.
_gar) o (tL03_ o
_g) o (zL04_ O
_esb) o (çL01_ O
_r) o (çL03_ O
tr) o (çL03_ O // des-
_ad) o (çL03_ O
_end) o (çL03_ O
//endsort
@@ -1162,5 +1173,6 @@ _remem) o (rL04_ O
__) - (_D m'enUs
D_) - (_D m'enUs
A_) - (_D _
C_) - (_D _