[1.25.13] Phoneme name [r] is no longer reserved, may be redefined by languages.

Phoneme [z], increased voicing and slightly longer.
lang=af, updates to af_list,af_rules
lang=hu, added unstressed words, abbreviations.


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

dictsource/af_list

-//maintainer: Willem van der Walt
+//maintainer: Willem van der Walt
 // email: [email protected]
 // tel: +27 12 8413996
 // Meraka Institute, CSIR
 
 // Place names
 
-afrika      'A:frika
 bethlehem   bEt_liEm
+brittanje   $2
 ceylon      s@lOn
 china       S'ina
 engeland    'EN@lant
+kongo       kONgu
 mesopotamië mEsuput'A:mi@
+mosambiek   musamb'ik
 thaba       tA:ba
 (thaba nchu) tab'A:||ntSu
 europa      Y@r'o@pa
 paarl       p&:r@L
+portugal    $1
 pretoria    prit'o@ria
 stellenbosch st%&l@mbOs 
 worcester   v'ust@r
 aucamp      @Ukamp
 benjamin    bEndZ@m@n
 botha       bo@ta
+bothma      bOtma
+breytenbach breIt@nbax2
 carl        kA:r@L
 charles     _^_EN
 chris       krIs
 coetzee     kuts'e@
 debora      d@bo@ra
 der         d@r
+deventer d'e@v@nt@r
+elize       il'i:z
 esegiël    is'e@x2i_@l
 eugene      judZ'i:n
 eugène     yZ'En
 jacobus     jako@bWs
 jacques     ZA:k
 jesus       ji:sWs
+joey        dZ@ui
 john        _^_EN
 le l@
 leandra     li'andra
 natasha n%at'aSa
 paul        p@Ul
 paulus      p@UlWs
+pierre p'e@r
 petrus      pe@trWs
 phoebe      fi:bi
-plooy pl'oI
 preez       pr'e@
 rebekka     r@bEka
 ronel       run'&l
 rousseau    r@s@U
 roux r'u
+schalk sk'alk
 scheepers   ske@p@rs
 schoor      sko@r
 shakespeare _^_EN
 mev         m@fr@U
 dr          d'Okt@r
 insp        InspEkt'Y@r
+kapt kapt'eIn
 prof        pruf'Es@r
 st          s@nt
 supt        suprEntEnd'Ent
 bewend        be@v@nt
 bewering      b@ve@rIN
 biblioteek    $4
+bostaande b'o@stA:nd@
 
 dadelik       dA:d@lIk
 darem         dar@m
 derde         d&:rd@
 dekade        dEk'A:d@
+deurgaans     $1
 diegene       dix2,e@n@
 dikwels       dIkv@ls
 diplomasie    d@plo@mas'i
 ekstra $1
 
 elders        &ld@rs
+elite         il'i:t
 enige         e@nIx2@
 era           e@ra
 erger         &rg@r
 ingang        Inx2aN
 intens @nt'Ens
 intensiteit   $4
-ironie        irun'i
 
 joernalis $3
 
 kafee         kaf'e@
 kantoor       $2
 kapitaal      kapit'A:l
-koevert       kuf'&rt
 kollega       kul'e@x2a
 komaan        kOmA:n
 komberse      kOmb'&rs@
 kombers       kOmb'&rs
-konferensie   kOnf@r'e:nsi
 kopiereg      kup'ir&x2
 krediet       kr@dit
 kritiek       krIt'ik
 lekker        l&k@r
 lekkerder     l&k@rd@r
 lekkerste     l&k@rst@
-lughawe       lWx2h,A:v@
 
 makabere m%ak'A:b@r@
 matige        mA:t@x2@
 onkunde       $1
 onlangs       $1
 onmag         $1
+onmin         $1
+onraad        $1
 onrus         $1
 oorkom        $2
 oorleef       $2

dictsource/dict_phonemes

 
 Dictionary fr_dict
 
-@    @-   a    A    A~   e    E    E~   
-i    o    O    O~   u    u:   W    w^i  
-W~   y    Y    
+@    @-   a    A    A~   e    E    E:   
+E~   i    o    O    O    O~   u    W    
+w^i  W~   y    Y    
 
 (o)  :    ;    b    c    d    dZ   f    
 g    h    j    k    l    L    l/2  m    
 Dictionary hr_dict
 
 &    @    @-   @2   a    A    a:   aI   
-aU   E    e    e:   eI   i    I    i:   
-iI   l-   o    o:   oI   oU   O~   r-   
-u    U    u:   uI   
+aU   E    e    e:   eI   E~   i    I    
+i:   iI   l-   o    o:   oI   oU   O~   
+r-   u    U    u:   uI   
 
 *    b    d    dZ   dZ;  f    g    h    
 j    k    l    l^   m    n    N    n^   
-p    r    R    s    S    t    t;   tS   
-ts   tS;  v    x    z    Z    
+p    r    R    s    S    t    tS   ts   
+tS;  v    x    z    Z    
 
 
 Dictionary hu_dict
 
 &    &/   &U~  &~   @    @-   a    A    
 aI   aU   e    E    eI   EI   eU   EU   
-e~   i    i/   iU   o    O    oI   OI   
+i    i/   iU   i~   o    O    oI   OI   
 o~   U    u    uI   u~   y    
 
 *    :    ;    b    C    d    dZ   f    
 g    h    j    k    l    l^   m    n    
 N    n^   p    Q    r    R    s    S    
-s#   s;   t    tS   ts   v    w    x    
-z    Z    
+s#   s;   t    T    tS   ts   v    w    
+x    z    Z    
 
 
 Dictionary ru_dict

dictsource/en_list

 ?6 (some one)    sVmw0n
 ?6 one           wVn           $nounf $onlys $unstressend
 ?6 ones          wVnz          $only $unstressend
- 
+
+
+// General American
+?3 status        statVs
+

dictsource/fr_list

 fils	      fis
 mars	      maRs
 pays	      pEi
-pourcent    purs'A~
+pourcent      puRs'A~
 sens	      sA~s
 c'est         sEt2 $u
 qu'à          ka
 emacs		Emaks
 emacspeak	Emakspik
 espeak		@spik
-firefox		faj@rfOks
-thunderbird	f@ndErb@rd
-girl		g@rl
+firefox		faj@RfOks
+thunderbird	f@ndErb@Rd
+girl		g@Rl
 gnome		gnom
 gnu		gnu
 insight		insajt
 (mac os x)	makoEsiks
 night		najt
 redhat		rEdat
-schubert	SubEr
+schubert	SubER
 sun		s@n
 sunlight	s@nlajt
 ubuntu		ubuntu
 viavoice	viavOjs
 windows		windoz
-word		wOrd
+word		wORd
 wright		wrajt
 yacht		jot
 

dictsource/hu_list

 _dpt      v,Ess2Y:
 
 
+// Abbreviations
+km	kilo:me:tER
+mm      milime:tER
+
+ill	illEdvE  $dot
+stb	SAtYb:i  $dot
+vö	vEZd _!'Yss2E
+pl	pe:lda:ul  $dot
+mta	$abbrev
+a.m	An^n^i||m'int  $dot
+
+
+
 // Articles
 a         $u
 az        $u
 ne        $u+
 
 
-// Unstressed adverbs etc.
+// Unstressed adverbs prepositions etc.
 néhány    $u+
-is        $u         // ??
+is        $u         // also
+
+elöl	$u
+elől	$u
+elé	$u
+előtt	$u
+
+mögül	$u
+mögött	$u
+mögé	$u
+
+kívül	$u
+után	$u
+
+alól	$u
+alá	$u
+alatt	$u
+
+felől	$u
+felé	$u
+fölé	$u
+felett	$u
+fölött	$u
+
+mellől	$u
+mellé	$u
+mellett	$u
+
+közül	$u
+közé	$u
+között	$u
+
+ba	$u
+be	$u
+ra	$u
+re	$u
+ik	$u
+es	$u
+os	$u
+ós	$u
+ös	$u
+ból	$u
+ből	$u
+ról	$u
+ről	$u
+án	$u
+én	$u
+on	$u
+en	$u
+ön	$u
+szor	$u
+szer	$u
+ször	$u
 
 
 // Verbs
 tudnak    $u+
 
 // Letters
-_a        A:
-a         A: $atend     // letter "a"
-b         be:
-c         tse:
-d         de:
-f         Ef
-g         ge:
-h         ha:
-j         je:
-k         ka:
-l         El
-m         Em
-n         En
-p         pe:
-q         ku:
-r         ER
-s         S_
-s         ES  $atend
-_s        ES
-v         ve:
-w         duplAve:
-x         iks
-y         ipsilAn
-z         ze:
-_.        pont
+_a	A:
+a	A: $atend     // letter "a"
+b	be:
+c	tse:
+d	de:
+f	Ef
+g	ge:
+h	ha:
+j	je:
+k	ka:
+l	El
+m	Em
+n	En
+p	pe:
+q	ku
+r	ER
+s	S_
+s	ES  $atend
+_s	ES
+v	ve:
+w	duplAve:
+x	iks
+y	ipsilon
+z	ze:
+
+cs	tSe:
+dz	dze:
+dzs	dZe:
+sz	Es
+zs	Ze:
+gy	Je:
+ty	ce:
+ly	Ellipsilon
+ny	En^
+
+_.	pont
+%	sa:zAle:k
+@	kukAts
+€	Eu*o
++	plus
+§	p'A*AgRAfuS
+
 
 
 // Main Exceptions List

dictsource/hu_rules

 
   _sto) ck (holm  k
 
+ kilen) c (sz    tS
+  nyol) c (sz    tS
+   har) c (sz    tS
+   lán) c (sz    tS
+   pol) c (so    tS
+   per) c (sz    tS
+   por) c (sé    tS
+   por) c (sz    tS
+   rán) c (sz    tS
+   tán) c (sz    tS
+
 
 .group d
         d        d
      A) gyj (A   J:
 
     _e) gy (es   J:
+    _e) gy (et   J:
     _e) gy (ik   J:
+    _e) gy (üt   J:
 _minde) gy (ik   J:
 
 
         lly      jj
         lj       jj
 
+    mi) ll (i    l
+
+
 .group m
         m        m
 
+    ko) mm (unis  m
+
+
 .group n
         n        n
         n (g     N
         sz       s
         ssz      ss2
 
+    ki) s (ebb   SS
+
         sz (öld    Sz
 
 
         zs       Z
         zzs      Z:
 
+    gá) z (sz    z
+    gé) z (sz    z
+    há) z (so    z
+    há) z (sz    z
+    lá) z (sz    z
+    má) zc (sz   z
+    mé) zc (sz   z
+    tű) z (sz    z
+    ví) z (sz    z
+
     ga) zs (ág     zS
    _ví) zsz (int   zs:
    _gá) zsz (ámla  zs:
 
 
 .group
-        %        sa:zAle:k
         $        dolla:r
-        @        kukAts
-        €        Eu*o
-        +        plus
 
         .        pont
         . (.     _:

dictsource/it_list

 sugli   $u
 sulle   $u
 
-con	$u $pause	// with
+con	$u $pause $only	// with
 col     $u
 coi     $u
 
 verso      $u+ $brk     // toward
 sopra	   $u+ $brk	// above
 sotto	   $u+ $brk	// below
-per        $u $pause    // for
+per        $u $pause $only   // for
 eccetto    $pause       // except
 senza      $pause       // without
 durante    $pause       // during

dictsource/pt_list

 ?1 braille    b:r'aily
 ?1 cancel     k'&ns'El
 ?1 caps       k'aps
-?1   com       kom
+?1 com        kom
  ctrl       k'oNt:r,Ol
 ?1   dat       d'at
 ?1 doc        d'Ok
 ?1 delete     d'il'it
 ?1 design     d,iz'ain
-?1   dj       d,i:dZ'eI
+?1 dj         d,i:dZ'eI
 ?1 down       d'a,wn
 ?1 download   d'a,wnl'oud
 ?1 end        'end
 ?1 exe        'Ezy
 ?1 explorer   ,ekspl'O:r&@-
 ?1 eyes       'aiz
+?2 frame      fR'eImi
 ?1 gmail      g,em'eIl
+?2 Gmail      Zem'eIl
 ?1 google     g'u:g&l 
+?2 google     g'ugol
 ?1 hardware   'ard,w'E@
 ?2 hardware   x'ardwe@-
 ?1 home       'omy
+?2 home       x'owmi
 ?1 hotmail    'Otm'eIl
+?2 hotmail    xotm'eIl
 ?1 install    ,inst'al
 ?2 internet   iNtern'Et
+?2 Intranet   iNtRan'Et
 ?1 kernel     k'Ern,El
-?2 kernel     k'ErnEU
+?2 kernel     k'Ern@l
 ?1 line       l'ain
-layout        l'eI,aUt
+   layout     l'eI,aUt
 ?1 lock       l'Ok
-?1 mail       m'eIl
+   mail       m'eIl
 ?1 maior      m'&j'O@
 ?2 maior      maI'Or
 ?1 menor      myn'O@
 ?1 menu       menu
 ?1 next       n'Ekst
    ok         Ok'eI
+?2 offline    Ofl'aIN
+?2 online     oNlaIN
+   org        Org
 ?1 ovo        'ovu
 ?1 pause      p'au:z
-?1 page       p'eIdZ
+   page       p'eIdZ
+   python     p'aIT&~N
 ?1 readme     r'i:dmi:
-?1   sapi       s,ap'i
+?1 sapi       s,ap'i
 ?1 scanner    sk'En&r
 ?1 shift      S'ift
 ?1 scroll     sk:r'ol
 ?1 space      sp'eIsy
 ?1 sporting   sp'Ort,ing
 ?1 tab        t'ab
-?1   telemóvel       t,El,Em'OvEl
-?1    telemóveis       t,El,Em'OveIs#
+?1 telemóvel  t,El,Em'OvEl
+?1 telemóveis t,El,Em'OveIs#
 ?1 up         &p
 ?1 upload     &pl'oud
 ?1 window     w'iNd'ou
    firefox     f'ai@fOks
 ?1 front       f:r'ont
 ?1 jaws        dZ'au:z
+?2 jaws        dZ'Os
 ?1 linux       l,in'uks
 ?2 linux       l'inUks
 ?1 live        l'aiv

dictsource/pt_rules

           áy         ''aI
           áu         ''aU
           áu (s      ''aU
-          ál         ''Al
+?1        ál         ''Al
           á (uCK     ''a
 
 
           e (ce_     E
           e (cem_    E
           e (ces_    E
-          e (stA_    E
+
+e (stA_    E
           e (stAm_   E
           e (stAs_   E
+        e (strA_        E
 
           e (rnA_    E
           e (rnAm_    E
           e (xA_     E
           e (xAm_    E
           e (xAs_    E
-
+?2        _n) e (t        E
 
           em (C      eIm
           en (K      eIN
           en (_      =eIN
           en (s_     =eIN
 
-
           ei         eI
           ei (s      eI
           e (iCK     e
 
           o (Ca_     O
 ?1        o (l_      'O
-?2        ol (K      Ow
+?2        ol (_      Ow
 ?2        olh        olj
 
         om (_      oN

dictsource/ro_rules

+
 // translation rules for Romanian
 // This file is UTF-8 encoded
 
 
      &) ic (_    =ik
      &) ice (_   =itSe
-     &) icile (_  =itSile  // ??
-     &) icilor (_ =itSilor // ??
+     &) icile (_  =itSile 
+     &) icilor (_ =itSilor
+@) icii (_ =itSiI
+
      &) ing (_   %iNg     // foreign words
-        i (t_    'i
+
+i (t_    'i
 
 .group î
         î        y
 
 
+
+@) î (_ 'y
 .group j
         j        Z
      @) j (i_    Z;
         m        m
      @) m (i_    m;
      _) m (-a    m
-@-_) mi  mI^                // ??
+
+     -) mi (_    mi/
 
 
 .group n
 
      &) sprezece (_S8t sp@-*ez,etSe
 
-     @) sem (_S3t   sem 
-     @) seră (_S4t  se*@
-     @) serăm (_S5t se*@m
-     @) serăţi (_S6t se*@tsI^
-     @) seşi (_S4t   seSI^
+     @) sem (_S1t   sem 
+     @) seră (_S2t  se*@
+     @) serăm (_S3t se*@m
+     @) serăţi (_S4t se*@tsI^
+     @) seşi (_S2t   seSI^
 
 
 .group ş
 //    @)  ţi (-i   ts;'iI
 //    @)  ţi (-l   ts;'i
 
+     -) ţi (_    ts;i/
 
 .group u
         u        u
         **
    **)  * (_     _::
 
+

phsource/compile_report

 34 phoneme tables
           new total
-    base  94   94
-      en  52  141
-    en_n  29  141
-   en_us  36  141
-   en_sc  39  143
-   en_rp  34  141
-   en_wm  30  141
-      af  38  125
-      cy  30  120
-      de  28  117
-      eo  13  106
-      fi  40  125
-      fr  33  116
-   fr_ca  11  116
-      hi  49  129
-      hu  24  111
-      nl  25  114
-      pl  17  105
-      sk  26  122
-      cs   5  122
-      hr  25  132
-      ru  36  122
-      it  28  115
-      es   6  115
-      pt  34  138
-   pt_pt  20  138
-      ro  36  139
-      el   8  115
-      sv  25  116
-      no  29  120
-      is  33  120
-      vi  41  131
-  zh_yue  32  122
-      sw  14  103
+    base  95   95
+      en  52  142
+    en_n  29  142
+   en_us  36  142
+   en_sc  39  144
+   en_rp  34  142
+   en_wm  30  142
+      af  37  126
+      cy  29  121
+      de  28  118
+      eo  13  107
+      fi  40  126
+      fr  32  117
+   fr_ca  11  117
+      hi  49  130
+      hu  23  112
+      nl  26  116
+      pl  15  106
+      sk  26  123
+      cs   5  123
+      hr  25  133
+      ru  36  123
+      it  25  114
+      es   6  114
+      pt  34  137
+   pt_pt  20  137
+      ro  36  138
+      el   8  114
+      sv  25  117
+      no  28  121
+      is  32  120
+      vi  41  132
+  zh_yue  32  123
+      sw  14  104
 
   3  b/b            base hi ro
   2  b/b_           base hi
   1  r2/r2i         base
   1  r2/r2o         base
   1  r2/r2u         base
-  6  r3/r_          base af cy fr pl ru
+  4  r3/r_          base af fr ru
   1  r3/r_@         base
   1  r3/r#_         is
   1  r3/r_a         base
   1  r3/r_e         base
   1  r3/r_i         base
-  5  r3/r_n         base cy fr pl ru
+  3  r3/r_n         base fr ru
   1  r3/r_o         base
-  8  r3/r_trill     base af sk it pt
+ 11  r3/r_trill     base af cy nl sk pt
   2  r3/r_trill2    base hr
   2  r3/r_trill2.wav base hr
-  4  r3/r_trill3.wav base af
-  4  r3/r_trill.wav base sk it pt
+  8  r3/r_trill3.wav base af cy nl
+  3  r3/r_trill.wav base sk pt
   1  r3/r_u         base
- 26  r3/rx          base af cy fr fr_ca pl ru pt_pt ro is
+ 21  r3/rx          base af fr fr_ca ru pt_pt ro is
   2  r3/rz_cs       sk
   2  r3/@tap        base
   2  r3/@tap_i      base
-  8  r/r            base en_sc de fr hu it pt_pt
-  6  r/_r           base en_sc fr hu it pt_pt
- 17  r/r_           base en_sc af cy de fi fr hu nl pl ru it ++
+  5  r/r            base en_sc de pt_pt
+  3  r/_r           base en_sc pt_pt
+  9  r/r_           base en_sc de fi nl ru pt_pt ro sw
   1  r/r@           base
   1  r/ra           base
   1  r/re           base
   1  r/ri           base
   1  r/ro           base
- 26  r/rr           base af cy de fi nl pl ru it ro no sw
+ 14  r/rr           base af de fi nl ru ro sw
   1  r/ru           base
- 18  r/tr           base en_sc fr hu it pt_pt
- 51  r/trr          base af cy de fi nl pl ru it ro sv no ++
+  9  r/tr           base en_sc pt_pt
+ 30  r/trr          base af de fi nl ru ro sv sw
  11  r/xr           base
   1  ufric/ch       base
   3  ufric/f        base de ro

phsource/ph_af

 endphoneme
 
 
-
 phoneme r
   liquid
-  length 100
-  lengthmod 7
-  beforenotvowel r/
-  trill
-  formants r/rr
-  after _ r/rr
-  after t r/trr p r/trr k r/trr
-  before _ r/r_
+  length 60
+  vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
+  vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
+  formants r3/r_trill+r3/r_trill3.wav%99
+  before _ r3/r_trill+r3/r_trill3.wav%99
+  trill  
+  lengthmod 6
 endphoneme
 
 
   after t r/trr p r/trr k r/trr
 endphoneme
 
-phoneme R
-  liquid
-  length 60
-  vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
-  vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
-  formants r3/r_trill+r3/r_trill3.wav%99
-  before _ r3/r_trill+r3/r_trill3.wav%99
-  trill  
-  lengthmod 6
-endphoneme
-
 
 phoneme l
   liquid

phsource/ph_dutch

 //===========
 
 
-phoneme r
+phoneme r    // from Afrikaans
+  liquid
+  length 60
+  vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
+  vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
+  formants r3/r_trill+r3/r_trill3.wav%99
+  before _ r3/r_trill+r3/r_trill3.wav%99
+  trill  
+  lengthmod 6
+endphoneme
+
+
+phoneme r2
   liquid
   lengthmod 7
   beforenotvowel r/

phsource/ph_english_sc

 endphoneme
 
 phoneme r
-  liquid
+  liquid  starttype #r endtype #r
   length 100
   lengthmod 7
   beforenotvowel r/

phsource/ph_finnish

 
 
 phoneme r
-  liquid starttype r endtype r
+  liquid  starttype #r endtype #r
   length 100
   lengthmod 7
   beforenotvowel r/

phsource/ph_french

 
 
 
-phoneme r
-  liquid
-  length 100
-  lengthmod 7
-  beforenotvowel r/
-  formants r/r
-  after _ r/_r  t r/tr p r/tr k r/tr
-  before _ r/r_
-endphoneme
-
-
 
 phoneme R
   liquid

phsource/ph_german

 // This is actually the ENGLISH "rolling r". For german, we now use * in the dictionary,
 // so this phoneme will only be used in english words in german texts.
 phoneme r
-  liquid
+  liquid  starttype #r  endtype #r
   lengthmod 7
   beforenotvowel r/
   trill

phsource/ph_hungarian

 // CONSONANTS
 //===========
 
-phoneme r
-  liquid
-  length 100
-  lengthmod 7
-  beforenotvowel r/
-  trill
-  formants r/r
-  after _ r/_r  t r/tr p r/tr k r/tr
-  before _ r/r_
-endphoneme
-
 
 phoneme ts
   vls alv afr sibilant

phsource/ph_icelandic

 endphoneme
 
 
-phoneme r#2
-  vls alv frc
-  vowelin f1=0  f2=1700 -300 300  f3=-300 80
-  vowelout f1=0 f2=1700 -300 250  f3=-300 80  rms=20
-  lengthmod 2
-  wave r3/rx%90
-endphoneme
-
 phoneme r#   // used for [r] when not preceding a vowel
   liquid
   length 100

phsource/ph_italian

 //===========
 
 
-phoneme r
-  liquid
-  length 100
-  lengthmod 7
-  beforenotvowel r/
-  trill
-  formants r/r
-  after _ r/_r  t r/tr p r/tr k r/tr
-  before _ r/r_
-endphoneme
-
-
-phoneme R2x
-  liquid starttype r endtype r
-  length 100
-  lengthmod 7
-  beforenotvowel r/
-  trill
-  formants r/rr
-  after _ r/rr
-  after t r/trr p r/trr k r/trr
-  before _ r/r_
-endphoneme
-
-
-phoneme R3x
-  liquid
-  vowelin  f1=0  f2=1700 -300 300  f3=-300 80
-  vowelout f1=2  f2=1700 -300 300  f3=-300 80 brk
-  beforenotvowel r/
-  formants r3/r_trill+r3/r_trill.wav%50
-  trill
-  lengthmod 6
-endphoneme
-
-
 
 phoneme w2
   starttype w  endtype w

phsource/ph_norwegian

 endphoneme
 
 
-
-phoneme r
-  liquid
-  lengthmod 7
-  beforenotvowel r/
-  trill
-  formants r/rr
-  after _ r/rr
-  after t r/trr p r/trr k r/trr
-  before _ r/r_
-endphoneme
-

phsource/ph_polish

 
 
 
-
-phoneme r
-  liquid
-  length 100
-  lengthmod 7
-  beforenotvowel r/
-  trill
-  formants r/rr
-  after _ r/rr
-  after t r/trr p r/trr k r/trr
-  before _ r/r_
-endphoneme
-
-
-phoneme r/   // used for [r] when not preceding a vowel
-  liquid
-  length 100
-  lengthmod 2   //
-  formants r3/r_+r3/rx
-  before n   r3/r_n+r3/rx
-  after _ r/rr
-  after t r/trr p r/trr k r/trr
-endphoneme
-
-
 phoneme w
   liquid
   length 100

phsource/ph_romanian

 // Consonants
 
 phoneme r
-  liquid starttype r endtype r
+  liquid starttype #r endtype #r
   length 100
   lengthmod 7
   beforenotvowel r/

phsource/ph_russian

 
 
 phoneme r
-  liquid starttype r endtype r
+  liquid starttype #r endtype #r
   length 100
   lengthmod 7
   beforenotvowel r/

phsource/ph_swahili

 // Consonants
 
 phoneme r
-  liquid starttype r endtype r
+  liquid starttype #r endtype #r
   length 100
   lengthmod 7
   beforenotvowel r/

phsource/ph_swedish

 
 
 phoneme r
-  liquid
+  liquid  starttype #r endtype #r
   lengthmod 7
   beforenotvowel r/
   trill
   formants vwl_sv/r_sv3
-//  formants r/rr
-//  after _ r/rr
   after t r/trr p r/trr k r/trr
-//  before _ r/r_
 endphoneme
 
 

phsource/ph_welsh

 
 phoneme r
   liquid
-  length 100
-  lengthmod 7
-  beforenotvowel r/
-  trill
-  formants r/rr
-  after _ r/rr
-  after t r/trr p r/trr k r/trr
-  before _ r/r_
-endphoneme
-
-
-phoneme r/   // used for [r] when not preceding a vowel
-  liquid
-  length 100
-  lengthmod 2   //
-  formants NULL
-  before _ r3/r_+r3/rx
-  before n   r3/r_n+r3/rx
-  after _ r/rr
-  after t r/trr p r/trr k r/trr
+  length 60
+  vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
+  vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
+  formants r3/r_trill+r3/r_trill3.wav%99
+  before _ r3/r_trill+r3/r_trill3.wav%99
+  trill  
+  lengthmod 6
 endphoneme
 
 

phsource/phonemes

   after  l l/l@
   after  L l/l@
   after  l^ l^/j2@
-  after  r r/r@-15
+  after  #r r/r@-15
   after  r- r2/r2@
   after  m m/m@
   after  n n/n@
   before l DFT-50+l/xl
   before w DFT-30+w/xw
   before j DFT-30+j/xj
-  before r DFT-50+r/xr
+  before #r DFT-50+r/xr
   before r- DFT-60+r/xr
   before r/ DFT+r3/r_@
 endphoneme
   after  l l/la
   after  L l/la
   after  l^ l^/j2a
-  after  r r/ra-15
+  after  #r r/ra-15
   after  r- r2/r2a
   after  m m/ma
   after  n n/na
   before l DFT-40+l/xl
   before w DFT-30+w/xw
   before j DFT-30+j/xj
-  before r DFT-50+r/xr
+  before #r DFT-50+r/xr
   before r- DFT-60+r/xr
   before r/ DFT+r3/r_a
 endphoneme
   after  l l/le
   after  L l/le
   after  l^ l^/j2e
-  after  r r/re-15
+  after  #r r/re-15
   after  r- r2/r2e
   after  m m/me
   after  n n/ne
   before l DFT-40+l/xl
   before w DFT-30+w/xw
   before j DFT-30+j/xj
-  before r DFT-50+r/xr
+  before #r DFT-50+r/xr
   before r- DFT-60+r/xr
   before r/ DFT+r3/r_e
 endphoneme
   after  l l/li-10
   after  L l/li
   after  l^ l^/j2i
-  after  r r/ri-15
+  after  #r r/ri-15
   after  r- r2/r2i
   after  m m/mi
   after  n n/ni
   before ; DFT-40+j2/xj2
   before l DFT-40+l/xl
   before j DFT-30+j/xj
-  before  r- DFT-60+r/xr
+  before r- DFT-60+r/xr
   before r/ DFT+r3/r_i
 endphoneme
 
   before l DFT-40+l/xl
   before w DFT-30+w/xw
   before j DFT-30+j/xj
-  before r DFT-50+r/xr
+  before #r DFT-50+r/xr
   before r- DFT-60+r/xr
   before r/ DFT+r3/r_o
 endphoneme
   before l DFT-40+l/xl
   before w DFT-30+w/xw
   before j DFT-30+j/xj
-  before r DFT-50+r/xr
+  before #r DFT-50+r/xr
   before r- DFT-60+r/xr
   before r/ DFT+r3/r_u
 endphoneme
 // use to mean general sonorant
 endphoneme
 
+phoneme #r   virtual
+// use for English r in virtual phonemes
+endphoneme
+
 
 //*******************************************************************
 // SONORANTS
 
 
 phoneme r
-  liquid
+  liquid starttype #r endtype #r
   length 100
   lengthmod 7
   beforenotvowel r/

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.25.11  29.May.07";
+const char *version_string = "1.25.13  30.May.07";
 const int version_phdata  = 0x012501;
 
 int option_device_number = -1;