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

Merge remote-tracking branch 'ValdisVitolins/master'

master
Reece H. Dunn 8 years ago
parent
fc7a94dcf1 824e55b855
commit
9d885c89fd
7 changed files with 85 additions and 30 deletions
Split View Show Diff Stats
  1. 4
    0
      dictsource/lv_list
  2. 56
    20
      dictsource/lv_rules
  3. 9
    5
      docs/dictionary.md
  4. 5
    2
      espeak-ng-data/voices/bat/lv
  5. 8
    0
      phsource/ph_latvian
  6. 1
    1
      src/libespeak-ng/voices.c
  7. 2
    2
      src/libespeak-ng/wavegen.c

+ 4
- 0
dictsource/lv_list View File

@@ -546,7 +546,10 @@ franko $alt
frikasē $alt $3
galifē $alt $3
geto $alt
go $alt
google $alt
halo $alt
hallo $alt
hugo $alt
indigo $alt
info $alt
@@ -587,6 +590,7 @@ odo $alt
odoo $alt
ohaio $alt
oho $alt
ok $alt
ontārio $alt $2
oracle $alt
oregano $alt $3

+ 56
- 20
dictsource/lv_rules View File

@@ -38,6 +38,8 @@
.L17 ai ais am ā ām ās ie iem o os // suffixes of certain adjectives finishing with ..ējais
.L18 am āk i u ot ēt os // suffixes of adverbs (apstākļa vārdi)

.L20 ~ ne // optional negation prefix

// +---------------------------+
// | Pronunciation of e and ē |
// +---------------------------+
@@ -46,7 +48,7 @@
.L21 i ī ie ei y // vowel narrowers of e
.L22 č ģ j k ļ ņ ŗ š ž dž bj pj mj vj // consonant narrowers of e
.L23 s i m // remaining ending of the 2. and 5. decl. words
.L27 č e ē f ģ h ḩ i ī j k ļ ņ q ŗ š w x y ž ei ie iu // all narrowers of e
.L27 č e ē f ģ h ḩ i ī j k ļ ņ q ŗ š w x y ž ei ie iu // all narrowers of e
// Also: .L41 — international consonants and diphthongs as a narrowers of e/ē

// E wideners
@@ -64,7 +66,7 @@

// Default rules for o with succeeding consonants
.L40 č ģ ķ ļ ņ ŗ š ž // uo indicators — o is spelled as uo in words with Latvian soft consonants
.L41 eo f h ḩ io y q w x // o indicators — o is spelled as ȯ in words with Latin letters, also narrowers of e/ē
.L41 eo f h ḩ io iē y q w x // o indicators — o is spelled as ȯ in words with Latin letters, also narrowers of e/ē
.L42 e i o ng // o prefixes (no a, because of sao.., pao... where o is uo)
.L43 lg ng rb zn ļš ss // o postfixes
.L44 gļ kļ šņ jā // uo postfixes
@@ -173,8 +175,8 @@
dž (L61 DZ

.group e
e e // Default as narrow e
ee e_|e // internationalisms
e e // Default as narrow e
ee e_|e // internationalisms, prefix: ne-e...
ei ei

// narrow e ---------------------------------------------------------------------- //
@@ -185,7 +187,7 @@
e (L10L10L41+ e
e (L10L41++ e
e (L41+++ e
L41) e (@ e // narrow only if there is another syllable for ending
L41) e (@ e // narrow only if there is another syllable for ending
L41L10) e (@ e
L41L10L10) e (@< e
L41L10L10L10) e (@<< e
@@ -212,6 +214,14 @@ L41L10L10L10) e (@<< e
@) e (rL02_ e // -ris
@) e (rL05_ e // -re

e (CL05_ e // 5. decl. words
e (CCL05_< e
e (CCCL05_<< e
e (L10L05_+ e
e (L10L10L05_ e
e (L10L10L10L05_< e
e (L10L10L10L10L05_<< e

// wide e ------------------------------------------------------------------------ //
// widening consonants follow
e (L25 E
@@ -228,6 +238,7 @@ L41L10L10L10) e (@<< e
L25) e (L18_+ E // vareni etc.

// specific words ----------------------------------------------------------------- //
// āb) e (L77L05_ e // ābele
b) e (dL82L05_ e // bedre
_b) e (t_ e
_b) e (z e
@@ -243,11 +254,11 @@ L41L10L10L10) e (@<< e
_) e (lgL04_ e // Elga
_) e (lzL04_ e // Elza
ene (r ene
_) e (sam_+ e // esam
_) e (sat_+ e // esat
_L20) e (sam_+ e // esam
_L20) e (sat_+ e // esat
_) e (s_ e // es
_) e (si_ e // esi
_) e (smu_ e // esmu
_L20) e (si_ e // esi
_L20) e (smu_ e // esmu
g) e (t e
ģ) enē (z ene:
int) e (r e
@@ -280,20 +291,23 @@ L41L10L10L10) e (@<< e
_v) e (ltL04_ e // Velta
_z) e (lmL04_ e // Zelma
_z) e (m e
// z) eme (L80L05_ 'e'me // zemene

.group ē
ē e: // Default as narrow ē
i) ē (++ e:

// narrow ē ---------------------------------------------------------------------- //
// narrowing international consonants
ē (L10L10L10L41 e:
ē (L10L10L41 e:
ē (L10L41 e:
ē (L41+ e:
L41) ē (@ e: // narrow only if there is another syllable for ending
ē (L10L10L10L41 e:
ē (L10L10L41 e:
ē (L10L41 e:
ē (L41+ e:
L41) ē (@ e: // narrow only if there is another syllable for ending
L41L10) ē (@ e:
L41L10L10) ē (@< e:
L41L10L10L10) ē (@<< e:
L41L10L10L10L10) ē (@<<< e:
// narrowing vowels follow
ē (CCCCL21 e:
ē (CCCL21 e:
@@ -337,11 +351,20 @@ L41L10L10L10) ē (@<< e:
ē (L01_ E:
ē (L25L01_ E:
ē (L25L25L01_ E:
// 5. dec. words
ē (CL05_ e:
ē (CCL05_< e:
ē (CCCL05_<< e:
ē (L10L05_+ e:
ē (L10L10L05_ e:
ē (L10L10L10L05_< e:
ē (L10L10L10L10L05_<< e:


// specific words ------------------------------------------------------------------- //
b) ē (g@ e:
cilv) ē (L75 E:
_d) ē (ļ_ e:
d) ē (ļ_+ e:
d) ē (vē e:
dv) ēse (L77 e:se
ēdē e:de:
@@ -352,7 +375,6 @@ L41L10L10L10) ē (@<< e:
ē (tL55_ E:
izp) ē (t e:
_kāp) ē (c_ e: // kāpēc
m) ēbe (L77 e:be
m) ēne (L83L01_ e:ne // mēness
m) ēne (L83L02_ e:ne // mēnesis
m) ē (rķ e:
@@ -368,6 +390,7 @@ L41L10L10L10) ē (@<< e:
sp) ē (kL01 E: // ..spēks
sp) ē (L65 e: // spēt
sp) ē (L77 e:
sv) ē (tk E:
šķ) ē (L77L05_ e: // šķēle
šķ) ē (L82L05_ e: // šķēre
_tāp) ē (c_ e: // tāpēc
@@ -445,7 +468,7 @@ L41L10L10L10) ē (@<< e:
_C) o (_+ o` // shorter version of uo for particles
o) o o: // in ..oo.. second o is spelled as ō
o ($w_alt++ o // $alt words in lv_list are spelled as o
o (_$w_alt1+ o: // o at the end of internationalisms ($alt1) words is spelled as ō
o (_$w_alt1++ o: // o at the end of internationalisms ($alt1) words is spelled as ō
L56) o (_ o: // ō at the end of ..ao, ..eo, ..io, ..uo
L42) o o: // o prefixes
o (L43+ o // o postfixes
@@ -540,9 +563,10 @@ L46L45L45) o (<< uo
oL10L10) o (lL01_< o:
oL10) o (lL01_ o:

L41L10L10L10sk) o (pL01_ o: // ...skops
L41L10L10sk) o (pL01_ o:
L41L10sk) o (pL01_ o:
o (L62% o




aer) o o:
agn) o o
@@ -595,6 +619,7 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
ekspl) o o
ekvin) o o
elektr) o o:
ez) o o>
energ) o o:
enL87) o o
ent) o (@ o
@@ -609,6 +634,7 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
gn) o o
g) o (L66 o:
gon) o o
iez) o uo
ilg) o (L80L02_ uo // Ilgonis
_ind) o o
indukt) o o
@@ -621,6 +647,7 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
iv) o o
iz) o o
jān) o (+ uo
j) o (L90++ uo
_j) o (_ uo
kaif) o (L65 uo
kain) o o
@@ -678,6 +705,7 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
niek) o uo
nik) o o
_n) o (L41 uo
n) o (L88 uo
okean) o o
okt) o o:
o (L50 o
@@ -1163,6 +1191,7 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
rib) on (uk on
s) on on
sp) on on
t) on (edēļ uon
_t) on (ijL04_ on // Tonija
t) on (ikL04_ o:n // ..tonika
t) on (isk o:n
@@ -1182,6 +1211,11 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
z) oo oo:

.group op

L41L10L10L10sk) op (L01_ o: // ...skops
L41L10L10sk) op (L01_ o:
L41L10sk) op (L01_ o:

ad) op op
cikl) op (L01_ o:p // ciklops
d) op op
@@ -1254,6 +1288,7 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
_b) or (isL01_ oR // Boriss
b) or (s o:R
b) or (t oR
dat) or o:R
d) or (i oR
_gl) or (ijL04_ o:R // Glorija
gl) or (i oR
@@ -1384,6 +1419,7 @@ L41L10L10L10sk) o (pL01_ o: // ...skops
š) os (ej os
_t) os (te os
_t) os (tL01_ os // tosts
_z) os (L06_ uos // zoss

.group ot
an) ot ot

+ 9
- 5
docs/dictionary.md View File

@@ -119,7 +119,8 @@ and then the single-letter group. The highest scoring rule in either of
those two groups is used.

`~` Letter in letter group means, that there can be no letter in this group
at the beginning or end of the word.
at the beginning or end of the word.
Beware of [issue #196](https://github.com/espeak-ng/espeak-ng/issues/196).

_For example:_

@@ -197,7 +198,7 @@ translation rules and spoken with English phonemes.
| `K` | Not a vowel (i.e. a consonant or word boundary or non-alphabetic character). |
| `X` | There is no vowel until the word boundary. |
| `Z` | A non-alphabetic character. |
| `%` | Doubled (placed before a character in \<pre\> and after it in \<post\>. |
| `%` | Doubled (placed before a character in \<pre\> and after it in \<post\>. (Beware of [bug #195](https://github.com/espeak-ng/espeak-ng/issues/195)) |
| `/` | The following character is treated literally. |
| `\xxx` | Character is written as by 3 digit octal value of `xxx`|
| `@` | One syllable (i.e. at least one vowel or diphthong) |
@@ -243,7 +244,7 @@ rule with more syllables.
|-------------|-------------|
| `+` | Force an increase in the score in this rule by 20 points (may be repeated for more effect). |
| `<` | Force a decrease in the score in this rule by 20 points (may be repeated for more effect). |
| `J_xxx` | Skip letters of current word till to the end, and check starting `xxx` letters for the next word. |
| `Jxxx` | (If `_` is set, skip letters of current word till to the end and) check starting `xxx` letters for the next word. |
| `S<number>` | This number of matching characters are a standard suffix, remove them and retranslate the word. |
| `P<number>` | This number of matching characters are a standard prefix, remove them and retranslate the word. |
| `Lnn` | `nn` is a 2-digit decimal number in the range 01 to 20 Matches with any of the letter sequences which have been defined for letter group `nn` |
@@ -255,8 +256,11 @@ rule with more syllables.

e.g.

_) un (i ju: // ... except in words starting "uni"
_) un (inP2 ,Vn // ... but it is for words starting "unin"
_) un (i ju: // ... except in words starting "uni"
_) un (inP2 ,Vn // ... but it is for words starting "unin"
a (J_get u // for `ada get` will say `uda get`
a (Jset e // for `ada set` will say `ade set`


`S` and `P` must be at the end of the \<post\> string.


+ 5
- 2
espeak-ng-data/voices/bat/lv View File

@@ -5,7 +5,10 @@ maintainer Valdis Vitolins <[email protected]>
status mature
words 0 2
pitch 64 118
breath 5 2 0 0 0 1
breathw 20 40 500 1200
formant 1 95 100 100 -5
//tunes s5 c5 q5 e5
tone 80 100 600 250 900 240 1400 100
stressAmp 14 10 10 8 0 0 22 15
tone 150 220 450 255 850 10 3500 255
stressAmp 14 10 10 8 0 0 20 15
stressLength 180 180 180 160 0 0 230 180

+ 8
- 0
phsource/ph_latvian View File

@@ -158,6 +158,14 @@ phoneme tS
WAV(ustop/tsh,40)
endphoneme

phoneme n-
vowel starttype #a endtype #a
ipa nU+0329
lengthmod 4
length 120
FMT(n/n-syl)
endphoneme

phoneme R // Latvian hard r
liquid
trill

+ 1
- 1
src/libespeak-ng/voices.c View File

@@ -408,7 +408,7 @@ void VoiceReset(int tone_only)
voice->height[pk] = default_heights[pk]*2;
voice->width[pk] = default_widths[pk]*2;
voice->breath[pk] = 0;
voice->breathw[pk] = breath_widths[pk]; // default breath formant woidths
voice->breathw[pk] = breath_widths[pk]; // default breath formant widths
voice->freqadd[pk] = 0;

// adjust formant smoothing depending on sample rate

+ 2
- 2
src/libespeak-ng/wavegen.c View File

@@ -638,7 +638,7 @@ static void SetBreath()
for (pk = 1; pk < N_PEAKS; pk++) {
if (wvoice->breath[pk] != 0) {
// breath[0] indicates that some breath formants are needed
// set the freq from the current ynthesis formant and the width from the voice data
// set the freq from the current synthesis formant and the width from the voice data
setresonator(&rbreath[pk], peaks[pk].freq >> 16, wvoice->breathw[pk], 0);
}
}
@@ -727,7 +727,7 @@ int Wavegen()
for (h = 1; h < N_LOWHARM && h <= maxh2 && h <= maxh; h++)
harmspect[h] += harm_inc[h];

// bring automctic gain control back towards unity
// bring automatic gain control back towards unity
if (agc < 256) agc++;
}


Write Preview
Loading…
Cancel
Save