diff --git a/dictsource/lv_list b/dictsource/lv_list index 4567de78..97ae44a4 100644 --- a/dictsource/lv_list +++ b/dictsource/lv_list @@ -250,9 +250,12 @@ aizvien $2 arvien $2 jebkad $2 jebkur $2 +joprojām $2 +kautko $2 labdien $2 labvakar $2 nekad $2 +neko $2 nekur $2 pagalam $2 palaikam $2 @@ -272,7 +275,7 @@ turpretī $2 (kaut cik) $2 (kaut kā) $2 (nez kad) $2 -(nezin kad) $2 +(nezin kad) $3 (nezin kur) $3 diff --git a/dictsource/lv_rules b/dictsource/lv_rules index 7187eefb..73dcf124 100644 --- a/dictsource/lv_rules +++ b/dictsource/lv_rules @@ -33,9 +33,9 @@ // +---------------------------+ // E narrowers -.L21 i ī ie ei // vowel narrowers of e +.L21 i ī ie ei y // vowel narrowers of e .L22 j k ģ ļ ņ ŗ š ž č dž // consonant narrowers of e -.L26 f h ḩ // international consonants as a narrowers of e +.L26 f h ḩ q x w // international consonants as a narrowers of e .L23 s i m // remaining ending of the 2. and 5. decl. words // E wideners @@ -48,8 +48,8 @@ // +---------------------------+ // Default rules for o with succeeding consonants -.L40 č ģ ķ ļ ņ ŗ š ž // uo indicator letters o is spelled as uo with Latvian soft consonants -.L41 f h w x y // o indicators — o is spelled as o with Latin letters +.L40 č ģ ķ ļ ņ ŗ š ž // uo indicator letters o is spelled as uo with Latvian soft consonants +.L41 f h q w x y // o indicators — o is spelled as o with Latin letters .L42 i e o // o vowel pre/postfixes .L43 lg ng zn // o postfixes @@ -73,7 +73,7 @@ // | All letters | // +---------------------------+ // These are used for "." like padding -.L88 a ā b c č d e ē f g ģ h ḩ i ī j k ķ l ļ m n ņ o ō p r ŗ s š t u ū v w x y z ž - +.L88 a ā b c č d e ē f g ģ h ḩ i ī j k ķ l ļ m n ņ o ō p q r ŗ s š t u ū v w x y z ž // +---------------------------+ // | Pronunciation groups | @@ -278,10 +278,10 @@ L42) o o: // o prefixes o (L43 o // o postfixes - L41) o (L88 o // o indicators before - L41L88) o (L88 o - L41L88L88) o (L88 o - L41L88L88L88) o (L88 o + L41) o o // o indicators before + L41L88) o o + L41L88L88) o o +L41L88L88L88) o o o (L41 o // o indicators after o (L88L41 o o (L88L88L41 o @@ -293,12 +293,15 @@ o (L44 uo // uo postfixes + _femt) o o _kil) o o // international prefixes _mikr) o (+ o // otherwise conflicts with ..kroko(t/d).. _micr) o o _nan) o o _pik) o o _hekt) o o + _yokt) o o + _zept) o o _m) ono ono: _stere) o o: @@ -707,7 +710,7 @@ lj) o o: l) o (ģ o: l) o (ģiz+ o - l) o (jL50 l o + l) o (jL50 o _l) o (litL04_ o // Lolita l) o (kal o l) okomo okomo @@ -877,7 +880,7 @@ _) o (mi o: o (ng o o (nko o - o (pL01_+ o: // ..ops + @) o (pL01_+ o: // ..ops o (nL01_+ o: // ..ons o (no o on) o o @@ -1182,6 +1185,7 @@ _t) opo (n opo t) opo (t uopuo t) opo (š uopuo + _t) o (pL01_ o t) o (ra o t) o (rā o _t) o (reiz_ uo // toreiz diff --git a/espeak-data/voices/xaq/lv b/espeak-data/voices/xaq/lv index 8c5a104a..4d6bd421 100644 --- a/espeak-data/voices/xaq/lv +++ b/espeak-data/voices/xaq/lv @@ -2,7 +2,7 @@ name latvian language lv gender male - +words 0 2 //intonation 2 //tunes s5 c5 q5 e5 diff --git a/phsource/ph_latvian b/phsource/ph_latvian index 97f012c7..9a584ad6 100644 --- a/phsource/ph_latvian +++ b/phsource/ph_latvian @@ -3,18 +3,18 @@ // ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN // FMT(vowel/..., 50) // ELSE -// FMT(vowel/..., 75) +// FMT(vowel/..., 80) // ENDIF phoneme a vowel starttype #a endtype #a length 120 IF thisPh(isStressed) THEN - FMT(vowel/aa_7, 90) // other possible variants: a_3, a_5 or aa_7 + FMT(vwl_lv/a, 100) // adjusted from aa_3 ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/aa_7, 45) + FMT(vwl_lv/a, 50) ELSE - FMT(vowel/aa_7, 68) + FMT(vwl_lv/a, 80) ENDIF endphoneme @@ -23,11 +23,11 @@ phoneme a: length 300 long IF thisPh(isStressed) THEN - FMT(vowel/aa_9, 80) // other possible variants: a_3 + FMT(vwl_lv/aa, 100) ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/aa_9, 40) + FMT(vwl_lv/aa, 50) ELSE - FMT(vowel/aa_9, 60) + FMT(vwl_lv/aa, 80) ENDIF endphoneme @@ -35,11 +35,11 @@ phoneme E vowel starttype #e endtype #e length 120 IF thisPh(isStressed) THEN - FMT(vowel/ee_3, 90) + FMT(vwl_lv/E, 100) ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/ee_3, 45) + FMT(vwl_lv/E, 50) ELSE - FMT(vowel/ee_3, 68) + FMT(vwl_lv/E, 80) ENDIF endphoneme @@ -47,11 +47,11 @@ phoneme E: vowel starttype #e endtype #e length 300 IF thisPh(isStressed) THEN - FMT(vowel/ee_5, 60) + FMT(vwl_lv/EE, 100) ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/ee_5, 30) + FMT(vwl_lv/EE, 50) ELSE - FMT(vowel/ee_5, 45) + FMT(vwl_lv/EE, 80) ENDIF endphoneme @@ -59,11 +59,11 @@ phoneme e vowel starttype #e endtype #e length 120 IF thisPh(isStressed) THEN - FMT(vowel/e_9, 100) // other alternative e_5 + FMT(vwl_lv/e, 100) // other alternative e_5 ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/e_9, 50) + FMT(vwl_lv/e, 50) ELSE - FMT(vowel/e_9, 75) + FMT(vwl_lv/e, 80) ENDIF endphoneme @@ -71,11 +71,11 @@ phoneme e: vowel starttype #e endtype #e length 300 IF thisPh(isStressed) THEN - FMT(vowel/e_mid2, 100) // other alternative e_8 + FMT(vwl_lv/ee, 100) // other alternative e_8 ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/e_mid2, 50) + FMT(vwl_lv/ee, 50) ELSE - FMT(vowel/e_mid2, 75) + FMT(vwl_lv/ee, 80) ENDIF endphoneme @@ -83,11 +83,11 @@ phoneme i vowel starttype #i endtype #i length 120 IF thisPh(isStressed) THEN - FMT(vowel/i_6, 140) + FMT(vwl_lv/i, 110) // was i_6 ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/i_6, 70) + FMT(vwl_lv/i, 55) ELSE - FMT(vowel/i_6, 105) + FMT(vwl_lv/i, 88) ENDIF endphoneme @@ -95,11 +95,11 @@ phoneme i: vowel starttype #i endtype #i length 300 IF thisPh(isStressed) THEN - FMT(vowel/i_7, 120) + FMT(vwl_lv/ii, 110) // was i_7 ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/i_7, 60) + FMT(vwl_lv/ii, 55) ELSE - FMT(vowel/i_7, 90) + FMT(vwl_lv/ii, 88) ENDIF endphoneme @@ -107,11 +107,11 @@ phoneme o vowel starttype #o endtype #o length 120 IF thisPh(isStressed) THEN - FMT(vowel/oo_2, 100) + FMT(vwl_lv/o, 90) ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/oo_2, 50) + FMT(vwl_lv/o, 45) ELSE - FMT(vowel/oo_2, 75) + FMT(vwl_lv/o, 68) ENDIF endphoneme @@ -119,11 +119,11 @@ phoneme o: vowel starttype #o endtype #o length 300 IF thisPh(isStressed) THEN - FMT(vowel/oo_1, 90) + FMT(vwl_lv/oo, 80) ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/oo_1, 45) + FMT(vwl_lv/oo, 40) ELSE - FMT(vowel/oo_1, 68) + FMT(vwl_lv/oo, 60) ENDIF endphoneme @@ -131,11 +131,11 @@ phoneme u vowel starttype #u endtype #u length 120 IF thisPh(isMaxStress) THEN - FMT(vowel/u, 140) + FMT(vwl_lv/u, 140) ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/u, 70) + FMT(vwl_lv/u, 70) ELSE - FMT(vowel/u, 105) + FMT(vwl_lv/u, 105) ENDIF endphoneme @@ -143,11 +143,11 @@ phoneme u: vowel starttype #u endtype #u length 300 IF thisPh(isMaxStress) THEN - FMT(vowel/u_3, 120) + FMT(vwl_lv/uu, 120) ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN - FMT(vowel/u_3, 60) + FMT(vwl_lv/uu, 60) ELSE - FMT(vowel/u_3, 90) + FMT(vwl_lv/uu, 90) ENDIF endphoneme @@ -160,7 +160,7 @@ phoneme ai ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph/aai, 50) ELSE - FMT(vdiph/aai, 75) + FMT(vdiph/aai, 80) ENDIF endphoneme @@ -173,7 +173,7 @@ phoneme au ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph/aau, 50) ELSE - FMT(vdiph/aau, 75) + FMT(vdiph/aau, 80) ENDIF endphoneme @@ -186,7 +186,7 @@ phoneme ei ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph/eei_2, 50) ELSE - FMT(vdiph/eei_2, 75) + FMT(vdiph/eei_2, 80) ENDIF endphoneme @@ -199,7 +199,7 @@ phoneme ie ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph2/ie_2, 50) ELSE - FMT(vdiph2/ie_2, 75) + FMT(vdiph2/ie_2, 80) ENDIF endphoneme @@ -212,7 +212,7 @@ phoneme iu ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph2/iu_2, 50) ELSE - FMT(vdiph2/iu_2, 75) + FMT(vdiph2/iu_2, 80) ENDIF endphoneme @@ -225,7 +225,7 @@ phoneme ui ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph/ui, 50) ELSE - FMT(vdiph/ui, 75) + FMT(vdiph/ui, 80) ENDIF endphoneme @@ -238,7 +238,7 @@ phoneme uo ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph2/uaa, 50) ELSE - FMT(vdiph2/uaa, 75) + FMT(vdiph2/uaa, 80) ENDIF endphoneme @@ -251,7 +251,7 @@ phoneme oi ELIF thisPh(isDiminished) AND NOT prevVowel(isStressed) THEN FMT(vdiph/ooi, 50) ELSE - FMT(vdiph/ooi, 75) + FMT(vdiph/ooi, 80) ENDIF endphoneme diff --git a/phsource/vwl_lv/E b/phsource/vwl_lv/E new file mode 100644 index 00000000..83415a13 Binary files /dev/null and b/phsource/vwl_lv/E differ diff --git a/phsource/vwl_lv/EE b/phsource/vwl_lv/EE new file mode 100644 index 00000000..025206fb Binary files /dev/null and b/phsource/vwl_lv/EE differ diff --git a/phsource/vwl_lv/a b/phsource/vwl_lv/a new file mode 100644 index 00000000..d6dd625f Binary files /dev/null and b/phsource/vwl_lv/a differ diff --git a/phsource/vwl_lv/aa b/phsource/vwl_lv/aa new file mode 100644 index 00000000..467a7cea Binary files /dev/null and b/phsource/vwl_lv/aa differ diff --git a/phsource/vwl_lv/e b/phsource/vwl_lv/e new file mode 100644 index 00000000..c9c58297 Binary files /dev/null and b/phsource/vwl_lv/e differ diff --git a/phsource/vwl_lv/ee b/phsource/vwl_lv/ee new file mode 100644 index 00000000..711e3520 Binary files /dev/null and b/phsource/vwl_lv/ee differ diff --git a/phsource/vwl_lv/i b/phsource/vwl_lv/i new file mode 100644 index 00000000..87eed9cb Binary files /dev/null and b/phsource/vwl_lv/i differ diff --git a/phsource/vwl_lv/ii b/phsource/vwl_lv/ii new file mode 100644 index 00000000..5ab9fb16 Binary files /dev/null and b/phsource/vwl_lv/ii differ diff --git a/phsource/vwl_lv/o b/phsource/vwl_lv/o new file mode 100644 index 00000000..9f3b31b9 Binary files /dev/null and b/phsource/vwl_lv/o differ diff --git a/phsource/vwl_lv/oo b/phsource/vwl_lv/oo new file mode 100644 index 00000000..38573c5c Binary files /dev/null and b/phsource/vwl_lv/oo differ diff --git a/phsource/vwl_lv/u b/phsource/vwl_lv/u new file mode 100644 index 00000000..2e49524f Binary files /dev/null and b/phsource/vwl_lv/u differ diff --git a/phsource/vwl_lv/uu b/phsource/vwl_lv/uu new file mode 100644 index 00000000..4f623e54 Binary files /dev/null and b/phsource/vwl_lv/uu differ diff --git a/phsource/vwl_lv/vowelchart.png b/phsource/vwl_lv/vowelchart.png new file mode 100644 index 00000000..d5f8a46e Binary files /dev/null and b/phsource/vwl_lv/vowelchart.png differ