git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@87 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
 _0M3     mIlj'art
 _0and   _!En
 _dpt    'pWnt
+_roman  rum'eIns@   
 
 
 
 
 
 
-// unstressed verbs
+// unstressed and auxiliary verbs
 
-is		$u
-het		$u
-sal		$u
-sou 		$u
-kan		$u $strend
-kon		$u $strend
-wil		$u $strend $only
-word		$u
-gaan            $u $only
+is		$u $verbf
+het		$u $verbf
+sal		$u $verbf
+sou 		$u $verbf
+kan		$u $strend $verbf
+kon		$u $strend $verbf
+mag		max2 $verbf
+moes		mus $verbf
+moet		mut $verbf
+wil		$u $strend $only $verbf
+word		$u $verbf
+wou		$u $verbf
+gaan            $u $only $verbf
 
 
 // conjunctions and questions
 
 //maar
-toe		$u
+toe		$u $verbf
 //tog
 
-en		$u $pause
+en		$u $pause $verbf
 want		$pause
 of		$u $pause
-dan		$pause
-anders		$pause
-al		$pause
-daarom		$pause
-dus		$pause
-gevolglik	$pause
-daarna		$pause
-desondanks      dEs?OndaNks $pause
+dan		$pause $verbf
+anders		$pause $verbf
+al		$pause $verbf
+daarom		$pause $verbf
+dus		$pause $verbf
+gevolglik	$pause $verbf
+daarna		$pause $verbf
+desondanks      dEs?OndaNks $pause $verbf
 ondanks         'OndaNks $pause
 verder		f'&rd@r $pause
-nogtans		$pause
+nogtans		$pause $verbf
 inteendeel      $2 $pause
-intussen	$pause
+intussen	$pause $verbf
 omdat		$pause
 sodat		$pause
 voordat		$pause
 // misc unstressed
 de		d@
 dat		$u $strend
-te		t@
-nie $unstressend
+te		t@ $verbf
+nie $unstressend $verbextend
 
 soos		$u
 beker		be@k@r
 
 
 // pronouns
-ek	&k 	$u
-jy		$u
-u		$u
-hy		$u
-sy		$u
-dit		$u
-ons		o~ns $u
-julle		$u
-hulle		$u
-hulleself       hWl@s&lf
-my		$u
-jou		$u
-hom		$u
-haar		$u
+ek	&k 	$u $verbf
+jy		$u $verbf
+u		$u $verbf
+hy		$u $verbf
+sy		$u $verbf
+dit		$u $verbf
+ons		o~ns $u $verbf
+julle		$u $verbf
+hulle		$u $verbf
+hulleself       hWl@s&lf $verbf
+my		$u $verbf
+jou		$u $verbf
+hom		$u $verbf
+haar		$u $verbf
 se		s@
 
 dis		$u
 
 // abbreviations
 
-mnr         mIn'e@r
-mej         m@jWfr@U
-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
-pres        pr@s@d'Ent
-bv          beIf'o@rbe@lt
+mnr         mIn'e@r $dot
+mej         m@jWfr@U $dot
+mev         m@fr@U $dot
+dr          d'Okt@r $dot
+insp        InspEkt'Y@r $dot
+kapt kapt'eIn $dot
+prof        pruf'Es@r $dot
+st          s@nt $dot
+supt        suprEntEnd'Ent $dot
+pres        pr@s@d'Ent $dot
+bv          beIf'o@rbe@lt $dot
 
 
 
 minister      m@nIst@r
 minute        m@nyt@
 minuut        m@nyt
+misbruik      $2 $verb
 miskien       $2
 misterie      m@ste@ri
 monitor       mOnitOr
 nietemin      n'it@m@n
 nobelprys     $2
 normale       nOrm'A:l@
-november      $2
 numeri        nWm@ri
 
 oeuvre        W:vr@
 omtrent       Omtr'Ent
 onbegrip      $1
+onderrig      On@r'Ix2 $verb
+ondersoek     $3 $verb
 onderweg      $3
+onderwerp     $3 $verb
 onderwyser    $3
 ongeag        $1
 ongeduld      $1
 oorsee        $2
 oorsese       $2
 oorspronklike $2
+oorval        $2 $verb
 
 pandemonium   pand@m'o@niWm
 parke         park@
 tesame        t@sA:m@
 tevrede       t@fre@d@
 toegee        tux2e@
-toenemend     $2
 totale        tut'A:l@
 totsiens      $2
 
 
-uitdagings    YydA:x2@Ns
 uitdaging     YydA:x2@N
 uiteindelik   $2
 uiteraard     Yyt@r_'A:rt
 vanne         fan@
 veraf         f&r_af
 verafgeleë    f&rafx2@le@@
-verantwoordelikheid f@rantv'o@rd@l@keIt
 verby         f@rbeI
 verdere       f&rd@r@
 vererger      f@r&rg@r
 via           via
 volheid       $1
 voluit        fOl_Yyt
-volwassenes   fOlv'as@n@s
 voorgee       fo@rx2e@
 voorkeer      $1
 voorkom       $2

dictsource/af_rules

-//maintainer: Willem van der Walt
+//maintainer: Willem van der Walt
 // email: [email protected]
 // tel: +27 12 8413996
 // Meraka Institute, CSIR
          &r) a (_         %a // short final a in words ending in -ra: infra/mantra/sentra, etc.
         &dr) a (_         A: // exceptwrds ending in -dra: ingedra/oorgedra, etc.
         &vr) a (_         A: // and wrds ending in -vra: oorgevra/uitgevra/vasvra, etc.
-         &t) a (_         %a // short final a: basta/delta/junta/pasta/many names
+         &t) a (_N        %a // short final a: basta/delta/junta/pasta/many names
              a (C         a
           C) a (Csier     %a // (ge)finansier/kassier
           j) a (pan       %a //japan first a sound and stress
              asem         A:s@m // asemgehaal/asemhaling/asemteug/ontwaseming
           _) as (ke       %as // move default stress: askeet/askete/asketies/askese
              assist       %as@st // assistent/e/assisteer
-             assiste (_  %as'Ist@ // rassiste
+             assiste (_   %as'Ist@ // rassiste stress and last e sound
              atten (C     at'En // attent/heid/onattent/attensies
           @) ator (K      'A:tOr // katalisator/diktatorskap and many similar
              augustus     Ox2'WstWs
           C) ensie (_     'Ensi // many words ending in stressed ensie(s)
           C) ensies       'Ensis // forensiese
           @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaardig
-         @C) ent (_       'Ent // orent/student/topstudent
+         @C) ent (K       'Ent // orent/student/presidentsrede
          en) ent (_       Ent // restore default stress: koppenent/voetenent
          @C) ent (e_      'Ent // plurals of some of the above
           C) er (tyd      @r // tegelykertyd/kindertyd/indertyd
           _) gri (mA      x2r@ // grimas/grimeer/-middel and other compounds/grimering
              grotere      x2ro@t@r@ // fix vowel sounds and stress: grotere/-s
              guerrilla    g@r'Ila
+             gésel        x2e@s@l // fix stress and e sounds: (ge)gésel/-ing
 
 .group ge
              ge           x2@
 .group j
              j            j
              j (j
-          _) ja (cobA     j%a // fix stress and a sound: Jacoba/Jacobus
+          _) ja (CobA     j%a // fix stress and a sound: Jacoba/Jacobus/Jakobus
              jakaranda    j%ak%ar'anda //jakaranda and compounds
              jaloe (sie   j%al%u // stress: jaloesie/beroepsjaloesie
              januarie     j'any,A:ri
              kommando     k%umandu // move stress, fix o sounds: kommando and compounds
              ko (pie@     k%u // kopiereg/kopie
              koe (rA      k%u // koerier/koerasie/koerant and compounds 
-             korrek k%urEk //korrek and derivitives
+             korrek       k%urEk //korrek and derivitives
              kort (stond  k%Ort // move default stress: kortstondig/-e/-heid
              koever (t    k%uf&r // koevert/-e/-jie and compounds
              kollege      k'OlidZ    // kollege/onderwyskollege
              mis (troos   m@s // mistroostig
              mis (vorm    m@s // stress on 2nd slb
              mode         m''o@d@ // fix e sound: modeontwerper/-maker, etc.
-             modee m@d'e@ //akkommodeer
+             modee        m@d'e@ //akkommodeer
              mode (l      m%o@d& // fix stress and e sound: model/-le and compounds
              mode (lle@   m%Od@ // fix stress and e sound: modelleer/modellering
              modern       m%ud&r@-n
 
 .group o
              o            o@
-         &C) o (_         %u // fix o at end of words: Marokko/(aanvang)saldo/risiko, etc.
+         &C) o (_N        %u // fix o at end of words: Marokko/(aanvang)saldo/risiko, etc.
         bur) o (_         ,o@ // but: buro and compounds like arbeidsburo
          rb) o (_         'o@ // and daarbo/hierbo/waarbo
          &s) o (_         o@ // and: sommerso/netso
              onder (hou   %On@r // move default stress: onderhou/-dend/-e
              onder (ne    %On@r // move default stress: onderneem/onderneming
              onderonsie   %On@r?o~nsi // fix stress, short break and nasalised o: onderonsie/-s
-             onder (rig   %On@r // exception to default stress rule
              onder (soeken %On@r // move default stress: ondersoekend/-e
              onder (skA   %On@r // exception to default stress rule
              onderstebo   %On@rst@bo@ // fix stress: onderstebo/koponderstebo
           s) w (il        v // fix w sound: groepswil/hemelswil/liefdeswil/korswil	
           s) w (yf        v // fix w sound: viswyf/ganswyfie/mannetjieswyfie
         ens) w v
+        ers) w            v // flenterswaai/kerswense/koerswaarde/kopersweerstand/trekkerswee/verkeerswisselaar
+        ers) w (eer_      w // but: kankersweer/uiersweer, etc.
         los) w            v // fix w sound: (los)wikkel/woel/wriemel
         mis) w            v // fix w sound: miswaas/misweer/miswurm
         vas) w            v // fix w sound: vaswikkel/-woel
           @) werste       vIrst@
           k) w (oA        v // fix w sound: dankwoord/werkwoord/skoonmaakwoede/spreekwoord
          @C) w (oCC       v // fix w sound: kubiekwortel/steekwond/onafhanklikwording/republiekwording/varkwors
+         @C) woning       vo@n@N // fix w sound in many compounds ending in -woning
              woe (styn    v%u // move default stress: woestyn and compounds
              wolke        vOlk@ // nimbuswolke/wolkekrabber
              woorde       vo@rd@

dictsource/hu_rules

   pszy) ch       C
    mün) ch (en   C
   maso) ch (istA C
+ monar) ch (i    C
    szé) ch       tS
    _zi) ch (y    tS
 
     ki) s (ebb   SS
    _má) s (szó   S
 _munká) s        S
+_nyílá) s        S
     _o) slo      slo:
     _o) sló      slo:
 
 
     gá) z (sz    z
     gé) z (sz    z
+    ké) z (sz    z
     há) z (so    z
     há) z (sz    z
     lá) z (sz    z

phsource/compile_report

   1  vwl_en_us/ur   en_us
   1  vwl_en_us/V    en_us
   1  vwl_en_wm/i    en_wm
-  3  vwl_fr/@R      fr pt_pt
+  2  vwl_fr/@R      fr pt_pt
   1  vwl_fr/@R2     fr_ca
+  1  vwl_fr/rfr     fr
   1  vwl_hi/A       hi
   3  vwl_hi/l-voc   hi sk
   2  vwl_no/&       no

phsource/mbrola/sv

 0  8  NULL   0  u0
 0  W  NULL   0  2
 0  E  NULL   0  e
+0  E- NULL   0  e
 0  @  N      0  e
 0  a2 NULL   0  a
 0  E: r      0  {:

phsource/mbrola/sv2

 0  8  NULL   0  u0
 0  W  NULL   0  2
 0  E  NULL   0  e
+0  E- NULL   0  e
 0  @  N      0  e
 0  a2 NULL   0  a
 0  E: r      0  {: