mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-13 09:14:12 +00:00
Merge branch 'master' into build
Conflicts: src/Makefile.espeakedit
This commit is contained in:
+36
-32
@@ -111,9 +111,9 @@ _19 n'ed@-n
|
||||
_2X t'y:w
|
||||
_3X tR'&#Dv@ //PB [tR'ADv@] changed to [tR'&#Dv@]
|
||||
_4X f'WRV //PB [f'W:*3] changed to [ f'WRV]
|
||||
_5X hal't*es
|
||||
_5X h&l't*es // PB [a] changed to [&]
|
||||
_6X t*'es
|
||||
_7X halfj'&rs
|
||||
_7X h&lfj'&rs // PV a changed to &
|
||||
_8X f'irs
|
||||
_9X h&lf'Ems // PB a changed to &
|
||||
_0C h'un*@:D
|
||||
@@ -163,6 +163,8 @@ en e:n $u
|
||||
et ed $u
|
||||
her $u
|
||||
kun $u
|
||||
vel $u+
|
||||
da $u
|
||||
|
||||
// conjunctions
|
||||
og V $u+ $pause // and
|
||||
@@ -187,6 +189,7 @@ med $u+ // with
|
||||
af & // PB changed from [a?] to [&] - sound too short in a sentence
|
||||
// Also removed $u from 'af' and other words. They disappeared.
|
||||
ad &: // PB added 'ad'
|
||||
ad &D $atend $sentence // PB "Det må ikke skille os ad."
|
||||
at &: $u // PB changed from [at] to [&:]
|
||||
hos // at - PB: removed [$u+]
|
||||
som sVm // which / that - PB: removed [$u+]
|
||||
@@ -257,7 +260,7 @@ f Ef
|
||||
g ge:
|
||||
h hO:
|
||||
_i i:
|
||||
j joD
|
||||
j jVD // PB changed from [o]
|
||||
k kO:
|
||||
l El
|
||||
m Em
|
||||
@@ -316,7 +319,6 @@ interface _^_EN
|
||||
image _^_EN
|
||||
joke _^_EN
|
||||
joystick _^_EN
|
||||
junkie _^_EN
|
||||
laptop _^_EN
|
||||
level _^_EN
|
||||
login _^_EN
|
||||
@@ -335,13 +337,11 @@ password _^_EN
|
||||
penthouse _^_EN
|
||||
pickup _^_EN
|
||||
pidgin _^_EN
|
||||
producer _^_EN
|
||||
ranger _^_EN
|
||||
receiver _^_EN
|
||||
research _^_EN
|
||||
remake _^_EN
|
||||
roadie _^_EN
|
||||
roastbeef _^_EN
|
||||
run _^_EN
|
||||
scanner _^_EN
|
||||
science _^_EN
|
||||
@@ -356,7 +356,6 @@ small _^_EN
|
||||
snob _^_EN
|
||||
song _^_EN
|
||||
source _^_EN
|
||||
spam _^_EN
|
||||
spirit _^_EN
|
||||
squaw _^_EN
|
||||
sweatshirt _^_EN
|
||||
@@ -2344,7 +2343,7 @@ dessin des'EN $alt
|
||||
dioxin $alt
|
||||
disciplin $alt
|
||||
doktrin $alt
|
||||
(drive-in) drajv'in $alt
|
||||
//(drive-in) drajv'in $alt
|
||||
dusin $alt
|
||||
endokrin $alt
|
||||
endorfin $alt
|
||||
@@ -2398,7 +2397,6 @@ lupin $alt
|
||||
magasin $alt
|
||||
mandarin $alt
|
||||
mandolin $alt
|
||||
mannequin m&n@k'EN $alt
|
||||
margin $alt
|
||||
marin $alt
|
||||
marocain mAro'kEN $alt
|
||||
@@ -5046,6 +5044,7 @@ adstringer $alt
|
||||
adviser $alt
|
||||
advoker $alt
|
||||
afficer $alt
|
||||
aflever $alt
|
||||
afmarcher $alt
|
||||
afrikaniser $alt
|
||||
agere $alt
|
||||
@@ -5154,7 +5153,7 @@ banaliser $alt
|
||||
bandagere $alt
|
||||
banderolere $alt
|
||||
barbariser $alt
|
||||
barber $alt
|
||||
barbere $alt
|
||||
barder $alt
|
||||
barrier $alt
|
||||
barrikader $alt
|
||||
@@ -5179,7 +5178,7 @@ bonbonniere bVNbVNj'E:r $alt
|
||||
boniter $alt
|
||||
botaniser $alt
|
||||
braiser $alt
|
||||
briketter $alt
|
||||
brikettere $alt
|
||||
brillere $alt
|
||||
brochere $alt
|
||||
brodere $alt
|
||||
@@ -5188,7 +5187,7 @@ bronzere $alt
|
||||
brunere $alt
|
||||
brutaliser $alt
|
||||
bruyere bryj'E:r $alt
|
||||
budgetter $alt
|
||||
budgettere $alt
|
||||
bugser $alt
|
||||
bureaukratiser $alt
|
||||
cadmier $alt
|
||||
@@ -5274,7 +5273,7 @@ deputer $alt
|
||||
dereguler $alt
|
||||
deriver $alt
|
||||
desarmer $alt
|
||||
deserter $alt
|
||||
desertere $alt
|
||||
designere $alt
|
||||
desinficer $alt
|
||||
destiller $alt
|
||||
@@ -5434,7 +5433,7 @@ farser $alt
|
||||
fasciner $alt
|
||||
favoriser $alt
|
||||
feminiser $alt
|
||||
ferier $alt
|
||||
feriere $alt
|
||||
fermenter $alt
|
||||
ferniser $alt
|
||||
fertiliser $alt
|
||||
@@ -5550,7 +5549,7 @@ halver $alt
|
||||
harceler $alt
|
||||
harmoner $alt
|
||||
harmoniser $alt
|
||||
harpuner $alt
|
||||
harpunere $alt
|
||||
havarer $alt
|
||||
hektografer $alt
|
||||
herbariser $alt
|
||||
@@ -5669,7 +5668,7 @@ intriger $alt
|
||||
introducer $alt
|
||||
intuber $alt
|
||||
invader $alt
|
||||
invalider $alt
|
||||
invalidere $alt
|
||||
inventer $alt
|
||||
inverter $alt
|
||||
invester $alt
|
||||
@@ -5890,7 +5889,6 @@ laminer $alt
|
||||
lancer $alt
|
||||
lasere $alt
|
||||
latiniser $alt
|
||||
//lavere $alt
|
||||
lavpasteuriser $alt
|
||||
legaliser $alt
|
||||
leger $alt
|
||||
@@ -6119,7 +6117,7 @@ plakater $alt
|
||||
planere $alt
|
||||
plastificer $alt
|
||||
platiner $alt
|
||||
pletter $alt
|
||||
plettere $alt
|
||||
plisser $alt
|
||||
plomber $alt
|
||||
plæder $alt
|
||||
@@ -6153,7 +6151,7 @@ privileger $alt
|
||||
prober $alt
|
||||
problematiser $alt
|
||||
proceder $alt
|
||||
producer $alt
|
||||
producere $alt
|
||||
profaner $alt
|
||||
professionaliser $alt
|
||||
profeter $alt
|
||||
@@ -6190,7 +6188,7 @@ præferer $alt
|
||||
præjudicer $alt
|
||||
prækvalificer $alt
|
||||
præluder $alt
|
||||
præmier $alt
|
||||
præmiere $alt
|
||||
prænumerer $alt
|
||||
præparer $alt
|
||||
præsenter $alt
|
||||
@@ -6218,7 +6216,7 @@ ramponer $alt
|
||||
ranger $alt
|
||||
rappeller $alt
|
||||
rapportere $alt
|
||||
raser $alt
|
||||
rasere $alt
|
||||
ratificer $alt
|
||||
ratihaber $alt
|
||||
rationaliser $alt
|
||||
@@ -6256,7 +6254,7 @@ reimporter $alt
|
||||
reinvester $alt
|
||||
rejicer $alt
|
||||
rekapituler $alt
|
||||
reklamer $alt
|
||||
reklamere $alt
|
||||
rekognoscer $alt
|
||||
rekommander $alt
|
||||
rekompenser $alt
|
||||
@@ -6418,7 +6416,7 @@ stabiliser $alt
|
||||
staffer $alt
|
||||
stagner $alt
|
||||
standardiser $alt
|
||||
stationer $alt
|
||||
stationere $alt
|
||||
statuere $alt
|
||||
stenciler $alt
|
||||
stenografer $alt
|
||||
@@ -6492,9 +6490,9 @@ temperer $alt
|
||||
tender $alt
|
||||
teoretiser $alt
|
||||
termografer $alt
|
||||
terrasser $alt
|
||||
terrassere $alt
|
||||
terroriser $alt
|
||||
testamenter $alt
|
||||
testamentere $alt
|
||||
testere $alt
|
||||
tiere $alt
|
||||
titrer $alt
|
||||
@@ -6565,7 +6563,7 @@ verbaliser $alt
|
||||
verificer $alt
|
||||
verser $alt
|
||||
versificer $alt
|
||||
versioner $alt
|
||||
versionere $alt
|
||||
vibrer $alt
|
||||
vidimer $alt
|
||||
vikarier $alt
|
||||
@@ -10300,23 +10298,24 @@ også Vs@ // also
|
||||
idet id'e // in so far as
|
||||
bleg blaj
|
||||
blegrød blajrWD
|
||||
blegrøde blajrWD@
|
||||
//blege blaj@
|
||||
blegemiddel bl&#j@mid@l
|
||||
//blegansigt bl&#jansegt
|
||||
slags sl'ags // sort, type
|
||||
tre tr'e // the number 3
|
||||
barber bab'er // PB barber
|
||||
barbere bab'eV // PB barbere
|
||||
barberer bab'eV // PB barberer
|
||||
//barber bAb'er // PB barber
|
||||
//barbere bab'eV // PB barbere
|
||||
//barberer bab'eV // PB barberer
|
||||
//barberes bab'eVs // PB barberes
|
||||
barbererne bab'eVn@ // PB barberene
|
||||
barberenes bab'eVn@s // PB barberenes
|
||||
//barbererne bab'eVn@ // PB barberene
|
||||
//barberenes bab'eVn@s // PB barberenes
|
||||
rejicere rejis'eV // PB should not be pronounced [raje]
|
||||
rejicerer rejis'eV // PB
|
||||
rejiceres rejis'eVs // PB
|
||||
rejicering rejis'eRiN // PB
|
||||
gele sjel'e // PB gele
|
||||
géle sjel'e // PB géle
|
||||
gelé sjel'e // PB gelé
|
||||
geleen sjel'e@-n // PB geleen
|
||||
geleer sjel'e3 // PB geleer
|
||||
geleens sjel'e@-ns // PB geleens
|
||||
@@ -10361,6 +10360,7 @@ shampu Sjambo // PB Danish pronunciation - oo has been replaced b
|
||||
(tour de force) tu:@d@||'fV:s // PB
|
||||
(al qaeda) al||k'ajda // PB
|
||||
(force majeure) fVrs||,ma'sjW:r // PB
|
||||
(diner transportable) din'e|trANspVt'abl@ // PB
|
||||
(quiche lorraine) kiS||lor'E:n:
|
||||
(fait accompli) fEtakVmpl'i // PB
|
||||
wien v'i:n // PB Wien - the town of Vienna
|
||||
@@ -10406,6 +10406,8 @@ dna $abbrev
|
||||
sos $abbrev // PB the SOS signal
|
||||
pharm fA:rm? $hasdot // PB fx cand. pharm.
|
||||
phil fil/3 $hasdot // PB fx cand. phil.
|
||||
bh $abbrev
|
||||
(bh'er) b,e:h'O:V
|
||||
|
||||
// Try to catch errors
|
||||
|
||||
@@ -10439,6 +10441,7 @@ sig si $capital //PB Sig = si with capital S - Sig det med blom
|
||||
(vi steg) vi||st'e
|
||||
(de steg) di||st'e
|
||||
(alle steg) &l3||st'e
|
||||
steg sdaj $atend $sentence
|
||||
steget ste@d
|
||||
// PB problem with noun "hav" = ocean and verb "hav(e)" = to have [hAu]/[h&v]
|
||||
(et hav) ed||h'Au // PB "et hav" = an ocean - not "hav en god dag" - have a nice day
|
||||
@@ -10472,6 +10475,7 @@ legenderne leg'EndVn3s
|
||||
(så længe) sV||l'EN3
|
||||
(så må) sV||m'O
|
||||
(så har) sV||har
|
||||
så sV $sentence $atstart
|
||||
(virkede så) v'irkeD@||sV
|
||||
(kom så) kVm||sV
|
||||
(koste med) kosd@||mED
|
||||
|
||||
+618
-157
File diff suppressed because it is too large
Load Diff
@@ -62,7 +62,7 @@ W# y Y
|
||||
* - : ? b B d D
|
||||
dZ f g h j J k l
|
||||
l/2 l/3 m n N p r R
|
||||
s S t T tS v w
|
||||
s S t T tS v w z
|
||||
|
||||
|
||||
Dictionary hu_dict
|
||||
|
||||
@@ -792,6 +792,7 @@ chloroplast $1
|
||||
chocolate tS0kl@t
|
||||
cholera k0l@r@
|
||||
cholesterol k@lEst@r0l
|
||||
chorizo tSOr'i:zoU
|
||||
chromosome kroUm@soUm
|
||||
ciao tSaU
|
||||
cigar sI2gA@
|
||||
@@ -1003,6 +1004,7 @@ dose doUs
|
||||
dosage doUsI2dZ
|
||||
dramatic dr@matIk
|
||||
drawer drO@
|
||||
dreamt drEmpt
|
||||
drier draI3
|
||||
driest draI|@st
|
||||
duet dju:'Et
|
||||
@@ -1221,6 +1223,7 @@ havoc hav@k
|
||||
hasty heIstI
|
||||
hatred heItrI2d
|
||||
hazardous haz3d@s
|
||||
headfirst $2
|
||||
heh hEh
|
||||
hehe hi:h'i:
|
||||
heifer hEf@
|
||||
@@ -1492,6 +1495,7 @@ metaphor mEt@fO@
|
||||
metallic mEt'alIk
|
||||
miaou mi:'aU
|
||||
miaow mi:'aU
|
||||
mic maIk
|
||||
mica maIk@
|
||||
microorganism maIkroU'O@g@nIz@m
|
||||
midday m,Idd'eI
|
||||
@@ -1759,6 +1763,7 @@ preset pri:sEt
|
||||
prestige prEst'i:Z
|
||||
?3 pretense pri:tEns
|
||||
pretext pri:tEkst
|
||||
pretrial pri:tr'aI|@L
|
||||
pretty prItI
|
||||
privation praIv'eIS@n
|
||||
privilege prIvI2lI2dZ
|
||||
@@ -3096,6 +3101,7 @@ thy ,DaI
|
||||
thine ,DaIn
|
||||
|
||||
me ,mi: $only
|
||||
me mi: $atstart $atend
|
||||
him ,hIm $only
|
||||
us ,Vz $only
|
||||
us $abbrev $allcaps
|
||||
|
||||
+3
-3
@@ -24,7 +24,7 @@
|
||||
|
||||
// 2006-11-18 Gilles Casse <gcasse@oralux.org>
|
||||
//
|
||||
// Updated 2010-06-11 Michel Such <michel.such@free.fr>
|
||||
// Updated 2010-06-15 Michel Such <michel.such@free.fr>
|
||||
//
|
||||
// * Numbers, a few abbreviations and exceptions.
|
||||
//
|
||||
@@ -778,7 +778,7 @@ zut zyt
|
||||
exocet E2gzosEt
|
||||
fret fr'Et
|
||||
budget bydZE2
|
||||
hamlet hamlEt
|
||||
hamlet _|amlEt
|
||||
knesset knesEt
|
||||
lazaret lazarE2
|
||||
margaret margarEt
|
||||
@@ -884,7 +884,7 @@ contentions kO~tA~tjO~z2
|
||||
dations datjO~z2
|
||||
désertions dezErtjO~z2 $verb
|
||||
exploitions EksplwatjO~z2
|
||||
heurtions hYrtjO~z2
|
||||
heurtions _|WrtjO~z2
|
||||
partions partjO~z2
|
||||
rations ratjO~z2 $verb
|
||||
tentions tA~tjO~z2
|
||||
|
||||
+1460
-1457
File diff suppressed because it is too large
Load Diff
+1
-3
@@ -746,9 +746,7 @@
|
||||
r) u (_A u
|
||||
u (A_ 'u
|
||||
|
||||
ui 'uI
|
||||
ui (_ uI
|
||||
ui (s 'uI
|
||||
ui uI
|
||||
u (iu w
|
||||
u (iCK u
|
||||
uy uI
|
||||
|
||||
+3
-3
@@ -393,7 +393,7 @@
|
||||
_) ட (வல t.V
|
||||
_) ட (வர t.V
|
||||
_) ட (ேப t.
|
||||
_) ட (ாக்ஸி t.
|
||||
_) டாக (்ஸி t.a:k
|
||||
|
||||
.group ண
|
||||
ண n.V
|
||||
@@ -597,6 +597,7 @@
|
||||
_) த (ொம் d
|
||||
_) த (ோசை d
|
||||
_) த (ோஷ d
|
||||
_) த (ுபாய d
|
||||
//endsort
|
||||
|
||||
//sort
|
||||
@@ -671,6 +672,7 @@ _பார்வ) த (ி t
|
||||
ச) த (்ரு t
|
||||
த) த (்ரூப t
|
||||
பா) த (்ரூம t
|
||||
_ப) த (ஞ்சலி tV
|
||||
//endsort
|
||||
|
||||
|
||||
@@ -989,13 +991,11 @@ _முகத்தின்_) ப (ாவ b
|
||||
சிறு) ப (ிள்ளை p
|
||||
ஆண்) ப (ிள்ளை p
|
||||
பெண்) ப (ிள்ளை p
|
||||
பூம்) ப (ுகார p
|
||||
ம்) ப (ுரா b
|
||||
இன்) ப (ுற b
|
||||
_துன்) ப (ுற b
|
||||
ப (ுறK p
|
||||
மண்) ப (ுழு p
|
||||
பூம்) ப (ுஹார p
|
||||
ம்) ப (ூர b
|
||||
ராம்) ப (ூர p
|
||||
அ) ப (ூர்வ b
|
||||
|
||||
Reference in New Issue
Block a user