diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes index e8515fb7..459b2d99 100644 --- a/dictsource/dict_phonemes +++ b/dictsource/dict_phonemes @@ -1,6 +1,20 @@ Phonemes which are used in the *_rules and *_list files +Dictionary af_dict + +& &: 3: @ @- @L @U a +A: aI AI aU A~ E e: e@ +eI e~ I i iu O O: o@ +OI oI o~ u uI W y Y@ +Yy + +- : ; ? b c d dZ +f g h j k l L m +n N p r s S t tS +v w x2 z Z + + Dictionary cs_dict @- a a: aU e e: eI eU @@ -54,24 +68,27 @@ Dictionary en_dict 0 3 3: @ @- @2 @5 @L a a2 A: A@ aa aI aI@ aU -aU@ A~ E e@ eI I i I2 -i: i@ i@3 IR O O: o: O@ -o@ OI oU O~ U u: U@ V -VR +aU@ A~ E e: e@ eI I i +I2 i: i@ i@3 IR O O: o: +O@ o@ OI oU O~ U u: U@ +V VR -: ; ? b C d D dZ -f g h j k l m n -N n^ p Q r r- s S -t T t2 tS v w x z -Z +* : ; ? b C d D +dZ f g g- h j k l +L m n N n^ p Q r +r- s S t T t2 tS v +w x z Z Dictionary eo_dict -@- a aI aU e i o u +@- a aI aU e eI eU i +o OI u uI -* b d k l m n p -r R s t ts v z Z +* b d dZ f g h j +k l m n p r R s +S t T tS ts v w x +z Z Dictionary es_dict @@ -106,33 +123,82 @@ y Y : ; b c d dZ f g h j k l m n N n2 -n^ p p2 r R r2 s S -t t2 t3 tS v w z Z -z2 z3 +n^ p p2 r r2 s S t +t2 t3 tS v w z Z z2 +z3 + + +Dictionary grc_dict + +a aI aU e E EI eU EU +i o O oI OI OU u y +yI + +: b d f g h j k +l m n N p R s t +T v x z + + +Dictionary hbs_dict + +& @ @2 a A a: aI aU +E 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 l^ m n +N n^ p r R R2 s S +t tS ts tS; v x z Z Dictionary hi_dict -@ @2 @3 a a: aI aU E -e: E: E~ I i: O o: O: -O~ r- U u: V +@ @- @2 @3 a a: aI aU +e E e: E: E~ i I i: +l- o O o: O: o~ O~ r- +U u: u~ V -: b c ch d d. f g -h H j J k kh l l. -m n N n. n^ p ph Q -q r s S s. t T t. -t.h th v w x z +- : b c ch d d. f +g h H j J k kh l +l. m n N n. n^ p ph +Q q r s S s. t T +t. t.h th v w x z Dictionary hu_dict A a: E e: i i: o o: -u u: Y Y: +u u: Y y y: Y: -: b c d dZ f g h -j J k l m n n^ p -R R2 s S s2 t tS ts -v z Z +: b c C d dZ f g +h j J k l l^ m n +N n^ p R R2 s S s2 +t tS ts v z Z + + +Dictionary id_dict + +@ a aI aU e E E2 i +o O u + +* : ? b d dZ f g +h j k l m n N n^ +p r R R2 s S t tS +v w x z + + +Dictionary is_dict + +& @- a aI aU e E eI +i I o O oU oU2 u W +y y# Yy + +* ** : ; b c C d +D f g h j J k l +l# m m# n N n# N# n^ +n^# p Q r R r# R2 s +S s2 t T tl# v x z Dictionary it_dict @@ -146,6 +212,50 @@ n^ p r R s S t tS ts v w w2 z +Dictionary jbo_dict + +@ a aI aU e eI i l- +o OI r- u + +b d dZ f g h j k +l m n N p R s S +t tS v w x z Z + + +Dictionary ku_dict + +8 a e E E# eI eU i +I o u U y + +* : b c d dZ f g +h j J k l m n p +q r R s S t tS v +w x z Z + + +Dictionary la_dict + +@- a a: aI aU E e: EU +I i: O o: OI U u: y +y: + +* : ; ? b d f +g h j k l m n N +p r R s t w z + + +Dictionary mk_dict + +& @ @- @2 a A a: E +e 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 + + Dictionary nl_dict 8 @ @- A a: E e: EI @@ -172,8 +282,8 @@ s S s; t v w x z Dictionary pl_dict -@- a E E# E~ i I O -O~ u y +@- a E E# E~ i O O~ +u y * : ; b c C d d; dZ dz; f g h j k l @@ -182,6 +292,35 @@ s; S; t t; tS ts ts; tS; v w x z Z Z; +Dictionary pt_dict + +& &/ &U~ &~ @ @- a A +aI aU e E eI EI eU EU +i I i/ iU o O oI OI +o~ u U uI u~ y + +* : ; b C d dZ f +g h j k l l^ m n +N n^ p Q r R r- s +S s# s; t T tS ts v +w w2 x z Z + + +Dictionary ro_dict + +@ @- @I @U a aI aU e +ea eI eo eU i i/ I^ iI +iU o O Oa oI oU u uI +y Y yI yU + +* *; b b; c C d d; +dZ f f; g h j k l +l; m m; n N n; p p; +r s S S; t t; tS ts +ts; v v; w w2 x z Z +z; Z; + + Dictionary ru_dict 8 @- A a E e E# E2 @@ -230,13 +369,52 @@ p Q r s S t T tS v w x z +Dictionary ta_dict + +a a: aU e E e: E: i +I i: o o: U u u: V + +: b c C d d. dZ f +g h j k l l. m n +N n. n^ p r R s S +s. t t. tS v w z z. + + +Dictionary tr_dict + +a e E i I o O u +U u# W y Y + +* : b c d dZ f g +h j J k l m n p +Q r R s S t tS v +w z Z + + Dictionary vi_dict -@: a a: a:I aI aU E e -i o +@ @: @:I @:U @I @U a a: +a:I a:U aI aU E e eU EU +i i@ iU O o OI oI u +u@ uI y y@ yI -b d g h k m n p -s t t[ ts; v w z +b c d D f g h j +k kh l m n N n^ p +Q s t t[ ts; tS; v w +x z Z z; + + +Dictionary zh_dict + +@ @r a A ai Au E ei +i i. i[ iA iE io iou N- +o o- ou u u@ ua uai uei +uo y y& y@ yE yi yu + +: ; f j k kh l m +n N p ph r R s s. +S; t th ts ts. ts. tS; tS; +tsh v w x z z. Dictionary zhy_dict @@ -248,197 +426,3 @@ oi ong ou u ui yu b c d f g h j k l m n N p r s t tS v w z - - -Dictionary af_dict - -& &: 3: @ @- @L @U a -A: aI AI aU A~ E e: e@ -eI e~ I i iu O O: o@ -OI oI o~ u uI W y Y@ -Yy - -- : ; ? b c d dZ -f g h j k l L m -n N p r s S t tS -v w x2 z Z - - -Dictionary ta_dict - -a a: e E e: E: i I -i: o o: U u u: V - -: b c C d d. dZ f -g h j k l l. m n -N n. n^ p r R s S -s. t t. tS v w z - - -Dictionary pt_dict - -& &/ &U~ &~ @ @- a A -aI aU e E eI EI eU EU -i I i/ iU o O oI OI -o~ u U uI u~ y - -* : ; b C d dZ f -g h j k l l^ m n -N n^ p Q r R r- s -S s# s; t T tS ts v -w w2 x z Z - - -Dictionary ro_dict - -@ @- @I @U a aI aU e -ea eI eU i I^ iI iU o -Oa oI oU u uI y - -* *; b c d dZ f g -h j k l m m; n p -r s S S; t tS ts ts; -v w w2 x z Z - - -Dictionary is_dict - -& @- a aI aU e E eI -i I o O oU oU2 u W -y y# Yy - -* ** : ; b c C d -D f g h j J k l -l# m m# n N n# N# n^ -n^# p Q r R r# R2 s -S s2 t T tl# v x z - - -Dictionary la_dict - -@- a a: E e: I i: O -o: U u: - -* : ; b d f g h -k l m n N p r R -s t w z - - -Dictionary grc_dict - - - -Dictionary mk_dict - -& @ @- @2 a E e i -I o r- u - -* b d dZ dZ; f g j -k k^ l l^ m n n^ p -r R s S t tS ts v -x z Z - - -Dictionary zh_dict - -@ @r a A ai Au E ei -i i. i[ iou N- o o- ou -u uai y - -: f j k kh l m n -N p ph r R s s. S; -t th ts ts. ts. tS; tS; tsh -v w x z z. - - -Dictionary jbo_dict - -@ a aI aU e eI i l- -o OI r- u - -b d dZ f g h j k -l m n N p R s S -t tS v w x z Z - - -Dictionary sq_dict - -@ a e E i O u 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 - - -Dictionary hbs_dict - -& @ @2 a A a: aI aU -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 l^ m n -N n^ p r R R2 s S -t tS ts tS; v x z Z - - -Dictionary id_dict - -@ a aI aU e E E2 i -o O u - -* : ? b d dZ f g -h j k l m n N n^ -p r R R2 s S t tS -v w x z - - -Dictionary tr_dict - -a e E i I o O u -U u# W y Y - -* b c d dZ f g h -j J k l m n p r -R s S t tS v z Z - - -Dictionary ku_dict - -8 a e E E# eI eU i -I o u U y - -* : b c d dZ f g -h j J k l m n p -q r R s S t tS v -w x z Z - - -Dictionary da_dict - -@- O V - -d n p - - -Dictionary rw_dict - -a e i o u - -* : b B c d dZ f -g h j J k l m n -N n^ p q R s S S; -t tS v w x z - - -Dictionary ko_dict - -a e E i ji o u u- -V - -b c C c` ch d dZ g -h j J k k` kh l m -n N p p` ph r s S; -s` t t` th w diff --git a/dictsource/en_list b/dictsource/en_list index d7ef2496..39b98559 100644 --- a/dictsource/en_list +++ b/dictsource/en_list @@ -410,6 +410,7 @@ advertise adv3taIz advertiser adv3taIz3 advertize adv3taIz advertisement a2dv3:tIsm@nt +?3 advertisement $3 adware 'adw,e@ adze adz aegis i:dZIs @@ -473,7 +474,7 @@ amaryllis am@r'IlIs amass a2mas ambassador a2mbas@d3 ambidextrous $3 -amen A:m'En $onlys +amen ,A:m'En $onlys amok a2m0k amoral eIm'0r@L amount a2maUnt @@ -491,6 +492,7 @@ anecdotal anIkd'oUt@L anemometer anIm'0mIt3 anemone a2nEn@mI2 anew a2nju: +?3 anew a2nu: anion aneI@n anniversary anIv'3:s@rI2 anon a2n0n @@ -584,6 +586,7 @@ baloney b@loUnI2 bagel beIg@L banal beIn@L banana b@nA:n@ +?3 banana ba2nan@ banged baNgd banquet baNkwIt barbeque bA@b@kju: @@ -716,7 +719,7 @@ circumvent s3:k@mvEnt ?5 circumvent sIRk@mvEnt citizen sItIz@n cleanse klEnz -clerk klA@k +?!3 clerk klA@k cliche kli:SeI close kloUs $only close kloUz $verb @@ -731,6 +734,7 @@ coffee k0fI2 cochlea k0kli:@ coconut koUk@nVt codify koUdIfaI +coeur k3: cognac k0njak coincide koUIns'aId college k0lIdZ @@ -852,6 +856,7 @@ denouement deIn'u:mO~ denier dI2naI3 deny dI2naI denial dI2naI@l +depot dEpoU derange dI2reIndZ descry dIskr'eI desert dI2z3:t @@ -904,7 +909,6 @@ driest draI|@st duet dju:'Et dugout dVgaUt duvet du:veI -dynasty dIn@stI2 d'ye dj@ ebook i:bUk @@ -1135,7 +1139,7 @@ humane $2 hunger hVng3 hurrah hVr'A: hurray hVr'eI -hurricane hVrIk@n +hurricane hVrIkeIn hussar hVz'A@ hyperbola haIp'3:b@l@ hyperbole haIp'3:b@lI2 @@ -1226,12 +1230,13 @@ kopje k0pI kosher koUS3 la ,la $only -laboratory la2b'0r@trI2 +laboratory la2b'0r@trI2 labor leIb3 labored leIb@d lager lA:g3 landowner l'and,oUn3 las ,las +?3 las ,lA:s lasagne l@zanj@ laser leIz3 lasso las'u: @@ -1496,7 +1501,6 @@ pasting peIstIN pastry peIstrI2 pate pateI pathos peIT0s -patrol p@troUl pear pe@ peculiar pI2kju:lI3 pedalo pEd@loU @@ -1555,6 +1559,7 @@ precedence prEsId@ns precedent prEsId@nt precept pri:sEpt precipice prEsIpIs +precis preIsi: precise prI2saIs // 's' not 'z' at end predefine pri:dIf'aIn predicate prEdIkeIt @@ -1567,8 +1572,8 @@ present prEz@nt $only present $verb presently prEz@ntlI2 $verbf preset pri:sEt -precis preIsi: prestige prEst'i:Z +?3 pretense pri:tEns pretext pri:tEkst pretty prItI2 privilege prIvIlIdZ @@ -1579,6 +1584,7 @@ pros proUz proceed proUsi:d $onlys proceed $verb proceed $only +produce pr0dju:s $noun progeny pr0dZ@nI2 progress proUgrEs $only ?3 progress pr0grEs $only @@ -1654,6 +1660,7 @@ reciprocal rI2sIpr@k@L recommend r,Ek@mEnd recommendation rEk@mEnd'eIS@n record rEkO@d $onlys +?3 record rEk3d $onlys record $verb redcross $2 redeye r'Ed,aI @@ -1701,6 +1708,7 @@ rescuer rEskju:3 reservation rEz3v'eIS@n reservoir rEz3vwA@ resin rEzIn +restive rEstIv respiration rEspIr'eIS@n respiratory rI2spIr@t@rI2 respite rEspaIt @@ -1840,7 +1848,6 @@ standby standbaI stagnate $2 stampede $2 strychnine str'Ikni:n -?3 status stat@s sterile stEraIl stomata stoUm@t@ storytell stO:rI2tEl @@ -2011,7 +2018,7 @@ vagina v@dZaIn@ (van den) vandEn (van der) vand3: variety v@raI@tI2 -vase vA:z +?!3 vase vA:z veg vEdZ vegetable vEdZIt@b@L vehicle vi@k@L @@ -2082,10 +2089,12 @@ yer j3 ye ji: yea jeI yoghurt j0g3t +?3 yoghurt joUg3t yoyo joUjoU zulu zu:lu: + // place names Altrincham O:ltrIN@m @@ -2212,6 +2221,7 @@ Jerusalem dZ@ru:s@l@m Johannesburg $2 Kalgoorlie kalgU@lI2 Karachi k@rA@tSI2 +Kentucky $2 Kiev ki:Ev Khmer kmi@3 Korea kOr'i:@ @@ -2249,6 +2259,7 @@ Nairobi naIr'oUbI Nauru naUru: Nebraska $2 Nepal nEp'O:l +?3 Nevada nI2vad@ Noumea nu:m'eI@ Oahu oU'A:hu: Ohio oUh'aIoU @@ -2300,6 +2311,7 @@ Tripoli trIp@lI2 Ukraine ju:kr'eIn Ural ju:@r@L Utah ju:tA: +?3 Utah ju:tO: Utrecht ju:trECt Vancouver $2 Vegas veIg@s @@ -2334,6 +2346,7 @@ Anthony ant@nI2 Anton ant0n Ares e@ri:z Astley astlI2 +Barack ba2rA:k Barbara bA@b@r@ Boris b0rIs Brien braI@n @@ -2432,6 +2445,7 @@ Pandora $2 Penelope p@nEl@pI2 Phoebe fi:bi: Rachel reItS@L +Raul raU'u:l Rhys ri:s Roderick r0drIk Samantha s@manT@ @@ -2444,7 +2458,9 @@ Sonia s0nj@ Sophie soUfI2 Stephen sti:v@n Stewart stju:3t +?3 Stewart stu:3t Stuart stju:3t +?3 Stuart stu:3t Theresa t@ri:z@ Thomas t0m@s Tina ti:n@ @@ -2548,6 +2564,7 @@ unto ,VntU ?3 unto ,Vnt2U upon @p,0n from %fr0m +?3 from %frVm (from where) %fr0m||w'e@ $pause (from which) %fr0m||w'ItS $pause up ,Vp $strend2 @@ -2592,6 +2609,8 @@ is I2z $pastf $only // use contraction for 'is a' // am %am $nounf $only // now in en_rules are %A@ $pastf $only was %w0z $pastf $only +?3 was %wVz $pastf $only +?3 wasn't wVznt $pastf $only wast %w0st $only $pastf $only were %w3: $pastf $only isn't ,Iz@nt $pastf $strend2 @@ -2633,6 +2652,7 @@ shan't ,SA:nt $verbf $strend2 can %kan $verbf $only $strend2 can't kA:nt $verbf $only $strend2 +?3 cannot $2 $verbf $only $strend2 (can't have) kA:nta2v $pastf (can't have to) ,kA:nt'avt@5 $verbf $atend ?3 can't kant $verbf $only $strend2 @@ -2794,6 +2814,7 @@ whenever wEn,Ev3 $pause within $pause whoever hu:'Ev3 whatever w0t'Ev3 $pause +?3 whatever wVt'Ev3 $pause while $pause whilst waIlst $pause (rather than) r'A:D3||Da2n $pause @@ -2845,6 +2866,7 @@ which ,wItS $pause $strend2 $only $verbf who ,hu: $verbf $pause $strend2 $onlys whose ,hu:z $pause $only what ,w0t $strend2 $onlys +?3 what ,wVt $strend2 $onlys how ,haU $strend2 $onlys where ,we@ $pause $strend2 $onlys why ,waI $strend2 $onlys @@ -2868,16 +2890,49 @@ like laIk $strend2 // ?6 'one' = [wVn], 'of' = [Vv] -?6 noone noUwVn -?6 anyone EnIwVn -?6 everyone EvrIwVn -?6 someone sVmwVn -?6 (some one) sVmw0n -?6 one wVn $nounf $onlys $unstressend -?6 ones wVnz $only $unstressend +?6 noone noUwVn +?6 anyone EnIwVn +?6 everyone EvrIwVn +?6 someone sVmwVn +?6 (some one) sVmw0n +?6 one wVn $nounf $onlys $unstressend +?6 ones wVnz $only $unstressend // General American -// ?3 status statVs +?3 agile adZ@L +?3 docile doUs@L +?3 facile fas@L +?3 fertile f3:t@L +?3 fragile fradZ@L +?3 futile fju:t@L +?3 hostile h0st@L +?3 missile mIs@L +?3 projectile pr@dZEkt@L +?3 puerile pjU@r@L +?3 sterile stEr@L +?3 virile vIr@L +?3 volatile v0la2t@L + +?3 amen ,eIm'En +?3 anti antaI +?3 comrade k0mrad +?3 depot di:poU +?3 envelope A:nv@loUp +?3 err e@ +?3 garage ga2rA:Z +?3 laboratory labr@tO:rI2 +?3 launch lA:ntS +?3 multi mVltaI +?3 pasta pA:st@ +?3 patent pat@nt +?3 privacy praIv@sI2 +?3 semi sEmaI +?3 status stat@s +?3 template tEmpl@t +?3 tomato t@meItoU +?3 vitamin vaIt@mIn +?3 zebra zi:br@ + diff --git a/dictsource/en_rules b/dictsource/en_rules index 5469eb31..abc6588f 100644 --- a/dictsource/en_rules +++ b/dictsource/en_rules @@ -418,6 +418,7 @@ agio (_ 'A:dZIoU _) ag (l@ a2g &) ag (on_ @g +?3 &) agon (_ @g0n dr) agon ag@n w) agon ag@n agon (al 'ag@n @@ -803,7 +804,7 @@ _) arr (ant ar _) arr (o ar ar (i_ 'A:r - @) ar (io_ 'A:r +?3 @) ar (io_ 'ar c) ar (i ar ar (ious e@ cl) ar (i ar @@ -922,6 +923,7 @@ _) ash (a a2S _) ash (o a2S _) asia eIS@ +?3 _) asia eIZ@ as (k aas _) as (o eIs C) as (p aas @@ -953,6 +955,7 @@ as (tro as as (trolog a2s as (trono a2s + &) as (ty_ a2s ass (ym as purch) as (e Is ph) ase (_ eIz @@ -1000,6 +1003,8 @@ pl) at (ea at &) at (eer_ @t g) at (eau at + p) atrol a2troUl +?3 p) at (r eIt fr) at (ern a2t c) atego atIg@ c) atego (ric atIg'0 @@ -1117,9 +1122,10 @@ de) bt t _) bug (le bju:g @) bury (_$4i brI2 +?3 @) bury (_$4i bErI2 _) by baI - + .group be may) be (_ bi: _) be (CA bI2 @@ -1347,6 +1353,7 @@ co (mmodor k0 common k0m@n commun k0mju:n + commun (a k%0mju:n co (mmunic++ k@ co (mmuta k0 co (mpany kV @@ -1447,6 +1454,7 @@ dg (y dZ _) dir (_ daI@ we) dne (sd n +?3 &) du (CA dZu: du (al_ dZu: du (cat dZu: @) dum (_ =d@m @@ -1508,7 +1516,6 @@ de (pol d%i: de (pop d%i: depo (siti dEp@ - depot dEpoU de (pt dE de (put dE _) de (rai dI2 @@ -1724,6 +1731,7 @@ eur 3: ?5 eur VR eur (_ '3: +?3 eur (_ 'U@ ?5 eur (_ 'VR &) eus (_ =I2@s _) euro jU@roU @@ -1731,6 +1739,9 @@ ew ju: ew (_ ju: j) ew (+ u: +?3 d) ew u: +?3 n) ew u: +?3 t) ew u: j) ewe (l u:@ l) ew (+ u: r) ew (+ u: @@ -2114,9 +2125,10 @@ &) ere (_ 3 ere (_ 3: &) er (s_ 3 +?3 b) erry (_ ErI2 g) eral (d Er@L er (bial '3: - _d) er (b A@ +?!3 _d) er (b A@ &) er (A 3r @) er (o_ 'e@r eri (A 'i@rI2 @@ -2184,7 +2196,7 @@ &) er (t_ 3 conc) er (t_ 3: er (tion 3: - h) er (tf A@ +?!3 h) er (tf A@ c) er (t 3: asc) er (t 3 v) er (t 3: @@ -2262,7 +2274,7 @@ ete (_ i:t _) et (ern I2t _) eth (A i:T - eth (ane i:T +?!3 eth (ane i:T _) eth (a ET eth (ic ET eth (y i:T @@ -2307,7 +2319,7 @@ ever (l ,Ev3 ever (m ,Ev3 f) ever (+ i:v3 - _l) ever i:v3 +?!3 _l) ever i:v3 cl) ever Ev3 cl) eve (l i:v every EvrI2 @@ -2429,6 +2441,7 @@ h (_ _B) h &) ham (_ @m +?3 &) ham (_ ham @) hammed h'amId A) han (_ h'an // places ha (st heI @@ -2756,6 +2769,7 @@ @) iety 'aI@tI2 l) ieu u: l) ieu (te %Ef +?3 l) ieute u:t'E med) ie (val I2i: ie (v i: iew (_ ju: @@ -2821,6 +2835,7 @@ im (presa ,Im im (provis Im im (pulse_ Im +?3 s) im (ult aIm .group in @) ing (_+$3dve I2N @@ -3187,14 +3202,14 @@ listen lIs@n @) lo (gous =l@ lu (na lu: - @) ly (_$2if lI2 - @l) ly (_$2f I2 + @) ly (_$2i lI2 + @l) ly (_$2 I2 f) ly (_ laI - ief) ly (_$2f lI2 - ff) ly (_$2f lI2 - of) ly (_$2f lI2 + ief) ly (_$2 lI2 + ff) ly (_$2 lI2 + of) ly (_$2 lI2 multip) ly laI - &p) ly (_$2f lI2 + &p) ly (_$2 lI2 p) ly (_ laI _) ly (d lI @@ -3499,7 +3514,7 @@ un) ope (n oUp@ @) opol '0p@L opolitan @p'0lIt@n - oppor (t 0p3 + oppor (tu %0p3 opp (res @p pr) o (pe 0 appr) o (p oU @@ -3564,7 +3579,6 @@ b) ol (t oUl c) ol (our Vl @@) ol (us 'oUl - patr) ol oUl contr) ol oUl ext) ol oUl _id) ol @L @@ -3678,7 +3692,7 @@ _) one (r oUn@ m) oney VnI und) one (_ Vn - m) ong (er VNg +?!3 m) ong (er VNg on (i_ 'oUn &) onism (_ =@nIz@m &) onist (_ =@nIst @@ -3816,6 +3830,7 @@ sw) or o@ &) or (ous 3r orough Vr@ +?3 orough VroU eff) or (t 3 f) orte (_ 'o@teI w) or (t_ o@ @@ -3963,12 +3978,12 @@ _) out (@P3 %aUt // prefix out c) ou (si V m) ou (sse u: - r) ou (te u: +?!3 r) ou (te u: r) ou (tin u: Cr) ou (t aU c) ou (th u: s) ou (ther V - y) ou (th u: + y) ou (t u: ou (v u: oux (_ u: @@ -4335,7 +4350,7 @@ re (veren rE re (volu rE rea (l ri@ -?3 rea (l ri: +?3 rea (l ri:@- rea (lit rI2a _) rea (lloP2 ,ri: rea (lm rE @@ -4385,6 +4400,7 @@ pea) s (e z tea) s (e z _re) s (o z +?3 re) s (our s ai) s (e z ui) se (_ z _Coi) s (e z @@ -4412,8 +4428,10 @@ &) ships (_$5 SIps &) shire (_$5 S@ sia (_ =Zi@ +?3 sia (_ =Z@ ssia (_ S@ sian (_ =Zi@n +?3 sian (_ =Z@n ssian (_ S@n ea) sib z@b &) sib s@b @@ -4421,6 +4439,7 @@ ea) s (il z _) sid (e# saId C) sion S@n +?3 er) sion Z@n A) sion Z@n ?8 C) sion SVn ?8 A) sion ZVn @@ -4615,8 +4634,9 @@ u (ma_ 'u: u (mo_ 'u: u (CA ju: +?3 d) u (CA u: ?3 n) u (CA u: -?3 t) u (CA u: +?3 t) u (CA+ u: u (CeCo_ ju: l) u (CA u: _l) u (a u: @@ -4656,6 +4676,7 @@ ?3 n) ucle u:klI ?3 n) uclear u:kli@3 @) u (ctive 'V + @) u (da_ 'ju: u (guC V f) u (gal 'ju: ug (er_ u:g @@ -4721,6 +4742,7 @@ u (tion 'ju: K) u (tri ju: u (ty ju: +?3 d) u (ty u: min) u (te I vac) uu ju: uu (m ju:@ @@ -4778,6 +4800,7 @@ _) un (u %Vn @) un (al 'ju:n une (_ ju:n +?3 d) une (_ u:n j) une (_ u:n l) une (_ u:n r) une (_ u:n @@ -4970,7 +4993,6 @@ yang j'aN // chinese names d) ynam aInam @C) y (mAn_ I - d) y (nas I w) y (n I gl) y (ce I d) yse (n Is@ @@ -5000,7 +5022,7 @@ _) yes jEs yeah jEh @C) y (gen I - d) y (nas I +?!3 d) y (nas I s) ynch Ink t) ype aIp t) y (pist aI diff --git a/dictsource/fi_list b/dictsource/fi_list index ac10cb33..2c538021 100755 --- a/dictsource/fi_list +++ b/dictsource/fi_list @@ -65,11 +65,14 @@ _{ alkua:lto _} lop:ua:lto _< p'ienempIk'uin _> s'u:*empIk'uin +_- vi:va2 +__ ala2vi:va2 + plus / kaut:a2 \ keno € eu*o £ punta2 +¤ valu:t:a2 & et @ &t % p@-*osent:I diff --git a/dictsource/fr_list b/dictsource/fr_list index de8419d6..43b95ba1 100755 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -66,7 +66,7 @@ _ô $accent œ o||@||lie p pe q ky -r ER +r Er s Es u y ù $accent @@ -75,7 +75,7 @@ u y v ve w dubl@v'e x iks -_y i:gR'Ek +_y i:gr'Ek z zEd @@ -86,15 +86,15 @@ _acu aksA~tEg'y _ac2 dublaksA~tEg'y _brv br'Ev _ced sed'ij -_cir aksA~siRkO~fl'Eks -_dia tRem'a +_cir aksA~sirkO~fl'Eks +_dia trem'a _dot pwE~syskr'i -_grv aksA~gR'av +_grv aksA~gr'av _hac kar'O~ _mcn makr'O~ _ogo OgOn'Ek _rng rO~t2A~S'Ef -_stk b'aR +_stk b'ar _tld t'ild @@ -109,39 +109,39 @@ _#32 Espas _" gijmE _# djEz -_' apOstROf -_( 'uvR@-paRA~t'Ez -_) f'ERm paRA~t'Ez -_* astERisk: -_, viRgyl -_- tiRE +_' apOstrOf +_( 'uvr@-parA~t'Ez +_) f'Erm parA~t'Ez +_* astErisk: +_, virgyl +_- tirE _. _|pw%E~ _/ slaS _: d'Ypw'E~ -_; pwE~viRg'yl -_< E~feRjWR +_; pwE~virg'yl +_< E~ferjWr _= egal -_> sypeRjWR +_> syperjWr _? pwE~dE~terogasj'O~ -_[ uvR@-_kRoSE +_[ uvr@-_kroSE _\ b'aksl'aS -_] f'ERm_kRoS'E -_^ siRkOnflEks +_] f'Erm_kroS'E +_^ sirkOnflEks __ sulin^e -_` aks'A~_gR'av -_{ uvR_akOlad -_| baR -_} f'ERm_akOl'ad +_` aks'A~_gr'av +_{ uvr_akOlad +_| bar +_} f'Erm_akOl'ad ² pw^is'A~s||d'Y // numeric -_0 zeRo +_0 zero _1 W~ _2 dYz2 -_3 tRw^az2 -_4 katR +_3 trw^az2 +_4 katr _5 sE~k _6 siz3 _7 sEt @@ -150,8 +150,8 @@ _9 nWf _10 diz3 _11 _!O~z _12 duz -_13 tREz -_14 katORz +_13 trEz +_14 katOrz _15 kE~z _16 sEz _17 dis:Et @@ -160,17 +160,17 @@ _19 diznWf _20 vE~ _21 vE~te:W~ _22 vE~tdYz2 -_23 vE~t:tRw^az2 -_24 vE~tkatR +_23 vE~t:trw^az2 +_24 vE~tkatr _25 vE~tsE~k _26 vE~tsiz3 _27 vE~tsEt _28 vE~tw^it3 _29 vE~tnWf -_3X tRA~t -_31 tRA~te:W~ -_4X kaRA~t -_41 kaRA~te:W~ +_3X trA~t +_31 trA~te:W~ +_4X karA~t +_41 karA~te:W~ _5X sE~kA~t _51 sE~kA~te:W~ _6X sw^asA~t @@ -178,31 +178,31 @@ _61 sw^asA~te:W~ _7X sw^asA~t:diz3 _71 sw^asA~te:O~z _72 sw^asA~t:duz -_73 sw^asA~t:tREz -_74 sw^asA~t:katORz +_73 sw^asA~t:trEz +_74 sw^asA~t:katOrz _75 sw^asA~t:kE~z _76 sw^asA~t:sEz _77 sw^asA~t:dis:Et _78 sw^asA~t:diz'w^it3 _79 sw^asA~t:diznWf -_8X katR@vE~ -_80 katR@vE~z2 -_9X katR@vE~diz3 -_91 katR@vE~:O~z -_92 katR@vE~:duz -_93 katR@vE~:tREz -_94 katR@vE~:katORz -_95 katR@vE~:kE~z -_96 katR@vE~:sEz -_97 katR@vE~:dis:Et -_98 katR@vE~:dizw^it3 -_99 katR@vE~:diznWf +_8X katr@vE~ +_80 katr@vE~z2 +_9X katr@vE~diz3 +_91 katr@vE~:O~z +_92 katr@vE~:duz +_93 katr@vE~:trEz +_94 katr@vE~:katOrz +_95 katr@vE~:kE~z +_96 katr@vE~:sEz +_97 katr@vE~:dis:Et +_98 katr@vE~:dizw^it3 +_99 katr@vE~:diznWf _0C sA~ _1C0 sA~t2 _0M1 mil _1M1 mil _0M2 miljO~ -_0M3 miljaR +_0M3 miljar _0and e _dpt virgyl @@ -250,10 +250,10 @@ avh aveaS bd boulevard $text cci $abbrev cio $abbrev -ctrl kO~tRo2l $pause -dept depaRt@mA~ +ctrl kO~tro2l $pause +dept depart@mA~ edf $abbrev -etc etseteRa +etc etsetera ghz ZigaErts hmm h@m hz _!Erts @@ -267,7 +267,7 @@ khz kiloErts km kilomEtr kw kilowat m. m@sjY -mbrola Em'bRola +mbrola Em'brola mhz megaErts mlle mad@mw^azEl mme madam @@ -279,7 +279,7 @@ nvda $abbrev ong $abbrev pci $abbrev pda $abbrev -p.s postskRiptOm +p.s postskriptOm ratp $abbrev scsi $abbrev s.t.p s'il:t'@:pl'E @@ -296,7 +296,7 @@ xfce iksEfse@ xy $abbrev -dr dOkt WR $dot $capital +dr dOkt Wr $dot $capital prof $dot @@ -561,7 +561,7 @@ tunis tynis monsieur m@sjY messieurs mesjYz2 -montréal mO~Real +montréal mO~real (n'est ce pas) n'Es@-||p'az2 (qu'est ce que) kEsk@ $u absent absA~ @@ -586,7 +586,7 @@ hélas elas $u+ iris iris laser lazEr malus malys -mars maRs +mars mars parangon parA~gO~ phallus falys polder pOldEr @@ -606,23 +606,23 @@ mens mA~z2 sens sA~s sens sA~z2 $verb (sud est) sydEst -(nord est) nOREst +(nord est) nOrEst // ut (t is said) août ut azimut azim'yt -brut bR'yt +brut br'yt but by $verb but byt cut cWt mazout mazut michael mikaEl out aut -rut Ryt -scorbut skORbyt +rut ryt +scorbut skOrbyt scout skut stout staut -uppercut ypERkyt +uppercut ypErkyt ut yt zut zyt @@ -630,37 +630,37 @@ zut zyt // et (t is said) exocet EgzOsEt -fret fR'Et +fret fr'Et budget bydZE hamlet hamlEt knesset knEsEt -lazaret lazaREt -margaret maRgaREt +lazaret lazarE +margaret margarEt net nEt offset OfsEt set sEt soviet sOvjEt // urt (t is said) -kurt kuRt -yaourt jauRt +kurt kurt +yaourt jaurt yoghourt yogurt -yogourt yoguRt +yogourt yogurt // ort (t said) -short SORt +short SOrt // art (t said) -steward stiwaRt -stuttgart StutgaRt -hart aRt -kart kaRt -smart smaRt +steward stiwart +stuttgart Stutgart +hart art +kart kart +smart smart // irt -flirt flWRt -(sweat shirt) swEtSWRt -(tee shirt) tiSWRt +flirt flWrt +(sweat shirt) swEtSWrt +(tee shirt) tiSWrt // words from other languages @@ -682,7 +682,7 @@ emacspeak Emakspi:k end _^_en epson EpsOn espeak @spi:k -ethernet etERnEt +ethernet etErnEt exit egzit (file zilla) fa2jl||zija from _^_en $u+ @@ -714,10 +714,10 @@ outlook autlu:k paint _^_en paper _^_en people _^_en -redhat REdat +redhat rEdat same _^_en sametime _^_en -schubert SubER +schubert SubEr sun _^_en (text aloud) tEkst||@la=wd ubuntu ubuntu @@ -730,11 +730,11 @@ yes _^_en constations kO~statjO~z2 contentions kO~tA~tjO~z2 dations datjO~z2 -désertions dezERtjO~z2 $verb +désertions dezErtjO~z2 $verb exploitions Eksplw^atjO~z2 -heurtions hWRtjO~z2 -partions paRtjO~z2 -rations RatjO~z2 $verb +heurtions hWrtjO~z2 +partions partjO~z2 +rations ratjO~z2 $verb tentions tA~tjO~z2 votions votjO~z2 étions etjO~z2 @@ -742,7 +742,7 @@ votions votjO~z2 // no liaison (quelqu'un) kElkW~ -pourcent puRsA~ +pourcent pursA~ vincent vE~sA~ diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 2ff19b7f..57133f08 100755 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -23,7 +23,7 @@ // 2006-11-18 Gilles Casse // -// Updated: 2008-08-30 Michel Such +// Updated: 2008-09-02 Michel Such // // Letter classes: @@ -390,14 +390,14 @@ _) ç' (P2v s sp) ens (_ Ens // suspens éC) ens (_ A~z2 // dépens démens - _C) er (_ ER // fer - _Ch) er (_ ER // cher - _env) er (_ ER - _hi) er (_ ER // hier - _fi) er (_ ER // fier - _hiv) er (X ER // hiver - tain) er (X ER // container - _ti) er (_ ER + _C) er (_ Er // fer + _Ch) er (_ Er // cher + _env) er (_ Er + _hi) er (_ Er // hier + _fi) er (_ Er // fier + _hiv) er (X Er // hiver + tain) er (X Er // container + _ti) er (_ Er ack) er (K Wr ock) er (K Er rock) er (K Wr @@ -657,6 +657,7 @@ _) half _^_en _Cr) i (A i: Cr) i (é i: Cr) i (er_ i: + rr) i (er_ j dr) iver a2jvWr C) ien (t_ i dév) ien (t_ i @@ -959,11 +960,11 @@ C) oing (_ _^_en // going .group r - _su) rr RR // surréaliste -cou) rr RR // courrai + _su) rr rr // surréaliste +cou) rr rr // courrai cou) rr (i r // courrier -mou) rr RR // mourrai - rr R // erreur +mou) rr rr // mourrai + rr r // erreur r r // rien _) radio (@P5 radio @@ -1320,24 +1321,24 @@ _) t (_ te // symbols that are normally spoken when reading text , (D pilk:u ! Eksklamasj'O~ - $ do2laR - @ aRobaz - % puRsA~ + $ do2lar + @ arobaz + % pursA~ & _e + plys ~ tilde - € @Ro + € @ro ¢ sEnt ¥ i;En - £ livR - ° d@gRe + £ livr + ° d@gre _n_) ° // n° ± pl'yz_'u_mw'E~ - × myltipli:'e_p'aR - ÷ diviz'e_p'aR - ¼ W~_k'aR + × myltipli:'e_p'ar + ÷ diviz'e_p'ar + ¼ W~_k'ar ½ W~_d@m'i - ¾ tRw'a2 k'aR + ¾ trw'a2 k'ar © _^_EN ® m'ark_depos'e diff --git a/dictsource/pl_list b/dictsource/pl_list index 69e1e1ec..225020cd 100644 --- a/dictsource/pl_list +++ b/dictsource/pl_list @@ -124,6 +124,19 @@ _z zEt ż ZEt|z|k@-*'OpkO~ ź Z;i +ä $accent +ö $accent +ü $accent +č $accent +ř $accent +š $accent +ž $accent +å $accent +æ $accent +ø $accent +ñ $accent +í $accent + // other characters diff --git a/dictsource/pl_rules b/dictsource/pl_rules index 5a424a7c..18ef1633 100644 --- a/dictsource/pl_rules +++ b/dictsource/pl_rules @@ -481,7 +481,7 @@ k k // k (i c kł (_ k - ki (A kj +// ki (A kj _) klow (n klaw .group l @@ -536,7 +536,6 @@ .group ń ń n^ - ń (_ n_ // ?? jsd .group o o O @@ -557,7 +556,6 @@ .group p p p - pie (ń pI // ??? jsd _ko) pi (A pj _fotoko) pi (A pj @@ -833,6 +831,7 @@ .group w w v + w (sk _v ier) wsz (A S w (_A f c) w (A f diff --git a/docs/mbrola.html b/docs/mbrola.html index 10e5c058..b6b06f8f 100644 --- a/docs/mbrola.html +++ b/docs/mbrola.html @@ -89,7 +89,49 @@ eg.
  • <translation> is a translation file to convert between eSpeak phonemes and the equivalent Mbrola phonemes. These are kept in: espeak-data/mbrola_ph -They are binary files which are compiled, using espeakedit, from source files in phsource/mbrola. Details to be defined. - +They are binary files which are compiled, using espeakedit, from source files in phsource/mbrola, see below. +

    Mbrola Phoneme Translation Data

    +Mbrola phoneme translation files specify translations from eSpeak phoneme names to mbrola phoneme names. They are referenced from voice files. +

    +The source files are in phsource/mbrola. These are compiled using the espeakedit program (Compile->Compile mbrola phonemes list) to produce data files in espeak-data/mbrola_ph which are used by eSpeak. +

    +Each line in the mbrola phoneme translation file contains: +

    + +<control> <espeak ph1> <espeak ph2> <percent> <mbrola ph1> [<mbrola ph2>] + +

      +
    • <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 +

      +

    • <espeak ph1>
      +The eSpeak phoneme which is to be translated to an mbrola phoneme. +

      +

    • <espeak ph2>
      +If this field is not NULL, then the match only occurs if this field matches the next phoneme. If control bit 1 is set, then the previous rather than the next phoneme is matched. This field may also have the following values:
      +VWL   matches any Vowel phoneme. +

      +

    • <percent>
      +If this field is zero then only one mbrola phoneme is used. If this field is non-zero, then two mbrola phonemes are used, and this value gives the percentage length of the first mbrola phoneme. +

      +

    • <mbrola ph1>
      +The mbrola phoneme to which the eSpeak phoneme is translated. This field may be NULL. +

      +

    • <mbrola ph2>
      +The second mbrola phoneme. This field is only used if the <percent> field is not zero. +

      +

    +The list is searched from start to finish, until a match is found. Therefore, a line with more specific match condition should appear before a line which matches the same eSpeak phoneme but with a more general condition. +

    +The file dictsource/dict_phonemes lists the eSpeak phonemes which are used for each language. Translations for all these should be given in the mbrola phoneme translation file. In addition, some phonemes which are referenced from phoneme files (eg. phsource/ph_language, phsource/phonemes) in lines such as:

    +   beforenotvowel   l/
+   reduceto  a#  0
+
    +should also be included, even though they don't appear in dictsource/dict_phonemes. +

    +If the language's *_list or *_rules files includes rules to speak words "as English" the mbrola phoneme translation file should include rules which translate English phonemes into near equivalents, so that they can spoken by the mbrola voice. diff --git a/phsource/compile_report b/phsource/compile_report index 798cdd13..25aa027d 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -1,4 +1,4 @@ -51 phoneme tables +47 phoneme tables new total base 98 98 base2 24 117 @@ -15,7 +15,7 @@ eo 13 110 jbo 4 111 fi 40 129 - fr 54 134 + fr 53 134 fr_ca 11 134 hi 51 135 ta 17 138 @@ -24,9 +24,9 @@ pl 18 111 sk 29 129 cs 6 129 - hr 26 133 - mk 3 134 - sr 14 133 + hr 26 134 + mk 3 135 + sr 14 134 ru 39 129 it 17 120 la 21 116 @@ -47,10 +47,6 @@ tr 18 122 ku 18 122 id 15 119 - rw 15 124 - ko 18 145 - da 15 128 - sq 12 122 Data file Used by b/b [b] base @@ -177,7 +173,6 @@ dzh/dz_pzd [J] base [J2] hi [J] tr [J] ku - [J] sq dzh/dz_pzd_ [J] base [J2] hi dzh/xdzh [dZ] base @@ -191,7 +186,6 @@ dzh/xdzh [dZ] base dzh/xdz_pzd [J] base [J2] hi envelope/i_risefall [11] zh -envelope/i_risefall2 [+2] rw envelope/p_214 [214] zh envelope/p_512 [8] vi envelope/p_fall [2] vi @@ -203,7 +197,6 @@ envelope/p_fall [2] vi [22] zh [33] zh [53] zh - [+] rw envelope/p_fallrise [4] vi envelope/p_level [1] vi [3] zhy @@ -361,7 +354,6 @@ l/L2_uL [(u)] base [u:] en_n [u:] en_rp l/l_3 [l/] de -l/l_4 [ll] sq l/la [(a)] base [a] fr [a2] fr @@ -387,7 +379,6 @@ l/lo [(o)] base [o2] fr [w^a] fr l^/l_rfx [l.] hi - [l.] sq l/lu [(u)] base [u] fr [y] fr @@ -445,13 +436,11 @@ n^/n^#_ [n^#] is n/_n [n] base [n;] ro [n] zh - [n] da n/n_ [n] base [n2] fr [n;] ro n/n@ [(@)] base n/n#_ [n#] is - [n] da n^/n^a [(a)] base n/na [(a)] base n^/n^e [(e)] base @@ -464,7 +453,6 @@ n/nj [n] base [n.] base [n^] base [n;] ro - [n] da n/n_long_ [n] zh nn/_nn [N] base [N] en @@ -501,8 +489,10 @@ r3/r_@ [(@)] base r3/r#_ [r#] is r3/r_2 [r/] fr r3/r_a [(a)] base + [a2] fr r3/r_e [(e)] base r3/r_i [(i)] base + [i] fr r3/r_n [r/] base [r/] fr [r/] ru @@ -533,10 +523,8 @@ r3/r_u [(u)] base r3/rx [*] base [r/] base [r/] af - [R] fr [r] fr [r/] fr - [r2] fr [R] fr_ca [r/] ru [x] pt_pt @@ -545,10 +533,7 @@ r3/rx [*] base r3/rz_cs [R^] sk [R^/] sk r3/@tap [**] base - [r] ko r3/@tap2 [**] base - [r] ko -r/a_ [r] da r/r [r] base [r-] base [r] en_sc @@ -560,7 +545,6 @@ r/r_ [r] base [r] en_sc [r] de [r] fi - [r] fr [r2] nl [r] ru [r] ro @@ -583,7 +567,6 @@ r/rr [r/] base r/ru [(u)] base r/tr [r] base [r] en_sc - [r] fr r/trr [r/] base [r/] af [r] de @@ -601,29 +584,17 @@ r/xr [(@)] base [(i)] base [(o)] base [(u)] base - [@] fr - [E] fr [O] fr [W] fr [Y] fr [a] fr - [e] fr - [i] fr - [o] fr [u] fr [y] fr - [@2] fr - [E2] fr - [O2] fr [W2] fr [a2] fr - [o2] fr [i:] fr [u:] fr [A~] fr - [E~] fr - [O~] fr - [W~] fr [w^a] fr [w^i] fr ufric/ch [C] base @@ -647,7 +618,6 @@ ufric/s [s] base [z2] fr [s] es [s#] pt - [s`] ko ufric/s_ [s] base [z] base [s2] fi @@ -679,8 +649,8 @@ ufric/sh_ [S] base ufric/sh3 [S] hr [Z] hr ufric/sh_pzd [S;] base + [Z;] base [S;] ro - [s`] ko ufric/sh_pzd_ [S;] base [Z;] base ufric/sh_pzd2 [S] sr @@ -726,7 +696,6 @@ ustop/k_ [k] base [k] el [kh] zh [k] sw - [k] sq ustop/ki [c] base [k] base [k] base2 @@ -744,8 +713,6 @@ ustop/ki [c] base [c] tr [J] ku [c] ku - [J] sq - [c] sq ustop/kl [k] base [k] base2 [k] en @@ -776,8 +743,6 @@ ustop/k_unasp [k] base [k] sk [k] el [k] zhy - [k`] ko - [k] sq ustop/k_unasp_ [k] zh ustop/null [?] base ustop/p [p] base @@ -801,7 +766,6 @@ ustop/pl [p] base [p] sk [p] la [p;] ro - [p] sq ustop/pr [p] base [p] base2 [p] fi @@ -821,8 +785,6 @@ ustop/p_unasp [p] base [p] la [p;] ro [p] zh - [p`] ko - [p] sq ustop/p_unasp_ [p] base2 [p] fi [p] hi @@ -830,7 +792,6 @@ ustop/p_unasp_ [p] base2 [p] sk [p] la [p;] ro - [p] sq ustop/q [q] base ustop/q_u [q] base ustop/t [t] base @@ -847,7 +808,6 @@ ustop/t_ [t] base [t] sk [t] el [th] zh - [t] sq ustop/t_dnt [t] base [t[] base [t] base2 @@ -861,7 +821,6 @@ ustop/t_dnt [t] base [t;] ro [t[] vi [t] sw - [t`] ko ustop/t_dnt2 [t[] vi ustop/t_hi [t] hi [th] hi @@ -893,7 +852,6 @@ ustop/t_short [t] fr [t.] hi [t] sk [t] el - [t] sq ustop/tsh_pzd [tS;] zh ustop/tsh_pzd_unasp [tS;] zh ustop/tsh_sr [tS] sr @@ -905,7 +863,6 @@ ustop/ts_pzd_ [c] hi [c] hu ustop/ts_pzd2 [c] hi [c] hu - [c`] ko ustop/ts_pzd3 [tS;] hr [dZ;] hr ustop/t_sr [d] sr @@ -965,10 +922,8 @@ vdiph2/uw [u:] en_us vdiph2/uw_2 [u:] en vdiph2/uw_3 [yU] ro vdiph2/uw_4 [u:] en_n -vdiph2/uw_6 [y] ko vdiph2/y@ [y@] zh vdiph2/y#@ [Y@] af -vdiph2/yE [yE] sq vdiph2/yu [yU] nl [yu] zh vdiph2/y-y# [yY] fi @@ -1131,7 +1086,6 @@ vdiph/yi [yi] fi vdiph/y#i [Yi] fi vdiph/y#i_2 [Yy] is vdiph/yi_fr [w^i] fr - [ji] ko vdiph/y#y [Yy] fi vdiph/y#y_2 [Yy] af [eoi] zhy @@ -1146,8 +1100,8 @@ vnasal/ee_n [E~] en [E~] fr_ca vnasal/ee_n2 [a] en_us [E~] hi - [E~] pl [&~] pt_pt +vnasal/ee_u_n [E~] pl vnasal/e_n [e~] af [e~] pt vnasal/i_n [i~] pt @@ -1161,8 +1115,8 @@ vnasal/o_n2 [o~] af vnasal/o_n3 [O~] fr vnasal/oo_n [O~] en vnasal/oo_n2 [O~] hi - [O~] pl [o] zh +vnasal/oo_n3 [O~] pl vnasal/u_n [u~] hi [u~] pt [u] zh @@ -1254,7 +1208,6 @@ vowel/@ [@] base [@] en_rp [V] cy [@4] hi - [@] sq vowel/@- [@-] base [r*] hr vowel/& [a] en_rp @@ -1309,15 +1262,12 @@ vowel/a [a] en_n [a] it [a] zh [a] id - [a] ko vowel/a# [a/] base2 [a2] en_sc [a2] en_wi [&] sr [&] pt [&/] pt - [a#] rw - [a/] rw vowel/a_2 [a] base2 [a] en_wi [A:] en_wi @@ -1328,9 +1278,8 @@ vowel/a_2 [a] base2 [a] pt_pt [a] ro [a:] vi - [a] rw - [a] da -vowel/a#_2 [&] hr +vowel/a#_2 [a#] pl + [&] hr [a2] sv [&] is [a/] sw @@ -1342,7 +1291,6 @@ vowel/a_3 [a] en_sc [a:] la [a] is [A] zh - [A] da vowel/a#_3 [a2] en [a2] en_n [a2] en_us @@ -1390,7 +1338,6 @@ vowel/aa_6 [A] de vowel/aa_7 [A] nl vowel/aa_8 [0] en_us [A:] en_us - [V] ko vowel/a_en [a] en [aa] en [A] fr @@ -1418,10 +1365,6 @@ vowel/e [e] base2 [e] grc [e] vi [e] id - [e] rw - [e#] rw - [e] ko - [e] da vowel/e# [I] en_sc [I2] en_sc vowel/e_2 [eI] en_sc @@ -1434,8 +1377,7 @@ vowel/e_2 [eI] en_sc vowel/e_3 [e:] hu [e] ku vowel/e_5 [i] en_sc -vowel/ee [E] pl - [E] sv +vowel/ee [E] sv vowel/e_e [E] en_sc [e] is vowel/ee# [E#] pl @@ -1453,7 +1395,6 @@ vowel/ee_2 [E] en [E2] nl [E] zh [E#] ku - [&] da vowel/ee#_2 [E-] sv vowel/ee_3 [&] af [&:] af @@ -1470,6 +1411,7 @@ vowel/e_mid [E] en_rp [E] fr_ca [E] hi [E] hu + [E] pl [e:] sk [e] cs [E] hr @@ -1481,8 +1423,6 @@ vowel/e_mid [E] en_rp [E] tr [E] id [E2] id - [E] da - [E] sq vowel/e_mid2 [E] af [E] de [E2] de @@ -1495,7 +1435,6 @@ vowel/e_mid2 [E] af [e] el [e] sw [e] tr - [E] ko vowel/@_fnt [@] en_wi [@2] en_wi [@2] hr @@ -1519,9 +1458,6 @@ vowel/i [i] base2 [i] zhy [i] zh [i] sw - [i] rw - [i#] rw - [i] ko vowel/i# [i] en_rp [y:] cy vowel/i_2 [i:] en_rp @@ -1538,7 +1474,6 @@ vowel/i_4 [i] fi [i] hu [I] it [i] is - [i] da vowel/i_5 [i:] en_sc vowel/i#_5 [y] pt_pt [i/] pt_pt @@ -1569,14 +1504,13 @@ vowel/ii [I] en_rp [i] zhy [I] ku vowel/ii# [Y] cy - [y] pl [Y] ru [I] ku vowel/ii_2 [i] zh +vowel/ii#_2 [y] pl vowel/ii_3 [I] cy [I] fi [I] hi - [I] pl [i] sk [I] hr [I] sv @@ -1626,16 +1560,12 @@ vowel/o [o] base2 [o] grc [o:] sv [o] id - [o] rw - [o#] rw vowel/o_2 [o:] cy [o2] fr [o:] hi [o:] hu [o:] la [o:] no - [o] ko - [o] da vowel/o-_2 [V] en_n [V] en_wm vowel/o_3 [oU] en_sc @@ -1644,13 +1574,11 @@ vowel/o-_3 [U] en_rp vowel/o_4 [oU] en_n vowel/o-_4 [o] ro vowel/o_5 [O] nl - [O] da vowel/o_6 [O:] nl vowel/o_7 [o] ku vowel/oe [W] en [W] af [W] de - [W] da vowel/oe_2 [W] no [W] tr vowel/oe_4 [W] sv @@ -1687,7 +1615,6 @@ vowel/oo_1 [O:] en_n vowel/oo_2 [0] en_sc [O] cy [o] cs - [0] da vowel/oo_3 [O] af vowel/oo_4 [O] base2 [0] en_wm @@ -1705,6 +1632,7 @@ vowel/oo_en [O] en [O] en_rp vowelr/aa_r [A:] en_sc [A@] en_sc +vowelr/i_r [i@3] en_sc vowelr/oo_r [O@] en_sc vowelr/o_r [o@] en_sc vowelr/r-voc [r-] jbo @@ -1765,9 +1693,6 @@ vowel/u_bck [u] base2 [u] is [u] zhy [u] zh - [u] rw - [u#] rw - [u] ko vowel/u_bck2 [u:] la vowel/u_fnt [u:] en_rp vowel/uu [U] en @@ -1788,7 +1713,6 @@ vowel/uu_bck [U] en_n [U] pt [U] no [u] zhy -vowel/u_unr [u-] ko vowel/V [3] en_sc vowel/V_2 [V] en [a] af @@ -1800,7 +1724,6 @@ vowel/V_3 [V] en_rp [V] ta vowel/V_4 [V] en_sc [@:] vi - [V] da vowel/V_6 [V] en_us vowel/y [y:] en [y:] de @@ -1809,7 +1732,6 @@ vowel/y [y:] en [y] nl [y] la [yu] zhy - [y] sq vowel/y# [Y:] en [3:] en_wm [Y:] de @@ -1820,7 +1742,6 @@ vowel/y# [Y:] en [Y] ro [y] vi [oe] zhy - [Y] ko vowel/y## [y#] is vowel/y_2 [y] fr [y"] fr @@ -1836,7 +1757,6 @@ vowel/y_5 [y:] sv [y] ku vowel/yy [y"] fr_ca [y] no - [Y] da vowel/yy_3 [y] sv vowel/yy_4 [y] de [y] hu @@ -1890,7 +1810,6 @@ vwl_en_us/ar [A:] en_us vwl_en_us/ee [E] en_us vwl_en_us/er [e@] en_us vwl_en_us/ir [i@3] en_us - [i@3] en_sc vwl_en_us/oor [O@] en_us vwl_en_us/or [O:] en_us [o@] en_us @@ -1898,8 +1817,7 @@ vwl_en_us/or [O:] en_us vwl_en_us/ur [U@] en_us vwl_fr/@R [x] pt_pt vwl_fr/@R2 [R] fr_ca -vwl_fr/@R3 [R] fr - [r] fr +vwl_fr/@R3 [r] fr [r2] fr vwl_fr/w_a [w^a] fr vwl_hi/A [a:] hi diff --git a/phsource/mbrola/fr1 b/phsource/mbrola/fr1 index 92a8bf26..05dac6bb 100644 --- a/phsource/mbrola/fr1 +++ b/phsource/mbrola/fr1 @@ -20,6 +20,7 @@ volume 15 0 O~ NULL 0 o~ 0 W~ NULL 0 9~ 0 w^i NULL 0 H +0 w^a NULL 50 w a 0 r NULL 0 R 0 n^ NULL 75 n j 0 c NULL 0 k @@ -33,6 +34,7 @@ volume 15 0 p2 NULL 0 p 0 r2 NULL 0 r 0 t2 NULL 0 t +0 t3 NULL 0 t 0 z2 NULL 0 z 0 z3 NULL 0 z @@ -46,7 +48,7 @@ volume 15 0 @2 NULL 0 @ 0 @5 NULL 0 @ 0 3 NULL 0 @ -0 a2 NULL 0 @ +0 a2 NULL 0 a 0 I2 NULL 0 i 0 aa NULL 0 a 0 V NULL 0 @ diff --git a/phsource/n^/n^_ b/phsource/n^/n^_ index 50838e13..93cf744f 100644 Binary files a/phsource/n^/n^_ and b/phsource/n^/n^_ differ diff --git a/phsource/ph_english_sc b/phsource/ph_english_sc index e31f3d8d..ac8dd36e 100644 --- a/phsource/ph_english_sc +++ b/phsource/ph_english_sc @@ -277,7 +277,7 @@ endphoneme phoneme i@3 vowel starttype (i) endtype (@) length 220 - formants vwl_en_us/ir + formants vowelr/i_r appendph r endphoneme diff --git a/phsource/ph_english_us b/phsource/ph_english_us index 59f97db1..0244666a 100644 --- a/phsource/ph_english_us +++ b/phsource/ph_english_us @@ -62,8 +62,7 @@ endphoneme phoneme E vowel starttype (e) endtype (e) - length 190 -// formants vowel/ee_2 + length 195 formants vwl_en_us/ee reduceto I 0 endphoneme @@ -88,7 +87,7 @@ endphoneme phoneme i // optional variant of [I] for end of words vowel starttype (i) endtype (i) - length 180 + length 170 formants vowel/ii_final linkout ; endphoneme @@ -104,7 +103,7 @@ endphoneme phoneme V vowel starttype (a) endtype (@) - length 175 + length 180 formants vowel/V_6 reduceto @ 0 endphoneme diff --git a/phsource/ph_french b/phsource/ph_french index 19e44b71..12bcbfc8 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -13,7 +13,6 @@ phoneme @ length 170 formants vowel/@_hgh before l/ DFT-30+l/xl+20 - before (r) DFT-50+r/xr endphoneme @@ -22,7 +21,6 @@ phoneme @2 length 150 formants vowel/@_fr before l/ DFT-30+l/xl+20 - before (r) DFT-50+r/xr endphoneme @@ -32,8 +30,7 @@ phoneme a formants vowel/a_5 after l l/la-15 before l/ DFT-20+l/xl - before (r) DFT-40+r/xr - before r/ DFT-30+r/xr + before r/ DFT+r/xr-40 reduceto a2 1 endphoneme @@ -43,7 +40,7 @@ phoneme a2 length 150 formants vowel/a_5 after l l/la-15 - before (r) DFT-40+r/xr + before (r) DFT-20+r3/r_a before r/ DFT-20+r/xr endphoneme @@ -54,7 +51,6 @@ phoneme e formants vowel/e after l l/le-15 before l/ DFT-20+l/xl - before (r) DFT-50+r/xr endphoneme @@ -64,8 +60,6 @@ phoneme E formants vowel/e_mid after l l/le-15 before l/ DFT-20+l/xl - before (r) DFT-50+r/xr - before r/ DFT-40 reduceto E2 1 endphoneme @@ -75,7 +69,6 @@ phoneme E2 length 175 formants vowel/e_mid after l l/le-15 - before (r) DFT-50+r/xr before r/ DFT-20 endphoneme @@ -87,8 +80,8 @@ phoneme i linkout ; after l l/li-15 before l/ DFT-20+l/L1_iL-80 - before (r) DFT-40+r/xr - before r/ DFT-20+r/xr-25 + before (r) DFT-20+r3/r_i + before r/ DFT+r3/r_i endphoneme @@ -99,7 +92,6 @@ phoneme i: // longer than i linkout ; after l l/li-15 before l/ DFT-20+l/L1_iL-80 - before (r) DFT-40+r/xr before r/ DFT-20+r/xr-25 endphoneme @@ -109,7 +101,6 @@ phoneme o length 170 formants vowel/o_3 after l l/lo-10 - before (r) DFT-50+r/xr endphoneme @@ -119,7 +110,6 @@ phoneme o2 formants vowel/o_2 after l l/lo-10 before l/ DFT-20+l/L1_oL-80 - before (r) DFT-50+r/xr endphoneme @@ -129,7 +119,6 @@ phoneme O formants vowel/o_mid after l l/lo-10 before l/ DFT-10+l/xl - before (r) DFT-50+r/xr before r/ DFT-25+r/xr-20 reduceto o 1 endphoneme @@ -140,8 +129,6 @@ phoneme O2 // Like O but no reduceto length 170 formants vowel/o_mid after l l/lo-10 - before (r) DFT-50+r/xr - before r/ DFT-40+r/xr-10 endphoneme @@ -151,7 +138,6 @@ phoneme u formants vowel/u_3 after l l/lu-20 before l/ DFT-20+l/L1_uL-80 - before (r) DFT-50+r/xr before r/ DFT+r/xr-40 endphoneme @@ -162,7 +148,6 @@ phoneme u: // slitely longer than u formants vowel/u_3 after l l/lu-20 before l/ DFT-20+l/L1_uL-80 - before (r) DFT-50+r/xr before r/ DFT+r/xr-40 endphoneme @@ -173,7 +158,6 @@ phoneme y formants vowel/y_2 after l l/lu-20 before l/ DFT-20+l/L1_uL-80 - before (r) DFT-40+r/xr before r/ DFT+r/xr-30 endphoneme @@ -184,7 +168,6 @@ phoneme Y formants vowel/y# after l l/l@-20 before l/ DFT-40+l/xl+15 - before (r) DFT-40+r/xr before r/ DFT+r/xr-40 endphoneme @@ -195,7 +178,6 @@ phoneme W formants vowel/@_5 after l l/l@-20 before l/ DFT-40+l/xl+15 - before (r) DFT-50+r/xr before r/ DFT-20+r/xr-30 reduceto Y 1 endphoneme @@ -207,7 +189,6 @@ phoneme W2 // same as W but don't reduce formants vowel/@_3 after l l/l@-20 before l/ DFT-40+l/xl+15 - before (r) DFT-50+r/xr before r/ DFT+r/xr-40 endphoneme @@ -218,7 +199,6 @@ phoneme w^a formants vwl_fr/w_a after l l/lo-10 before l/ DFT-10+l/xl - before (r) DFT-50+r/xr before r/ DFT-25+r/xr-15 endphoneme @@ -229,7 +209,6 @@ phoneme w^i formants vdiph/yi_fr after l l/lu-20 before l/ DFT-20+l/xl - before (r) DFT-50+r/xr before r/ DFT+r/xr-30 endphoneme @@ -238,7 +217,6 @@ phoneme A~ vowel starttype (a) endtype (a) length 190 formants vnasal/aa_n2 - before (r) DFT-30+r/xr before r/ DFT+r/xr-40 endphoneme @@ -248,7 +226,6 @@ phoneme E~ // same as W~ for fr-fr length 200 formants vnasal/W_n before n2 DFT-100 - before (r) DFT-50+r/xr endphoneme @@ -257,7 +234,6 @@ phoneme O~ length 200 formants vnasal/o_n3 before n2 vowel/o_mid - before (r) DFT-30+r/xr endphoneme @@ -265,7 +241,6 @@ phoneme W~ vowel starttype (@) endtype (@) length 204 formants vnasal/W_n - before (r) DFT-50+r/xr endphoneme @@ -330,7 +305,7 @@ phoneme d before (r) d/dr+x/d%50 before r/ d/dr+x/d%50 after _ d/d+x/d%50 - after @ d/xd + after (@) d/xd lengthmod 5 switchvoicing t endphoneme @@ -356,7 +331,7 @@ phoneme k lengthmod 2 wave ustop/k%40 // reduce strength of noise burst before _ ustop/k_ - before (r) ustop/kr%45 + before (r) ustop/kr%30 before r/ ustop/kr%45 before l ustop/kl%45 before l/ ustop/kl%45 @@ -405,12 +380,12 @@ phoneme p vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 vowelout f1=0 f2=1000 -500 -350 f3=-300 80 brk lengthmod 2 - wave ustop/p%60 + wave ustop/p%50 after _ ustop/p%70 before _ ustop/p_%70 - before (r) ustop/pr%60 + before (r) ustop/pr%40 before @- ustop/p_unasp%60 - before l ustop/pl%60 + before l ustop/pl%30 switchvoicing b endphoneme @@ -427,53 +402,42 @@ endphoneme phoneme r - vcd rfx frc starttype (r) endtype (r) - vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40 - vowelout f1=0 f2=800 -50 50 f3=-100 80 len=40 + liquid pla starttype (r) endtype (r) + vowelin f1=0 f2=1500 -400 400 f3=-600 80 + vowelout f1=0 f2=1500 -400 400 f3=-600 80 length 100 lengthmod 7 - beforenotvowel r/ - formants vwl_fr/@R3+r3/rx%40 - after t r/tr - after k r/tr - after p r/tr - before _ r/r_ + beforenotvowel r/ + formants vwl_fr/@R3+r3/rx%20 + after k vwl_fr/@R3-60 + after p vwl_fr/@R3-60 + after t vwl_fr/@R3-60+r3/rx%30 endphoneme phoneme r2 // silent unless followed by vowel - vcd rfx frc starttype (r) endtype (r) - vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40 - vowelout f1=0 f2=600 -100 100 f3=-100 100 len=40 + liquid pla starttype (r) endtype (r) length 100 lengthmod 7 beforenotvowel NULL - formants vwl_fr/@R3+r3/rx%40 + formants vwl_fr/@R3 + after k vwl_fr/@R3-60 + after p vwl_fr/@R3-60 + after t vwl_fr/@R3-40 before _ r/r endphoneme - -phoneme R - vcd rfx frc starttype (r) endtype (r) - vowelin f1=0 f2=800 -50 50 f3=-100 100 len=40 - length 100 - lengthmod 7 - beforenotvowel r/ - formants vwl_fr/@R3+r3/rx%40 -// after r r/rr -endphoneme - phoneme r/ // variant of [r] when not preceding a vowel - vcd rfx frc - vowelout f1=0 f2=800 -50 50 f3=-100 100 len=40 + vcd pal frc + vowelout f1=0 f2=800 -50 50 f3=-600 80 len=40 length 100 lengthmod 2 formants r3/r_2+r3/rx%40 after _ r/rr - after t r/trr+r3/rx - after p r/trr+r3/rx - after k r/trr+r3/rx - before n r3/r_n+r3/rx%50 + after t r/trr + after p r/trr + after k r/trr + before n r3/r_n beforevowel r endphoneme @@ -512,8 +476,8 @@ phoneme t lengthmod 2 wave ustop/t_short%50 before _ ustop/t_%40 + before (r) ustop/t_short%40 before r/ ustop/t_short%50 - before (r) ustop/t_short%50 switchvoicing d endphoneme diff --git a/phsource/ph_polish b/phsource/ph_polish index 9b66c144..6c4753a0 100644 --- a/phsource/ph_polish +++ b/phsource/ph_polish @@ -8,13 +8,21 @@ phoneme a vowel starttype (a) endtype (a) length 190 formants vowel/a_en + reduceto a# 0 endphoneme +phoneme a# + vowel starttype (a) endtype (a) + length 170 + formants vowel/a#_2 +endphoneme + + phoneme E vowel starttype (e) endtype (e) length 180 - formants vowel/ee + formants vowel/e_mid before _ vowel/ee_1 endphoneme @@ -33,13 +41,6 @@ phoneme i linkout ; endphoneme -phoneme I - vowel starttype (i) endtype (i) - length 170 - formants vowel/ii_3 - linkout ; -endphoneme - phoneme O vowel starttype (o) endtype (o) @@ -58,21 +59,21 @@ endphoneme phoneme y // close central unrounded (i-bar) vowel starttype (i) endtype (i) length 180 - formants vowel/ii# + formants vowel/ii#_2 endphoneme phoneme E~ - vowel starttype (e) endtype (e) + vowel starttype (e) endtype (u) length 250 - formants vnasal/ee_n2 + formants vnasal/ee_u_n endphoneme phoneme O~ vowel starttype (o) endtype (o) length 250 - formants vnasal/oo_n2 + formants vnasal/oo_n3 endphoneme @@ -153,7 +154,7 @@ phoneme f vowelout f1=0 f2=1000 -500 -350 f3=-200 80 lengthmod 3 wave ufric/f%140 - before s ufric/f%200 + before s ufric/f%160 before _ ufric/f_ switchvoicing v endphoneme diff --git a/phsource/phonemes b/phsource/phonemes index 5640989a..b1adafe3 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -838,7 +838,7 @@ phoneme Z; vcd pal frc sibilant palatal vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70 vowelout f1=2 f2=2300 250 300 f3=-300 80 brk - formants voc/z_pzd+ufric/sh_pzd_ + formants voc/z_pzd+ufric/sh_pzd%80 before _ voc/z_pzd_+ufric/sh_pzd_ lengthmod 6 switchvoicing Z; @@ -980,6 +980,7 @@ phoneme k before @- ustop/k_unasp%70 before l ustop/kl before (i) ustop/ki + before ; ustop/ki switchvoicing g endphoneme @@ -1275,15 +1276,3 @@ include ph_kurdish phonemetable id base2 include ph_indonesian - -phonemetable rw base2 -include ph_kinyarwanda - -phonemetable ko hi -include ph_korean - -phonemetable da is -include ph_danish - -phonemetable sq es -include ph_albanian diff --git a/phsource/vdiph/8u b/phsource/vdiph/8u index 9eb71dec..04574cb7 100644 Binary files a/phsource/vdiph/8u and b/phsource/vdiph/8u differ diff --git a/phsource/vdiph/aae b/phsource/vdiph/aae index 6de0b9b0..4951bfab 100644 Binary files a/phsource/vdiph/aae and b/phsource/vdiph/aae differ diff --git a/phsource/vdiph/aoo b/phsource/vdiph/aoo index 3024fcf7..fcfeec13 100644 Binary files a/phsource/vdiph/aoo and b/phsource/vdiph/aoo differ diff --git a/phsource/vdiph2/ei_4 b/phsource/vdiph2/ei_4 index 1db76594..1f983361 100644 Binary files a/phsource/vdiph2/ei_4 and b/phsource/vdiph2/ei_4 differ diff --git a/phsource/vdiph2/uw b/phsource/vdiph2/uw index 7b25df5b..3145f48f 100644 Binary files a/phsource/vdiph2/uw and b/phsource/vdiph2/uw differ diff --git a/phsource/vnasal/vowelchart.png b/phsource/vnasal/vowelchart.png index a951d563..c3b70307 100644 Binary files a/phsource/vnasal/vowelchart.png and b/phsource/vnasal/vowelchart.png differ diff --git a/phsource/vowel/a#_2 b/phsource/vowel/a#_2 index 30cb011a..ba14c114 100644 Binary files a/phsource/vowel/a#_2 and b/phsource/vowel/a#_2 differ diff --git a/phsource/vowel/aa_8 b/phsource/vowel/aa_8 index 6b6b28ac..4a4ce732 100644 Binary files a/phsource/vowel/aa_8 and b/phsource/vowel/aa_8 differ diff --git a/phsource/vowel/ii_final b/phsource/vowel/ii_final index 73d248eb..daaccaec 100644 Binary files a/phsource/vowel/ii_final and b/phsource/vowel/ii_final differ diff --git a/phsource/vowel/vowelchart.png b/phsource/vowel/vowelchart.png index cddfee36..23dc3240 100644 Binary files a/phsource/vowel/vowelchart.png and b/phsource/vowel/vowelchart.png differ diff --git a/phsource/vwl_en_us/3_us b/phsource/vwl_en_us/3_us index 17edd14e..52e30148 100644 Binary files a/phsource/vwl_en_us/3_us and b/phsource/vwl_en_us/3_us differ diff --git a/phsource/vwl_en_us/3_us2 b/phsource/vwl_en_us/3_us2 index 390cef77..454e29e0 100644 Binary files a/phsource/vwl_en_us/3_us2 and b/phsource/vwl_en_us/3_us2 differ diff --git a/phsource/vwl_en_us/a b/phsource/vwl_en_us/a index f5435aef..8961be6a 100644 Binary files a/phsource/vwl_en_us/a and b/phsource/vwl_en_us/a differ diff --git a/phsource/vwl_en_us/ee b/phsource/vwl_en_us/ee index a7fbe3ef..bd9f6937 100644 Binary files a/phsource/vwl_en_us/ee and b/phsource/vwl_en_us/ee differ diff --git a/phsource/vwl_en_us/er b/phsource/vwl_en_us/er index e63f6fc2..412b19cf 100644 Binary files a/phsource/vwl_en_us/er and b/phsource/vwl_en_us/er differ diff --git a/phsource/vwl_en_us/ir b/phsource/vwl_en_us/ir index 729228f3..a644c502 100644 Binary files a/phsource/vwl_en_us/ir and b/phsource/vwl_en_us/ir differ diff --git a/phsource/vwl_en_us/or b/phsource/vwl_en_us/or index 01347beb..a8fc7988 100644 Binary files a/phsource/vwl_en_us/or and b/phsource/vwl_en_us/or differ diff --git a/phsource/vwl_fr/@R3 b/phsource/vwl_fr/@R3 index 505084f4..bb9e8526 100755 Binary files a/phsource/vwl_fr/@R3 and b/phsource/vwl_fr/@R3 differ diff --git a/src/synthdata.cpp b/src/synthdata.cpp index cbce92e7..e84fab0b 100755 --- a/src/synthdata.cpp +++ b/src/synthdata.cpp @@ -35,8 +35,8 @@ #include "translate.h" #include "wave.h" -const char *version_string = "1.38.03 01.Sep.08"; -const int version_phdata = 0x013800; +const char *version_string = "1.39 08.Sep.08"; +const int version_phdata = 0x013900; int option_device_number = -1; diff --git a/src/vowelchart.cpp b/src/vowelchart.cpp index 25aa01d3..e2f5343d 100644 --- a/src/vowelchart.cpp +++ b/src/vowelchart.cpp @@ -376,6 +376,7 @@ void FindPhonemesUsed(void) {//======================== int hash; char *p; + unsigned int *pw; char *start; char *next; unsigned char c; @@ -397,6 +398,18 @@ void FindPhonemesUsed(void) } if(*p == RULE_GROUP_START) { + if(p[1] == RULE_REPLACEMENTS) + { + p++; + pw = (unsigned int *)(((long)p+4) & ~3); // advance to next word boundary + while(pw[0] != 0) + { + pw += 2; // find the end of the replacement list, each entry is 2 words. + } + p = (char *)(pw+1); + continue; + } + if(p[1] == RULE_LETTERGP2) { while(*p != RULE_GROUP_END) p++;