[1.37]

Option --stdout, include a fake length for the RIFF length as well as the data length.
Fix option -k2 with <say-as>.


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

dictsource/dict_phonemes

 
 Dictionary ko_dict
 
-a    e    E    i    ji   o    u    u-   
-V    
+a    E    i    V    
 
-b    c    C    c`   ch   d    dZ   g    
-h    j    J    k    k`   kh   l    m    
-n    N    p    p`   ph   r    s    S;   
-s`   t    t`   th   w    
+-    b    c    C    d    dZ   g    h    
+j    J    k    l    m    n    N    p    
+r    s    S;   t    w    
 
 
 Dictionary hbs_dict
 
 Dictionary rw_dict
 
-a    e    i    o    u    
+a    e:   i    i:   o:   u:   
 
 *    :    b    B    c    d    dZ   f    
 g    h    j    J    k    l    m    n    

dictsource/en_list

 skies            skaIz
 skied            ski:d
 skua             sku:@
+slavish          sleIvIS
 snooker          snu:k3
 society          s@saI@tI2
 sofa             soUf@
 stagnate                       $2
 stampede          $2
 strychnine       str'Ikni:n
-slavish          sleIvIS
 ?3 status        stat@s
 sterile          stEraIl
 stomata          stoUm@t@
 Harare		h@rA:rI
 Hanoi		han'OI
 Hawaii		h@w'aIi:
+Hawai'i		h@w'aIi:
 Hawaiian	h@w'aI@n
 Hebrew		hi:bru:
 Hebrides	hEbr@di:z
 now               $verbf
 soon              $verbf
 still             $verbf
-also              $verbf
 already           O:lr,EdI2    $verbf $strend2
 
 not              ,n0t          $verbextend $only $strend

dictsource/en_rules

          j) oh (n        0
             oi           OI
             oia          OI@
-            oi (c_       oUI2
+            oi (c        oUI2
+            oi (ce       OI
+            oi (ck       OI
             oi(na_       'OI
             o (ing       oU
          d) o (ing       u:
          c) or (e_       o@
          d) or (_        o@
         _f) or (@        O@
+        _f) ore (A       O@
          f) or (k        O@
         ch) or (d        O@
          l) or (d        O@
             rea (C%      r,i:@
          _) rea (dC      r,i:@
             rea (gen     rI2eI
-         _) re (ali      ,ri:
+         _) re (alig     ,ri:
          _) re (all      ,ri:
          _) re (au@P2    ,ri:
             re (ck       rE
          _) up (b        %Vp
          _) up (c        %Vp
          _) up (d        %Vp
+         _) up (e        %Vp
          _) up (g        %Vp
          _) up (h        %Vp
          _) up (se       %Vp

dictsource/ku_rules

 
 .group w
         w        w
-     x) we       8
 
 .group x
         x        x
+        xwe      xw8
 
 .group y
         y        j

dictsource/ta_list

 
 // letters (consonants)
 க்	ik
-ங்	iN
+ங்	iNg
 ச்	itS
 ஜ்	idZ
 ஞ்	in^

espeak-data/voices/ku

 language ku
 gender male
 
-words 1 48
+//words 1 48
 

phsource/compile_report

-49 phoneme tables
+47 phoneme tables
           new total
     base  98   98
    base2  24  117
       tr  18  122
       ku  18  122
       id  15  119
-      rw  15  124
-      ko  18  145
 
 Data file      Used by
 b/b             [b] base
 dzh/xdz_pzd     [J] base
                 [J2] hi
 envelope/i_risefall  [11] zh
-envelope/i_risefall2  [+2] rw
 envelope/p_214  [214] zh
 envelope/p_512  [8] vi
 envelope/p_fall  [2] vi
                 [22] zh
                 [33] zh
                 [53] zh
-                [+] rw
 envelope/p_fallrise  [4] vi
 envelope/p_level  [1] vi
                 [3] zhy
 r3/rz_cs        [R^] sk
                 [R^/] sk
 r3/@tap         [**] base
-                [r] ko
 r3/@tap2        [**] base
-                [r] ko
 r/r             [r] base
                 [r-] base
                 [r] en_sc
                 [s] fr
                 [s] es
                 [s#] pt
-                [s`] ko
 ufric/s_        [s] base
                 [z] base
                 [s2] fi
                 [Z] hr
 ufric/sh_pzd    [S;] base
                 [S;] ro
-                [s`] ko
 ufric/sh_pzd_   [S;] base
                 [Z;] base
 ufric/sh_pzd2   [S] sr
                 [k] sk
                 [k] el
                 [k] zhy
-                [k`] ko
 ustop/k_unasp_  [k] zh
 ustop/null      [?] base
 ustop/p         [p] base
                 [p] la
                 [p;] ro
                 [p] zh
-                [p`] ko
 ustop/p_unasp_  [p] base2
                 [p] fi
                 [p] hi
                 [p] la
                 [p;] ro
 ustop/q         [q] base
+ustop/q_u       [q] base
 ustop/t         [t] base
                 [t2] en
                 [t] fr
                 [t;] ro
                 [t[] vi
                 [t] sw
-                [t`] ko
 ustop/t_dnt2    [t[] vi
 ustop/t_hi      [t] hi
                 [th] hi
                 [c] hu
 ustop/ts_pzd2   [c] hi
                 [c] hu
-                [c`] ko
 ustop/ts_pzd3   [tS;] hr
                 [dZ;] hr
 ustop/t_sr      [d] sr
 vdiph/y#i       [Yi] fi
 vdiph/y#i_2     [Yy] is
 vdiph/yi_fr     [w^i] fr
-                [ji] ko
 vdiph/y#y       [Yy] fi
 vdiph/y#y_2     [Yy] af
                 [eoi] zhy
                 [a] it
                 [a] zh
                 [a] id
-                [a] ko
 vowel/a#        [a/] base2
                 [a2] en_sc
                 [a2] en_wi
                 [&] sr
                 [&] pt
                 [&/] pt
-                [a#] rw
-                [a/] rw
 vowel/a_2       [a] base2
                 [a] en_wi
                 [A:] en_wi
                 [a] pt_pt
                 [a] ro
                 [a:] vi
-                [a] rw
 vowel/a#_2      [&] hr
                 [a2] sv
                 [&] is
 vowel/aa_7      [A] nl
 vowel/aa_8      [0] en_us
                 [A:] en_us
-                [V] ko
 vowel/a_en      [a] en
                 [aa] en
                 [A] fr
                 [e] grc
                 [e] vi
                 [e] id
-                [e] rw
-                [e#] rw
-                [e] ko
 vowel/e#        [I] en_sc
                 [I2] en_sc
 vowel/e_2       [eI] en_sc
                 [e] el
                 [e] sw
                 [e] tr
-                [E] ko
 vowel/@_fnt     [@] en_wi
                 [@2] en_wi
                 [@2] hr
                 [i] zhy
                 [i] zh
                 [i] sw
-                [i] rw
-                [i#] rw
-                [i] ko
 vowel/i#        [i] en_rp
                 [y:] cy
 vowel/i_2       [i:] en_rp
                 [o] grc
                 [o:] sv
                 [o] id
-                [o] rw
-                [o#] rw
 vowel/o_2       [o:] cy
                 [o:] hi
                 [o:] hu
                 [o:] la
                 [o:] no
-                [o] ko
 vowel/o-_2      [V] en_n
                 [V] en_wm
 vowel/o_3       [oU] en_sc
                 [u] pt_pt
                 [u] ku
 vowel/u#_6      [u:] en_us
-                [y] ko
 vowel/u_7       [u] vi
 vowel/u#_7      [u#] tr
 vowel/u_bck     [u] base2
                 [u] is
                 [u] zhy
                 [u] zh
-                [u] rw
-                [u#] rw
-                [u] ko
 vowel/u_bck2    [u:] la
 vowel/u_fnt     [u:] en_rp
 vowel/uu        [U] en
                 [U] pt
                 [U] no
                 [u] zhy
-vowel/u_unr     [u-] ko
 vowel/V         [3] en_sc
 vowel/V_2       [V] en
                 [a] af
                 [Y] ro
                 [y] vi
                 [oe] zhy
-                [Y] ko
 vowel/y##       [y#] is
 vowel/y_2       [y] fr
                 [y"] fr

phsource/phonemes

   vowelout f1=1 f2=1700 -100 200  f3=-300 80  f4 rms=35
   lengthmod 2
   wave ustop/q%48
+  before (u) ustop/q_u%80
   before _ ustop/q%40
 endphoneme
 
 phonemetable id base2
 include ph_indonesian
 
-
-phonemetable rw base2
-include ph_kinyarwanda
-
-phonemetable ko hi
-include ph_korean

src/espeak.cpp

 //===================================
 {
 	static unsigned char wave_hdr[44] = {
-		'R','I','F','F',0,0,0,0,'W','A','V','E','f','m','t',' ',
+		'R','I','F','F',0x24,0xf0,0xff,0x7f,'W','A','V','E','f','m','t',' ',
 		0x10,0,0,0,1,0,1,0,  9,0x3d,0,0,0x12,0x7a,0,0,
-		2,0,0x10,0,'d','a','t','a',  0xff,0xff,0xff,0x7f};
+		2,0,0x10,0,'d','a','t','a',  0x00,0xf0,0xff,0x7f};
 
 	if(path == NULL)
 		return(2);

src/readclause.cpp

 		if(iswupper(c1))
 		{
 			clause_upper_count++;
-			if((option_capitals == 2) && !iswupper(cprev))
+			if((option_capitals == 2) && (sayas_mode == 0) && !iswupper(cprev))
 			{
 				char text_buf[40];
 				char text_buf2[30];

src/speak.cpp

 static int OpenWaveFile(const char *path, int rate)
 //=================================================
 {
-	// Set the length of 0x7fffffff for --stdout
+	// Set the length of 0x7ffff000 for --stdout
 	// This will be changed to the correct length for -w (write to file)
 	static unsigned char wave_hdr[44] = {
-		'R','I','F','F',0,0,0,0,'W','A','V','E','f','m','t',' ',
+		'R','I','F','F',0x24,0xf0,0xff,0x7f,'W','A','V','E','f','m','t',' ',
 		0x10,0,0,0,1,0,1,0,  9,0x3d,0,0,0x12,0x7a,0,0,
-		2,0,0x10,0,'d','a','t','a',  0xff,0xff,0xff,0x7f};
+		2,0,0x10,0,'d','a','t','a',  0x00,0xf0,0xff,0x7f};
 
 	if(path == NULL)
 		return(2);

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.36.13  13.Apr.08";
+const char *version_string = "1.37  16.Apr.08";
 const int version_phdata  = 0x013400;
 
 int option_device_number = -1;