mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.39.08]

Browse Source 
lang=sq: Adjust phonemes.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@196 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-10-04 02:02:15 +00:00
parent 5ef05700e1
commit 72cf85ec8e
34 changed files with 305 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dictsource/af_list
+10 -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
@@ -29,6 +29,7 @@ pres pr@s@d'Ent $dot
prof pruf'Es@r $dot
sabc $abbrev
sanrb $abbrev
sms'e Es_Em_'Es@
sauk $abbrev
st s@nt $dot
supt suprEntEnd'Ent $dot
@@ -81,7 +82,6 @@ z zEd
û $accent
ü $accent
_cap h'o@flEt@r
_?? s@mb'o@l
_?A l'Et@r
@@ -163,6 +163,7 @@ boekarest bukarEst
bonnievale _^_EN
brittanje $2
brooklyn _^_EN
burundi bur'undi
caledon kalidOn
carolina karul'ina
ceres se@r@s
@@ -189,6 +190,7 @@ goudini $2
gordonsbaai gO:rd@nsb'AI
(graaff reinet) x2rA:f||r@n'Et
griekeland x2rik@lant
groblersdal x2rObl@rsd'al
havana hav'ana
hermon $1
hirosjima hiruS'ima
@@ -200,6 +202,7 @@ kaïro ka_'iru
kameroen kam@r'un
kenia ki:nia
kimberley kimb@rli
kinshasa kinS'A:sa
kongo kONgu
knysna neIsna
kuruman kuruman
@@ -210,6 +213,7 @@ macedonië mas@d'o@ni@
madagaskar madax2'askar
majuba maj'uba
malmesbury mA:msb@ri
maputo map'u:tu
mauritius mOr'iSjWs
milaan $2
mesopotamië mEsuput'A:mi@
@@ -230,6 +234,7 @@ sahara sah'A:ra
secunda s@kunda
senekal se@n@kal
singapoer siNgapur
soshanguve sOSaNg'u:vE
soweto suw'E:tu
springs _^_EN $capital
sunnyside _^_EN
@@ -668,6 +673,7 @@ beta be@ta
bewe be@v@
bewend be@v@nt
bewering b@ve@rIN
bomaat bo@mA:t
boskaas $2
bostaande b'o@stA:nd@
bourgeois _^_FR
@@ -904,8 +910,10 @@ persent p@rsEnt
petite p@tit
pinotage pinut'A:Z
pirouette p@ru:'Et
plasenta plas'Enta
primaat $2
primate $2
(pro forma) pro@||f'Orma
rebelleer r@b@le@r
rededele re@d@de@l@
dictsource/af_rules
+21 -3
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
@@ -101,6 +101,8 @@
w) a (tering A: //watering exception to the rest
C) a (tering %a //short unstressed a before tering formatering etc. except watering
@C) a (tief %a // fix a sound: akkumulatief/negatief and many similar
@m) a (tiek %a // shorten a sound: diplomatiek/dogmatiek/problematiek/sistematiek/-e
tam) a (tiek A: // but fix stress and a sound: tamatiekelkie/-konfyt/-kultivar
@C) a (tiewe %a // fix a sound: konserwatiewe/putatiewe and many similar
_arC) ad (A 'A:d // Arcadia/arkadia/arkade/armada
ai aI
@@ -318,6 +320,7 @@
aan (valler A:n // but restore default stress: aanvaller/-s
aan (vank A:n' // stress aanvanklik/e
aan (vullend %A:n // move default stress: aanvullend/-e
aan (vegba %A:n // move default stress: aanvegbaar/-bare/-baarheid
aanwen (d 'A:nvEn // to correct pronunciation of e
aanwen (_ 'A:nvEn // to correct pronunciation of e in aanwen/aanwending
aan (wesig %A:n // move default stress: aanwesig/-e/-es/-heid
@@ -407,6 +410,8 @@
bo (grond bo@ // fix 1st o sound: bogronds/-e
_) bo (kle bo@ // fix o sound: bokleed/boklere
bokma (kier b%Okm%a // fix stress and a sound: bokmakierie/-s/-tjie
bom (AA bOm_ // fix a sound, pause: bomaanval/-aanslag/-aard/-eenheid and compounds
bomaans bo@mA:ns // but fix O sound: bomaans/-e
bonde (C bOnd@ // verbondenheid/bondeldraer/gebondene/saambondelend
boos (aardig b%o@s_ // move default stress: boosaardig/-e/-heid
_) bor (dA@ b%Or // geborduur/bordeel/bordele
@@ -727,6 +732,7 @@
dingaan d@NgA:n // fix stress and g sound: Dingaan(sdag)
dino (sou d%in%u // move default stress: dinosourus/-se and compounds
di (ploma d@ // move default stress: diploma/-s and compounds/diplomaat
diplo (mat d@pl%u // fix stress and o sound: (handels-/top)diplomate, etc./diplomaties
direk d%irEk // direk/-sie/-te/-theid/indirek...
dirig (e d@r@x2 // fix stress and i sounds: dirigeer/dirigent and compounds
_) dis (inP3 d@s // disintegrasie/disinvestering and similar
@@ -735,6 +741,7 @@
_) dis (kre d@s // move default stress: diskreet/-heid/-ste/diskrete
dis (loja d@s // move default stress: dislojaal/-lojale/-lojaliteit
_) dis (oP3 d@s // disorganisasie/disoriënteer
dis (pu d@s // move default stress: dispuut/dispute
distro (fie d@str%u // fix stress and o sound: (spier)distrofie, etc.
divide (nd d@v@dE //dividende etc.
d (_N t //
@@ -918,6 +925,7 @@
sk) e (ne_ e@ // fix penultimate e sound: hakskene and any compounds
&s) e (ne_ @ // fix penultimate e sound: aangewesene/gekosenes/genesene/herresene/toegewesene/
enge (l EN@ // Engeland/Engelsman/Engelssprekend/hengelklub/mengeldrankie/-moes
enjin Enj@n // fix e sound of compounds with -enjin: diesel-/agterenjin, etc.
boord) e (ns @ // fix e sound: boordens(te)vol
l) ens (_ E:ns // fix e sound: kamaralens/wyehoeklens/kontaklens and similar
l) ense (_ E:ns@ // plurals: kamaralense/wyehoeklense/kontaklense
@@ -1762,6 +1770,8 @@
inisi (eA %in%iS%i // fix inisieer etc.
in (kenn @n // move default stress: inkennig/-e/-heid
i (nneemba @ // move default stress: (on)inneembaar/-bare/-baarheid
insek (A InsEk_ // fix e sound, pause: insekeier/-etend/-eter/-oog/-orde
insek (u @ns@k // but: insekuriteit and compounds
insi (dent @ns@ // insident/e/insidentjie
in (skik @n // move default stress: inskiklik and derivatives
in (skrip @n // move default stress: inskripsie/-s
@@ -2088,6 +2098,7 @@
kanfer (foel k%A~nf@r // move default stress: kanferfoelie and compounds
kanni (ba k%an%i // move default stress: kannibaal/kannibale/kannibalisme
_) kano (vaar k%ano@ // fix stress and vowel sounds: kanovaarder/vaart, etc.
kano (_ k%ano@ // fix last o sound: (opblaas)kano/-'s
kan (tien k%an // move default stress: kantien and compounds
_) kan (to@ k%an move default stress: kantoor/kantore and compounds
kant (onder kant_ // kantonderklere/-onderrok, etc.
@@ -2346,6 +2357,7 @@
m (m
@) marie (_ m%ar'i //names ending in marie fix a and stress.
macedo (nA m%as@do@ // fix stress and vowel sounds: Macedonië/Macedóniër/-s
machiave m%ak%i%avE // fix stress, vowel and v sounds: Machiavelliaans/-e
made (lie m%A:d@ // fix stress and e sound: madeliefie/-s/watermadeliefies
_) ma (d m%a // fix stress and 1st a sound: madonna/-s/-beeld/-lelie/Madiba/Madras
maga (lie m%ax2a // fix stress and a sounds: Magalies/-berg/-e/-burg/-kruin
@@ -2370,6 +2382,7 @@
mando (lien m%and%u // fix stress and o sound: mandolien and compounds
mane (l m%an& // fix stress and e sound: (kerk)manel(le)punte, etc.
mane (wale m%an@ // fix stress and shorten a sound: manewale/-s and compounds
_) mango maNg%u // fix g and o sounds: mangoboord/-sap/-'s
man (haft m%an // move default stress: manhaftig/-e/-heid
manier m@ni:r //manier and compounds
manifes manifEs // fix vowel sounds: manifes and compounds/manifestasie/manifesteer
@@ -2651,10 +2664,11 @@
n (_n_ n // fix n in phrases like: afkappingsteken n
neer (drukk n%e@r // move default stress: neerdrukkend/-e
neer (halend n%e@r // move default stress: neerhalend/-e
@) nees (_ n'e@s // fix stress: Soedanees and similar
&) nele (_ n'e@l@
_) nes (ei nEs_ // fix 1st e sound: neseier/-s/-tjie/-s
s) nes (K nEs // onheilsnes/rowersnes
nese (_ n'e@s@ //japannese soedannese stres and e sound
nese (_ n'e@s@ //japannese soedannese stress and e sound
netel ne@t@l // netelig and derivatives/netel and compounds
niko (ti n%ik%u // fix stress and vowel sounds: nikotien/nikotine and compounds
nitro nitr%u // fix vowel sounds: nitrogliserien and similar compounds
@@ -3361,6 +3375,7 @@
ramp (salig r%amp // move default stress
ramp (spoed@ r%amp // move default stress: rampspoedig and derivatives
_) rand (A@ rant_ // fix d sound and insert pause: randafwerking/-akker/-eier
_) ran (geer r%aN // split n/g: (ge)rangeer/rangeerder and compounds
ra (nonkel r@ // fix stress and a sound: ranonkel/-s/ranonkelrooi, etc.
ra (ntsoen r%a // move default stress: rantsoen and compounds
ra (pier r%a // move default stress: rapier/-e and compounds
@@ -3523,6 +3538,7 @@
siklu (s siklW // siklus and many compounds
silhoe (A s@l%uw // silhoeët/-te/-teer
sili (nd s@lI // silinder(s)/silinderkoppe
si (llabA s@
si (napK s@ // fix stress and i sound: sinaps/-esinapties
sin (ja s@n // move default stress: sinjaal/sinjale
_) si (noC s@ // fix stress and i sound: sinode and compounds/sinops/sinop;ties
@@ -3662,6 +3678,7 @@
snaper (ing snA:p@r // fix stress and vowel sounds: versnapering/-e/-s and compounds
snel (_ sn&l // fix e: aansnel/agternasnel/blitssnel/heengesnel/koppesnel/nasnel/verbysnel
sodom (iet s,o@dOm // fix stress
_) soeda (n s%uda // fix stress: Soedan/Soedanese
soet (sappi s%ut // move default stress: soetsappig/-e/-heid
soewe (nier s%uv@ // move default stress: soewenier/-e/-s
_) soie so@?i // soiets/soiemand
@@ -3669,6 +3686,7 @@
sol (dy s%Ol // fix stress: soldy and compounds
so (lied s%O // stress and o sound: solied/-e
so (lid s%O // konsolidasie/solidariteit
_) soma (liA s%umA: // fix stress and vowel sounds: Somalië/-r/Somaliese
sonant sun'ant // fix stress and o sound: sonant/dissonant/konsonant
so (natA s%u // move default stress and fix o sound: sonate/-s and compounds
sonne (t s%unE // fix stress and vowel sounds: sonnet/-te/sonnetvorm
@@ -3709,7 +3727,7 @@
@) siewe (_ s'iv@ // massiewe/aggressiewe/passiewe/intensiewe
@) siewer (_ s'iv@r // massiewer/aggressiewer/passiewer/intensiewer
_) sieke sik@ // siekeboeg/-fonds/-lys/-lokaal/-loon
si (llabe s@ // move default stress: sillabe/-s
si (llabA s@ // move default stress: sillabe/-s/sillabus
silwer sIlv@r // silwerskoon/silwerware/compounds of silwer
_) sim (bA s@m // move default stress: simbool/simbole/simbolies/-e/simbaal/simbale
simbo (liek s@mb%u // fix stress and vowel sounds: simboliek and compounds
dictsource/dict_phonemes
+12 -11
View File
@@ -380,13 +380,13 @@ t t; tS ts v x z Z
Dictionary sq_dict
@ a e E i O u y
yE
@ a A e E i O u
V y yE
* ** b c d D dZ f
g h j J k l ll m
n n^ p r R s S t
T tS ts v w z Z
n n^ p r R R2 s S
t T tS ts v w z Z
Dictionary sv_dict
@@ -485,11 +485,12 @@ tS v w z z.
Dictionary bn_dict
a a~ e e~ i i~ l- o
O oI oU o~ O~ r- u u~
V
& a a: a~ e E e~ i
I i: i~ l- o O o~ O~
r- U u u: u~ V
** b c ch d d. e[ g
h j J k kh l m n
N p ph r R r. s S
t t. t.h th
* ** b B c C ch d
d. g h j J k kh l
m n N n. p ph Q r
R r. s S s. t t. t.h
th tS x z
dictsource/en_list
+27 -9
View File
@@ -630,8 +630,9 @@ bonhomie b0n@mi:
boogie b'u:gI2
bosom bUz@m
bosun boUs@n
bourgeois bu:3Zwa
bourgeoise bu:3Zwaz
bourgeois bU@ZwA:
bourgeoise bU@ZwA:z
bourgeoisie bU@ZwA:z'i:
bouquet bu:k'eI
bow boU
bow baU $verb
@@ -888,6 +889,7 @@ disc dIsk // for discs
disciple dIs'aIp@L
discourse $1
discounted $2
discus dIsk@s $only
disease dIz'i:z
dishes dISIz
dismal dIzm@l
@@ -899,6 +901,7 @@ divan dI2van
doable du:@b@L
doctrine d0ktrIn
doctrinal d0ktr'aIn@L
dogged d0gI2d
domino $1
donor doUn3
dont doUnt $only
@@ -960,8 +963,10 @@ escapism Esk'eIpIz@m
escort Esk'O@t $verb
espionage EspI@nA:Z
essential Is'EnS@L
estimate EstImeIt $verb
estoppel Est'0p@L
estrange $2
etiquette $1
exit EgzIt // exiting
exonerate Egz'0n@reIt
eureka ju:'ri:ka2
@@ -1083,6 +1088,7 @@ graduate gradju:eIt $verb
graffiti gra2fi:tI2
gredient gri:di@nt // ingredient
grenade gr@neId
griffon grIf@n
grosvenor groUv@n3
groupie gru:pI
gui gu:I2
@@ -1155,20 +1161,25 @@ hypotenuse haIp'0t@nju:s
icon aIk0n
iconbar aIk0nbA@
ignoramus Igno@r'eIm@s
imagine I2madZI2n
impedance I2mpi:d@ns
imperative I2mpEr@tIv
impi $1
impinging I2mpIndZIN
imprecise I2mprIs'aIs
impregnable I2mprEgn@b@L
inanimate I2nanIm@t
inappropriate ,Ina2proUpri@t
incense Ins'Ens $verb
incoming InkVmI2N
increase I2nkri:s $verb
indeterminate IndIt'3:mIn@t
indicative $2
indices IndIsi:z
indict Ind'aIt
indie IndI2
indiscriminate IndIskr'ImIn@t
indo IndoU
indoor $1 $only
industry IndVstrI
@@ -1208,6 +1219,7 @@ interrupt $3 $verb
interval Int3v@L
interven Int3v'i:n // for intervening
intro $1
irate aIr'eIt
iris aIrIs
irony aIr@nI2
isosceles aIs'0s@li:z
@@ -1263,6 +1275,7 @@ lesion li:Z@n
lethal li:T@L
libre li:br@
lier laI3 // outlier
ligate li:geIt
lilac laIl@k
lily lIlI2
limit lImIt // limited
@@ -1550,8 +1563,8 @@ pirate paIr@t
piteous pIti@s
pituitary $2
plaguing pleIgIN
plicate $2
plugin plVgIn
plunging plVndZIN
plus plVs
poky poUkI2
politer p@l'aIt3
@@ -1641,7 +1654,6 @@ rainforest r'eInf,0rIst
rajah rA:dZA:
rapier reIpi@3
rapport rap'o@
rarest re@r@st
rascal raask@L
ratatouille rat@t'u:I2
?!3 rather rA:D3
@@ -1787,6 +1799,7 @@ secretive si:kr@tI2v
secretary sEkr@trI2
sedate sI2deIt
seduce sI2dju:s
segue sEgweI
separate sEp@-r@t
separate sEp3reIt $verb
semen si:m@n
@@ -1895,7 +1908,6 @@ symbol sImbVl
sync sINk
synthesis sInT@sIs $only
synthesise sInT@saIz
syringe $2
tablet tabl@t
taboo $2
@@ -2065,6 +2077,7 @@ wehrmacht ve@maxt
website wEbsaIt
weekend wi:k'End
wheelbarrow w'i:l_b,aroU
whew fju:
whichever $2
whitish waItIS
whois hu:'Iz
@@ -2195,10 +2208,11 @@ Calcutta $2
Canada kan@d@
Carolina kar@l'aIn@
Caribbean kar@b'i@n
Ceylon $2
Chicago SIk'A:goU
Chile tSIlI2
Ceylon $2
Cologne k@loUn
Columbus $2
Congo $1
Connecticut k@nEtIk@t
Copenhagen koUp@nh'eIg@n
@@ -2259,10 +2273,11 @@ Melbourne mElb3n
Memphis mEmfIs
Mexico $1
Miami maI'amI
Michigan mISIg@n
Milan $2
Mindanao mInd@n'aU
Minneapolis mIni:'ap@lI2s
Missouri mIs'U@rI
Missouri mIz'U@rI
Montreal m0ntrI'O:l
Morocco m@r0koU
Munich mju:nIk
@@ -2481,6 +2496,7 @@ Thomas t0m@s
Tina ti:n@
Tracy treIsI2
Tricia trIS@
Vanessa va2nEs@
Wally w0lI2
Yvonne $2
Zoe zoUI
@@ -2488,6 +2504,7 @@ Zoe zoUI
Andromeda andr'0mId@
Buchanan bju:k'an@n
Campbell kamb@l
Chrysler kraIzl3
Disney dIznI2
Patel p@t'El
Prentice prEntIs
@@ -2769,8 +2786,9 @@ I aI $u+ $verbf $only
he %hi: $verbsf
she %Si: $only $verbsf
it %It $verbsf
(it has) I2t||h'az $atend
(it was) I2t||w'0z $atend
(it has) I2t||haz $atend
(it is) I2t||Iz $atend
(it was) I2t||w0z $atend
it $allcaps $abbrev
we %wi: $verbf $only
you %ju: $verbf
dictsource/en_rules
+24 -12
View File
@@ -533,7 +533,7 @@
alz alt|s
&) al (_ @L
?8 &) al (_ a2l
&) ally (_$2 lI2
@) ally (_$2 lI2
@@ic) ally (_$4 lI2
inst) al (_ O:l
&) al (d @L
@@ -552,7 +552,6 @@
@) algia (_ 'aldZ@
g) al (i_ 'A:l
al (ity 'al
s) al (iva @l
p) al (et al
qu) al (@ 0l
b) al (m A:
@@ -770,7 +769,7 @@
app (le ap
app (lic ap
app (licab a2p
appre (h ,aprI
app (reh ap
apres apreI
_) apprec (i a2pri:S
_) ap (ri eIp
@@ -852,6 +851,7 @@
h) ar (dy_ A@
are e@
area e@ri@
arest (_ e@r@st
ar (en ar
p) are (nth @rE
c) ar (eer ar
@@ -871,6 +871,7 @@
m) ar (iner ar
m) ar (io ar
htm) ar e@
ar (ic ar
&) arise (_ @raIz
log) ar (i @r
m) ar (it ar
@@ -1136,6 +1137,7 @@
_) be (cq bE
_) be (dC bE
_) be (dra bI2
_) be (f bI2
_) be (gg bE
_) be (lC bE
_) be (lli bI2
@@ -1370,7 +1372,7 @@
co (mposit k0
co (mpost k0
co (mpou k0
comprehen k0mprIh'En
co (mprehen k0
co (mprom k0
co (mpt k0
co (mputa k,0
@@ -2003,6 +2005,7 @@
eng (lA INg
eng (in EndZ
eng (_ 'EN // place names
enging EndZIN
en (ig En
en (igma_ %En
&) enine @ni:n
@@ -2053,7 +2056,6 @@
_s) en (i i:n
en (ia 'i:n
mill) en (ia 'En
engin EndZI2n
l) eni (e i:nI
v) eni (e i:nI
&) en (t_ @n
@@ -2482,6 +2484,7 @@
&sk) i (_ =I2
i (CCi_ 'I
XC) i (Ca_ i:
@) i (Cate_ =I
XC) i (Co_ i:
i (Be# aI
i (Bee I
@@ -2525,6 +2528,7 @@
@) i (butor 'I
&) i (c_ =I
&) i (ca_ =I
&) ico (_ =IkoU
&) i (cal =I
i (cial 'I
ician 'IS@n
@@ -2615,7 +2619,7 @@
m) io (n I20
sh) io (n @
_) io (n aI0
_l) io (n aI@
_l) ion aI@n
z) io (n aI@
r) ior (_ I3
&) ior (+ i@3
@@ -2630,7 +2634,6 @@
_s) i (ph aI
i (que_ 'i:
i (qu_ i:
iquette I2kEt
@) i (scenC 'I
&) i (zabl aI
&) i (sabl aI
@@ -2808,6 +2811,7 @@
d) ig (nA Ig
_) ig (ni I2g
ig (no I2g
ig (nom Ig
ig (noran Ig
ig (na Ig
_m) ig (ra aIg
@@ -3028,9 +3032,10 @@
ir (a_ 'i@r
ir (able 'aI@
m) ir (ac Ir
sp) ir (al aI@r
sp) iral aI@r@L
@) ir (ation Ir
ir (at %aIr
ir (ate =i@r
ire aI@
?8 ire aIa2
s) ir (en aI@
@@ -3349,7 +3354,6 @@
?3 _) news (P4 n'u:z
ng N
n (x N
nging (_ NI2N
nk Nk
?7 nk nk // ?? Scottish
n (kn n
@@ -3384,6 +3388,10 @@
you) ng (er Ng
ng (est Ng
co) nge (st ndZE
nging (_ NI2N
cri) nging ndZIN
hi) nging ndZIN
u) nging (_ ndZIN
ngue N
.group o
@@ -3704,7 +3712,7 @@
&) onist (_ =@nIst
@) on (ica '0n
m) on (k Vn
sp) on (ge Vn
_sp) ong VndZ
fr) on (t Vn
m) on (th Vn
&) onous @n@s
@@ -4066,7 +4074,7 @@
j) ow aU
k) ow aU
_all) ow aU
sall) ow aU
isall) ow aU
cl) ow aU
fl) ow (er aU
gl) ow (er aU
@@ -4251,7 +4259,7 @@
qu (er_ k
quest kwEst
quet (_ keI
quette (_ kEt
quett k'Et
queu kju:
qu (_ k
quay ki:
@@ -4304,6 +4312,7 @@
_) re (alig ,ri:
_) re (all ,ri:
rea (m ri:
_) re (an ri:
_) re (au@P2 ,ri:
re (ck rE
reckon rEk@n
@@ -4328,6 +4337,7 @@
re (gion ri:
regim rEdZIm
re (gist rE
rehen rIh'En
_) re (i@P2 r,i:
_) rei (l raI
_) rele (g rElI2
@@ -4392,6 +4402,7 @@
_) scar (a skar
scarc ske@s
sc (i s
sci (_ =skaI
s (cious
sc (ept sk
mu) sc (l s
@@ -5020,6 +5031,7 @@
y (Cify 'I
_s) y I
@) y (ra_ 'aI
s) yring I2rIndZ
yse (+_ aIz
ysing (_ aIzI2N
ysed (_ aIzd
dictsource/es_rules
+2 -2
View File
@@ -129,7 +129,7 @@
.group r
r R
_) r R2
_) r RR2
r (_ *
r (t **
A) r (A **
@@ -138,7 +138,7 @@
m) r (A R
n) r (A R
s) r (A R
rr *R2
rr RR2
.group s
dictsource/fr_list
+3 -2
View File
@@ -24,7 +24,7 @@
// 2006-11-18 Gilles Casse <gcasse@oralux.org>
//
// Updated 2008-09-24 Michel Such <michel.such@free.fr>
// Updated 2008-09-27 Michel Such <michel.such@free.fr>
//
// * Numbers, a few abbreviations and exceptions.
//
@@ -141,7 +141,7 @@ _0 zero
_1 W~
_2 dYz2
_3 tR2wAz2
_4 katR2=@-
_4 katR2
_5 sE~k
_6 siz3
_7 sEt
@@ -521,6 +521,7 @@ telles $u+
tout t'ut2 $u+
toute t'ut $u+
toutes t'utz2 $u+
tous $u+
rien Ri'E~n2 $u+
// Letters which can be words
dictsource/fr_rules
+7 -1
View File
@@ -23,7 +23,7 @@
// 2006-11-18 Gilles Casse <gcasse@oralux.org>
//
// Updated: 2008-09-24 Michel Such <michel.such@free.fr>
// Updated: 2008-09-27 Michel Such <michel.such@free.fr>
//
// Letter classes:
@@ -205,6 +205,8 @@ _) ç' (P2v s
// Define use of the final 'e' in french
e (_
rch) e (_ =@-
rch) e (s_ =@-
elqu) e =@-
uisqu) e =@
rsqu) e =@
@@ -1061,6 +1063,10 @@ mou) rr rr // mourrai
s (g z
s (j z
s (v z
_tou) s (_Ces_
_tou) s (_des_ s
_tou) s (_Cos_
_tou) s (_leurs_
// group s: English section
sh (_ _^_en
phsource/compile_report
+141 -25
View File
@@ -50,36 +50,46 @@
rw 15 126
ko 18 147
da 15 130
sq 12 124
sq 23 129
ml 13 139
bn 20 145
bn 59 145
Data file Used by
b/b [b] base
[b] fr
[b] hi
[b;] ro
[b] bn
b/b_ [b] base
[b] fr
[b] hi
[b] bn
b/b@ [b] base
[b] hi
[b] bn
b/b@2 [b] base
[b] hi
[b] bn
b/ba [b] base
[b] hi
[b] bn
b/be [b] base
[b] hi
[b] bn
b/bi [b] base
[b] hi
[b;] ro
[b] bn
b/bo [b] base
[b] hi
[b] bn
b/bu [b] base
[b] hi
[b] bn
b/xb [b] base
[b] fr
[b] hi
[b] bn
d/d [d] base
[d[] base
[d] base2
@@ -97,6 +107,8 @@ d/d [d] base
[d] el
[d] sw
[d] id
[d] bn
[d.] bn
d/d_ [d] base
[d[] base
[d] base2
@@ -114,6 +126,8 @@ d/d_ [d] base
[d] el
[d] sw
[d] id
[d] bn
[d.] bn
d/d_dnt [d] sr
d/dr [*] base
[d] base
@@ -133,6 +147,8 @@ d/dr [*] base
[d] el
[d] sw
[d] id
[d] bn
[d.] bn
d/tap [*;] ro
d/tap1 [*] base
d/tap2 [t#] en_us
@@ -154,6 +170,8 @@ d/xd [d] base
[d] el
[d] sw
[d] id
[d] bn
[d.] bn
d/xd_pzd [d;] pl
[d;] ru
d/x_tap [t#] en_us
@@ -165,6 +183,7 @@ dzh/dzh [dZ] base
[dZ] sr
[dZ;] sr
[dZ;] ru
[J] bn
dzh/dzh_ [dZ] base
[dZ;] base
[dz;] base
@@ -173,15 +192,17 @@ dzh/dzh_ [dZ] base
[dZ;] hr
[dZ;] mk
[dZ;] ru
[J] bn
dzh/dzh2 [dZ] hr
[dZ;] hr
dzh/dz_pzd [J] base
[J2] hi
[J] tr
[J] ku
[J] sq
[J2] bn
dzh/dz_pzd_ [J] base
[J2] hi
[J2] bn
dzh/xdzh [dZ] base
[dZ;] base
[dz;] base
@@ -190,8 +211,10 @@ dzh/xdzh [dZ] base
[dZ;] hr
[dZ;] mk
[dZ;] ru
[J] bn
dzh/xdz_pzd [J] base
[J2] hi
[J2] bn
envelope/i_risefall [11] zh
envelope/i_risefall2 [+2] rw
envelope/p_214 [214] zh
@@ -224,16 +247,19 @@ g2/g [g-] base
g2/g_ [g-] base
g2/xg [g-] base
[g] hi
[g] bn
g/g [g] base
[g] cy
[g] fr
[g] hi
[g] es
[g] bn
g/g_ [g] base
[g] cy
[g] fr
[g] hi
[g] es
[g] bn
g/xg [g] base
[g] cy
[g] fr
@@ -243,35 +269,50 @@ h/h_ [h] base
[H] hi
[h] hi
[<h>] la
[H] bn
[h] bn
h/h@ [h] base
[h] fi
[H] hi
[h] hi
[h] sr
[<h>] la
[H] bn
[h] bn
[th] bn
h/ha [h] base
[h] fi
[H] hi
[h] hi
[<h>] la
[H] bn
[h] bn
h/he [h] base
[h] fi
[H] hi
[h] hi
[<h>] la
[H] bn
[h] bn
h/hi [h] base
[h] fi
[H] hi
[h] hi
[<h>] la
[H] bn
[h] bn
h/ho [h] base
[H] hi
[h] hi
[<h>] la
[H] bn
[h] bn
h/hu [h] base
[H] hi
[h] hi
[<h>] la
[H] bn
[h] bn
h/hu_fi [h] fi
j2/_j2 [;] base
j2/j2@ [(@)] base
@@ -281,7 +322,6 @@ j2/j2i [(i)] base
j2/j2o [(o)] base
j2/j2u [(u)] base
j2/xj2 [(i)] base
j/e_ [e[] bn
j/_j [j] base
[j] zh
j/j_ [j/] base
@@ -317,6 +357,7 @@ l/l [l] base
[l] la
[l] pt
[l;] ro
[l] sq
l/_l [l] base
[l/] base
[l/3] base
@@ -333,6 +374,7 @@ l/_l [l] base
[l] pt
[l;] ro
[l] zh
[l] sq
l/l_ [l/] base
[l/3] base
[l/] fr
@@ -355,13 +397,13 @@ l/L1_uL [(u)] base
l/L2_aL [(a)] base
l/L2_eL [(e)] base
l/L2_iL [(i)] base
[i] sq
l/L2_@L [(@)] base
[I] en_sc
l/L2_oL [(o)] base
[oU] en_sc
l/L2_uL [(u)] base
[u:] en
[u:] en_rp
l/l_3 [l/] de
l/l_4 [ll] sq
l/la [(a)] base
@@ -389,10 +431,12 @@ l/l_i [(i)] base
[i] fr
[i:] fr
[w^i] fr
[i] sq
l/l_long [l] base
[l] fr
[l] la
[l;] ro
[l] sq
l/lo [(o)] base
[O] fr
[o] fr
@@ -405,6 +449,7 @@ l/l_o [(o)] base
[o2] fr
l^/l_rfx [l.] hi
[l.] sq
[l.] bn
l/lu [(u)] base
[u] fr
[y] fr
@@ -425,6 +470,7 @@ l/tl [l] base
[l] la
[l] pt
[l;] ro
[l] sq
l/xl [(@)] base
[(a)] base
[(e)] base
@@ -523,6 +569,7 @@ r3/r_o [(o)] base
[O] fr
r3/r_ru [R4] ru
r3/r_ru2 [R4] ru
r3/r_sr [r.] bn
r3/r_trill [R2] base
[R3] base
[r] af
@@ -572,6 +619,7 @@ r/r [r] base
[r2] fr
r/_r [r] base
[r] en_sc
[r.] bn
r/r_ [r] base
[r] en_sc
[r] de
@@ -580,6 +628,7 @@ r/r_ [r] base
[r] ru
[r] ro
[r] sw
[r.] bn
r/r@ [(@)] base
r/ra [(a)] base
r/re [(e)] base
@@ -589,7 +638,6 @@ r/rr [r/] base
[r/] af
[r] de
[r] fi
[r] fr
[r/2] fr
[r2] nl
[r] ru
@@ -601,6 +649,7 @@ r/tr [r] base
[r] en_sc
[R] fr
[R2] fr
[r.] bn
r/trr [r/] base
[r/] af
[r] de
@@ -723,6 +772,7 @@ ustop/k [k] base
[kh] hi
[k] zhy
[k] sw
[kh] bn
ustop/k_ [k] base
[k] base2
[k] en
@@ -735,6 +785,7 @@ ustop/k_ [k] base
[kh] zh
[k] sw
[k] sq
[kh] bn
ustop/ki [c] base
[k] base
[k] base2
@@ -752,8 +803,6 @@ ustop/ki [c] base
[c] tr
[J] ku
[c] ku
[J] sq
[c] sq
ustop/kl [k] base
[k] base2
[k] en
@@ -765,6 +814,7 @@ ustop/kl [k] base
[k] el
[k] zhy
[k] sw
[kh] bn
ustop/kr [k] base
[k] base2
[k] en
@@ -776,6 +826,7 @@ ustop/kr [k] base
[k] el
[k] zhy
[k] sw
[kh] bn
ustop/k_unasp [k] base
[k] base2
[k] fi
@@ -786,17 +837,20 @@ ustop/k_unasp [k] base
[k] zhy
[k`] ko
[k] sq
[k] bn
ustop/k_unasp_ [k] zh
ustop/null [?] base
ustop/p [p] base
[p] fr
[p2] fr
[p] zhy
[ph] bn
ustop/p_ [p] base
[p] fr
[p2] fr
[ph] hi
[ph] zh
[ph] bn
ustop/p_asp [ph] hi
ustop/percus10 [(X1] base
ustop/pl [p] base
@@ -810,6 +864,8 @@ ustop/pl [p] base
[p] la
[p;] ro
[p] sq
[p] bn
[ph] bn
ustop/pr [p] base
[p] base2
[p] fi
@@ -819,6 +875,8 @@ ustop/pr [p] base
[p] hu
[p] la
[p;] ro
[p] bn
[ph] bn
ustop/p_unasp [p] base
[p] base2
[p] fi
@@ -831,6 +889,7 @@ ustop/p_unasp [p] base
[p] zh
[p`] ko
[p] sq
[p] bn
ustop/p_unasp_ [p] base2
[p] fi
[p] hi
@@ -839,12 +898,14 @@ ustop/p_unasp_ [p] base2
[p] la
[p;] ro
[p] sq
[p] bn
ustop/q [q] base
ustop/q_u [q] base
ustop/t [t] base
[t2] en
[t.h] hi
[t] zhy
[t.h] bn
ustop/t_ [t] base
[t2] en
[t] fr
@@ -856,6 +917,8 @@ ustop/t_ [t] base
[t] el
[th] zh
[t] sq
[t.] bn
[t.h] bn
ustop/t_dnt [t] base
[t[] base
[t] base2
@@ -871,8 +934,11 @@ ustop/t_dnt [t] base
[t[] vi
[t] sw
[t`] ko
[t] bn
ustop/t_dnt2 [t[] vi
ustop/t_hi [t] hi
[t] bn
[th] bn
ustop/t_pzd [t;] pl
[t;] ru
ustop/tr [t] base
@@ -880,6 +946,7 @@ ustop/tr [t] base
[t2] en
[t.h] hi
[t] ru
[t.h] bn
ustop/ts [ts] base2
[ts] de
[ts] eo
@@ -902,6 +969,7 @@ ustop/t_short [t] fr
[t] sk
[t] el
[t] sq
[t.] bn
ustop/tsh_pzd [tS;] zh
ustop/tsh_pzd_unasp [tS;] zh
ustop/tsh_sr [tS] sr
@@ -909,11 +977,15 @@ ustop/ts_pzd [tS;] base
[ts;] base
[ch] hi
[tS;] ru
[c] sq
[ch] bn
ustop/ts_pzd_ [c] hi
[c] hu
[c] bn
ustop/ts_pzd2 [c] hi
[c] hu
[c`] ko
[c] bn
ustop/ts_pzd3 [tS;] hr
[dZ;] hr
ustop/t_sr [d] sr
@@ -934,7 +1006,8 @@ vdiph2/e@ [3:] en_sc
[e@] en_sc
[e@] en_wi
vdiph2/ea [ea] ro
vdiph2/ee_@ [e@] en_n
vdiph2/ee@ [e@] en_n
vdiph2/ee@_2 [e@] en_rp
vdiph2/ei_2 [eI] en_rp
vdiph2/ei_3 [i:] en_wm
vdiph2/ei_4 [eI] en_us
@@ -996,6 +1069,7 @@ vdiph/aau_2 [aU] en_wi
[aU] la
[aau] zhy
vdiph/aau_3 [aU] hi
[aU] bn
vdiph/aau_4 [aU] vi
vdiph/ae [E:] fr_ca
[aI] la
@@ -1035,6 +1109,7 @@ vdiph/au_4 [aU] base2
[aU] is
[aU] id
vdiph/ee-e [E:] hi
[E:] bn
vdiph/eei [EI] base2
[eI] en
[EI] de
@@ -1073,6 +1148,7 @@ vdiph/eu [eU] base2
vdiph/eu_2 [eu] fi
vdiph/&i [&i] fi
[aI] hi
[aI] bn
vdiph/@i_2 [eI] af
[@I] cy
[@Y] cy
@@ -1090,7 +1166,6 @@ vdiph/oi [oI] base2
[oI] it
[OI] la
[oI] vi
[oI] bn
vdiph/oi_2 [oI] af
vdiph/ooi [OI] en
[OI] en_n
@@ -1108,7 +1183,6 @@ vdiph/oou [oU] cs
[OU] grc
vdiph/ou [ou] fi
[ou] zhy
[oU] bn
vdiph/ou_2 [oU] sk
[oU] ro
vdiph/ou_3 [oU] is
@@ -1147,6 +1221,7 @@ vdiph/y#y [Yy] fi
vdiph/y#y_2 [Yy] af
[eoi] zhy
vdiph/y#y_3 [Y:] nl
vnasal/aa_n [a~] bn
vnasal/aa_n2 [A~] en
[A~] fr
vnasal/aa_n3 [A~] af
@@ -1155,18 +1230,18 @@ vnasal/a#u_n [&U~] pt
[&U~] pt_pt
vnasal/ee_n [E~] en
[E~] fr_ca
[E~] bn
vnasal/ee_n2 [a] en_us
[E~] hi
[&~] pt_pt
[E~] bn
vnasal/ee_u_n [E~] pl
vnasal/e_n [e~] af
[e~] pt
[e~] bn
vnasal/i_n [i~] pt
[i~] bn
[i:~] bn
vnasal/m- [m-] sw
vnasal/&_n [a~] bn
vnasal/n- [n-] sw
vnasal/nn- [N-] sw
vnasal/oi_n [oI~] pt
@@ -1184,6 +1259,7 @@ vnasal/u_n [u~] hi
[u~] pt
[u] zh
[u~] bn
[u:~] bn
vnasal/W_n [E~] fr
[W~] fr
voc/bh [B] base
@@ -1208,6 +1284,7 @@ voc/v [v] base
[v2] nl
[v;] ro
[v] is
[v] bn
voc/v_ [B] base
[v] base
[v] fi
@@ -1218,6 +1295,7 @@ voc/v_ [B] base
[v#] es
[v;] ro
[v] is
[v] bn
voc/v2 [v#] es
voc/vj [v] base
[v] fr
@@ -1272,14 +1350,16 @@ vowel/@ [@] base
[@] en_rp
[V] cy
[@4] hi
[@] sq
[@] ml
[@4] bn
vowel/@- [@-] base
[r*] hr
vowel/& [a] en_rp
[&] fi
[&:] hi
[&] sv
[&] bn
[&:] bn
vowel/0 [0] en
[O] hi
[O] pt
@@ -1297,6 +1377,8 @@ vowel/@_3 [@] en_sc
[@] de
[W2] fr
[@3] hi
[E#] sq
[@3] bn
vowel/3_2 [3:] en_n
[@] zh
vowel/3_3 [3:] en_rp
@@ -1312,6 +1394,7 @@ vowel/8_2 [U] en_us
[8] sv
vowel/8_3 [eo] zhy
vowel/8_5 [8] ku
vowel/8_6 [@] sq
vowel/a [a] en_n
[aa] en_n
[a] en_wm
@@ -1329,7 +1412,6 @@ vowel/a [a] en_n
[a] zh
[a] id
[a] ko
[a] bn
vowel/a# [a/] base2
[a2] en_sc
[a2] en_wi
@@ -1355,6 +1437,7 @@ vowel/a#_2 [a#] pl
[a2] sv
[&] is
[a/] sw
[a/] sq
vowel/a_3 [a] en_sc
[a/] en_sc
[A:] en_sc
@@ -1377,6 +1460,7 @@ vowel/a#_3 [a2] en
[@] vi
[a] zhy
[a] ml
[a] bn
vowel/a_4 [a/] el
[a] vi
vowel/a_5 [a] fr
@@ -1387,6 +1471,7 @@ vowel/a_5 [a] fr
[a] sv
[a] sw
[a] tr
[a] sq
[a:] ml
vowel/aa [a] fi
[A] fr_ca
@@ -1401,6 +1486,7 @@ vowel/aa_2 [A:] en
[A:] cy
[A] zh
vowel/aa_3 [A:] af
[A] sq
vowel/aa_4 [O] en_us
[O:] en_us
[A:] sv
@@ -1420,6 +1506,8 @@ vowel/a_en [a] en
[a] pl
vowel/@_bck [@] hi
[@] zh
[V] sq
[@] bn
vowel/e [e] base2
[e:] en
[eI] en_n
@@ -1447,7 +1535,6 @@ vowel/e [e] base2
[e] da
[e] ml
[e:] ml
[e] bn
vowel/e# [I] en_sc
[I2] en_sc
vowel/e_2 [eI] en_sc
@@ -1457,15 +1544,19 @@ vowel/e_2 [eI] en_sc
[e] it
[e:] sv
[e:] no
[e] bn
[e:] bn
vowel/e_3 [i] en_n
[e:] hu
[e] ku
vowel/e_5 [i] en_sc
vowel/e_7 [e] sq
vowel/ee [E] en_n
[E] sv
vowel/e_e [E] en_sc
[e] is
vowel/ee# [E#] pl
[E] sq
vowel/ee_1 [E] base2
[e@] en
[E] pl
@@ -1480,7 +1571,6 @@ vowel/ee_2 [E] en
[E] zh
[E#] ku
[&] da
[E] bn
vowel/ee#_2 [E-] sv
vowel/ee_3 [&] af
[&:] af
@@ -1509,7 +1599,7 @@ vowel/e_mid [E] en_rp
[E] id
[E2] id
[E] da
[E] sq
[E] bn
vowel/e_mid2 [E] af
[E] de
[E2] de
@@ -1576,7 +1666,6 @@ vowel/i_6 [i] ta
[i] ku
[i] id
[i] ml
[i] bn
vowel/i#_6 [i.] zh
vowel/i_7 [i] pl
vowel/i#_7 [i[] zh
@@ -1586,6 +1675,8 @@ vowel/i_en [i:] en
vowel/i_fnt [i:] en_wi
[i] hi
[i:] hi
[i] bn
[i:] bn
vowel/ii [I] en_n
[I2] en_n
[I] en_rp
@@ -1602,6 +1693,8 @@ vowel/ii [I] en_n
vowel/ii# [Y] cy
[Y] ru
[I] ku
[i] sq
[e#] sq
[y] ml
vowel/ii_2 [i] zh
vowel/ii#_2 [y] pl
@@ -1613,6 +1706,7 @@ vowel/ii_3 [I] cy
[I] sv
[I] no
[I] tr
[I] bn
vowel/ii_4 [I] en
[I2] en
[I] en_us
@@ -1627,7 +1721,9 @@ vowel/ii_6 [I] en_wm
[I] pt
[y] pt
[i/] pt
[i] sq
vowel/ii_en [i] en
[i] sq
vowel/ii_final [i] en_us
[i] en_rp
vowel/@_low [3] en_rp
@@ -1641,6 +1737,9 @@ vowel/@_low [3] en_rp
[@] ro
[@2] no
[@] id
[@] bn
[V] bn
[@2] bn
vowel/o [o] base2
[o:] en
[oU] en_n
@@ -1669,6 +1768,7 @@ vowel/o_2 [o:] cy
[o:] no
[o] ko
[o] da
[o:] bn
vowel/o-_2 [V] en_n
[V] en_wm
vowel/o_3 [oU] en_sc
@@ -1686,7 +1786,8 @@ vowel/oe [W] en
vowel/oe_2 [W] no
[W] tr
vowel/oe_4 [W] sv
vowel/o_mid [O] fr
vowel/o_mid [U@] en_rp
[O] fr
[O2] fr
[O~] fr
[o] hu
@@ -1716,6 +1817,7 @@ vowel/oo_1 [O:] en_n
[o:] sk
[o] hr
[o] vi
[O/] sq
vowel/oo_2 [0] en_sc
[O] cy
[o] cs
@@ -1727,6 +1829,7 @@ vowel/oo_4 [O] base2
[3:] en_wi
[O:] hi
[O] it
[O] sq
[O] bn
vowel/oo_5 [O] pl
[O] is
@@ -1746,6 +1849,7 @@ vowelr/r-voc [r-] jbo
[r-] sk
[r:] sk
[r-] hr
[r-] bn
vowelr/V3_r [VR] en
[3] en_sc
[@r] zh
@@ -1805,6 +1909,8 @@ vowel/u_bck [u] base2
[u] rw
[u#] rw
[u] ko
[u] sq
[u:] bn
vowel/u_bck2 [u:] la
vowel/u_fnt [u:] en_rp
vowel/uu [U] en
@@ -1825,6 +1931,7 @@ vowel/uu_bck [U] en_wi
[U] pt
[U] no
[u] zhy
[U] bn
vowel/u_unr [u-] ko
vowel/V [3] en_sc
vowel/V_2 [V] en
@@ -1911,11 +2018,8 @@ vwl_en_rp/aa [A:] en_rp
[A@] en_rp
[aa] en_rp
vwl_en_rp/aU@ [aU@] en_rp
vwl_en_rp/e@ [e@] en_rp
vwl_en_rp/i@ [i@] en_rp
vwl_en_rp/oo [U@] en_rp
vwl_en/u_L [u:] en
[u:] en_rp
vwl_en_us/3_us [3] en_us
vwl_en_us/3_us2 [3:] en_us
vwl_en_us/a [a] en_us
@@ -1937,20 +2041,22 @@ vwl_fr/@R [x] pt_pt
vwl_fr/@R2 [R] fr_ca
vwl_fr/@R3 [R] fr
[r] fr
[R2] fr
[r2] fr
vwl_fr/@R4 [R] fr
[r] fr
[r2] fr
vwl_fr/@R5 [R2] fr
vwl_fr/r_e [E] fr
vwl_fr/r_u [u] fr
vwl_fr/r_y [y] fr
vwl_fr/w_a [wA] fr
vwl_hi/A [a:] hi
[a:] bn
vwl_hi/l-voc [l-] jbo
[l-] hi
[l-] sk
[l:] sk
[l-] bn
vwl_no/& [a] no
[a:] no
vwl_no/au- [aU] no
@@ -2010,7 +2116,6 @@ w/w [w] base
w/_w [w] base
[w] zh
w/w_ [w/] base
[o[] bn
w/w@ [(@)] base
w/w2 [w2] base2
[w] pl
@@ -2043,6 +2148,7 @@ x/b [b] base
[b] hi
[b;] ro
[b] is
[b] bn
x/b_ [b] base
[b] fr
x/d [d] base
@@ -2053,6 +2159,7 @@ x/d [d] base
[d] el
[d] is
[d] id
[d.] bn
x/d_ [d] base
[d[] base
[d] base2
@@ -2069,6 +2176,8 @@ x/d_ [d] base
[d] is
[d] sw
[d] id
[d] bn
[d.] bn
x/d_dnt [d[] base
[d] base2
[d] fi
@@ -2078,23 +2187,28 @@ x/d_dnt [d[] base
[d] ru
[d;] ro
[d] sw
[d] bn
x/d_pzd [d;] pl
[d;] ru
x/dzh [J] base
[dZ] base
[J2] hi
[J2] bn
x/dzh_ [dZ] base
[dZ;] base
[dz;] base
[J] hi
[dZ;] mk
[dZ;] ru
[J] bn
x/dz_pzd [dZ;] base
[dz;] base
[J] hi
[dZ;] mk
[dZ;] ru
[J] bn
x/dz_pzd_ [J2] hi
[J2] bn
x/g_ [g] base
[g] cy
[g] fr
@@ -2106,5 +2220,7 @@ x/g2 [g] base
[g] hi
[g] es
[g] is
[g] bn
x/g2_ [g-] base
[g] hi
[g] bn
phsource/ph_english
+1 -1
View File
@@ -143,7 +143,7 @@ endphoneme
phoneme I2
vowel starttype (i) endtype (i)
unstressed
length 140
length 130
formants vowel/ii_4
linkout ;
endphoneme
phsource/ph_english_n
+1 -1
View File
@@ -198,7 +198,7 @@ endphoneme
phoneme e@
vowel starttype (e) endtype (@)
length 220
formants vdiph2/ee_@
formants vdiph2/ee@
linkout r-
endphoneme
phsource/ph_english_rp
+4 -4
View File
@@ -76,7 +76,7 @@ endphoneme
phoneme I2
vowel starttype (i) endtype (i)
unstressed
length 140
length 130
formants vowel/ii
linkout ;
endphoneme
@@ -195,7 +195,7 @@ phoneme u:
vowel starttype (u) endtype (u)
length 190
formants vowel/u_fnt
before l/2 vwl_en/u_L-40+l/L2_uL
// before l/2 vwl_en/u_L-40+l/L2_uL
endphoneme
@@ -238,7 +238,7 @@ endphoneme
phoneme e@
vowel starttype (e) endtype (@)
length 220
formants vwl_en_rp/e@
formants vdiph2/ee@_2
linkout r-
endphoneme
@@ -254,7 +254,7 @@ endphoneme
phoneme U@
vowel starttype (u) endtype (@)
length 230
formants vwl_en_rp/oo
formants vowel/o_mid
linkout r-
endphoneme
phsource/ph_english_us
+3 -3
View File
@@ -19,7 +19,7 @@ phoneme @ // Schwa
vowel starttype (@) endtype (@)
formants vowel/@_6
unstressed
length 140
length 130
endphoneme
@@ -95,7 +95,7 @@ endphoneme
phoneme 0
vowel starttype (a) endtype (a)
length 190
length 200
formants vowel/aa_8
reduceto @ 0
endphoneme
@@ -151,7 +151,7 @@ endphoneme
phoneme O:
vowel starttype (a) endtype (a)
length 210
length 220
formants vowel/aa_4
before r vwl_en_us/or
reduceto @ 0
phsource/ph_french
+12 -14
View File
@@ -23,7 +23,6 @@ phoneme @2
formants vowel/@_fr
before l/ DFT+l/l_@
before (r) DFT+r/xr
before R DFT+r/xr
endphoneme
@@ -190,7 +189,7 @@ phoneme W
formants vowel/@_5
after l l/l@-20
before l/ DFT-20+l/l_@
before r/2 DFT+vwl_fr/r_@
before r/2 DFT+20+vwl_fr/r_@
reduceto Y 1
endphoneme
@@ -207,7 +206,7 @@ endphoneme
phoneme wA
vowel starttype (o) endtype (a)
length 240
length 220
formants vwl_fr/w_a
after l l/lo-10
before l/ DFT-10+l/l_a
@@ -416,23 +415,22 @@ endphoneme
phoneme r
liquid rfx starttype (r) endtype (r)
vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40
vowelout f1=0 f2=1500 -400 400 f3=-600 80
vowelin f1=0 f2=1000 -200 200 f3=-100 100 len=40
vowelout f1=0 f2=1200 -200 200 f3=-100 100 len=20
length 100
lengthmod 7
beforenotvowel r/2
formants vwl_fr/@R3+r3/rx%30
after (e) vwl_fr/@R4+r3/rx%15
after (u) vwl_fr/@R4+r3/rx%15
after wA vwl_fr/@R4+r3/rx%20
before (i) r/rr
// after wA vwl_fr/@R4+r3/rx%20
endphoneme
phoneme r2 // silent unless followed by vowel
liquid rfx starttype (r) endtype (r)
vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40
vowelout f1=0 f2=1500 -400 400 f3=-600 80
vowelin f1=0 f2=1000 -200 200 f3=-100 100 len=40
vowelout f1=0 f2=1200 -200 200 f3=-100 100 len=20
length 100
lengthmod 7
beforenotvowel NULL
@@ -446,8 +444,8 @@ endphoneme
phoneme R // for beginning of words
vcd rfx flp
vowelin f1=0 f2=800 -50 50 f3=-100 80 len=40
vowelout f1=0 f2=1500 -400 400 f3=-600 80
vowelin f1=0 f2=1000 -200 200 f3=-100 80 len=40
vowelout f1=0 f2=1200 -200 200 f3=-100 100 len=20
length 100
lengthmod 7
beforenotvowel r/2
@@ -461,11 +459,11 @@ endphoneme
phoneme R2 // After consonnants
vcd rfx frc
vowelin f1=0 f2=800 -50 50 f3=-100 80 len=40
vowelin f1=0 f2=1000 -200 200 f3=-100 100 len=40
length 100
lengthmod 7
beforenotvowel r/2
formants vwl_fr/@R3-20+r3/rx%25
formants vwl_fr/@R5-20+r3/rx%25
after k r/tr
after p r/tr
after t r/tr
@@ -474,7 +472,7 @@ endphoneme
phoneme r/2 // variant of [r] when not preceding a vowel
vcd rfx frc
vowelout f1=0 f2=800 -50 50 f3=-600 80
vowelout f1=0 f2=1800 -100 100 f3=-100 100
length 100
lengthmod 2
formants r3/r_2+r3/rx%40
phsource/phonemes
+1 -1
View File
@@ -982,7 +982,7 @@ endphoneme
phoneme c
vls pal stop
vowelin f1=0 f2=2700 200 500 f3=400 80 rate len=80
vowelin f1=0 f2=2700 200 400 f3=300 80 rate len=80
vowelout f1=0 f2=2700 300 500 f3=300 80
lengthmod 2
wave ustop/c%130
phsource/vdiph2/ee_@ → phsource/vdiph2/ee@
View File
phsource/vwl_en_rp/e@ → phsource/vdiph2/ee@_2
View File
phsource/vdiph2/vowelchart.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 48 KiB

phsource/vowel/8_6
BIN
View File
Binary file not shown.
phsource/vowel/@_bck
BIN
View File
Binary file not shown.
phsource/vowel/V_3
BIN
View File
Binary file not shown.
phsource/vowel/e_7
BIN
View File
Binary file not shown.
phsource/vowel/ee_4
BIN
View File
Binary file not shown.
phsource/vowel/ii_5
BIN
View File
Binary file not shown.
phsource/vowel/o_mid
BIN
View File
Binary file not shown.
phsource/vowel/vowelchart.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 68 KiB

phsource/vwl_en_rp/@
BIN
View File
Binary file not shown.
phsource/vwl_en_rp/aa
BIN
View File
Binary file not shown.
phsource/vwl_en_rp/i
BIN
View File
Binary file not shown.
phsource/vwl_en_rp/oo
BIN
View File
Binary file not shown.
phsource/vwl_fr/w_a
BIN
View File
Binary file not shown.
src/synthdata.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.39.07 27.Sep.08";
const char *version_string = "1.39.08 04.Oct.08";
const int version_phdata = 0x013900;
int option_device_number = -1;
src/tr_languages.cpp
+34 -8
View File
@@ -90,15 +90,20 @@ static const unsigned int replace_cyrillic_latin[] =
void SetIndicLetters(Translator *tr)
{
{//=================================
// Set letter types for Indic scripts, Devanagari, Tamill, etc
static const char dev_consonants2[] = {0x02,0x03,0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f};
memset(tr->letter_bits,0,sizeof(tr->letter_bits));
SetLetterBitsRange(tr,LETTERGP_A,0x04,0x14); // vowel letters only
SetLetterBitsRange(tr,LETTERGP_B,0x3e,0x4d); // vowel signs, and virama
SetLetterBitsRange(tr,LETTERGP_C,0x15,0x39); // the main consonant range
SetLetterBits(tr,LETTERGP_C,dev_consonants2); // additional consonants
SetLetterBits(tr,LETTERGP_C,dev_consonants2); // + additional consonants
SetLetterBitsRange(tr,LETTERGP_Y,0x04,0x14); // vowel letters
SetLetterBitsRange(tr,LETTERGP_Y,0x3e,0x4c); // + vowel signs
tr->langopts.param[LOPT_UNPRONOUNCABLE] = 1; // disable check for unpronouncable words
}
@@ -140,6 +145,26 @@ Translator *SelectTranslator(const char *name)
}
break;
case L('b','n'): // Bengali
{
static const short stress_lengths_bn[8] = {180, 180, 210, 210, 0, 0, 230, 240};
static const unsigned char stress_amps_bn[8] = {18,18, 18,18, 20,20, 22,22 };
tr = new Translator();
SetupTranslator(tr,stress_lengths_bn,stress_amps_bn);
tr->langopts.length_mods0 = tr->langopts.length_mods; // don't lengthen vowels in the last syllable
tr->langopts.stress_rule = 0;
tr->langopts.stress_flags = 0x10004; // use 'diminished' for unstressed final syllable
tr->letter_bits_offset = OFFSET_BENGALI;
SetIndicLetters(tr); // call this after setting OFFSET_BENGALI
SetLetterBitsRange(tr,LETTERGP_F,0x3e,0x4c); // vowel signs, but not virama
tr->langopts.numbers = 0x1;
tr->langopts.numbers2 = 0x100;
}
break;
case L('c','y'): // Welsh
{
static const short stress_lengths_cy[8] = {170,220, 180,180, 0, 0, 250,270};
@@ -680,8 +705,14 @@ SetLengthMods(tr,3); // all equal
break;
case L('s','q'): // Albanian
{
static const short stress_lengths_sq[8] = {170, 170, 170, 170, 0, 0, 250, 270};
static const unsigned char stress_amps_sq[8] = {17,12, 17,17, 20,20, 24,22 };
tr = new Translator();
SetupTranslator(tr,stress_lengths_sq,stress_amps_sq);
tr->langopts.stress_flags = 0x4;
SetLetterVowel(tr,'y');
}
break;
@@ -720,7 +751,6 @@ SetLengthMods(tr,3); // all equal
case L('t','a'): // Tamil
case L('m','l'): // Malayalam
case L('b','n'): // Bengali
{
static const short stress_lengths_ta[8] = {200, 200, 210, 210, 0, 0, 230, 230};
static const unsigned char stress_amps_ta[8] = {18,18, 18,18, 20,20, 22,22 };
@@ -737,12 +767,8 @@ SetLengthMods(tr,3); // all equal
{
tr->letter_bits_offset = OFFSET_MALAYALAM;
}
if(name2 == L('b','n'))
{
tr->letter_bits_offset = OFFSET_BENGALI;
}
tr->langopts.param[LOPT_WORD_MERGE] = 1; // don't break vowels betwen words
SetIndicLetters(tr);
SetIndicLetters(tr); // call this after setting OFFSET_
}
break;
src/voices.cpp
+1 -1
View File
@@ -776,7 +776,7 @@ voice_t *LoadVoice(const char *vname, int control)
break;
case V_NUMBERS:
sscanf(p,"%d",&langopts->numbers);
sscanf(p,"%d %d",&langopts->numbers,&langopts->numbers2);
break;
case V_OPTION: