mahta.fetrat
/
HomoFast-eSpeak-Persian
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

[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
master
jonsd 17 years ago
parent
c6e7a698be
commit
1c0de9e4b8
12 changed files with 26 additions and 62 deletions
Split View Show Diff Stats
  1. 5
    7
      dictsource/dict_phonemes
  2. 2
    2
      dictsource/en_list
  3. 6
    2
      dictsource/en_rules
  4. 1
    1
      dictsource/ku_rules
  5. 1
    1
      dictsource/ta_list
  6. 1
    1
      espeak-data/voices/ku
  7. 2
    35
      phsource/compile_report
  8. 1
    6
      phsource/phonemes
  9. 2
    2
      src/espeak.cpp
  10. 1
    1
      src/readclause.cpp
  11. 3
    3
      src/speak.cpp
  12. 1
    1
      src/synthdata.cpp

+ 5
- 7
dictsource/dict_phonemes View File

@@ -360,13 +360,11 @@ t tS v w x z Z

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
@@ -394,7 +392,7 @@ v w x z

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

+ 2
- 2
dictsource/en_list View File

@@ -1801,6 +1801,7 @@ ski ski:
skies skaIz
skied ski:d
skua sku:@
slavish sleIvIS
snooker snu:k3
society s@saI@tI2
sofa soUf@
@@ -1829,7 +1830,6 @@ standby standbaI
stagnate $2
stampede $2
strychnine str'Ikni:n
slavish sleIvIS
?3 status stat@s
sterile stEraIl
stomata stoUm@t@
@@ -2186,6 +2186,7 @@ Geneva dZ@ni:v@
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
@@ -2786,7 +2787,6 @@ never $verbf
now $verbf
soon $verbf
still $verbf
also $verbf
already O:lr,EdI2 $verbf $strend2

not ,n0t $verbextend $only $strend

+ 6
- 2
dictsource/en_rules View File

@@ -3461,7 +3461,9 @@
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:
@@ -3727,6 +3729,7 @@
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@
@@ -4252,7 +4255,7 @@
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
@@ -4788,6 +4791,7 @@
_) up (b %Vp
_) up (c %Vp
_) up (d %Vp
_) up (e %Vp
_) up (g %Vp
_) up (h %Vp
_) up (se %Vp

+ 1
- 1
dictsource/ku_rules View File

@@ -101,10 +101,10 @@

.group w
w w
x) we 8

.group x
x x
xwe xw8

.group y
y j

+ 1
- 1
dictsource/ta_list View File

@@ -5,7 +5,7 @@

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

+ 1
- 1
espeak-data/voices/ku View File

@@ -2,5 +2,5 @@ name kurdish
language ku
gender male

words 1 48
//words 1 48


+ 2
- 35
phsource/compile_report View File

@@ -1,4 +1,4 @@
49 phoneme tables
47 phoneme tables
new total
base 98 98
base2 24 117
@@ -47,8 +47,6 @@
tr 18 122
ku 18 122
id 15 119
rw 15 124
ko 18 145

Data file Used by
b/b [b] base
@@ -195,7 +193,6 @@ dzh/xdzh [dZ] 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
@@ -207,7 +204,6 @@ envelope/p_fall [2] vi
[22] zh
[33] zh
[53] zh
[+] rw
envelope/p_fallrise [4] vi
envelope/p_level [1] vi
[3] zhy
@@ -510,9 +506,7 @@ r3/rx [*] base
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
@@ -581,7 +575,6 @@ ufric/s [s] base
[s] fr
[s] es
[s#] pt
[s`] ko
ufric/s_ [s] base
[z] base
[s2] fi
@@ -614,7 +607,6 @@ ufric/sh3 [S] hr
[Z] hr
ufric/sh_pzd [S;] base
[S;] ro
[s`] ko
ufric/sh_pzd_ [S;] base
[Z;] base
ufric/sh_pzd2 [S] sr
@@ -707,7 +699,6 @@ ustop/k_unasp [k] base
[k] sk
[k] el
[k] zhy
[k`] ko
ustop/k_unasp_ [k] zh
ustop/null [?] base
ustop/p [p] base
@@ -750,7 +741,6 @@ ustop/p_unasp [p] base
[p] la
[p;] ro
[p] zh
[p`] ko
ustop/p_unasp_ [p] base2
[p] fi
[p] hi
@@ -759,6 +749,7 @@ ustop/p_unasp_ [p] base2
[p] la
[p;] ro
ustop/q [q] base
ustop/q_u [q] base
ustop/t [t] base
[t2] en
[t] fr
@@ -787,7 +778,6 @@ ustop/t_dnt [t] base
[t;] ro
[t[] vi
[t] sw
[t`] ko
ustop/t_dnt2 [t[] vi
ustop/t_hi [t] hi
[th] hi
@@ -828,7 +818,6 @@ ustop/ts_pzd_ [c] hi
[c] hu
ustop/ts_pzd2 [c] hi
[c] hu
[c`] ko
ustop/ts_pzd3 [tS;] hr
[dZ;] hr
ustop/t_sr [d] sr
@@ -1048,7 +1037,6 @@ vdiph/yi [yi] fi
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
@@ -1224,15 +1212,12 @@ vowel/a [a] en_n
[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
@@ -1243,7 +1228,6 @@ vowel/a_2 [a] base2
[a] pt_pt
[a] ro
[a:] vi
[a] rw
vowel/a#_2 [&] hr
[a2] sv
[&] is
@@ -1302,7 +1286,6 @@ vowel/aa_6 [A] de
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
@@ -1329,9 +1312,6 @@ vowel/e [e] base2
[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
@@ -1400,7 +1380,6 @@ vowel/e_mid2 [E] af
[e] el
[e] sw
[e] tr
[E] ko
vowel/@_fnt [@] en_wi
[@2] en_wi
[@2] hr
@@ -1426,9 +1405,6 @@ vowel/i [i] base2
[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
@@ -1524,14 +1500,11 @@ vowel/o [o] base2
[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
@@ -1637,7 +1610,6 @@ vowel/u_6 [U] pt_pt
[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
@@ -1659,9 +1631,6 @@ 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
@@ -1682,7 +1651,6 @@ vowel/uu_bck [U] en_n
[U] pt
[U] no
[u] zhy
vowel/u_unr [u-] ko
vowel/V [3] en_sc
vowel/V_2 [V] en
[a] af
@@ -1712,7 +1680,6 @@ vowel/y# [Y:] en
[Y] ro
[y] vi
[oe] zhy
[Y] ko
vowel/y## [y#] is
vowel/y_2 [y] fr
[y"] fr

+ 1
- 6
phsource/phonemes View File

@@ -989,6 +989,7 @@ phoneme q
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

@@ -1274,9 +1275,3 @@ include ph_kurdish
phonemetable id base2
include ph_indonesian


phonemetable rw base2
include ph_kinyarwanda

phonemetable ko hi
include ph_korean

+ 2
- 2
src/espeak.cpp View File

@@ -197,9 +197,9 @@ int OpenWavFile(char *path, int rate)
//===================================
{
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);

+ 1
- 1
src/readclause.cpp View File

@@ -2129,7 +2129,7 @@ f_input = f_in; // for GetC etc
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];

+ 3
- 3
src/speak.cpp View File

@@ -232,12 +232,12 @@ static void PitchAdjust(int pitch_adjustment)
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);

+ 1
- 1
src/synthdata.cpp View File

@@ -35,7 +35,7 @@
#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;

Write Preview
Loading…
Cancel
Save