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

[1.40.22] 

Fix numbers greater than 1000000, for Indian languages.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@221 d46cf337-b52f-0410-862d-fd96e6ae7743
master
jonsd 16 years ago
parent
0fc12016fa
commit
d39f19570b
13 changed files with 54 additions and 50 deletions
Split View Show Diff Stats
  1. 1
    1
      dictsource/dict_phonemes
  2. 0
    2
      dictsource/en_list
  3. 2
    2
      dictsource/en_rules
  4. 12
    8
      dictsource/fr_list
  5. 7
    7
      dictsource/fr_rules
  6. 3
    2
      dictsource/hi_list
  7. 1
    1
      dictsource/is_list
  8. 10
    9
      dictsource/is_rules
  9. 3
    3
      phsource/compile_report
  10. 12
    12
      phsource/ph_french
  11. BIN
      phsource/vwl_fr/r_a
  12. 1
    1
      src/synthdata.cpp
  13. 2
    2
      src/translate.cpp

+ 1
- 1
dictsource/dict_phonemes View File

@@ -249,7 +249,7 @@ y y# Yy
D f g h j J k l
l# m m# n N n# N# n^
n^# p Q r R r# R2 s
S s2 t T tl# v x z
s2 t T tl# v x z


Dictionary it_dict

+ 0
- 2
dictsource/en_list View File

@@ -1044,7 +1044,6 @@ everything EvrI2TIN
evildoers i:v@Ldu:3z
ewe ju:
evening i:vnI2N
every Iv3:t
evit EvI2t // inevitable
exalt Egz'0lt
execute EksI2kju:t // not $2
@@ -2434,7 +2433,6 @@ Peking pi:k'IN
Peru p@ru:
Phillipine fIlI2pi:n
Philipine fIlI2pi:n // misspell
Poland poUl@nd
Polish poUlIS $capital $only
Portuguese po@tju:g'i:z
Potomac $2

+ 2
- 2
dictsource/en_rules View File

@@ -704,6 +704,7 @@
adv) an (c an
_) an (cie eIn
&l) an (d @n
yl) an (d an
usb) an (d @n
@) an (Ca_ 'an
ando (_ 'andoU
@@ -3239,8 +3240,6 @@
w) l (_ l
r) l (_ l
Al) l (_
&) la (nd_ la2
over) la (nd la
&) lim (ent lIm
&t) ling (_ _lI2N
&B) ling (_ lI2N
@@ -3652,6 +3651,7 @@

.group ol
&st) ol (_ @L
ol (and_ oUl
ol (ar oUl
@@) ol (ar 'oUl
h) ol (ar 0l

+ 12
- 8
dictsource/fr_list View File

@@ -24,7 +24,7 @@

// 2006-11-18 Gilles Casse <[email protected]>
//
// Updated 2009-05-14 Michel Such <[email protected]>
// Updated 2009-06-08 Michel Such <[email protected]>
//
// * Numbers, a few abbreviations and exceptions.
//
@@ -266,6 +266,8 @@ kde $abbrev
kg kilogram
khz kiloErts
km kilomètre $text
(km player) ka,EmplEj'Wr
(kmplayer) ka,EmplEj'Wr
kw kilowat
m. m@siY
mbit megabit
@@ -334,14 +336,14 @@ mais $u+
ou $u $brk
eh $u $brk
et e $u $brk
ni $u $brk
car $u $brk
ni $u
car $u
car $noun
cependant $brk
néanmoins $brk
toutefois $brk
avant $u+ $brk
après $u+ $brk
cependant
néanmoins $u+
toutefois $u+
avant $u+
après $u+
(temps en temps) tA~zA~tA~
alors alOr $u+
depuis $u+
@@ -362,6 +364,8 @@ que $u+
(parce qu'elles) parskElz2 $u+
(parce qu'on) parskO~n2 $u+
tant tA~t2 $u+
(tant mieux) tA~mjY $u+
(tant pis) tA~pi $u+
qui $verbf $u+
quoique $u
quant kA~t2 $u

+ 7
- 7
dictsource/fr_rules View File

@@ -23,7 +23,7 @@

// 2006-11-18 Gilles Casse <[email protected]>
//
// Updated: 2009-05-14 Michel Such <[email protected]>
// Updated: 2009-05-28 Michel Such <[email protected]>
//

// Letter classes:
@@ -605,11 +605,11 @@ iew) er (X er2
vin) gt (_neuvi t

gt (_ // vingt doigts

gt t // vingtaine doigté

gui gi // anguille
ai) gu (il gy // aiguillage
in) gu (is gy // linguiste
ai) gui (l gw^i // aiguillage
in) gui (s gw^i // linguiste
g (C g

_ran) g (_ // rang
@@ -1253,9 +1253,9 @@ A) t (- t2
C) ucci utSi // capuccino
c) ueill Wj // cueillir
c) ueil (_ Wj // recueil
_g) u (a u
ag) u (a_ u
tig) u (a_ u
_g) ua wA
ag) ua (_ wA
Ctig) ua (_ wA
_c) ul (_ y
_) ultra (P5 yltra
g) u (ay u

+ 3
- 2
dictsource/hi_list View File

@@ -14,7 +14,7 @@ _8 'a:t.h
_9 n'O:
?3 _9 n'aU

_10 dVs
_10 d'Vs
_11 gj'a:r@2
_12 b'a:r@2
_13 t'E:r@2
@@ -117,7 +117,8 @@ _0C s'O:
_0M1 h@z'a:r
_0M2 l'a:kh
_0M3 cr'ore
_0M4 b'ilion // ?? English
_0M4 'Vr@b
_0M5 kh'Vr@b
_dpt _d@s@ml'o:_ // ?? what is Hi for "." ?

// Single consonants

+ 1
- 1
dictsource/is_list View File

@@ -20,7 +20,7 @@ _3f Tr#j'u:
_4f fj'W:Qyrr#
_5 f'Im
_6 s'e:xs
_7 S'W:
_7 sj'W:
_8 'aUhd&
_9 n'i:;y
_10 t'i:;y

+ 10
- 9
dictsource/is_rules View File

@@ -5,6 +5,9 @@
// letter group F p,t,k,s
// letter group H j,r,v,

.replace
x xz


.group a
a a:
@@ -53,7 +56,7 @@
e (CC E
e (ng eI
e (nk eI
egi eI:jI
ei eI:
ey eI:
ei (FH eI:
@@ -116,7 +119,6 @@
hj C
hl l#
hn hn#
hr r#
hv kv


@@ -184,6 +186,7 @@
ó) nn dn
ú) nn dn
ý) nn dn
æ) nn dn
au) nn dn
ei) nn dn
ey) nn dn
@@ -223,13 +226,13 @@


.group r
_) r R2
_) r _|R2
C) r @-R
l) r **R
A) r (A *R
B) r r#
r (B rr#
r (_ rr#
r (_ _|R
r _|R2
rr R*R
rl dl
@@ -240,7 +243,6 @@
.group s
s s
ss ss2
sj S


.group t
@@ -259,7 +261,6 @@
u (CC y
K) u (ng u
K) u (nk u
&) ur (_ y#r#


.group ú
@@ -277,8 +278,8 @@


.group x
x xs
x ks
xz ks

.group y
y I:
@@ -319,6 +320,6 @@
_) ö (@P1N ,W:

.group
$ dolar
$ dOllar



+ 3
- 3
phsource/compile_report View File

@@ -684,8 +684,6 @@ r/xr [(@)] base
[(o)] base
[(u)] base
[Y] fr
[a] fr
[A~] fr
ufric/ch [C] base
[J^] base
[C2] de
@@ -2248,7 +2246,8 @@ vwl_fr/@R2 [R] fr_ca
vwl_fr/@R3 [Q2] hy
vwl_fr/@R4 [Q2] hy
vwl_fr/@R5 [Q2] hy
vwl_fr/r_a [wA] fr
vwl_fr/r_a [a] fr
[wA] fr
vwl_fr/r_e [E] fr
[e] fr
vwl_fr/r_i [i] fr
@@ -2265,6 +2264,7 @@ vwl_fr/r_y [y] fr
vwl_fr/tr [r] fr
vwl_fr/w_a [wA] fr
vwl_fr/xr [a] fr
[wA] fr
[A~] fr
vwl_hi/l-voc [l-] jbo
[l-] hi

+ 12
- 12
phsource/ph_french View File

@@ -37,8 +37,8 @@ phoneme a
formants vowel/a_6
after l l/la-15
before l/ DFT+l/l_a
before (r) DFT-10+vwl_fr/xr
before r/2 DFT+r/xr
before (r) DFT+vwl_fr/xr
before r/2 DFT-20+vwl_fr/r_a
endphoneme


@@ -71,7 +71,7 @@ phoneme i
after (l) l/li-15
before l/ DFT+l/l_i
before (r) DFT-20+vwl_fr/r_i
before r/2 DFT+vwl_fr/r_i
before r/2 DFT-20+vwl_fr/r_i
endphoneme


@@ -125,7 +125,7 @@ phoneme O
formants vowel/o_mid
after (l) l/lo-10
before l/ DFT+l/l_o
before r/2 DFT+vwl_fr/r_o
before r/2 DFT-20+vwl_fr/r_o
reduceto o2 1
endphoneme

@@ -137,7 +137,7 @@ phoneme O2 // Like O but no reduceto
after (l) l/lo-10
before l/ DFT+l/l_o
before (r) DFT+vwl_fr/r_o
before r/2 DFT+vwl_fr/r_o
before r/2 DFT-20+vwl_fr/r_o
endphoneme


@@ -148,7 +148,7 @@ phoneme u
after l l/lu-20
before l/ DFT-20+l/l_u
before (r) DFT+vwl_fr/r_u
before r/2 DFT+vwl_fr/r_u
before r/2 DFT-30+vwl_fr/r_u
before i DFT-50
endphoneme

@@ -171,7 +171,7 @@ phoneme y
after l l/lu-20
before l/ DFT-30+l/l_y
before (r) DFT+vwl_fr/r_y
before r/2 DFT+vwl_fr/r_y
before r/2 DFT-30+vwl_fr/r_y
before E~ DFT-50
endphoneme

@@ -194,7 +194,7 @@ phoneme W
after (l) l/l@-20
before l/ DFT-20+l/l_@
before (r) DFT+vwl_fr/r_@2
before r/2 DFT+vwl_fr/r_@2
before r/2 DFT-30+vwl_fr/r_@2
reduceto Y 1
endphoneme

@@ -216,7 +216,7 @@ phoneme wA
formants vwl_fr/w_a
after (l) l/lo-10
before l/ DFT-10+l/l_a
before (r) DFT+vwl_fr/r_a
before (r) DFT+vwl_fr/xr
before r/2 DFT+vwl_fr/r_a
endphoneme

@@ -238,7 +238,7 @@ phoneme A~
formants vnasal/aa_n4
before l/ DFT+l/l_a
before (r) DFT+vwl_fr/xr
before r/2 DFT+r/xr-40
before r/2 DFT+vwl_fr/xr
endphoneme


@@ -429,7 +429,7 @@ endphoneme

phoneme r
liquid starttype (r) endtype (r)
vowelin f1=0 f2=1800 10 10 f3=-200 100
vowelin f1=1 f2=1800 10 10 f3=-200 100
vowelout f1=1 f2=1800 10 10 f3=-200 100
length 100
lengthmod 7
@@ -444,7 +444,7 @@ phoneme r
after p vwl_fr/tr+r3/rx%35
after s vwl_fr/tr+r3/rx%30
after S vwl_fr/tr+r3/rx%45
after t vwl_fr/tr+r3/rx%15
after t vwl_fr/tr+r3/rx%30
after v vwl_fr/tr+r3/rx%30
after z vwl_fr/tr+r3/rx%30
after Z vwl_fr/tr+r3/rx%30

BIN
phsource/vwl_fr/r_a View File


+ 1
- 1
src/synthdata.cpp View File

@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"

const char *version_string = "1.40.21 29.May.09";
const char *version_string = "1.40.22 19.Jun.09";
const int version_phdata = 0x014015;

int option_device_number = -1;

+ 2
- 2
src/translate.cpp View File

@@ -2563,7 +2563,7 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
char *pn;
char *pw;
static unsigned int break_numbers1 = 0x49249248;
static unsigned int break_numbers2 = 0x492492a8; // for languages which have numbers for 100,000 and 100,00,000
static unsigned int break_numbers2 = 0x24924aa8; // for languages which have numbers for 100,000 and 100,00,000, eg Hindi
static unsigned int break_numbers3 = 0x49249268; // for languages which have numbers for 100,000 and 1,000,000
unsigned int break_numbers;
char number_buf[80];
@@ -2620,7 +2620,7 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
pn = &number_buf[1];
nx = n_digits;

if(tr->langopts.numbers2 & NUM2_100000a)
if((tr->langopts.numbers2 & NUM2_100000a) == NUM2_100000a)
break_numbers = break_numbers3;
else
if(tr->langopts.numbers2 & NUM2_100000)

Write Preview
Loading…
Cancel
Save