[1.27.05] Fix bug in numbers (million spoken as "thousand") introduced in 1.27.04.

Added mk_rules, mk_list, phonemes_mk.


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

dictsource/dict_phonemes

@@ -11,8 +11,8 @@ Yy
 
 -    :    ;    b    c    d    dZ   f    
 g    h    j    k    l    m    n    N    
-p    r    r-   s    S    t    tS   ts   
-v    w    x2   z    Z    
+p    r    r-   s    S    t    tS   v    
+w    x2   z    Z    
 
 
 Dictionary cs_dict
@@ -110,7 +110,7 @@ yi   Yy   yY
 
 *    :    b    d    f    g    h    j    
 k    l    m    n    N    p    r    s    
-S    s2   t    ts   v    Z    
+S    s2   t    v    Z    
 
 
 Dictionary fr_dict
@@ -122,7 +122,7 @@ y    Y
 :    ;    b    c    d    dZ   f    g    
 h    j    k    l    L    m    n    N    
 n^   p    R    s    S    t    t2   tS   
-ts   v    w    z    Z    z2   
+v    w    z    Z    z2   
 
 
 Dictionary hi_dict
@@ -142,8 +142,9 @@ t.h  th   v    w    x    z
 Dictionary hr_dict
 
 &    @    @-   @2   a    A    a:   aI   
-aU   E    e    e:   i    I    i:   l-   
-o    o:   oU   r-   u    U    u:   y    
+aU   E    e    e:   E~   i    I    i:   
+l-   o    o:   oU   r-   u    U    u:   
+y    
 
 *    b    d    dZ   dZ;  f    g    h    
 j    k    l    l^   m    n    N    n^   
@@ -182,7 +183,7 @@ y    Y:   yU
 *    :    ;    b    C    d    f    g    
 h    j    k    l    m    n    N    n^   
 p    Q    r    s    S    s;   t    tS   
-ts   v    v2   w    x    z    
+v    v2   w    x    z    
 
 
 Dictionary no_dict
@@ -321,7 +322,7 @@ y    y#   Yy
 f    g    h    j    J    k    l    l#   
 m    m#   n    N    n#   N#   n^   n^#  
 p    Q    r    R    r#   R2   s    S    
-t    T    tl#  ts   v    x    z    
+t    T    tl#  v    x    z    
 
 
 Dictionary la_dict
@@ -338,8 +339,9 @@ r    R    s    t    w    z
 Dictionary sr_dict
 
 &    @    @-   @2   a    A    a:   aI   
-aU   E    e    e:   i    I    i:   l-   
-o    o:   oU   r-   u    U    u:   y    
+aU   E    e    e:   E~   i    I    i:   
+l-   o    o:   oU   r-   u    U    u:   
+y    
 
 *    b    d    dZ   dZ;  f    g    h    
 j    k    l    l^   m    n    N    n^   
@@ -349,9 +351,11 @@ tS;  v    x    z    Z
 
 Dictionary mk_dict
 
-@-   a    E    i    l-   O    r-   u    
+&    @    @-   @2   a    A    a:   E    
+e    e:   E~   i    I    i:   l-   o    
+o:   oU   r-   u    u:   y    
 
-*    b    c    d    dZ   f    g    h    
-j    J    k    l    l^   m    n    n^   
-p    R    s    S    t    tS   ts   v    
-z    Z    
+*    b    d    dZ   dZ;  f    g    h    
+j    k    k^   l    l^   m    n    N    
+n^   p    r    R    s    S    t    tS   
+ts   tS;  v    x    z    Z    

dictsource/fr_list

@@ -39,12 +39,12 @@ $	dOlaR
 %	puRsA~
 &	_e
 +	plys
-~	tild'e
-€	@R'o
+~	tilde
+€	@Ro
 ¢	sEnt
-¥	i;'En
-£	l'ivR
-°	d@gR'e
+¥	i;En
+£	livR
+°	d@gRe
 ±	pl'yz_'u_mw'E~
 ×	myltip@-lj'e_p'aR
 ÷	diviz'e_p'aR
@@ -59,30 +59,30 @@ $	dOlaR
 _?A  lEt@
 _??  sE~b'OL
 
-_"   gijm'E
-_#   dj'Ez
-_'   apOstR'Of
+_"   gijmE
+_#   djEz
+_'   apOstROf
 _(   'uvR@-paRA~t'Ez
 _)   f'ERm paRA~t'Ez
 _*   astERisk:
-_,   viRg'yl
-_-   tiR'E
-_.   pw'E~
-_/   sl'aS
+_,   viRgyl
+_-   tiRE
+_.   pwE~
+_/   slaS
 _:   d'Ypw'E~
 _;   pw'E~viRg'yl
-_<   E~feRj'WR
-_=   eg'al
-_>   sypeRj'WR
-_?   kEstj'O~
-_[   uvR@-_kRoS'E
+_<   E~feRjWR
+_=   egal
+_>   sypeRjWR
+_?   kEstjO~
+_[   uvR@-_kRoSE
 _\   b'aksl'aS
 _]   f'ERm_kRoS'E
-_^   siRkOnfl'Eks
-__   sulin^'e
+_^   siRkOnflEks
+__   sulin^e
 _`   aks'A~_gR'av
-_{   uvR_akOl'ad
-_|   b'aR
+_{   uvR_akOlad
+_|   baR
 _}   f'ERm_akOl'ad
 
 
@@ -165,42 +165,42 @@ _dpt	pw'E~
 //**************
 
 (http ://)	aSt,et,ep'e
-abc		'a b'e s'e
-ac		'a s'e
-api		'a p'e 'i
-cio		s'e'i;'o
-ctrl		kO~tR'ol
-dept		depaRt@m'A~
-etc		etseteR'a
+abc		$abbrev
+ac		$abbrev
+api		$abbrev
+cio		$abbrev
+ctrl		kO~tRol
+dept		depaRt@mA~
+etc		etseteRa
 hmm		h@m
-ibm		'i:b'e:'Em
-ip		'i:p'e
-kde		kade@
-m.		m@sj'Y
+ibm		$abbrev
+ip		$abbrev
+kde		$abbrev
+m.		m@sjY
 mbrola		Em'bRola
-mlle		mad@mwaz'El
-mme		mad'am
-mr		m@sj'Y
-p.s		pOftkRipt'Om
-ratp		'ER:'a:t'e:p'e
+mlle		mad@mwazEl
+mme		madam
+mr		m@sjY
+p.s		postskRiptOm
+ratp		$abbrev
 s.t.p		s'il:t'@:pl'E
 s.v.p		s'il:v'u:pl'E
 st		s'E~
 ste		s'E~t
 stp		s'il:t'@:pl'E
 svp		s'il:v'u:pl'E
-url		'y:'ER:'El
-usb		'y:'Es:'be
-utf		y:te:Ef
+url		$abbrev
+usb		$abbrev
+utf		$abbrev
 xfce		iksEfse@
-xy		'iks:igR'Ek
+xy		$abbrev
 
 ii               d'Y          $abbrev    // roman numerals
 iii              tRw'a        $abbrev
 iv               k'atR        $abbrev
 
 
-dr               dOkt'WR       $dot $capital
+dr               dOkt WR       $dot $capital
 prof                           $dot
 
 
@@ -411,11 +411,9 @@ imprudent     E~pRydA~
 discident     disidA~
 accident      aksidA~
 occident      OksidA~
-l'occident    lOksidA~
 orient        ORjA~
-l'orient      lORjA~
 secret        sYkRE
-secrets       sYkRE
+secrets       sYkREz2
 
 
 sens	      sA~s
@@ -433,7 +431,7 @@ l'écho          leko
 cci              $abbrev
 espeak          ispik
 nvda             $abbrev
-open            Op'@n
+open            Op'En
 outlook         autluk
 potentiomètre   pOtA~sjOmEtR
 reader          Rid'WR
@@ -512,7 +510,7 @@ smart		smaRt
 // irt
 flirt		fl@Rt
 (sweat shirt)	swEtS@Rt
-tee-shirt	tiS@Rt
+(tee shirt)	tiS@Rt
 
 parfum		paRfW~
 forum		fOR@m
@@ -610,6 +608,6 @@ votions		vOtjO~z2 $u
 
 // no liaison
 (quelqu'un)	kElkW~
-pourcent	puRs'A~
+pourcent	puRsA~
 vincent		vE~sA~
 

dictsource/fr_rules

@@ -435,6 +435,7 @@
 	_)	l (_        El
 		l           l		// lit
 		ll          l		// aller	
+	_)	l' (P2      l
 	au)	lt			// hérault
 	outi)	l (_ 			// outil
 	ui)	ll          j		// juillet

dictsource/mk_list

@@ -0,0 +1,272 @@
+ // translation rules for Macedonian
+// This file is UTF-8 encoded
+// Letters
+
+б     b@
+в     v@
+г     g@
+д     d@
+ѓ     dZ;@
+ж     Z@
+з     z@
+ѕ     dz@
+ј     j@2
+к     k@
+л     l@
+љ     l^@
+м     m@
+н     n@
+њ     n^@
+п     p@
+р     R@
+с     s@
+т     t@
+ќ     k^@
+ф     f@
+х     x@
+ц     ts@
+ч     tS@
+џ     dZ@
+ш     S@
+
+q     kv@
+w     dvost@-*uko||v@
+x     iks
+z     z@
+
+
+ // translation rules for Croatian
+// This file is UTF-8 encoded
+
+
+
+_??   znak          // unknown symbol
+_?A   bukva         // unknown letter
+©     'avtoRsk&||p@-*av&
+%     p'osto
++     plus
+€     'evRo
+@     _'et
+&     _'i
+!     'izvItSnIk
+:     dve_totSki
+#     b@-*'oj_
+/     k@-*'oz_
+\\    b'EkslES
+^     ts'irkumfleks
+~     t'ild&
+¤     v'alut&
+§     del
+µ     m'ik@-*o
+¶     tSlen
+°     st'epen
+_"    n'avodnIk
+_‚    'otvoRen||n'avodnIk
+_„    zatvoRen||n'avodnIk
+…     t@-*'i||t'otSki
+†     k@-*st
+‡     dv'oen||k@-*'st
+‰     p@-*'omil
+_‹    'otvoRen||n'avodnIk
+_‘    'otvoRen||n'avodnIk
+_’    'edinetSen||n'avodnIk
+_“    'otvoRen||n'avodnIk
+_”    z'atvoRen||n'avodnIk
+•     g'olema||t'otSk&
+_–    En||ts'r-t&
+_—    Em||ts'r-t&
+™     p@-*oizv'oditel
+˘     b@-*'evis
+¨     p@-*'ijegl&s
+_«    'otvoRen||n'avodnIk
+_­    p@-*'iv@-*emen&||ts'r-t'itSk&
+·     po
+¸     sed'il&
+_»    z'atvoRen||n'avodnIk
+®     R'egist@-*atsIj&
+ł     l@||s&||ts'r-t'itsom
+×     p'o
+÷     pod'el^,eno
+
+_$    d'ol&R
+_-    m'inus
+_*    dzv'ezditSk@
+_=    'edn&kvo
+_@    t'r-g'ovsko||'a
+_(    'otvoRen&||z'ag@-*ad&
+_)    z'atvoRen&||z'ag@-*ad&
+_'    'apost@-*of
+_*    dzv'ezditSk&
+_,    z'apiRk&
+_-    ts'r-t'itSk&
+_.    t'otSk&
+_;    t'otSk&z,apiRka
+_<    p'omalo||'od
+_=    'edn&kvo
+_>    pog'olemo||'od
+_?    pr'aSalnik
+_&    t'r-g'ovsko||'i
+_[    'otvoRen&||sR'edn&||z'ag@-*ad&
+_]    z'atvoRen&||sR'edn&||z'ag@-*ad&
+__    ts'r-t&
+_`    g@-*'avis
+_{    'otvoRen&||g'olem&||z'ag@-*ad&
+_|    veRtikaln&||ts'r-t&
+_}    z'atvoRen&||g'olema&||z'ag@-*ad&
+
+
+
+
+// Numbers
+_0    n'ul&
+_1    'eden
+_1f    'edna
+_2    d'v'a
+_2f   dv'e
+_3    tR'i
+_4    tS'EtI*I
+_5    p'Et
+_6    S'Est
+_7    s'Edum
+_8    'osum
+_9    d'EvEt
+_10   d'EsEt
+_11   edIn'aeset
+_12   dvan'aeset
+_13   t@-*in'aeset
+_14   tSEtirin'aeset
+_15   pEtn'aeset
+_16   SEsn'aeset
+_17   sEdumn'aeset
+_18   osumn'aeset
+_19   dEvEtn'aeset
+_2X   dv'aEsEt
+_3X   t@-*'iEsEt
+_4X   tSEtir-'iEsEt
+_5X   p'EEsEt
+_6X   S'EEsEt
+_7X   sEd'umdEsEt
+_8X   os'umdEsEt
+_9X   dEv'EEsEt
+_0C   st'o_
+_2C   dv'est'a
+_6C   S'Est'o
+_0M1  'iljadi
+_1MA1 'iljad&
+_0M2  mili'oni
+_1MA2 mili'on
+_0M3  m'iliardI
+_1MA3 m'iliarda
+_0M4  bili'oni
+_1M4  bili'on
+_dpt  _:z'api*k&_
+_0and i
+
+// Roman numerals
+ii	$abbrev
+iii	$abbrev
+iv	$abbrev
+vii	$abbrev
+viii	$abbrev
+ix	$abbrev
+xi	$abbrev
+xii	$abbrev
+xiii	$abbrev
+xiv	$abbrev
+xvi	$abbrev
+xvii	$abbrev
+xviii	$abbrev
+xix	$abbrev
+xxi	$abbrev
+xxii	$abbrev
+xxiii	$abbrev
+xxiv	$abbrev
+xxvi	$abbrev
+xxvii	$abbrev
+xxviii	$abbrev
+xxix	$abbrev
+xxxi	$abbrev
+xxxii	$abbrev
+xxxiii	$abbrev
+xxxiv	$abbrev
+xxxvi	$abbrev
+xxxvii	$abbrev
+xxxviii  $abbrev
+xxxix	$abbrev
+
+// Abbreviations
+
+// Demonstratives
+кој      $u+
+што      $u+
+кого     $pause
+
+
+// Pronouns
+
+
+// Prepositions
+за        $u $brk
+во        $u $brk
+со        s_ $brk
+
+
+// Conjunctions
+а        a $u $pause    // and
+и        i_: $u $pause   // and
+или      $pause       // but
+него     $pause       // but
+или      $u $pause    // or
+
+
+
+
+
+// Auxillary verbs
+ли       $u      // question
+
+сум      $u      // to be, short form
+си       $u
+е        $u $brk
+сме      $u
+сте      $u
+се       $u
+
+бил      $u       // to be, past tense
+била     $u
+било     $u
+беа      $u
+
+несум    $u+      // to be, negative
+неси     $u+
+нее      $u+
+несме    $u+
+несте    $u+
+несе     $u+
+
+имам     $u+      // to have
+имаш     $u+
+има      $u+
+имаме    $u+
+имате    $u+
+имаат    $u+
+
+немам    $u+      // to have, negative
+немаш    $u+
+нема     $u+
+немаме   $u+
+немате   $u+
+немаат   $u+
+
+
+
+
+
+// treat as letters not words if at the end of the clause
+а        a    $atend    // letter-а
+е        E    $atend    // letter-е
+и        i_   $atend    // letter-и
+
+
+// Exceptions
+

dictsource/mk_rules

@@ -0,0 +1,297 @@
+// translation rules for Macedonian
+// This file is UTF-8 encoded
+
+.group а
+          а        a
+
+.group б
+          б        b
+
+.group в
+          в        v
+          в (_     f
+
+
+.group г
+          г       g
+
+.group д
+          д       d
+
+.group ѓ
+          ѓ       dZ;
+
+.group е
+          е       e
+
+.group ж
+          ж       Z
+
+.group з
+          з       z
+
+.group ѕ
+          ѕ       dz
+
+.group и
+          и       i
+       _) и       i_
+
+.group ј
+          ј       j
+
+.group к
+          к       k
+
+.group л
+          л       l
+
+.group љ
+          љ       l^
+
+.group м
+          м       m
+
+.group н
+          н       n
+
+.group њ
+          њ       n^
+
+.group о
+          о       o
+
+.group п
+          п       p
+
+.group р
+          р       R
+       A) р (A    R
+       K) р (A    @-*
+          рр      R
+          р (_    R
+       C) р (C    'r
+
+       K) р (K    'r-
+
+
+.group с
+          с       s
+ 
+.group т
+          т       t
+
+.group ќ
+          ќ       k^
+
+.group у
+          у       u
+
+.group ф
+          ф       f
+
+.group х
+          х       h
+
+.group ц
+          ц       ts
+
+.group ч
+          ч       tS;
+
+.group џ
+          џ       dZ
+
+.group ш
+          ш       S
+
+.group a
+        a        a
+        a (j     A
+        a (r     A        // don't reduce to [&]
+
+.group b
+        b        b
+
+.group c
+        c        ts
+
+.group č
+        č        tS
+
+.group ć
+        ć        tS;
+
+.group d
+        d        d
+        dz       dz
+        dž       dZ
+
+.group đ
+        đ        dZ;
+
+.group e
+        e        E
+     j) e        e
+        e (j     e
+    ._) exe      %ekse        // filetype
+
+.group f
+        f        f
+
+.group g
+        g        g
+
+.group h
+        h        h
+     _) h        x
+
+.group i
+        i        i
+    ._) ini      %ini         // filetype
+
+.group j
+        j        j
+    XA) j (_     j_      // short pause after final [j] in one-syllable words
+
+.group k
+        k        k
+
+.group l
+        l        l
+     K) l (K     l-
+        lj (+    l^
+
+.group m
+        m        m
+
+.group n
+        n        n
+        n (g     N
+        n (k     N
+
+        nj       n^
+
+.group o
+        o        o
+        ou       oU
+
+.group p
+        p        p
+
+.group q
+        q        k
+        qu       kv
+
+.group r
+        r        R
+     A) r (A     R
+     K) r (A     @-*
+        rr       R
+        r (_     R
+
+     K) r (K     'r-
+
+
+.group s
+        s        s
+
+.group š
+        š        S
+
+.group t
+        t        t
+
+.group u
+        u        u
+
+.group v
+        v        v
+
+.group w
+        w        v
+
+.group x
+        x        ks
+
+.group y
+        y        j
+     K) y (K     i
+
+
+.group z
+        z        z
+
+.group ž
+        ž        Z
+                  
+.group
+        á        a:
+        é        e:
+        í        i:
+        ó        o:
+        ú        u:
+
+        ä        _^_DE   // use German voice
+        ö        _^_DE
+        ü        _^_DE
+        ß        _^_DE
+
+        $        d'ol&R
+
+        .        totSk&
+        . (.     _:
+   \.)  .
+
+   __)  - (_D    minus
+   A_)  - (_D    _
+   C_)  - (_D    _
+    --) -
+
+        *        dzv'ezditSk&
+    *)  * (*
+        **
+   **)  * (_     _::
+
+        =            'edn&kvo
+        = (==
+    =)  = (=
+   ==)  = (_         _::
+
+.group 0xce   // Greek letters
+
+	α	'alf&
+	ά	'alf&||t'onos
+	β	b'et&
+	γ	g'am&
+	δ	d'elt&
+	ε	'epsIlon
+	έ	'epsIlon||t'onos
+	ζ	z'et&
+	η	'et&
+	ή	'et&||t'onos
+	θ	tx'et&
+	ι	j'ot&
+	ί	j'ot&||t'onos
+	κ	k'ap&
+	λ	l'amd&
+	μ	m'i
+	ν	n'i
+	ξ	ks'i
+	ο	'omIk@-*on_
+
+.group 0xcf   // Greek letters
+
+	π	p'i
+	ρ	R'o
+	σ	s'igm&
+	ς	gr-tSko_||z'avr-Sno_||s'igm&
+	τ	t'au
+	υ	gr-tSki_||'ipsIlon
+	ύ	gr-tSki||'ipsIlon||t'onos
+	φ	f'i
+	χ	x'i
+	ψ	ps'i
+	ω	'omeg&
+	ώ	'omeg&||t'onos
+	ό	'omIk@-*on||t'onos