diff --git a/dictsource/de_list b/dictsource/de_list index 178b868f..abfc7578 100644 --- a/dictsource/de_list +++ b/dictsource/de_list @@ -237,7 +237,7 @@ oder o:d3 $u+ $pause sondern $pause denn dEn $u+ $pause wegen ve:g@n $u+ -weil v,aIl $pause +weil v,aIl $pause $only als als $u+ $brk bevor b@fo:r $2 $pause also $pause @@ -903,6 +903,7 @@ stalagmit stalagm'It subjekt $1 tag tA:g +tarif $2 teint t'W~ telegen te:le:g'e:n terrain tEr'W~ diff --git a/dictsource/de_rules b/dictsource/de_rules index 73186904..b9ae7c7e 100644 --- a/dictsource/de_rules +++ b/dictsource/de_rules @@ -711,6 +711,7 @@ r p) ay EI @) is (_ Is &) isch (_ =IS is (mus_ 'Is + is (men_ 'Is @) ist (_ 'Ist @) it (_N 'It @) ite (_ 'i:t@ @@ -979,11 +980,12 @@ formal) ie =I@ _) personen (@P8 pErz'o:n@n person p%Erzo:n persön p%ErzY:n - prüf pry:f philie f'i:li: _) photo f,o:to: + inter) pret pr'e:t _) pro (@ %pro: _) probe pro:b@ + prüf pry:f po (em p%o: po (et p%o: diff --git a/phsource/ph_german b/phsource/ph_german index 6fb8d681..c6f2fefb 100644 --- a/phsource/ph_german +++ b/phsource/ph_german @@ -1,4 +1,4 @@ - + //========================================================= // German @@ -9,7 +9,7 @@ phoneme @ // Schwa vwl starttype #@ endtype #@ unstressed - length 120 + length 40 IF nextPh(r) THEN IF next2Ph(isVowel) THEN ELSE @@ -171,7 +171,7 @@ endphoneme phoneme OY vwl starttype #o endtype #i length 220 - FMT(vdiph/oi) + FMT(vwl_de/eu) endphoneme @@ -205,19 +205,19 @@ endphoneme phoneme y vwl starttype #u endtype #u - ipa ʏ - length 110 + ipa ? + length 100 IF nextPh(*) THEN - length 115 + length 110 ENDIF - FMT(vowel/yy_4) + FMT(vowel/u#_3) endphoneme phoneme Y: vwl starttype #@ endtype #@ - length 180 - FMT(vowel/y#) + length 220 + FMT(vwl_de/y#) endphoneme @@ -344,7 +344,7 @@ phoneme r // note, following consonant must be 'ustop/t_' not 'ustop/tr' etc. ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) OR prevPhW(k) OR prevPhW(p) THEN PauseBefore 15 ELSE - InsertPhoneme(@-) + FMT(r3/r_, 40) addWav(r3/rx, 150) ENDIF ENDIF ENDIF @@ -361,7 +361,7 @@ endphoneme phoneme iR // TEST "vier" = [f'iR] not successful vwl starttype #i endtype #@ - ipa iɐ + ipa i? flag1 length 240 FMT(vdiph2/i@_3) @@ -370,7 +370,7 @@ endphoneme phoneme UR vwl starttype #u endtype #@ - ipa ʊɐ + ipa ?? flag1 length 180 FMT(vwl_de/uu_@) @@ -466,7 +466,7 @@ phoneme k ELIF nextPh(l) THEN WAV(ustop/kl) ELIF nextPh(@-) THEN - WAV(ustop/k_unasp) + WAV(ustop/k, 70) ENDIF WAV(ustop/k) endphoneme diff --git a/phsource/vwl_de/ue_short b/phsource/vwl_de/ue_short index 80d4a50b..03eccd0a 100644 Binary files a/phsource/vwl_de/ue_short and b/phsource/vwl_de/ue_short differ diff --git a/phsource/vwl_de/y# b/phsource/vwl_de/y# index 32c05397..0dfa3bbf 100644 Binary files a/phsource/vwl_de/y# and b/phsource/vwl_de/y# differ diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test index 43f6f80e..9269b6a1 100755 --- a/tests/language-phonemes.test +++ b/tests/language-phonemes.test @@ -48,7 +48,7 @@ test_lang cmn e7831fc783f79f1505e90d81d193dc591cb6f54e "na Na la ja pa pha fa ta test_lang cs 73d5bdeebdab81c629d34f76c87930bb6a188c50 "ma na n^a pa ta ca ka ba da Ja ga tsa tSa dza dZa fa sa Sa xa va za Za ha r-a Ra R^a R^/a la ja _:_ mi mi: me me: ma ma: mo mo: mu mu: maU meU moU" test_lang cy 5c5c7ab1c1b531dcacbbe072d5ee9cef3467d945 "ma na Na pa ta ka ba da ga tSa dZa fa Ta sa Sa xa ha ca Da za ra Ca la l/2a ja wa _:_ ma mE mI mY mO mU mV mi: my: mu: me: mo: mA: mAY maI maY maU m@I m@Y meU mIu mYu mOI mOY muI muY" test_lang da c55842af4f63fd67e6e48b97903b77223b6a4d77 "ma na Na pa ta ka ba da ga fa sa ha S;a tS;a va Da ja ra Ra _:_ m@ m@- m3 m3- mi m?i mI me m?e mE m?E m& m?& m&# m?&# mA m?A mu m?u mo m?o mO m?O mV m?V m0 m?0 my m?y mY mW m?W mW# m?W# maI" -test_lang de ec91c396bf20b12b96bb18b4d631188dcf2a480e "ma na Na pa ta ka ?a ba da ga pFa tsa tSa dZa sa Sa za Za fa Ta Ca xa ha ca Da ja la ra g#a l/a l2a _:_ m@ m3 ma mE mE2 mI mO mU mA mi2 my mW mI: mA: mi: mu: mE: me: mo: my: mY: maU maI mEI mOY moU mA~ miR mUR" +test_lang de f250cd80d6ddb782efcd3df9541b8b588e58e3d8 "ma na Na pa ta ka ?a ba da ga pFa tsa tSa dZa sa Sa za Za fa Ta Ca xa ha ca Da ja la ra g#a l/a l2a _:_ m@ m3 ma mE mE2 mI mO mU mA mi2 my mW mI: mA: mi: mu: mE: me: mo: my: mY: maU maI mEI mOY moU mA~ miR mUR" test_lang el b01fb02420612ea59c43bf6aff4175063bd93bcb "ma na pa ta ka ba da ga fa Ta sa xa va Da za Qa ra la _:_ ma me mi mo mu" test_lang en c4ed41c6ef4a43bae30f3469fe886c7b456dd02d "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" test_lang en-029 cfd13bc57be7f495935c662472eae3d2c7200ebd "ma na Na pa ta ka ba da ga fa Ta sa Sa xa ha va Da za Za tSa dZa la ra ja wa t2a t#a d#a z#a r-a z/2a w#a m- n- N- _:_ mI mE ma m0 mV mU mi: mA: mO: mu: m3: mA@ mO@ mo@ mU@ mi@3 mIR mVR mi@ me@ mi m@ m3 me# mI# mI2 meI maI mOI moU maU maa mO2 maI@ maI3 maU@" diff --git a/tests/language-pronunciation.test b/tests/language-pronunciation.test index 0ba78c26..26dca7f2 100755 --- a/tests/language-pronunciation.test +++ b/tests/language-pronunciation.test @@ -38,7 +38,7 @@ test_phonemes ca "Latn" "d'ona# a#m'o* k'E s@**,as f'Elis\na#jS;'O\nill'us k'omp test_phonemes cs "Latn" "n'exc j'iS hR^'i:Sne: s'aksof,oni J'a:blu: R'ozezv,utSi: s'i:n^ 'u:Jesn,i:mi t'o:ni v'aldzu\nt'aNga_! a kv'itskstepu\npR^'i:liZ Zl'ucoUtSki: k'u:n^ 'u:pjel J'a:belske: 'o:di" "Nechť již hříšné saxofony ďáblů rozezvučí síň úděsnými tóny waltzu, tanga a quickstepu. Příliš žluťoučký kůň úpěl ďábelské ódy." test_phonemes cy "Latn" "p'arkjaIs vY dZ'ak k'o:dI b'aU h'y:d l#'aUn d'u:r g'Er t'y: m'A:bOn" "Parciais fy jac codi baw hud llawn dŵr ger tŷ Mabon." test_phonemes da "Latn" "kv'isd?elt,?&jVn@-_! sp'?isd@-_! j'?orb?E3- m?ED fl'WD@-_!\nm'?Ens s'?i3-k?uskl,?0wn@-n w'Olth?V_! sp'?el@-D@-_! p?O s,?yl?of'?on\n'?ER?W,?Ol" "Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon. Ærøål." -test_phonemes de "Latn" "v'Ikto:r j'A:kt tsv'Wlf b'OkskEmpf3 kv'e:r_:_: _|,y:b3 de:n gr'o:s@n z'ylt3 d'aIC\nh'aItsWl@-r,yksto:s,abdEmpf,UN" "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich. Heizölrückstoßabdämpfung." +test_phonemes de "Latn" "v'Ikto:r j'A:kt tsv'Wlf b'OkskEmpf3 kv'e:r_:_: _|,y:b3 de:n gr'o:s@n z'ylt3 d'aIC\nh'aItsWlr,yksto:s,abdEmpf,UN" "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich. Heizölrückstoßabdämpfung." test_phonemes el "Grek" "ks,escep'azo t'im bz,ixofT'ora vD,eliQm'i;a" "Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία." test_phonemes en "Latn" "D@ kw'Ik br'aUn f'0ks dZ'Vmps ,oUv3 D@ l'eIzi d'0g" "The quick brown fox jumps over the lazy dog" test_phonemes eo "Latn" ",eble tS'i;u kv'azaUd'etsa f,uSxoR'aZo dZoI'igos homt'ipon\n,exoS'andZo tS,i;uZ'aUde\np@-*'eskaU f@-*'eSa tS'exa mandZ'aZo" "Eble ĉiu kvazaŭ-deca fuŝĥoraĵo ĝojigos homtipon. Eĥoŝanĝo ĉiuĵaŭde, preskaŭ freŝa ĉeĥa manĝaĵo."