Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

phsource/mbrola/fr1

@@ -1,3 +1,4 @@
+volume 17
 
 0  l/2 NULL  0  l
 0  l/ NULL   0  l
@@ -10,7 +11,6 @@
 0  j/ NULL   0  j
 0  ;  NULL   0  NULL
 0  g- NULL   0  NULL
-0  @- NULL   0  NULL
 0  @3 NULL   0  NULL
 0  *  NULL   0  R
 0  :  NULL   0  NULL
@@ -43,6 +43,7 @@
 0  z2 NULL   0  z
 0  z3 NULL   0  z
 
+0  @-  NULL  0  @
 0  a-  NULL  0  a
 0  e-  NULL  0  e
 0  y-  NULL  0  y

phsource/ph_hindi

@@ -24,6 +24,11 @@ phoneme V
   vowel flag1 starttype #@  endtype #@
   length 130
 
+  IF thisPh(isWordStart) THEN
+    FMT(vowel/V_3)
+    RETURN
+  ENDIF
+
   IF thisPh(isNotStressed) THEN
     IF prevPh(H) THEN
       ChangePhoneme(@)
@@ -33,7 +38,7 @@ phoneme V
       ChangePhoneme(NULL)
     ENDIF
 
-    IF NOT nextVowel(isFlag1) THEN
+    IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN
       IF thisPh(isSeqFlag1) THEN
         // delete the last inherent vowel of a sequence
         ChangePhoneme(NULL)
@@ -513,3 +518,22 @@ phoneme #X2  // click, use for indicating combining long vowels
 endphoneme
 
 
+phoneme r
+  liquid rhotic
+  lengthmod 3
+  
+  IF thisPh(isWordEnd) THEN
+    CALL base/r/
+  ELSE
+    IF prevPhW(isVowel) THEN
+      IF nextPhW(isNotVowel) OR nextPhW(V) THEN
+        ChangePhoneme(*)
+      ENDIF
+    ENDIF
+    
+    CALL base/r
+  ENDIF
+  ipa ɾ
+endphoneme
+
+