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

[1.26.09] UriCallback() "base" parameter has empty string rather than NULL pointer. 

lang=pt  character names for accentented letters.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@52 d46cf337-b52f-0410-862d-fd96e6ae7743
master
jonsd 18 years ago
parent
b7f2dd2d04
commit
a130114554
16 changed files with 148 additions and 69 deletions
Unified View Show Diff Stats
  1. 7
    1
      dictsource/de_list
  2. 24
    5
      dictsource/de_rules
  3. 6
    6
      dictsource/dict_phonemes
  4. 0
    3
      dictsource/hu_list
  5. 4
    0
      dictsource/hu_rules
  6. 49
    35
      dictsource/pt_list
  7. 38
    6
      dictsource/pt_rules
  8. 3
    3
      phsource/compile_report
  9. 0
    0
      phsource/ph_afrikaans
  10. 9
    0
      phsource/ph_german
  11. 0
    0
      phsource/ph_portugal
  12. 2
    2
      phsource/phonemes
  13. 2
    4
      src/extras.cpp
  14. 2
    1
      src/readclause.cpp
  15. 1
    1
      src/synthdata.cpp
  16. 1
    2
      src/voices.cpp

+ 7
- 1
dictsource/de_list View File

herberg hE*bE*g herberg hE*bE*g
historie $alt historie $alt
hm h@m hm h@m
horsam ho:zA:m
hostie $alt hostie $alt


illegitim Ile:gi:t'i:m illegitim Ile:gi:t'i:m
kamelie $alt kamelie $alt
kastanie $alt kastanie $alt
kid kId kid kId
kommend kOm'@nd
komödie $alt komödie $alt
konkret k%ONk@-*e:t konkret k%ONk@-*e:t
konservativ $1
konstatier kOnStat'i:*
konsul $1
kurie $alt kurie $alt


lakaienhaft l%akaInhaft lakaienhaft l%akaInhaft
orgie $alt orgie $alt
ok o:k'e: ok o:k'e:


paradies $3
passage pas'aZ@ passage pas'aZ@
perplex $2 perplex $2
petersilie $alt petersilie $alt
sogar $2 sogar $2
soweit $2 soweit $2
sowohl $2 sowohl $2
sparsam SpA:*zA:m
spinozaisch spi:n'o:tsaIS spinozaisch spi:n'o:tsaIS
stalagmit stalagm'It stalagmit stalagm'It
system z%IstEm system z%IstEm
the D@ // English the D@ // English
theater te:'A:t3 theater te:'A:t3
train t@-*e:n train t@-*e:n
turin $2
tuerei tu:*aI tuerei tu:*aI


unten Unt@n unten Unt@n

+ 24
- 5
dictsource/de_rules View File

_) ba (lA b%a _) ba (lA b%a
_) ba (ll@ b%a _) ba (ll@ b%a
&) bar (_S3 bA:* &) bar (_S3 bA:*
&) bare (_S4 bA:*@
&) barem (_S5 bA:*@m
&) baren (_S5 bA:*@n
&) barer (_S5 bA:*3
&) bares (_S5 bA:*@s
_) b (ebC b _) b (ebC b
_) b (ecC b _) b (ecC b
_) b (eet b _) b (eet b
eg (t_ e:k eg (t_ e:k


ell (_ 'El ell (_ 'El
ll) e (l e:
&) e (_S1 @ &) e (_S1 @
@t) e (_S1 @ @t) e (_S1 @
&) e (BB_ E2 &) e (BB_ E2
&) er (r_ E &) er (r_ E
w) er (k_ E* w) er (k_ E*
&) er (nd_ @* &) er (nd_ @*
@) erin (_ @rIn
&) erin (_ @*In
&) erisch (_ @*IS
@) es (_S2 @s @) es (_S2 @s
&) et (_ @t &) et (_ @t
ig) et (_S2 @t ig) et (_S2 @t
_) emph (@ %Emf _) emph (@ %Emf
_) emp (ir %Emp _) emp (ir %Emp
_) ene (rg %e:nE _) ene (rg %e:nE
@) en (i e:n
@) e (nsi E
_) ent (@P3 _|%Ent _) ent (@P3 _|%Ent
_) enten Ent@n _) enten Ent@n
_) ent (er Ent _) ent (er Ent
_) er (stC E* _) er (stC E*
_) er (ste E* _) er (ste E*
_) er (ste@@P2 _|%E* _) er (ste@@P2 _|%E*
@) er (v E*
mod) er (n E* mod) er (n E*


_) entert _^_EN _) entert _^_EN
ge (rman gE ge (rman gE
ge (rät g@ ge (rät g@
@) ght (_ _^_EN @) ght (_ _^_EN
graph g@-*A:f
graph g@-*Af
graph (_ g@-*'A:f graph (_ g@-*'A:f
green _^_EN green _^_EN
guide _^_EN guide _^_EN
@) ing (_N _^_EN @) ing (_N _^_EN
_) in (k %In _) in (k %In
_) inter Int@* _) inter Int@*
&) in (_ i2n
l) in (_ 'i:n
s) in (_ 'i:n
@) ion (_ j'o:n @) ion (_ j'o:n
@) io (n Io: @) io (n Io:
io Io: io Io:
k) k k) k


// @) keit (_$4 kaIt // @) keit (_$4 kaIt
// @) keiten (_$6 kaIt@n


kolleg k%Ole:g kolleg k%Ole:g
_) komme (C@ k%OmE
_) ko (mp k%O _) ko (mp k%O
_) ko (mpost kO _) ko (mpost kO
_) ko (n@ k%O
_) ko (nter kO




.group l .group l
_) l (_ El _) l (_ El
l l l l
l) l l) l
lin (_ l'i:n
l) lin (_ 'i:n


lady _^_EN lady _^_EN
_) land (C@P4 l'ant _) land (C@P4 l'ant
// ng (l Ng // ng (l Ng
o) ng (e ng o) ng (e ng
o) ng (A Ng o) ng (A Ng
u) ng (i Ng
ng (r Ng ng (r Ng
nk Nk nk Nk
nk (A nk nk (A nk
t) ogen (_ o:g'e:n t) ogen (_ o:g'e:n
@) o (gin_ 'o: @) o (gin_ 'o:
o (l_ 'o: o (l_ 'o:
o (lsam o:
o (m_ 'o: o (m_ 'o:
@A) o (n_ 'o: @A) o (n_ 'o:
@) oo (_ u: @) oo (_ u:
pf pF pf pF
ph f ph f


_) para (@ p,a*a
passagie pasaZ'i: passagie pasaZ'i:
_) pay _^_EN _) pay _^_EN
_) peri p,e:*i: _) peri p,e:*i:
sch (en_ sC sch (en_ sC
_) sh S _) sh S
sh (K S sh (K S

sou (nd saU sou (nd saU
p) s (a s p) s (a s
p) s (i s p) s (i s
_) vehe ve:he: _) vehe ve:he:
_) ver (@P3 f%E* _) ver (@P3 f%E*
_) ver (bal v%E* _) ver (bal v%E*
@) versich fE*z,IC
@) vergess fE*g,Es
_) viel (@P4 f'i:l _) viel (@P4 f'i:l
_) vier (g@P4 f'i:* _) vier (g@P4 f'i:*
_) viet vIEt _) viet vIEt

+ 6
- 6
dictsource/dict_phonemes View File

Dictionary de_dict Dictionary de_dict


3 @ @- a A A: aI aU 3 @ @- a A A: aI aU
E E2 E: e: I i: O o:
OY U u: W y y: Y:
E E2 E: e: I i2 i: O
o: OY U u: W y y: Y:


* : ; b C C2 d D * : ; b C C2 d D
dZ f g h j k l m dZ f g h j k l m
A a: E e e: i i: o A a: E e e: i i: o
o: u u: y Y y: Y: o: u u: y Y y: Y:


* : b c C d dZ f
g h j J k l m n
N n^ p R s S s2 t
tS ts v z Z
: b c C d dZ f g
h j J k l m n N
n^ p R s S s2 t tS
ts v z Z




Dictionary it_dict Dictionary it_dict

+ 0
- 3
dictsource/hu_list View File







// Names
ricárd RiCa:Rd
richard RiCa:Rd

+ 4
- 0
dictsource/hu_rules View File

r (C R r (C R
rr RR rr RR


_) richa (rd RiCa:
_) richá (rd RiCa:


.group s .group s
s S s S
sz s sz s

+ 49
- 35
dictsource/pt_list View File


// This file in UTF8 encoded // This file in UTF8 encoded


// Options // Options
// ?2 Brazilian Portuguese // ?2 Brazilian Portuguese




// Letters
// If a letter has a "word" pronunciation which is different from its
// "letter" name, then include the letter name here, with the letter
// prefixed by a _ character.




// character names // character names


_á ,a&g'udU
_à ,agR'avi
_â ,asirkuNfl'EksU
_ã ,atS'iU
_ç s,esed'elj&
_é ,e&g'udU
_ê ,asirkuNfl'EksU
_í ,i&g'udU
_ó ,o&g'udU
_ô ,osirkuNfl'EksU
_õ ,otS'iU
_ú ,u&g'udU
_ü ,utR'em&

_cap maI'uskulU _cap maI'uskulU
_?A l'etR& _?A l'etR&
_?? s'imbolU _?? s'imbolU
_% pors'eINtU _% pors'eINtU
_& 'e _& 'e
?1 _' ap'Ost@-*,ofy ?1 _' ap'Ost@-*,ofy
?2 _' ap'Ost@-*,ofU
_( ,ab@-*ipa*'eINtezi
?2 _' ap'OstR,ofU
_( ,abRipa*'eINtezi
_) f,ES&pa*'eINtezi _) f,ES&pa*'eINtezi
_* ,aste*'isku
_* ,aste*'iskU
_+ m'aIs# _+ m'aIs#


_, v'irgul& _, v'irgul&
//******** //********


?1_0 z'Eru ?1_0 z'Eru
?2_0 z'E*u
?2_0 z'E*U
?1_1 'um ?1_1 'um
?2_1 'uN ?2_1 'uN
_2 d'oIs# _2 d'oIs#
unts $abbrev unts $abbrev
usb $abbrev usb $abbrev


// roman numerals
?1 ii d'oIs# $abbrev
?1 iii tr'es# $abbrev
?1 iv kw'atru $abbrev



dr $dot
mr $dot
mrs $dot
prof pr'Of $dot
sr $dot
sra ,Es;'Errj'a $dot
dr $dot
dra $dot
mr $dot
mrs $dot
prof pr'Of $dot
sr $dot
?1 sra ,Es;'Errj'a $dot
?2 sra $dot




// articles // articles




// Letter names // Letter names
// If a letter has a "word" pronunciation which is different from its
// "letter" name, then include the letter name here, with the letter
// prefixed by a _ character.
// a e o à é can also be words

_a a _a a
_e E _e E
_o O _o O
_à ,agR'avi
_é ,e&g'udU
a a $atend a a $atend
e E $atend // assume letter-e at end of sentence e E $atend // assume letter-e at end of sentence
o O $atend o O $atend
à ,agR'avi $atend
é ,e||&g'udU $atend

á ,a||&g'udU
â ,a||sirkuNfl'EksU
ã ,atS'iU
ç s,esed'elj&
è ,egR'avi
ê ,e||sirkuNfl'EksU
í ,i&g'udU
ó ,o&g'udU
ô ,o||sirkuNfl'EksU
õ ,otS'iU
ú ,u&g'udU
ü ,utR'em&




// some common adjectives and adverbs // some common adjectives and adverbs
?1 cancel k'&ns'El ?1 cancel k'&ns'El
?1 caps k'aps ?1 caps k'aps
?1 com kom ?1 com kom
ctrl k'oNt:r,Ol
?1 ctrl k'oNt:r,Ol
?1 dat d'at ?1 dat d'at
?1 doc d'Ok ?1 doc d'Ok
?1 delete d'il'it ?1 delete d'il'it
?1 end 'end ?1 end 'end
?1 escape Sk'eIpy ?1 escape Sk'eIpy
?1 explorer ,ekspl'O:r&r- ?1 explorer ,ekspl'O:r&r-
?2 explorer ekspl'O*er
?1 eyes 'aiz ?1 eyes 'aiz
?1 frame fr'eImy ?1 frame fr'eImy
?2 frame fR'eImi ?2 frame fR'eImi
?2 maior maI'Or ?2 maior maI'Or
?1 menor myn'Or- ?1 menor myn'Or-
?2 menor men'Or ?2 menor men'Or
?2 mouse m'aUzi
?1 menu menu ?1 menu menu
?1 next n'Ekst ?1 next n'Ekst
ok Ok'eI ok Ok'eI
?1 scroll sk:r'ol ?1 scroll sk:r'ol
?1 site s'aIt ?1 site s'aIt
?2 site s'aItSi ?2 site s'aItSi
?1 software s'Oft,w'Er-
?2 software s'Oftwe@-
?1 software s'Oft,w'Er-
?2 software s'Oftwe@-
?1 space sp'eIsy ?1 space sp'eIsy
?1 sporting sp'Ort,ing ?1 sporting sp'Ort,ing
?1 tab t'ab ?1 tab t'ab
espeak isp'i:k espeak isp'i:k
?1 espeakedit isp'i:kEd,it ?1 espeakedit isp'i:kEd,it
?1 fedora _^_EN ?1 fedora _^_EN
?1 firefox f'ai&rfOks
?2 firefox f'ai@fOks
?1 firefox f'ai&rfOks
?2 firefox f'ai@fOks
?1 front fr'ont ?1 front fr'ont
?1 jaws dZ'au:z ?1 jaws dZ'au:z
?2 jaws dZ'Os ?2 jaws dZ'Os
?1 Publisher p'&bl,iS&r- ?1 Publisher p'&bl,iS&r-
?1 reader r'id,&r- ?1 reader r'id,&r-
?1 setup s'Et'&p ?1 setup s'Et'&p
?1 scout sk'aut // Nero scout
?1 scout sk'aut // Nero scout
?1 skype sk'aip ?1 skype sk'aip
slackware sl'akwe@ slackware sl'akwe@
?1 smart sm'art // nero StartSmart ?1 smart sm'art // nero StartSmart








+ 38
- 6
dictsource/pt_rules View File

// translation rules Brazilian
// translation rules Brazilian
// This file is UTF-8 encoded // This file is UTF-8 encoded


// Options // Options
e (be_ E e (be_ E
e (bem_ E e (bem_ E
e (bes_ E e (bes_ E
e (ca_ E
e (ce_ E e (ce_ E
e (cem_ E e (cem_ E
e (ces_ E e (ces_ E

e (clA_ E
e (clAs_ E
e (clAm_ E
e (co_ E

e (la_ E
e (las_ E
e (rA_ E
e (rAm_ E
e (rAs_ E
e (stA_ E e (stA_ E
e (stAm_ E e (stAm_ E
e (stAs_ E e (stAs_ E


e (rnA_ E e (rnA_ E
e (rnAm_ E e (rnAm_ E
e (rnAs_ E
e (rtA_ E
e (rnAs_ E

e (rtA_ E
e (rtAm_ E e (rtAm_ E
e (rtAs_ E e (rtAs_ E
e (rrA_ E

e (rrA_ E
e (rrAm_ E e (rrAm_ E
e (rrAs_ E e (rrAs_ E


e (rvA_ E
e (rvAm_ E
e (rvAs_ E

e (ve_ E
e (vem_ E
e (ves_ E
e (rrAs_ E



e (x_ E e (x_ E
e (xA_ E e (xA_ E
e (xAm_ E e (xAm_ E
on (K oN on (K oN
o (na_ o o (na_ o
onh on^ onh on^
o (rCA_ O
o (brA_ O
o (brAm_ O
o (brAs_ O
o (rCA_ O
o (rCAm_ O o (rCAm_ O
o (rCAs_ O o (rCAs_ O
o (stA_ O o (stA_ O

+ 3
- 3
phsource/compile_report View File

en_wm 30 144 en_wm 30 144
af 38 128 af 38 128
cy 29 122 cy 29 122
de 30 121
de 31 122
eo 13 108 eo 13 108
fi 40 127 fi 40 127
fr 32 118 fr 32 118
1 vowel/@_hgh no 1 vowel/@_hgh no
19 vowel/i base2 en_n en_rp en_wm cy eo fr hu pl it pt pt_pt ++ 19 vowel/i base2 en_n en_rp en_wm cy eo fr hu pl it pt pt_pt ++
1 vowel/i# cy 1 vowel/i# cy
4 vowel/i_2 de nl la sv
5 vowel/i_2 de nl la sv
2 vowel/i_3 af sk 2 vowel/i_3 af sk
4 vowel/i_4 fi hu it is 4 vowel/i_4 fi hu it is
5 vowel/i_5 en_sc 5 vowel/i_5 en_sc
1 w/wa base 1 w/wa base
1 w/we base 1 w/we base
3 w/wi base vi zh_yue 3 w/wi base vi zh_yue
11 w/wi2 en en_n en_us en_sc en_rp en_wm de nl la sv no
12 w/wi2 en en_n en_us en_sc en_rp en_wm de nl la sv no
1 w/wo base 1 w/wo base
1 w/wu base 1 w/wu base
5 w/xw base 5 w/xw base

phsource/ph_af → phsource/ph_afrikaans View File


+ 9
- 0
phsource/ph_german View File

before * DFT+40 before * DFT+40
endphoneme endphoneme


phoneme i2
vowel starttype (i) endtype (i)
length 180
formants vowel/i_2
after w w/wi2
before * DFT+40
reduceto I 4
endphoneme



phoneme u: phoneme u:
vowel starttype (u) endtype (u) vowel starttype (u) endtype (u)

phsource/ph_portugual → phsource/ph_portugal View File


+ 2
- 2
phsource/phonemes View File

include ph_english_wm include ph_english_wm


phonemetable af base phonemetable af base
include ph_af
include ph_afrikaans


phonemetable cy base phonemetable cy base
include ph_welsh include ph_welsh
include ph_pt_brazil include ph_pt_brazil


phonemetable pt_pt pt phonemetable pt_pt pt
include ph_portugual
include ph_portugal


phonemetable ro base2 phonemetable ro base2
include ph_romanian include ph_romanian

+ 2
- 4
src/extras.cpp View File

} }
#endif #endif


char* text1 = "Hello World. This is the second sentence";
char* text1 = "Hello World2. <audio src=\"here\"> Some text</audio> This is the second sentence";


void TestTest(int control) void TestTest(int control)
{//======================= {//=======================
unsigned int ix=0; unsigned int ix=0;
char textbuf[2000]; char textbuf[2000];
espeak_VOICE voice; espeak_VOICE voice;
espeak_VOICE *voice2;
unsigned int unique_identifier=0;


//FindPhonemesUsed(); //FindPhonemesUsed();
//return; //return;
espeak_SetSynthCallback(TestSynthCallback); espeak_SetSynthCallback(TestSynthCallback);
espeak_SetUriCallback(TestUriCallback); espeak_SetUriCallback(TestUriCallback);


unsigned int unique_identifier=0;
int index=0;
espeak_Synth(text1, strlen(text1)+1, 0, POS_CHARACTER, 0, espeakSSML|espeakCHARS_UTF8, &unique_identifier, NULL); espeak_Synth(text1, strlen(text1)+1, 0, POS_CHARACTER, 0, espeakSSML|espeakCHARS_UTF8, &unique_identifier, NULL);


espeak_SetParameter(espeakPUNCTUATION, 1, 0); espeak_SetParameter(espeakPUNCTUATION, 1, 0);

+ 2
- 1
src/readclause.cpp View File



espeak_VOICE *SelectVoice(espeak_VOICE *voice_select, int *variant); espeak_VOICE *SelectVoice(espeak_VOICE *voice_select, int *variant);


char *xmlbase = NULL; // base URL from <speak>
char *xmlbase = ""; // base URL from <speak>


int namedata_ix=0; int namedata_ix=0;
int n_namedata = 0; int n_namedata = 0;
case SSML_AUDIO + SSML_CLOSE: case SSML_AUDIO + SSML_CLOSE:
if(uri_callback == NULL) if(uri_callback == NULL)
break; break;
PopParamStack(tag_type, outbuf, outix);
return(CLAUSE_NONE); return(CLAUSE_NONE);


case SSML_BREAK: case SSML_BREAK:

+ 1
- 1
src/synthdata.cpp View File

#include "translate.h" #include "translate.h"
#include "wave.h" #include "wave.h"


const char *version_string = "1.26.08 19.Jun.07";
const char *version_string = "1.26.09 20.Jun.07";
const int version_phdata = 0x012601; const int version_phdata = 0x012601;


int option_device_number = -1; int option_device_number = -1;

+ 1
- 2
src/voices.cpp View File



// limit the rate of change for each formant number // limit the rate of change for each formant number
//static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220}; // values for 22kHz sample rate //static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220}; // values for 22kHz sample rate
static int formant_rate_22050[9] = {250, 200, 200, 200, 200, 200, 200, 200, 200}; // values for 22kHz sample rate
//static int formant_rate_22050[9] = {50, 100, 165, 200, 200, 200, 200, 200, 200}; // values for 22kHz sample rate
static int formant_rate_22050[9] = {240, 180, 180, 180, 180, 180, 180, 180, 180}; // values for 22kHz sample rate
int formant_rate[9]; // values adjusted for actual sample rate int formant_rate[9]; // values adjusted for actual sample rate





Write Preview
Loading…
Cancel
Save