[1.46.25]

Changes to: pt, tt, ko.

Phoneme definitions: added NOT operator, eg:
   IF NOT nextPh(isVowel) THEN

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@290 d46cf337-b52f-0410-862d-fd96e6ae7743

dictsource/de_rules

@@ -256,7 +256,7 @@
      e) chen (_    C@n
      ü) chen (_    C@n
 
-        chs        ks        (_
+        chs        ks
         chance     SA~s@
         chara (kt  k%ara
      _) ch (ic     S

dictsource/dict_phonemes

@@ -78,7 +78,7 @@ S    s2   t    t2   tS   ts   v    w
 z    Z    
 
 
-Dictionary de_dict  2012-06-27
+Dictionary de_dict  2012-09-13
 
 3    @    @-   a    A    A:   aI   aU   
 A~   E    E2   E:   e:   EI   i    I    
@@ -102,7 +102,7 @@ p    Q    r    R    s    s;   t    T
 ts   v    x    z    
 
 
-Dictionary en_dict  2012-09-08
+Dictionary en_dict  2012-09-14
 
 0    3    3:   @    @-   @2   @5   @L   
 a    a#   A:   A@   aa   aI   aI3  aI@  
@@ -376,7 +376,7 @@ S    s;   S;   t    t;   tS   ts   tS;
 ts;  v    w    x    z    Z    Z;   
 
 
-Dictionary pt_dict  2012-09-11
+Dictionary pt_dict  2012-09-14
 
 &    &/   &U~  &~   @    @-   a    A    
 aI   aU   e    E    eI   EI   eU   EU   
@@ -508,11 +508,11 @@ i    i.   i[   iA   iE   io   iou  N-
 o    o-   ong  ou   u    u@   ua   uai  
 uei  uo   y    y&   y@   yE   yi   yu   
 
-;    C    f    h    j    k    kh   l    
-l#   m    n    N    p    ph   Q    q    
-Q"   Q^   r    R    R2   R3   s    s.   
-S;   t    th   ts   ts.  ts.  tS;  tS;  
-tsh  v    w    x    X    z.   
+;    C    f    h    j    J^   k    kh   
+l    l#   m    n    N    p    ph   Q    
+q    Q"   Q^   r    R    R2   R3   s    
+s.   S;   t    th   ts   ts.  ts.  tS;  
+tS;  tsh  v    w    x    X    z.   
 
 
 Dictionary zhy_dict  2009-01-19
@@ -814,10 +814,10 @@ tS   ts   tS;  v    x    z    Z    z;
 Z;   
 
 
-Dictionary tt_dict  2012-09-11
+Dictionary tt_dict  2012-09-14
 
-a    A    A2   e    e2   i    I    o    
-u    u2   V    W    y    
+&    a    A    e    e2   e:   i    I    
+o    u    u2   V    W    y    
 
 :    ?    b    d    f    g    h    j    
 k    l    m    n    N    p    q    r    
@@ -825,10 +825,11 @@ R    s    S    S;   t    w    x    z
 Z    Z;   
 
 
-Dictionary ko_dict  2012-06-14
+Dictionary ko_dict  2012-09-14
 
 @    a    e    E    i    o    u    u-   
 
 *    -    ;    b    d    dZ;  g    h    
-j    k    k-   kh   l    m    n    p    
-p-   ph   s    t    t-   tS   tS;  w    
+j    k    k-   kh   l    m    n    N    
+p    p-   ph   q    r    s    t    t-   
+tS   tS;  w    

dictsource/en_list

@@ -3054,6 +3054,7 @@ Katie		keIti
 Keighli		keIli
 Keanu		kI'A:nu:
 Kieran		ki@r@n
+Kris		krIs
 Laurence	l0r@ns
 Lawrence	l0r@ns
 Leann		li:'an

dictsource/es_rules

@@ -1,4 +1,4 @@
-// translation rules for Spanish
+// translation rules for Spanish
 // This file is UTF-8 encoded
 
 // Conditional rules
@@ -128,8 +128,9 @@ ll	(_	l
 
 .group m
           m          m
+       @) m (_       =m
        _) mn (em     n
-_)	mb	(A	mb
+       _) mb (A      mb
 
 
 .group n

dictsource/ko_list

@@ -1,5 +1,6 @@
 $textmode
 
+// Number forms:
 _0      ᅧᆼ
 _1      ᅵᆯ
 _2      ᅵ
@@ -23,6 +24,46 @@ _0C     백
 _0M1    천
 _1M1    천
 
+$phonememode
+_0M2	m'an          // 10^4
+_1M2	m'an
+_0M3	tSh-@n||m'an  // 10^7
+_1M3	tSh-@n||m'an
+_0M4	'@q           // 10^8
+_1M4	'@q
+_0M5	tSh-@n||'@q   // 10^11
+_1M5	tSh-@n||'@q
+_0M6	tS;'o         // 10^12
+_1M6	tS;'o
+_0M7	tSh-@n||tS;'o
+_1M7	tSh-@n||tS;'o
+_0M8	gj'@nN
+_1M8	gj'@nN
+$textmode
+
+
+// Character names:
+ㄱ ㄱㅣㅇㅕㄱ
+ㄲ ㅆㅏㅇㄱㅣㅇㅕㄱ
+ㄴ ㄴㅣㅇㅡㄴ
+ㄷ ㄷㅣㄱㅡㄷ
+ㄸ ㅆㅏㅇㄷㅣㄱㅡㄷ
+ㄹ ㄹㅣㅇㅡㄹ
+ㅁ ㅁㅣㅇㅡㅁ
+ㅂ ㅂㅣㅇㅡㅂ
+ㅃ ㅆㅏㅇㅂㅣㅇㅡㅂ
+ㅅ ㅅㅣㅇㅗㅅ
+ㅆ ㅆㅏㅇㅅㅣㅇㅗㅅ
+ㅇ ㅇㅣㅇㅡㅇ
+ㅈ ㅈㅣㅇㅡㅈ
+ㅉ ㅆㅏㅇㅈㅣㅇㅡㅈ
+ㅊ ㅊㅣㅇㅡㅊ
+ㅋ ㅋㅣㅇㅡㅋ
+ㅌ ㅌㅣㅇㅡㅌ
+ㅍ ㅍㅣㅇㅡㅍ
+ㅎ ㅎㅣㅇㅡㅎ
+
+// Misc:
 // 사ᅵ시ᅩᆺ
 고랫재		고랟째
 귓밥		귇빱

dictsource/ko_rules

@@ -19,20 +19,20 @@
 // Order: ㄱㄲㅋ ㄷㄸㅌ ㅂㅃㅍ ㅅㅆㅈㅉㅊ ㄴㅁ ㄹ ㅎ
 
 .group		ᄀ	// ㄱ
-		ᄀ	g
-	_)	ᄀ	k
+		ᄀ	q
+	_)	ᄀ	g
 	L01)	ᄀ	k-
 	L03)	ᄀ	kh
 
 .group		ᄁ	// ㄲ
-		ᄁ	k-
+		ᄁ	q-
 
 .group		ᄏ	// ㅋ
 		ᄏ	kh
 
 .group		ᄃ	// ㄷ
 		ᄃ	d
-	_)	ᄃ	t
+	_)	ᄃ	d
 	L01)	ᄃ	t-
 	L03)	ᄃ	th
 
@@ -55,7 +55,7 @@
 		ᄑ	ph
 
 .group		ᄉ	// ㅅ
-		ᄉ	s
+		ᄉ	|s
 	L01)	ᄉ	s-
 
 .group		ᄊ	// ㅆ
@@ -68,16 +68,16 @@
 	L03)	ᄌ	tSh;
 
 .group		ᄍ	// ㅉ
-		ᄍ	tS;-	// TODO: phoneme
+		ᄍ	'tS;-	// TODO: phoneme
 
 .group		ᄎ	// ㅊ
-		ᄎ	tSh;	// TODO: phoneme
+		ᄎ	tSh-	// TODO: phoneme
 
 .group		ᄂ	// ㄴ
-		ᄂ	n
+		ᄂ	;n
 
 .group		ᄆ	// ㅁ
-		ᄆ	m
+		ᄆ	;m
 
 .group		ᄅ	// ㄹ
 		ᄅ		*	// TODO: alveolar flap [ɾ]
@@ -87,7 +87,7 @@
 		ᄒ	h	// TODO: [ɦ]
 	_)	ᄒ	h
 
-// Medials
+// Medials or vowels
 
 .group		ᅡ	// ㅏ
 		ᅡ	a
@@ -157,7 +157,7 @@
 // Order: ㄱㄳㄲㅋ ㄷㅌ ㅂㅍ ㅅㅆㅈㅊ ㄴㅁ ㅇㅎ ㄹ
 
 .group		ᆨ	// ㄱ
-		ᆨ		k	// TODO: final stops
+		ᆨ		q	// It is actually q, as using k adds unnecessary sound.
 		ᆨᄒ		kh
 
 .group		ᆪ	// ㄳ
@@ -175,14 +175,14 @@
 		ᆿ	(A	kh
 
 .group		ᆮ	// ㄷ
-		ᆮ		t
+		ᆮ		d- // Actually a soft D.
 		ᆮᄂ		nn
 		ᆮᄆ		mm
 		ᆮᄒ		th
 		ᆮ	(L02	dZ;
 
 .group		ᇀ	// ㅌ
-		ᇀ		t
+		ᇀ		t-
 		ᇀᄂ		nn
 		ᇀᄆ		mm
 		ᇀ	(A	th
@@ -202,14 +202,14 @@
 		ᇁ	(A	ph
 
 .group		ᆺ	// ㅅ
-		ᆺ		t
+		ᆺ		t-
 		ᆺᄂ		nn
 		ᆺᄆ		mm
 		ᆺ	(A	s
 		ᆺᄒ		s-
 
 .group		ᆻ	// ㅆ
-		ᆻ		t
+		ᆻ		t-
 		ᆻᄂ		nn
 		ᆻᄆ		mm
 		ᆻ	(A	s-
@@ -241,14 +241,14 @@
 		ᆷ		m
 
 .group		ᆼ	// ㅇ
-		ᆼ		ng
+		ᆼ		nN
 
 .group		ᇂ	// ㅎ
-		ᇂ		t
+		ᇂ		t-
 		ᇂ	(A
 
 .group		ᆯ	// ㄹ
-		ᆯ		l
+		ᆯ		rr
 		ᆯᄅ		l
 		ᆯ	(A	*
 

dictsource/pt_list

@@ -644,6 +644,7 @@ governo	gov'ernU	$noun
 // $alt   changes stressed [e] or [o] phoneme to open [E] or [O]
 // $alt2   changes stressed [E] or [O] phoneme to close [e] or [o]
 
+aborto		$alt $verb
 acerto		$alt2 $noun
 adereço		$alt2
 adore		$alt
@@ -659,10 +660,12 @@ ameba		$alt
 amores		$alt2
 anoiteça	$alt2
 anoiteço	$alt2
+apego		$alt2
 apreço		$alt2
 aperto		$alt2 $noun
 apoio		$alt $verb
 aprendeste	$alt2
+arremesso	$alt2 $noun
 assembleia	$alt
 atrozes		$alt
 austera		$alt
@@ -676,11 +679,13 @@ boleia		$alt
 bolo		$alt2
 borboleta	$alt2
 bordo		$alt
+bromelha	$alt
 cabeça		$alt2
 cacete		$alt2
 cachorra	$alt2
 camiseta	$alt2
 cantora		$alt2
+caractere	$alt
 casebre		$alt
 catorze		$alt2
 cefaleia	$alt
@@ -714,9 +719,12 @@ crede		$alt2
 cresce		$alt
 crescem		$alt
 der		$alt
+desapego	$alt2 $noun
 desce		$alt
 descem		$alt
+descordo	$alt
 descova		$alt2
+desespero	$alt2 $noun
 desfecho	$alt2
 desprezo	$alt $verb
 deva		$alt2
@@ -727,8 +735,11 @@ discordo	$alt
 dobro		$alt2 $noun
 doce		$alt2
 droga		$alt
+emprego		$alt2 $noun
 endereço	$alt2
 enumerem	$alt
+enredo		$alt $verb
+enterro		$alt2 $noun
 enxerto		$alt2 $noun
 epopeia		$alt
 eritreia	$alt
@@ -740,7 +751,7 @@ esforços	$alt
 esperma		$alt
 espeto		$alt2 $noun
 espiroqueta	$alt2
-enterro		$alt2 $noun
+esqueleto	$alt2
 estiverdes	$alt
 estiveres	$alt
 estrofe		$alt
@@ -750,6 +761,7 @@ expeça		$alt2
 expeço		$alt2
 farofa		$alt
 febre		$alt
+fera		$alt
 fere		$alt
 ferem		$alt
 fezes		$alt
@@ -758,6 +770,7 @@ Fizeram		$alt
 fizerem		$alt
 fizerdes	$alt
 fizeres		$alt
+folga		$alt
 fogos		$alt
 fores		$alt2
 forro		$alt $verb
@@ -765,6 +778,7 @@ fosse		$alt2
 fossem		$alt2
 foste		$alt2
 frevo		$alt2
+galera		$alt
 gameta		$alt2
 geleia		$alt
 gelo		$alt $verb
@@ -850,10 +864,12 @@ povos		$alt
 poxa		p'oS&
 preta		$alt2
 preto		$alt2
+primavera	$alt
 profere		$alt
 proferem	$alt
 puder		$alt
 puserdes	$alt
+recomeço	$alt2 $noun
 recordo		$alt
 recorto		$alt
 rede		$alt2
@@ -874,11 +890,14 @@ sincero		$alt
 sobe		$alt
 sobem		$alt
 soco		$alt2
+soco		$alt $verb
 sofrem		$alt
 sofre		$alt
 sofreste	$alt2
+sogra		$alt
 sopre		$alt
 soprem		$alt
+sopro		$alt $verb
 sorvete		$alt2
 sossego     $alt2 $noun
 souber		$alt
@@ -889,6 +908,7 @@ sugere		$alt
 sugerem		$alt
 suor		swOr
 tapete		$alt2
+tempero		$alt $verb
 teta		$alt2
 tiver		$alt
 tiveres		$alt

dictsource/pt_rules

@@ -16,7 +16,7 @@
 
 // endings
 .L01 a am o
-.L02 a am e em o
+.L02 a am e em o ue uem
 .L03 a am
 
 .group a
@@ -367,6 +367,13 @@ _compar) e (çL01_   e
 _desapar) e (çL01_  e
 _esclar) e (çL01_    e
 _reapar) e (çL01_   e
+ _sol) e (trL01_    E
+_acont) e (çL03_    e
+_envaid) e (çL01_   e
+ _ofer) e (çL01_    e
+_enriqu) e (çL01_   e
+_descr) e (vL01_    e
+_enfraqu) e (çL01_  e
 //endsort
 
 .group é
@@ -653,11 +660,14 @@ _reapar) e (çL01_   e
 ?1   f) o (rmulá   u         // eg: formulário, formulários.
 ?1   v) o (lt      O
 
+//sort
     _m) o (lhL02_  O
+  _ref) o (gL02_   O
      c) o (rrL03_  o   // escorra, incorra, corra, recorra
     _m) o (rrL03_  o
    _ap) oi (L03_   OI
      p) ostos (_   Ost=Us#   // dispostos etc.
+//endsort
 
 .group ô
         ô          ''o

dictsource/tt_list

@@ -36,8 +36,8 @@
 щ	SS;A
 ъ	kAlVnl,Vqbilges'e
 ы	V:
-ь	neS;kal,ekbilges'e
-э	e:
+ь	neS;k&l,ekbilges'e
+э	e|:
 ю	ju
 я	jA
 
@@ -69,7 +69,7 @@ _4X	kVr'Vk
 _5X	ill'e
 _6X	Altm'VS
 _7X	Z;itm'eS
-_8X	siks'an
+_8X	siks'&n
 _9X	tuks'An
 _0C	j'Wz
 _0M1	m'eN
@@ -80,4 +80,4 @@ _1M3	milli'Ard
 _0M4	billi'on
 _1M4	billi'on
 
-_dpt	bWt,en
+_dpt	_bWt,en

dictsource/tt_rules

@@ -6,7 +6,8 @@
         а        A
 
 .group ә
-        ә        a
+        ә        &
+        әе       e:  // 'әнкәен'
 
 .group б
         б        b
@@ -15,13 +16,13 @@
         в        w   // [v] in Russian words
 
 .group г
-        г        g  // may be [Q] or [r"] ??
+        г        g  // changes to [Q] or [Q"]
 
 .group д
         д        d
 
 .group е
-     _) е        je2  // may be [je] [jV]
+     _) е        je2  // changes to [je] or [jV]
         е        e
 
 .group ё
@@ -38,6 +39,7 @@
 
 .group и
         и        i
+     A) и        j
 
 .group й
         й        j
@@ -54,7 +56,7 @@
 
 .group н
         н        n
-        н (к     N
+//        н (к     N
         н (г     N
         н (х     N
 
@@ -81,9 +83,11 @@
 
 .group у
         у        u   // or w
+     A) у        w
 
 .group ү
         ү        y   // or w
+     A) ү        w
 
 .group ф
         ф        f
@@ -120,10 +124,10 @@
         э        e
 
 .group ю
-        ю        ju2   // or jy
+        ю        ju2   // changes to ju or jy
 
 .group я
-        я        jA2   // or ja
+        я        ja   // changes to jA or j&
 
 .group
         $        dolAR