mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.47.09]

Browse Source 
Fix: lookup in *_list occasionally find the wrong word.
Languages changes: hi, ne, sl.

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@351 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2013-04-29 22:59:27 +00:00
parent 6f58bb4d5b
commit adcb83fcf9
24 changed files with 285 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dictsource/bn_list
+2 -2
View File
@@ -9,7 +9,7 @@ _0 S'unjO
_1 '&k _1 '&k
_2 d'uj _2 d'uj
_3 t'in _3 t'in
_4 tSh'ar _4 tS#'ar
_5 p'a~tS _5 p'a~tS
_6 tS#'Oj _6 tS#'Oj
_7 S'at _7 S'at
@@ -25,7 +25,7 @@ _10 d'OS
_11 '&garo _11 '&garo
_12 b'arO _12 b'arO
_13 t'erO _13 t'erO
_14 tSh'oddO _14 tS#'oddO
_15 p'OnerO _15 p'OnerO
_16 S'olO _16 S'olO
_17 S'OterO _17 S'OterO
dictsource/bn_rules
+2 -2
View File
@@ -176,8 +176,8 @@
.group ছ .group ছ
ছ tShV ছ tS#V
ছ (B tSh ছ (B tS#
.group জ .group জ
dictsource/de_list
+2 -2
View File
@@ -695,8 +695,8 @@ pochier pOS'i:r
pochs pOxs pochs pOxs
präsident $3 präsident $3
prämie $alt prämie $alt
privatisier pri:vati:z'i:r privatisier $4
problematisier pro:ble:m'a:tIzi:r problematisier $3 //pro:ble:m'a:tIzi:r
reliquie $alt reliquie $alt
risik $1 risik $1
dictsource/dict_phonemes
+16 -16
View File
@@ -58,7 +58,7 @@ s; t t; tS ts v x z
Z z; Z z;
Dictionary bn_dict 2013-04-25 Dictionary bn_dict 2013-04-29
& a a~ e e~ i i: i~ & a a~ e e~ i i: i~
l- o O o: O~ o~ r- u l- o O o: O~ o~ r- u
@@ -124,7 +124,7 @@ r R R3 s S t T tS
v w x z Z v w x z Z
Dictionary de_dict 2013-04-25 Dictionary de_dict 2013-04-27
3 @ @- a A A: aI aU 3 @ @- a A A: aI aU
A~ E E2 E: e: EI i I A~ E E2 E: e: EI i I
@@ -148,7 +148,7 @@ p Q r R s s; t T
ts v x z ts v x z
Dictionary en_dict 2013-04-26 Dictionary en_dict 2013-04-29
0 0# 3 3: @ @- @2 @5 0 0# 3 3: @ @- @2 @5
@L a a# A: A@ aa aI aI3 @L a a# A: A@ aa aI aI3
@@ -272,18 +272,18 @@ N n^ p r R R2 s S
t tS ts tS; v x z Z t tS ts tS; v x z Z
Dictionary hi_dict 2013-04-10 Dictionary hi_dict 2013-04-29
@ @2 a a: aI aU a~ e @ @- a a: aI aU a~ e
E e: E: e~ E~ i I i: E e: E: e~ E~ i I i:
i~ l- o O o: O: O~ o~ i~ l- o O o: O: O~ o~
r- u U u: u~ V r- u U u: u~ V
#X1 #X2 - : b b# c c# #X1 #X2 * - : b b# c
d d# d. d.# f g g# h c# d d# d. d.# f g g#
H j J J# k k# l l. h H j J J# k k# l
m n N n. n^ p p# Q l. m n N n. n^ p p#
q r r. s S s. t T Q q r r. s S s. t
t# t. t.# v w x z t# t. t.# v w x z
@@ -496,7 +496,7 @@ k l m n p R s S
t tS v w x t tS v w x
Dictionary ne_dict 2013-03-09 Dictionary ne_dict 2013-04-28
@ @/ @2 @3 a a: aI aU @ @/ @2 @3 a a: aI aU
a~ e E e: E: eI e~ E~ a~ e E e: E: eI e~ E~
@@ -641,15 +641,15 @@ s S t t; tS ts v w
x z Z x z Z
Dictionary sl_dict 2013-01-30 Dictionary sl_dict 2013-04-28
@ @- a a: e E e: i @ @- a a: e E e: i
i: o O o: u u: y i: o O o: u u: y
: b d dZ dz f g h * : b d dZ dz f g
j k l l^ m n N n^ h j k l l^ m n N
p R R^ s S t tS ts n^ p R R^ s S t tS
v v# w x z Z ts tS; v v# w x z Z
Dictionary sq_dict 2008-12-22 Dictionary sq_dict 2008-12-22
dictsource/en_list
+6 -4
View File
@@ -566,6 +566,7 @@ i.e aIi:_! $pause
imo $abbrev imo $abbrev
inlb $abbrev inlb $abbrev
ios $abbrev ios $abbrev
ipa $abbrev
irc $abbrev irc $abbrev
irs $abbrev irs $abbrev
isbn $abbrev isbn $abbrev
@@ -1433,6 +1434,7 @@ duvet du:veI
d'ye dj@ d'ye dj@
dynamo $1 dynamo $1
earlobe i@3loUb
early 3:lI early 3:lI
eavesdrop i:vzdr0p eavesdrop i:vzdr0p
ebay i:beI ebay i:beI
@@ -2819,6 +2821,7 @@ taffeta tafI#t@
takel tak@L takel tak@L
talent tal@nt talent tal@nt
tallyho talI'hoU tallyho talI'hoU
timbre tamb3
tampon tamp0n tampon tamp0n
tangerine tandZ@r'i:n tangerine tandZ@r'i:n
taoiseach ti:S@x taoiseach ti:S@x
@@ -3001,6 +3004,7 @@ vertices v3:tIsi:z
vestige vEstI2dZ vestige vEstI2dZ
vex vEks // for vexed vex vEks // for vexed
viagra vaI'agr@ viagra vaI'agr@
vibrato vI2brA:toU
vicar vIk3 vicar vIk3
vigilante vIdZI2l'anti vigilante vIdZI2l'anti
vignette vInj'Et vignette vInj'Et
@@ -3448,11 +3452,8 @@ Abe eIb
Abu abu: Abu abu:
Abraham eIbr@ham Abraham eIbr@ham
Ada eId@ $onlys Ada eId@ $onlys
Andrea $2
Adrian eIdri@n Adrian eIdri@n
Agatha aga#T@ Agatha aga#T@
Angela andZ@l@
Angelika $2
Aggie agi Aggie agi
Agnes agn@s Agnes agn@s
Aguilera agi:l'e@r@ Aguilera agi:l'e@r@
@@ -3477,7 +3478,8 @@ Amy eImi
Andre 0ndreI Andre 0ndreI
Andrea andri@ Andrea andri@
Andreas A:ndr'eI@s Andreas A:ndr'eI@s
Angela ang@l@ Angela andZ@l@
Angelika $2
Anita $alt3 Anita $alt3
Anthony ant@ni Anthony ant@ni
Anton ant0n Anton ant0n
dictsource/en_rules
+4
View File
@@ -988,6 +988,7 @@
?3 _) ar (istocrat a#r ?3 _) ar (istocrat a#r
log) ar (i @r log) ar (i @r
marg) ar (AtA_ 3r' marg) ar (AtA_ 3r'
_l) ar (yn ar
m) ar (it ar m) ar (it ar
p) ar (i ar p) ar (i ar
p) ar (in e@ p) ar (in e@
@@ -1035,6 +1036,8 @@
&sp) ass (_ @s &sp) ass (_ @s
rr) ass @s rr) ass @s
&v) ass (_ @s &v) ass (_ @s
as (al eIz
b) as (al as
ascii askI ascii askI
f) asc (ia eIS f) asc (ia eIS
f) asci (s aSI f) asci (s aSI
@@ -4895,6 +4898,7 @@
pro (voc pr%0# pro (voc pr%0#
pro (vok pr@ pro (vok pr@
pro (sec pr0 pro (sec pr0
_) prose (l pr0s
pro (fil proU pro (fil proU
pro (gra proU pro (gra proU
pro (log proU pro (log proU
dictsource/hi_list
+91 -91
View File
@@ -2,124 +2,124 @@
// Numbers // Numbers
// devanagari numbers are changed to latin characters before translation // devanagari numbers are changed to latin characters before translation
_0 s'u:n.jV _0 S'u:nj@-
_1 'e:k _1 'e:k
_2 d'o: _2 d'o:
_3 t'i:n _3 t'i:n
_4 c:'a:r: _4 c'a:r
_5 'pa~c _5 'pa~c
_6 c#'@2 _6 c#'VH
_7 s'a:t _7 s'a:t
_8 'a:t.# _8 'a:t.#
_9 n'O: _9 n'O:
?3 _9 n'aU ?3 _9 n'aU
_10 d'Vs _10 d'Vs
_11 gj'a:r-ah _11 gj'a:*VH
_12 b'a:rah _12 b'a:rVH
_13 t'e:r@2h _13 t'e:rVH
_14 c#'O:d@2h _14 c'O:dVH
_15 p'Vndr@2h _15 p'VndrVH
_16 s'o:l@2h _16 s'o:lVH
_17 sVtr@2h _17 sVtrVh
_18 a:t#:arah _18 Vt.#'a:rVH
_19 Unn'Is _19 Unn'Is
_20 b'i:s _20 b'i:s
_21 Ik:'Is _21 Ik:'is
_22 b'a:Is _22 b'a:is
_23 t'ue:Is _23 t'e:is
_24 c'O:bIs _24 c'O:bis
_25 p@c:'Is _25 p'Vc:is
_26 c#@bb'i:rs _26 c#Vbb'is
_27 s@t:'a:Is _27 s@t:'a:is
_28 at#:'a:Is _28 at#:'a:is
_29 ,Unt'Is _29 'Untis
_30 t'i:s _30 t'i:s
_31 Ik@t:'Is _31 Ik@t'is
_32 b'at:'I'S _32 b'at:is
_33 tE~t'Is // E~ ? _33 t'E~tis // E~ ?
_34 cO~t'Is _34 c'O~tis
_35 pE~t'Is _35 p'E~tis
_36 c#aT'tIs _36 c#'Vt:is
_37 sE~t'Is _37 s'E~tis
_38 art'Is _38 'Vrtis
_39 Unta:l'Is _39 Unt'a:lis
_40 ca:l'Is _40 c'a:lis
_41 Ikta:l'Is _41 Ikt'a:lis
_42 baIa:l'Is _42 baI'a:lis
_43 tE~ta:l'Is _43 tE~t'a:lis
_44 cO:wa:l'Is _44 cO:v'a:lis
_45 paI'nta:l'Is _45 paInt'a:lis
_46 c#hIja:l'Is _46 c#Ij'a:lis
_47 sE~ta:l'Is _47 sE~t'a:lis
_48 arta:l'Is _48 Vrt'a:lis
_49 'Un^ca:s _49 'Unca:s
_50 p@c'a:s _50 pVc'a:s
_51 Ikj'a:wVn _51 Ikj'a:wVn
_52 b'a:wVn _52 b'a:wVn
_53 t'IrpVn _53 t'Ire:pVn
_54 c'Ou:wVn _54 c'O:wVn
_55 p'ac#pVn _55 p'VcpVn
_56 c#h@p:'Vn _56 c#'Vp:Vn
_57 santa:'w@n _57 sVt'a:w@n
_58 at#:a:'w@n _58 at.#:'a:w@n
_59 Uns'Vt# _59 'UnsVt.#
_60 s'a:t.# _60 s'a:t.#
_61 'Iks@t.# _61 'IksVt.#
_62 b'a:s@t.# _62 b'a:sVt.#
_63 t'Irs@t.# _63 t'Ire:sVt.#
_64 cO:'s@t.# _64 c'O~sVt.#
_65 paI's@t.# _65 p'E~sVt.#
_66 c#'Ija:s@t.# _66 c#Ij'a:sVt.#
_67 s'Vrs@t.# _67 s'Vr.sVt.#
_68 ars@t.# _68 Vr.sVt.#
_69 Un@h,at:'Vr: _69 'UnVht:Vr
_70 sat:'Vr: _70 s'Vt:Vr
_71 Ik#at:'Vr: _71 'IkHVt:Vr
_72 b@hat:'Vr: _72 'bVhVt:Vr
_73 tIhat:'Vr: _73 t'IhVt:Vr
_74 cO:hat:'Vr: _74 cO:H'Vt:Vr
_75 pac#,at:'Vr: _75 pVcH'Vt:Vr
_76 c#Ihat:'Vr: _76 c#IH'Vt:Vr
_77 s@t@hat:'Vr: _77 sVtH'Vt:Vr
_78 at#hat:'Vr: _78 VtH'Vt:Vr
_79 ,Un^Ia:s'i: _79 Un'a:si
_80 ,Vss'i: _80 'Vssi:
_81 Ikja:s'i _81 Ikj'a:si
_82 baIa:s'i _82 bVj'a:si
_83 tIra:s'i _83 tIr'a:si
_84 cO:ra:s'i _84 cO:r'a:si
_85 pI'ca:s'i _85 pVc'a:si
_86 c#Ija:s'i _86 c#Ij'a:si
_87 sVt:a:s'i _87 sVt:'a:si
_88 at#:a:s'i _88 at#:'a:si
_89 nVwa:s'i _89 nVw'a:si
_90 nVb:'e: _90 n'Vb:e:
_91 Ikj'a:n@we: _91 Ik:j'a:n@be:
_92 b'a:n@we: _92 b'a:n@be:
_93 tIr'a:n@we: _93 tIr'a:n@be:
_94 cO:r'a:m@we: _94 cO:r'a:m@be:
_95 p@c'a:n@we: _95 pVnc'a:n@be:
_96 c#Ij'a:n@we: _96 c#Ij'a:n@be:
_97 s@t:'a:n@we: _97 sVt:'a:n@be:
_98 at#:'a:n@we: _98 Vt#:'a:n@be:
_99 nIn^j'a:n@we: _99 nIn^j'a:n@be:
_0C s'O: _0C s'O:
_0M1 h@J,a:r _0M1 h'VJa:r
_0M2 l'a:k# _0M2 l'a:k#
_0M3 k@ro:r.V _0M3 k@r'o:r.V
_0M4 'Vr@b _0M4 'VrVb
_0M5 k#'Vr@b _0M5 k#'VrVb
_dpt _d@s@ml'o:_ // ?? what is Hi for "." ? _dpt _d@s@ml'o:_
// Single consonants // Single consonants
क k@ क k@
dictsource/hi_rules
+16
View File
@@ -158,6 +158,7 @@
.group ै .group ै
ै E: // ?? [aI] [E:] [&:] ै E: // ?? [aI] [E:] [&:]
ैं E~
ै (ँ E~ ै (ँ E~
ैं (_ E~ ैं (_ E~
ैँ (_ E~ ैँ (_ E~
@@ -203,6 +204,8 @@
क़ qV क़ qV
क़ (B q क़ (B q
क्क k:V // kk -> k:
क्क (B k:
क्ष kSV क्ष kSV
क्ष (B kS क्ष (B kS
@@ -260,11 +263,18 @@
ट t.V ट t.V
ट (B t. ट (B t.
ट (्य t.: ट (्य t.:
ट्ट t.:V // t.t. -> t.:
ट्ट (B t.:
ट्ठ t.#:V // t.t.# -> t.#:
ट्ठ (B t.#:
.group ठ .group ठ
ठ t.#V ठ t.#V
ठ (B t.# ठ (B t.#
ठ्ठ t.#:V // t.#t.# -> t.#:
ठ्ठ (B t.#:
.group ड .group ड
ड d.V ड d.V
ड (B d. ड (B d.
@@ -288,6 +298,9 @@
त (B t त (B t
त (्य t: त (्य t:
त्त t:V // tt -> t:
त्त (B t:
.group थ .group थ
थ t#V थ t#V
थ (B t# थ (B t#
@@ -315,6 +328,9 @@
प (B p प (B p
प (्य p: प (्य p:
प्प p:V // pp -> p:
प्प (B p:
.group फ .group फ
फ p#V फ p#V
फ (B p# फ (B p#
dictsource/ne_rules
+2 -6
View File
@@ -1,4 +1,5 @@
// Nepali Language.
// Nepali Language.
// This ne_rules file is prepared by Him Prasad Gautam < himjee@yahoo.com >. // This ne_rules file is prepared by Him Prasad Gautam < himjee@yahoo.com >.
// This file is UTF-8 encoded. // This file is UTF-8 encoded.
@@ -402,9 +403,6 @@
.group आ .group आ
आ a: आ a:
आँ a~'' आँ a~''
आइ a:I
आउ a:U
आऊ a:U'
.group इ .group इ
@@ -480,7 +478,6 @@
.group ा .group ा
ा a:,k'a::r@ // If not followed to a Consonant. ा a:,k'a::r@ // If not followed to a Consonant.
C) ा a: C) ा a:
ाव aU
C) ाँ a~' C) ाँ a~'
.group ि .group ि
@@ -1150,4 +1147,3 @@
// The Latin letter a-z are automatically translated into English. // The Latin letter a-z are automatically translated into English.
dictsource/sl_list
+17 -17
View File
@@ -31,7 +31,7 @@ q ku
w dv#'ojniv,@ w dv#'ojniv,@
x iks x iks
y 'ipsilon y 'ipsilon
ć m'ehkitS,@ ć m'ehki||tS,@
đ dZ@ đ dZ@
ä $accent ä $accent
@@ -48,13 +48,13 @@ _0 n'itS
_1 'Ena _1 'Ena
_2 dv#'a _2 dv#'a
_3 tR'i _3 tR'i
_4 St'iRi _4 St'i*i
_5 p'et _5 p'et
_6 S'est _6 S'Est
_7 s'edem _7 s'edEm
_8 'osem _8 'Os@m
_9 d'evet _9 d@v'Et
_10 d'eset _10 d@s'Et
_11 'e'najst _11 'e'najst
_12 dv#'anajst _12 dv#'anajst
_13 tR'inajst _13 tR'inajst
@@ -62,16 +62,16 @@ _14 St'iRinajst
_15 p'etnajst _15 p'etnajst
_16 S'estnajst _16 S'estnajst
_17 s'edemnajst _17 s'edemnajst
_18 'osemnajst _18 'Osemnajst
_19 d'evetnajst _19 d'evEtnajst
_2X dv#'ajset _2X dv#'ajsEt
_3X tR'ideset _3X tR'id@sEt
_4X St'iRideset _4X St'i*id@sEt
_5X p'etdeset _5X p'etd@sEt
_6X S'estdeset _6X S'estd@sEt
_7X s'edemdeset _7X s'edemd@sEt
_8X 'osemdeset _8X 'Os@md@sEt
_9X d'evetdeset _9X d'evEtd@sEt
_2C dv'esto _2C dv'esto
_0C sto _0C sto
_0M1 t'isotS _0M1 t'isotS
dictsource/sl_rules
+5
View File
@@ -17,6 +17,9 @@
.group č .group č
č tS č tS
.group ć
ć tS;
.group d .group d
d d d d
dz dz dz dz
@@ -103,6 +106,7 @@
.group r .group r
r R r R
rr R rr R
A) r (A *
K) r (K @R K) r (K @R
@@ -130,6 +134,7 @@
v (-A+ v // preposition 'v' before a vowel v (-A+ v // preposition 'v' before a vowel
A) v (K w A) v (K w
K) v (K %u K) v (K %u
K) v (r v
L01) v (A v# L01) v (A v#
phsource/compile_report
+15 -5
View File
@@ -72,7 +72,7 @@ consonants 11 119
fa 9 112 fa 9 112
rw 15 132 rw 15 132
prs 8 113 prs 8 113
sl 10 137 sl 11 137
gd 6 109 gd 6 109
nso 12 113 nso 12 113
ht 11 146 ht 11 146
@@ -741,6 +741,7 @@ r3/@tap [**] base
r3/@tap2 [**] base r3/@tap2 [**] base
[*] ko [*] ko
r3/@tap_rfx [r.] base r3/@tap_rfx [r.] base
r3/@tap_rfx_ [r.] base
r/a_ [r] da r/a_ [r] da
[3-] da [3-] da
r/aa [R] da r/aa [R] da
@@ -987,7 +988,6 @@ ustop/q_u [q] base
ustop/t [t] base ustop/t [t] base
[t] en-us [t] en-us
[d.#] hi [d.#] hi
[t.#] hi
[d.#] ml [d.#] ml
[t] zhy [t] zhy
[t] da [t] da
@@ -1018,6 +1018,7 @@ ustop/t_hi [t[] base
[t^] et [t^] et
[t[] vi [t[] vi
[t`] am [t`] am
ustop/th_rfx [t.#] hi
ustop/t_pzd [c] base ustop/t_pzd [c] base
[t^] et [t^] et
[t;] lt [t;] lt
@@ -1048,10 +1049,13 @@ ustop/tsh [tS] base
[c] zhy [c] zhy
[tS] tn [tS] tn
ustop/tsh_ [tS] base ustop/tsh_ [tS] base
[c] hi
[tS] bn
[c] zhy [c] zhy
[tS] tn [tS] tn
ustop/tsh2 [tS] hr ustop/tsh2 [tS] hr
[dZ] hr [dZ] hr
ustop/tsh_asp [tS#] bn
ustop/t_short [t-] consonants ustop/t_short [t-] consonants
[t] fr [t] fr
[t2] fr [t2] fr
@@ -1062,7 +1066,8 @@ ustop/t_short_ [t] fr
ustop/tsh_pzd [tS;h] zh ustop/tsh_pzd [tS;h] zh
ustop/tsh_pzd_unasp [tS;] zh ustop/tsh_pzd_unasp [tS;] zh
ustop/tsh_sr [tS] sr ustop/tsh_sr [tS] sr
ustop/tsh_unasp [tS`] am ustop/tsh_unasp [c] hi
[tS`] am
ustop/ts_pzd [tS;] base ustop/ts_pzd [tS;] base
[J#] hi [J#] hi
[J#] ml [J#] ml
@@ -1669,6 +1674,7 @@ vowel/a_2 [a] base2
[a] rw [a] rw
vowel/a#_2 [A] nl vowel/a#_2 [A] nl
[a:] nl [a:] nl
[a] bn
[a] kn [a] kn
[a#] pl [a#] pl
[&] hr [&] hr
@@ -1828,6 +1834,7 @@ vowel/e [e] base
[?e] da [?e] da
[e] rw [e] rw
[e#] rw [e#] rw
[e:] sl
[e] wo [e] wo
[e:] wo [e:] wo
[e] dv [e] dv
@@ -2033,8 +2040,7 @@ vowel/i_5 [i:] en-sc
vowel/i#_5 [y] pt-pt vowel/i#_5 [y] pt-pt
[i/] pt-pt [i/] pt-pt
[y] ro [y] ro
vowel/i_6 [i] hi vowel/i_6 [i] bn
[i] bn
[i] ta [i] ta
[i] kn [i] kn
[i] ml [i] ml
@@ -2119,12 +2125,14 @@ vowel/ii_5 [i] ta
vowel/ii_6 [I] en-wm vowel/ii_6 [I] en-wm
[I] en-wi [I] en-wi
[I2] en-wi [I2] en-wi
[i] hi
[I] sr [I] sr
[I] pt [I] pt
[y] pt [y] pt
[i/] pt [i/] pt
[i] is [i] is
[I] sq [I] sq
[i] sl
[i] wo [i] wo
vowel/ii_7 [i] en vowel/ii_7 [i] en
[i] ga [i] ga
@@ -2466,12 +2474,14 @@ vowel/V_2 [V] en
[V#] ru [V#] ru
[V] ku [V] ku
vowel/V_3 [V] en-rp vowel/V_3 [V] en-rp
[@] hi
[V] hi [V] hi
[V] pa [V] pa
[V] ta [V] ta
[a] bg [a] bg
vowel/V_4 [V] en-sc vowel/V_4 [V] en-sc
[O] ga [O] ga
[V] hi
[V] da [V] da
[?V] da [?V] da
vowel/V_6 [V] en-us vowel/V_6 [V] en-us
phsource/ph_bengali
+25 -2
View File
@@ -32,6 +32,9 @@ endphoneme
phoneme a phoneme a
vowel starttype #a endtype #a vowel starttype #a endtype #a
length 225 length 225
IF thisPh(isWordEnd) AND thisPh(isUnstressed) THEN
FMT(vowel/a#_2)
ENDIF
FMT(vowel/a_3) FMT(vowel/a_3)
endphoneme endphoneme
@@ -82,15 +85,35 @@ endphoneme
phoneme tS phoneme tS
import_phoneme base/tS vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_)
ENDIF
WAV(ustop/tsh_)
endphoneme endphoneme
phoneme tS# phoneme tS#
import_phoneme base/tS vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_asp)
ENDIF
WAV(ustop/tsh_asp, 120)
endphoneme endphoneme
phoneme ~ phoneme ~
virtual virtual
endphoneme endphoneme
phsource/ph_german
+3 -3
View File
@@ -126,9 +126,9 @@ phoneme i:
VowelStart(w/wi2) VowelStart(w/wi2)
ENDIF ENDIF
IF nextPh(r) AND next2Ph(isNotVowel) THEN // IF nextPh(r) AND next2Ph(isNotVowel) THEN
// ChangePhoneme(iR) // ChangePhoneme(iR)
ENDIF // ENDIF
FMT(vowel/i_2) FMT(vowel/i_2)
endphoneme endphoneme
@@ -346,7 +346,7 @@ phoneme iR // TEST "vier" = [f'iR] not successful
vowel starttype #i endtype #@ vowel starttype #i endtype #@
ipa iɐ ipa iɐ
flag1 flag1
length 230 length 240
FMT(vdiph2/i@_3) FMT(vdiph2/i@_3)
endphoneme endphoneme
phsource/ph_hindi
+41 -19
View File
@@ -16,13 +16,16 @@ phoneme @
IF nextPh(H) OR prevPh(H) THEN IF nextPh(H) OR prevPh(H) THEN
FMT(vowel/@_low) FMT(vowel/@_low)
ENDIF ENDIF
IF nextPh(j) THEN
FMT(vowel/V_3)
ENDIF
FMT(vowel/@_bck) FMT(vowel/@_bck)
endphoneme endphoneme
phoneme V phoneme V
vowel flag1 starttype #@ endtype #@ vowel flag1 starttype #@ endtype #@
length 130 length 140
IF thisPh(isWordStart) THEN IF thisPh(isWordStart) THEN
FMT(vowel/V_3) FMT(vowel/V_3)
@@ -30,12 +33,14 @@ phoneme V
ENDIF ENDIF
IF thisPh(isNotStressed) THEN IF thisPh(isNotStressed) THEN
IF prevPh(H) THEN length 130
ChangePhoneme(@)
IF thisPh(isWordEnd) AND NOT thisPh(isFirstVowel) THEN
ChangePhoneme(NULL)
ENDIF ENDIF
IF thisPh(isWordEnd) THEN IF prevPh(H) THEN
ChangePhoneme(NULL) ChangePhoneme(@)
ENDIF ENDIF
IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN
@@ -45,20 +50,22 @@ phoneme V
ChangePhoneme(NULL) ChangePhoneme(NULL)
ENDIF ENDIF
ENDIF ENDIF
ENDIF
IF prevPh(isPalatal) THEN IF prevPh(isPalatal) AND NOT nextPh(H) THEN
ChangePhoneme(@3) ChangePhoneme(@3)
ELSEIF prevPh(r) THEN ELSEIF prevPh(r) THEN
ChangePhoneme(@2) ChangePhoneme(@2)
ELSE ELSE
IF thisPh(isNotStressed) THEN
ChangePhoneme(@) ChangePhoneme(@)
ENDIF ENDIF
ENDIF
IF nextPh(H) OR prevPh(H) THEN IF nextPh(H) OR prevPh(H) THEN
FMT(vowel/@_low) FMT(vowel/@_low)
ENDIF ENDIF
IF prevPh(w) THEN
FMT(vowel/V_4)
ENDIF ENDIF
FMT(vowel/V_3) FMT(vowel/V_3)
@@ -84,6 +91,9 @@ endphoneme
phoneme i: phoneme i:
vowel long starttype #i endtype #i vowel long starttype #i endtype #i
length 230 length 230
IF thisPh(isUnstressed) THEN
ChangePhoneme(i)
ENDIF
IfNextVowelAppend(;) IfNextVowelAppend(;)
FMT(vowel/i_fnt) FMT(vowel/i_fnt)
endphoneme endphoneme
@@ -92,7 +102,7 @@ phoneme i // as [i:] but not marked as 'long'
vowel starttype #i endtype #i vowel starttype #i endtype #i
length 230 length 230
IfNextVowelAppend(;) IfNextVowelAppend(;)
FMT(vowel/i_6) FMT(vowel/ii_6)
endphoneme endphoneme
phoneme I phoneme I
@@ -110,7 +120,7 @@ endphoneme
phoneme e phoneme e
vowel starttype #e endtype #e vowel starttype #e endtype #e
length 130 length 140
FMT(vowel/e_2) FMT(vowel/e_2)
endphoneme endphoneme
@@ -122,7 +132,7 @@ endphoneme
phoneme E phoneme E
vowel starttype #e endtype #e vowel starttype #e endtype #e
length 130 length 140
FMT(vowel/e_mid) FMT(vowel/e_mid)
endphoneme endphoneme
@@ -135,7 +145,7 @@ endphoneme
phoneme a: phoneme a:
vowel long starttype #a endtype #a vowel long starttype #a endtype #a
length 190 length 200
IF nextPhW(j) THEN IF nextPhW(j) THEN
FMT(vowel/a_5) FMT(vowel/a_5)
ENDIF ENDIF
@@ -144,7 +154,7 @@ endphoneme
phoneme a phoneme a
vowel long starttype #a endtype #a vowel long starttype #a endtype #a
length 130 length 140
FMT(vowel/a#_3) FMT(vowel/a#_3)
endphoneme endphoneme
@@ -157,7 +167,7 @@ endphoneme
phoneme o phoneme o
vowel starttype #o endtype #o vowel starttype #o endtype #o
length 130 length 140
FMT(vowel/o) FMT(vowel/o)
endphoneme endphoneme
@@ -170,14 +180,14 @@ endphoneme
phoneme O phoneme O
vowel starttype #o endtype #o vowel starttype #o endtype #o
length 130 length 140
FMT(vowel/0) FMT(vowel/0)
endphoneme endphoneme
phoneme U phoneme U
vowel starttype #u endtype #u vowel starttype #u endtype #u
length 120 length 140
FMT(vowel/uu_bck) FMT(vowel/uu_bck)
endphoneme endphoneme
@@ -388,8 +398,11 @@ phoneme t.#
voicingswitch d.# voicingswitch d.#
Vowelin f1=0 f2=1800 -300 300 f3=-400 80 Vowelin f1=0 f2=1800 -300 300 f3=-400 80
Vowelout f1=0 f2=1800 -300 250 f3=-400 80 rms=20 colr=2 Vowelout f1=0 f2=1800 -300 250 f3=-400 80 rms=20 colr=2
// WAV(ustop/th_rfx)
WAV(ustop/t) IF nextPhW(t.#) THEN
ChangePhoneme(t.)
ENDIF
WAV(ustop/th_rfx)
endphoneme endphoneme
phoneme d. phoneme d.
@@ -437,10 +450,19 @@ endphoneme
// also try [tS] and [dZ] // also try [tS] and [dZ]
phoneme c phoneme c
import_phoneme base/c vls pla afr sibilant
voicingswitch dZ
lengthmod 2
Vowelin f1=0 f2=2300 200 400 f3=-100 80
IF nextPh(isPause2) THEN
WAV(ustop/tsh_)
ENDIF
WAV(ustop/tsh_unasp)
endphoneme endphoneme
phoneme c# phoneme c#
CALL base/tS; CALL base/tS;
ipa cU+02B0 ipa cU+02B0
phsource/ph_slovenian
+9
View File
@@ -9,6 +9,9 @@ phoneme i
vowel starttype #i endtype #i vowel starttype #i endtype #i
length 140 length 140
IfNextVowelAppend(;) IfNextVowelAppend(;)
IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
FMT(vowel/ii_6)
ENDIF
FMT(vowel/ii_3) FMT(vowel/ii_3)
endphoneme endphoneme
@@ -33,6 +36,12 @@ phoneme e
FMT(vowel/e_2) FMT(vowel/e_2)
endphoneme endphoneme
phoneme e:
vowel starttype #e endtype #e
length 240
FMT(vowel/e)
endphoneme
phoneme E phoneme E
vowel starttype #e endtype #e vowel starttype #e endtype #e
phsource/phonemes
+4
View File
@@ -907,6 +907,10 @@ phoneme r. // retroflex
lengthmod 3 lengthmod 3
Vowelout f1=3 f2=1400 -400 300 f3=-400 80 rms=35 len=15 colr=2 Vowelout f1=3 f2=1400 -400 300 f3=-400 80 rms=35 len=15 colr=2
Vowelin f1=2 f2=1400 -400 300 f3=-400 80 len=20 Vowelin f1=2 f2=1400 -400 300 f3=-400 80 len=20
IF nextPh(isNotVowel) THEN
FMT(r3/@tap_rfx_)
ENDIF
FMT(r3/@tap_rfx) FMT(r3/@tap_rfx)
endphoneme endphoneme
platforms/windows/make_espeak.iss
+5 -1
View File
@@ -2,7 +2,7 @@
[Setup] [Setup]
AppName=eSpeak AppName=eSpeak
AppVerName=eSpeak version 1.47.08 AppVerName=eSpeak version 1.47.09
AppCopyright=Licensed under GNU General Public License version 3. (See file License.txt for details). AppCopyright=Licensed under GNU General Public License version 3. (See file License.txt for details).
WindowVisible=yes WindowVisible=yes
@@ -107,6 +107,10 @@ ne.v1=भित्र्याउन चाहेको आवाजको च
ne.v2=अथवा यसमा निर्धारण गरिएको आवाजलाई नै चयन गर्ने हो भने ईन्टर कुञ्जीलाई दबाउनु होस् । ne.v2=अथवा यसमा निर्धारण गरिएको आवाजलाई नै चयन गर्ने हो भने ईन्टर कुञ्जीलाई दबाउनु होस् ।
ne.v3=आवाजको नाम प्रविष्टी गर्नु होस् , जस्तै: नेपालीका लागि ne, अथवा स्वरको पनि चयन गर्ने हो भने ne+f3 ne.v3=आवाजको नाम प्रविष्टी गर्नु होस् , जस्तै: नेपालीका लागि ne, अथवा स्वरको पनि चयन गर्ने हो भने ne+f3
hi.v1=स्थापना करने के लिए पसन्दिदा आवाजों को चयन करें ।
hi.v2=अगर आप कि चयन इसमें निर्दारित आवाज हि हो तो केवल ईन्टर कुञ्जी दबाए ।
hi.v3=आवाज कि नाम प्रविष्टी करें, जैसा कि हिन्दी के लिए hi, और किसि स्वर भि चयन करना चाहते हो तो hi+f3
[Code] [Code]
var var
UILanguage: Integer; UILanguage: Integer;
platforms/windows/make_espeakedit.iss
+1 -1
View File
@@ -1,7 +1,7 @@
[Setup] [Setup]
AppName=eSpeakEdit AppName=eSpeakEdit
AppVerName=eSpeakEdit version 1.47.08 AppVerName=eSpeakEdit version 1.47.09
DefaultDirName={pf}\eSpeak DefaultDirName={pf}\eSpeak
DefaultGroupName=eSpeak DefaultGroupName=eSpeak
OutputBaseFilename=setup_espeakedit OutputBaseFilename=setup_espeakedit
src/dictionary.cpp
+3 -2
View File
@@ -2980,8 +2980,9 @@ int TransposeAlphabet(Translator *tr, char *text)
*p2++ = (acc << (8-bits)); *p2++ = (acc << (8-bits));
} }
*p2 = 0; *p2 = 0;
strcpy(text, buf); ix = p2 - buf;
return((p2 - buf) | 0x40); // bit 6 indicates compressed characters memcpy(text, buf, ix);
return(ix | 0x40); // bit 6 indicates compressed characters
} }
else else
{ {
src/extras.cpp
+2 -2
View File
@@ -1684,7 +1684,7 @@ void ConvertToUtf8()
while(!feof(f_in)) while(!feof(f_in))
{ {
c = fgetc(f_in); c = fgetc(f_in) & 0xff;
if(c >= 0xa0) if(c >= 0xa0)
c = translator->charset_a0[c-0xa0]; c = translator->charset_a0[c-0xa0];
@@ -1696,7 +1696,7 @@ void ConvertToUtf8()
wxLogStatus(_T("Written to: ")+fname+_T("_1")); wxLogStatus(_T("Written to: ")+fname+_T("_1"));
} // end of ConvertToItf8 } // end of ConvertToUtf8
//****************************************************************************************************** //******************************************************************************************************
src/readclause.cpp
+2
View File
@@ -92,6 +92,7 @@ static const unsigned short punct_chars[] = {',','.','?','!',':',';',
0x061f, // Arabic ? 0x061f, // Arabic ?
0x06d4, // Arabic . 0x06d4, // Arabic .
0x0df4, // Singhalese Kunddaliya
0x0f0d, // Tibet Shad 0x0f0d, // Tibet Shad
0x0f0e, 0x0f0e,
@@ -142,6 +143,7 @@ static const unsigned int punct_attributes [] = { 0,
CLAUSE_QUESTION, // Arabic question mark CLAUSE_QUESTION, // Arabic question mark
CLAUSE_PERIOD, // Arabic full stop CLAUSE_PERIOD, // Arabic full stop
CLAUSE_PERIOD+0x8000, // Singhalese period
CLAUSE_PERIOD+0x8000, // Tibet period CLAUSE_PERIOD+0x8000, // Tibet period
CLAUSE_PARAGRAPH, CLAUSE_PARAGRAPH,
src/synthdata.cpp
+2 -2
View File
@@ -35,8 +35,8 @@
#include "translate.h" #include "translate.h"
#include "wave.h" #include "wave.h"
const char *version_string = "1.47.08 26.Apr.13"; const char *version_string = "1.47.09 29.Apr.13";
const int version_phdata = 0x014701; const int version_phdata = 0x014709;
int option_device_number = -1; int option_device_number = -1;
FILE *f_logespeak = NULL; FILE *f_logespeak = NULL;
src/tr_languages.cpp
+2 -2
View File
@@ -79,7 +79,7 @@ ALPHABET alphabets [] = {
{"_ar", OFFSET_ARABIC, 0x600, 0x6ff, 0, 0}, {"_ar", OFFSET_ARABIC, 0x600, 0x6ff, 0, 0},
{"_dv", OFFSET_THAANA, 0x780, 0x7bf, 0, 0}, {"_dv", OFFSET_THAANA, 0x780, 0x7bf, 0, 0},
{"_hi", OFFSET_DEVANAGARI, 0x900, 0x97f,L('h','i'), AL_WORDS}, {"_hi", OFFSET_DEVANAGARI, 0x900, 0x97f,L('h','i'), AL_WORDS},
{"_bn", OFFSET_BENGALI, 0x0980, 0x9ff, L('b','n'), 0}, {"_bn", OFFSET_BENGALI, 0x0980, 0x9ff, L('b','n'), AL_WORDS},
{"_gur", OFFSET_GURMUKHI, 0xa00, 0xa7f, L('p','a'), AL_WORDS}, {"_gur", OFFSET_GURMUKHI, 0xa00, 0xa7f, L('p','a'), AL_WORDS},
{"_gu", OFFSET_GUJARATI, 0xa80, 0xaff, 0, 0}, {"_gu", OFFSET_GUJARATI, 0xa80, 0xaff, 0, 0},
{"_or", OFFSET_ORIYA, 0xb00, 0xb7f, 0, 0}, {"_or", OFFSET_ORIYA, 0xb00, 0xb7f, 0, 0},
@@ -87,7 +87,7 @@ ALPHABET alphabets [] = {
{"_te", OFFSET_TELUGU, 0xc00, 0xc7f, L('t','e'), 0}, {"_te", OFFSET_TELUGU, 0xc00, 0xc7f, L('t','e'), 0},
{"_kn", OFFSET_KANNADA, 0xc80, 0xcff, L('k','n'), AL_WORDS}, {"_kn", OFFSET_KANNADA, 0xc80, 0xcff, L('k','n'), AL_WORDS},
{"_ml", OFFSET_MALAYALAM,0xd00, 0xd7f, L('m','l'), AL_WORDS}, {"_ml", OFFSET_MALAYALAM,0xd00, 0xd7f, L('m','l'), AL_WORDS},
{"_si", OFFSET_SINHALA, 0xd80, 0xdff, 0, 0}, {"_si", OFFSET_SINHALA, 0xd80, 0xdff, L('s','i'), AL_WORDS},
{"_th", OFFSET_THAI, 0xe00, 0xe7f, 0, 0}, {"_th", OFFSET_THAI, 0xe00, 0xe7f, 0, 0},
{"_lo", OFFSET_LAO, 0xe80, 0xeff, 0, 0}, {"_lo", OFFSET_LAO, 0xe80, 0xeff, 0, 0},
{"_ti", OFFSET_TIBET, 0xf00, 0xfff, 0, 0}, {"_ti", OFFSET_TIBET, 0xf00, 0xfff, 0, 0},