diff --git a/dictsource/de_list b/dictsource/de_list index 9bddc6b4..ba22bcad 100644 --- a/dictsource/de_list +++ b/dictsource/de_list @@ -189,33 +189,6 @@ _7o z'i:bt@ _8o _'axt@ _0Co 'hUnd3tst@ -// Abbreviations -//============== -(a . a . o .) A:||A:||_o: -allg 'alg@maIn -abb 'abb,IldUN -anm 'anm,ErkUN -bd band $capital -bde bEnd@ $capital -bzw b@tsi:UNsvaIz@ -chr krIstUs -dr d'Okto:r -evtl e:vEntu:'El -od o:d3 $only -fr fraU -frl frOYlaIn -hr hEr -hrsg hEr'aUsge:b3 -inkl Inklu:z'i:v@ -km ki:lo:m'e:t3 -nr nUm3 -strg St'OY@rUN -usf %Untzo:f'Ort -usw %Untzo:v'aIt3 $pause -vgl fErgl'aIC@ -(z. b.) tsUmb'aISpi:l - - // definite article der %dEr die %di: @@ -745,6 +718,7 @@ expedient Ekspe:dI'Ent extravagant $1 extrem Ekstr'e:m +fond fO~ foyer fOj'e: friedvoll fr'i:tfOl furchen fUrC@n @@ -878,6 +852,7 @@ oktober $2 optimal $3 ödem Y:d'e:m +pardon pard'O~ paradies $3 passage $alt perplex $2 @@ -905,6 +880,7 @@ rupie $alt sabbat zabat sagt zA:gt +saison zE:z'O~ salopp $2 schieberegler S'i:b@re:gl3 schokolad $3 @@ -932,6 +908,7 @@ stalagmit stalagm'It subjekt $1 tag tA:g +teint tW~ telegen te:le:g'e:n terrain tEr'W~ theater te:'A:t3 diff --git a/dictsource/de_rules b/dictsource/de_rules index 482f671d..65333863 100644 --- a/dictsource/de_rules +++ b/dictsource/de_rules @@ -1151,10 +1151,8 @@ formal) ie =I@ seku (nden ze:k'U _) selbst (@@P6 z'Elpst service (_S7 z%Ervi:s - share (ware SE:r shop _^_EN _) sky _^_EN - soft (ware sOft soldat z%OldA:t &) so (rt_ s_|O summe zUm@ @@ -1401,7 +1399,7 @@ formal) ie =I@ @) wert (_ ve:rt _) wh _^_EN - &) ware (_ wE:r + &) ware (_ _^_EN _) wasch (@P5 v'aS _) wasser (@P6 v'as@r _) weit (C@P4 v'aIt diff --git a/phsource/ph_german b/phsource/ph_german index 48b88d1c..25b244a6 100644 --- a/phsource/ph_german +++ b/phsource/ph_german @@ -171,7 +171,7 @@ endphoneme phoneme OY vwl starttype #o endtype #i length 220 - FMT(vwl_de/eu) + FMT(vdiph/oi) endphoneme @@ -210,7 +210,7 @@ phoneme y IF nextPh(*) THEN length 110 ENDIF - FMT(vowel/u#_3) + FMT(vowel/yy_4) endphoneme @@ -484,3 +484,10 @@ phoneme x ENDIF WAV(ufric/x_hr, 20) endphoneme + + +phoneme O~ // saison, Pardon, Fond + vwl starttype #o endtype #o + length 190 + FMT(vnasal/o_n5) +endphoneme diff --git a/phsource/vwl_de/eu b/phsource/vwl_de/eu deleted file mode 100644 index 47695147..00000000 Binary files a/phsource/vwl_de/eu and /dev/null differ diff --git a/phsource/vwl_de/ue_short b/phsource/vwl_de/ue_short deleted file mode 100644 index 03eccd0a..00000000 Binary files a/phsource/vwl_de/ue_short and /dev/null differ diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test index 85ee7cae..61dd39c8 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 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 de dc6224a5e19b1a9bacb049e5277a2bc2d748f8a8 "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@"