Merge branch 'master' into android

espeak-ng · Jan 30, 2013 · af41da0 · af41da0
2 parents 0c499c8 + 6a74024
commit af41da0
Show file tree

Hide file tree

Showing 18 changed files with 1,422 additions and 422 deletions.
diff --git a/dictsource/an_list b/dictsource/an_list
@@ -9,26 +9,29 @@ b	be
 c	Te
 d	de
 f	Efe
-g	xe
+g	ge
 h	atSe
-j	xOta
+j	,i||l'arga
 k	ka
 l	Ele
 m	Eme
 n	Ene
 ñ	En^e
 p	pe
 q	ku
-r	E*e	
+r	ERR2e	
 s	Ese
 t	te
 u	u
-v	uBe
-w	uBe||dOBle
-x	Ekis
-y	je
+v	,be||b'aIksa
+w	,be||d'Ople
+x	Se
 z	Teta
 
+y	i  $u     // word 'and'
+_y	je
+y	je	$atend
+
 
 // numbers
 _0	T'ero
@@ -58,7 +61,8 @@ _7X	set'anta
 _8X	gwit'anta
 _9X	noB'anta
 _0C	Tj'Entos
-_1C	Tj'En
+_1C	Tj'Ento
+_1C0	Tj'En
 _2C	doTj'Entos
 _3C	tresTj'Entos
 _6C	seITj'Entos
@@ -72,3 +76,5 @@ _0and	i
 _dpt	kon
 
 
+// unstressed words
+lo	$u
diff --git a/dictsource/an_rules b/dictsource/an_rules
@@ -98,6 +98,7 @@
         i        i
         i (A     j
      A) ix       S
+     _) ix       iS
 
 
 .group j
@@ -155,10 +156,13 @@
      _) r        R
         rr       RR2
      @) r (-     =      // followed by hyphen.  Silent, but stress on last vowel
+        rs (_    =s
+
 
 
 .group s
         s        s
+     &) s (_S1   s 
 
 
 .group t
@@ -176,8 +180,17 @@
      _) u (A     gw
 
 
-.group v
-        v        B
+.group v   // same as 'b'
+        v          b
+     _) v          b  // phoneme definition may change it to [B]
+     _) v (A       b
+        v (A       B
+        v (cY      B
+        v (L03     B
+     m) v          b
+     n) v          b
+        v (iA      b
+        v (uA      b
 
 
 .group w

diff --git a/dictsource/da_list b/dictsource/da_list
@@ -1793,6 +1793,7 @@ visent  $alt
 
 // PB final -graf - stressed a
 agraf  $alt
+angiograf $alt
 autograf  $alt
 barograf  $alt
 bibliograf  $alt
@@ -2828,6 +2829,7 @@ zucchini suk'ini  $alt
 agronomi  $alt
 akademi  $alt
 alkymi  $alt
+anarki  $alt
 anatomi  $alt
 antinomi  $alt
 antonymi  $alt
@@ -5777,8 +5779,8 @@ adstringer   $alt
 adviser   $alt
 advoker   $alt
 afficer   $alt
-aflever $alt
-afmarcher   $alt
+'aflever $alt
+'afmarcher   $alt
 afrikaniser   $alt
 agere   $alt
 aggraver   $alt
@@ -5992,6 +5994,7 @@ demissioner   $alt
 demokratiser   $alt
 demoler   $alt
 demonstrer   $alt
+demonter   $alt
 denaturer   $alt
 denoter   $alt
 denuntier   $alt
@@ -6344,6 +6347,7 @@ indlever   $alt
 indloger   $alt
 indmarcher   $alt
 indoktriner   $alt
+indruller   $alt
 inducer   $alt
 industrialiser   $alt
 inficer   $alt
@@ -6883,6 +6887,7 @@ praktiser   $alt
 premier   $alt
 primitiviser   $alt
 prioriter   $alt
+omprioriter   $alt
 privatfinansier   $alt
 privatiser   $alt
 privileger   $alt
@@ -6925,7 +6930,6 @@ prædisponer   $alt
 præfabriker   $alt
 præferer   $alt
 præjudicer   $alt
-prækvalificer   $alt
 præluder   $alt
 præmiere   $alt
 prænumerer   $alt
@@ -7150,6 +7154,7 @@ specificer   $alt
 spekuler   $alt
 spender   $alt
 spionere   $alt
+udspioner   $alt
 spolere   $alt
 sponser   $alt
 sponsorere   $alt
@@ -10108,7 +10113,6 @@ violet  $alt
 
 // PB nouns ending with -ine - stressed last syllable
 abonnine   $alt
-aubergine oberS'i:n@  $alt
 barkentine   $alt
 blondine   $alt
 bobine   $alt
@@ -11068,14 +11072,15 @@ titulatur  $alt
 tortur  $alt
 trubadur $alt
 
-// PB final -skop - stressed
+// PB final -skop & -trop - stressed
 biblioskop  $alt
 bronkoskop  $alt
 diaskop  $alt
 elektroskop  $alt
 endoskop  $alt
 epidiaskop  $alt
 episkop  $alt
+filantrop  $alt
 galvanoskop  $alt
 gastroskop  $alt
 gyroskop  $alt
@@ -11084,6 +11089,7 @@ kalejdoskop  $alt
 katodoskop  $alt
 laryngoskop  $alt
 mikroskop  $alt
+misantrop  $alt
 oscilloskop  $alt
 otoskop  $alt
 periskop  $alt
@@ -11207,6 +11213,7 @@ fx fVegsemp@l // PB "fx" is short for 'for eksempel'
 (cd'en) se:de:3n // PB
 (cd'er) se:de:V // PB
 emp $abbrev
+evt evEntu'El $abbrev $hasdot
 hbo $abbrev // TV station
 usa $abbrev
 kfum $abbrev
@@ -11257,7 +11264,7 @@ ikes ajks // PB
 hav hAu $atend
 (et for) ed||'for              // PB for i jakke - lining
 // PB problem with 'sig' [si] = "say" and 'sig' = "himself/herself" [saj]
-(sig mig)  si||maj               // PB sig mig engang
+//(sig mig)  si||maj               // PB sig mig engang
 (sig hvad) si||v&                // PB sig hvad du mener 
 sig $atend $sentence saj        // end of a sentence - han vaskede sig.
 (gør sig til) g,Wr||saj||t'el    // PB