diff --git a/phsource/compile_report b/phsource/compile_report index d9e64da9..605da61b 100644 --- a/phsource/compile_report +++ b/phsource/compile_report @@ -12,7 +12,7 @@ de 28 114 eo 15 103 fi 40 122 - fr 32 115 + fr 33 115 fr_ca 11 115 hi 50 127 hu 24 108 @@ -103,7 +103,7 @@ 1 l^/_l^ base 1 l^/l^ base 7 l/l base en af sk ru pt ro - 9 l/_l base en af de sk ru pt ro + 10 l/_l base en af de fr sk ru pt ro 1 l/l_ base 2 l/l@ base 1 l/L1_aL base @@ -112,7 +112,7 @@ 1 l/L1_@L base 1 l/L1_oL base 1 l/L1_uL base - 5 l/l_2 en af sk ru pt + 6 l/l_2 en af fr sk ru pt 1 l/L2_aL base 1 l/L2_eL base 1 l/L2_iL base @@ -124,10 +124,10 @@ 2 l/le base 1 l/L_eL_af af 2 l/li base - 2 l/l_long base ro + 3 l/l_long base fr ro 2 l/lo base 2 l/lu base - 7 l/tl base en af sk ru pt ro + 8 l/tl base en af fr sk ru pt ro 6 l/xl base 2 m/_m base ro 2 m/m_ base ro @@ -180,7 +180,7 @@ 7 r3/r_n base cy eo fr pl ru it 1 r3/r_o base 1 r3/r_u base - 29 r3/rx base af cy eo fr fr_ca pl ru it pt_pt ro + 28 r3/rx base af cy eo fr fr_ca pl ru it pt_pt ro 2 r3/@tap base 2 r3/@tap_i base 7 r/r base en_sc de fr hu it @@ -537,8 +537,8 @@ 2 vwl_en_wm/aa en_wm 1 vwl_en_wm/i en_wm 2 vwl_en_wm/ii en_wm - 2 vwl_fr/@R fr pt_pt - 2 vwl_fr/@R2 fr fr_ca + 1 vwl_fr/@R pt_pt + 3 vwl_fr/@R2 fr fr_ca 1 vwl_hi/A hi 3 vwl_hi/l-voc hi sk 2 vwl_no/& no diff --git a/phsource/ph_french b/phsource/ph_french index d3c3405d..2cef5f57 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -12,14 +12,14 @@ endphoneme phoneme @ vowel starttype (@) endtype (@) - length 120 + length 130 formants vowel/@_2 endphoneme phoneme a vowel starttype (a) endtype (a) - length 166 + length 160 formants vowel/a_en endphoneme @@ -40,7 +40,7 @@ endphoneme phoneme i vowel starttype (i) endtype (i) - length 158 + length 150 formants vowel/i linkout ; endphoneme @@ -49,14 +49,14 @@ endphoneme phoneme o vowel starttype (o) endtype (o) - length 166 + length 160 formants vowel/o_4 endphoneme phoneme O vowel starttype (o) endtype (o) - length 190 + length 170 formants vowel/o_6 endphoneme @@ -64,7 +64,7 @@ endphoneme phoneme u vowel starttype (u) endtype (u) - length 174 + length 150 formants vowel/u endphoneme @@ -85,7 +85,7 @@ endphoneme phoneme W vowel starttype (@) endtype (@) - length 198 + length 170 formants vowel/oe endphoneme @@ -101,21 +101,21 @@ endphoneme phoneme A~ vowel starttype (a) endtype (a) - length 222 + length 160 formants vnasal/aa_n3 endphoneme phoneme E~ // same as W~ for fr-fr vowel starttype (e) endtype (e) - length 192 + length 170 formants vnasal/W_n endphoneme phoneme O~ vowel starttype (o) endtype (o) - length 222 + length 160 formants vnasal/o_n3 endphoneme @@ -168,12 +168,24 @@ endphoneme //=========== // uses the consonants in file "phonemes", unless overridden here +phoneme l + liquid + length 100 + lengthmod 7 + beforenotvowel l/ + formants l/l_2 + after _ l/_l + after t l/tl + after l/ l/l_long // double l, make it longer +endphoneme + + + phoneme r liquid length 100 lengthmod 7 beforenotvowel r/ - trill formants r/r after _ r/_r t r/tr p r/tr k r/tr before _ r/r_ @@ -188,7 +200,7 @@ phoneme R length 100 lengthmod 7 beforenotvowel r/ - formants vwl_fr/@R+r3/rx%80 + formants vwl_fr/@R2 endphoneme @@ -199,7 +211,6 @@ phoneme R2 length 100 lengthmod 7 beforenotvowel r/ - trill formants vwl_fr/@R2+r3/rx%120 endphoneme diff --git a/phsource/vowel/a#_3 b/phsource/vowel/a#_3 index 8870918e..d8c7ab5b 100644 Binary files a/phsource/vowel/a#_3 and b/phsource/vowel/a#_3 differ diff --git a/phsource/vwl_fr/@R b/phsource/vwl_fr/@R index 5bf76ffb..a99b5532 100644 Binary files a/phsource/vwl_fr/@R and b/phsource/vwl_fr/@R differ