Merge branch 'espeak-italian'

dictsource/it_list

@@ -1,6 +1,6 @@
-
+
 // This file is UTF-8 encoded
-// Updated 2015 December 10 by Chris, Christian Leo M, <[email protected]>
+// Updated 2015 December 23 by Chris, Christian Leo M, <[email protected]>
 
 //  $alt   change [e] or [o] in the stressed syllable to [E] or [O]
 //  $alt2  change [E] or [O] in the stressed syllable to [e] or [o]
@@ -700,6 +700,7 @@ u	u: $atend
 
 abajour	abaZ'u@-*
 account	ak:'aw2nt
+adobe	ad'Ob@ $only
 after	$1
 amnesty	'amn@stI
 anonymous 	an'OnimUs
@@ -731,6 +732,7 @@ blind	bl'aInd $onlys
 blues	bl'u:z
 boiler	$1
 bonjour	b,O:_Z'u:r
+brioche	b@-*I'oS
 boogie	b'ugi
 boom	bum
 bordeaux	_^_FR
@@ -825,7 +827,7 @@ download	d'a/:w2nl,o:d
 drive	_^_EN
 driver	_^_EN
 ebook	'i:b,Uk
-edition	ed'iSon $only
+edition	ed'iSon $onlys
 editor	'Edito@-*	$onlys
 l'editor	l'Edito@-* $only
 eloquence		_^_EN
@@ -2139,6 +2141,7 @@ anastasia $3
 andersson	'a:nde@-*son
 anderson	$1
 andromeda	$2
+angelis	$1 $only
 anita	$2
 annamaria	$4
 annapaola	$3
@@ -2238,6 +2241,7 @@ fabiola	$3
 fahrenheit	f'aRenaIt
 federic	$3
 felicita	$2
+fenice	$2
 ferrer	$2	$alt2
 françois	f@-*,a/NsU'a
 francisco	f@-*ans'isko
@@ -2934,6 +2938,7 @@ contrattaccano	$3
 conversano	$2
 conversino	$2
 convoc	$1
+convochi	$1
 convochino	$1
 convogliano	$2
 coordin	$2
@@ -4581,7 +4586,7 @@ dammel	$1
 dammene	$1
 deciditi	$2
 dedical	$1
-digitalo	$1
+digital	$1
 digliel	$1
 digliene	$1
 dimmelo	$1
@@ -4741,3 +4746,5 @@ risolver	$2
 saran	$2	$only
 tender	$1
 tener	$2	$alt2 $only
+
+

dictsource/it_listx

@@ -1,4 +1,4 @@
-
+
 abazia $3
 abbadia $3
 abbain	ab:a'i:n
@@ -1175,7 +1175,7 @@ davver $2  $alt2
 debit $1  $alt2
 debole $1
 dec  $alt
-decameron $2
+decameron	$2 $only
 decapoli $2
 decebal $2  $alt
 decenni  $alt
@@ -3073,7 +3073,7 @@ porzioncine	$4
 pos  $alt
 posillip $2
 post  $alt2
-posta	$alt
+posta	p'O:sta/
 poste	$alt
 posteri $1
 posteriori  $alt2

dictsource/it_rules

@@ -1,7 +1,7 @@
 
 // Italian translation rules
 // This file is UTF-8 encoded
-// Last update: 2015 November  20 by Chris <[email protected]>
+// Last update: 2015 December 23 by Chris <[email protected]>
 // letter groups
 // A  any vowel
 // C  any consonant
@@ -25,7 +25,7 @@
 	ai (_	'aj
 		ai (C   aI
 	au	a|%U
-	@C)	a (_S1q  a     // lookup it_list without suffix
+	@C)	a (_S1q  a/     // lookup it_list without suffix
 	@i)	a (_S1q  a     // lookup it_list without suffix
 	C) a (cY_	'a
 	@)	a (co_	=a
@@ -123,7 +123,7 @@
 	@d) ei (_	'eI
 	@t) ei (_	'eI
 	@) ey (_	=eI
-	@C)	e (_S1q  e     // lookup it_list without suffix
+	@C)	e (_S1q  e/     // lookup it_list without suffix
 		e (C_    E
 		e (A     E
 		e (C%A_  E
@@ -733,3 +733,4 @@ _L16_)	: (_L17D_	_%%E_	// Say time
         A_)  - (_D        _
         C_)  - (_D        _
 		§	pa*'ag@-*afO
+

phsource/ph_italian

@@ -1,5 +1,6 @@
+
 //====================================================
-//  Italian
+//  Italian, last update 23 dec 2015 by Chris <[email protected]>
 //====================================================
 
 phoneme : //  Lengthen previous vowel by "length"
@@ -12,17 +13,17 @@ phoneme a
   vowel starttype #a endtype #a
   length 160
   ChangeIfNotStressed(a/)
-  FMT(vowel/a)
+  FMT(vowel/a, 80)
 endphoneme
 
 
 phoneme a/
-  vowel starttype #@ endtype #@
+  vowel starttype #a endtype #a
   length 140
   IF thisPh(isWordEnd) THEN
-    FMT(vowel/a#_4)
+    FMT(vowel/a#_4, 65)
   ENDIF
-  FMT(vowel/a_5)
+  FMT(vowel/a_7)
 endphoneme
 
 
@@ -30,7 +31,7 @@ phoneme e
   vowel starttype #e endtype #e
   length 150
   ChangeIfNotStressed(e/)
-  FMT(vowel/e_2)
+  FMT(vowel/e_2, 80)
 endphoneme
 
 phoneme e/
@@ -39,7 +40,7 @@ phoneme e/
   IF nextPhW(isNasal) OR nextPhW(isLiquid) THEN
     FMT(vowel/e_mid2)
   ELSE
-    FMT(vowel/e)
+    FMT(vowel/e, 65)
   ENDIF
 endphoneme
 
@@ -55,13 +56,13 @@ endphoneme
 
 phoneme i
   vowel starttype #i endtype #i
-  length 140
+  length 145
   IfNextVowelAppend(;)
-  FMT(vowel/i)
 
    IF thisPh(isWordEnd) AND thisPh(isNotStressed) AND NOT prevPhW(E) THEN
    ChangePhoneme(I)
    ENDIF
+  FMT(vowel/i)
 endphoneme
 
 
@@ -81,7 +82,6 @@ phoneme I
 endphoneme
 
 
-
 phoneme o
   vowel starttype #o endtype #o
   length 150
@@ -93,9 +93,9 @@ phoneme o/
   vowel starttype #o endtype #o
   length 140
   IF nextPhW(isNasal) OR nextPhW(isLiquid) THEN
-    FMT(vowel/oo_1)
+    FMT(vowel/o_2)
   ELSE
-    FMT(vowel/o)
+    FMT(vowel/o, 66)
   ENDIF
 endphoneme
 
@@ -110,15 +110,15 @@ endphoneme
 
 phoneme u
   vowel starttype #u endtype #u
-  length 150
+  length 160
   ChangeIfNotStressed(U)
-  FMT(vowel/u_bck)
+  FMT(vowel/u_bck, 120)
 endphoneme
 
 phoneme U
   vowel starttype #u endtype #u
   length 140
-  FMT(vowel/u_bck)
+  FMT(vowel/u_bck2)
 endphoneme
 
 
@@ -157,12 +157,12 @@ phoneme ts
   vls alv afr sibilant
   voicingswitch dz
   lengthmod 2
-  Vowelin f1=1  f2=1700 -300 300  f3=-100 70 len=60
-  Vowelout f1=2 f2=1700 -300 250  f3=-100 70  rms=14
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 60 len=60
+  Vowelout f1=0 f2=1700 -300 250  f3=-100 70  rms=14
   IF nextPh(isPause2) THEN
-    WAV(ustop/ts_)
+    WAV(ustop/ts)
   ENDIF
-  WAV(ustop/ts)
+  WAV(ustop/ts, 80)
 endphoneme
 
 phoneme dz
@@ -170,3 +170,5 @@ phoneme dz
   voicingswitch z
   lengthmod 3
 endphoneme
+
+