Merge remote-tracking branch 'ValdisVitolins/master'

This commit is contained in:
Reece H. Dunn
2017-01-22 19:39:33 +00:00
3 changed files with 6 additions and 5 deletions
+4 -3
View File
@@ -1056,8 +1056,9 @@ _C) oy (X _^_en // boy, toy
.group ô
ôt (_ o // rôt
ô o // cône
ô o: // long o: by default
ôt (_ O~ // rôt
ô (ne O~ // cône
.group p
@@ -1126,7 +1127,7 @@ _C) oy (X _^_en // boy, toy
.group r
rf (_ r/ // cerf, nerf, serf
_su) rr rr // surréaliste
cou) rr rr // courrai
mou) rr rr // mourrai
+1 -1
View File
@@ -291,6 +291,6 @@ phoneme l
import_phoneme en/l
endphoneme
phoneme x2
phoneme x
import_phoneme af/x2
endphoneme
+1 -1
View File
@@ -116,7 +116,7 @@ phoneme r/ // variant of [r] when not preceding a vowel
rhotic
starttype #r endtype #r
lengthmod 7
ipa U+0281
ipa ʁ
IF prevPhW(t) OR prevPhW(p) OR prevPhW(k) THEN
FMT(vwl_fr/trr) addWav(r3/rx, 15)