From e885aff70defbc95510c545ab586389842c910f9 Mon Sep 17 00:00:00 2001
From: Valdis Vitolins <valdis.vitolins@odo.lv>
Date: Tue, 7 Nov 2017 14:48:49 +0200
Subject: [PATCH] Latvian language improvements

---
 dictsource/lv_list         |  1 +
 dictsource/lv_rules        |  8 +++++---
 espeak-ng-data/lang/bat/lv |  2 +-
 phsource/ph_latvian        | 29 ++++++++++++++++++++++++-----
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/dictsource/lv_list b/dictsource/lv_list
index ecde154e..3e1dc8a6 100644
--- a/dictsource/lv_list
+++ b/dictsource/lv_list
@@ -615,6 +615,7 @@ porto        $alt
 positivus    $alt
 protežē      $alt $3
 puertoriko   $alt $4
+radio        $alt
 raivo        $alt
 rančo        $alt
 retro        $alt
diff --git a/dictsource/lv_rules b/dictsource/lv_rules
index 1090bf5f..b2ae56f2 100644
--- a/dictsource/lv_rules
+++ b/dictsource/lv_rules
@@ -460,6 +460,7 @@
       L59) n (@           :n
            n (d            N
            ne (vienl+      n'e       // nevienlīdzība
+           ne (vienmērīg   n'e       // nevienmērīgi
         _) ne (vien        n%e       // stress on 2nd syllable
            n (g            N
            n (k            N
@@ -470,7 +471,7 @@
 
 .group o
    //  default policy rules
-       _C) o (_+           o`        // shorter version of uo for particles
+       _C) o (_+           uo`       // 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 ō
@@ -496,7 +497,7 @@ L46L45L45) o (<<           uo
            o (L44+         uo        // uo postfixes
 
    //  Prefixes
-       _n) o               o`        // shorter uo for prefix
+       _n) o               uo`       // shorter uo for prefix
 
    //  international prefixes
     _femt) o               o
@@ -879,7 +880,7 @@ L46L45L45) o (<<           uo
       fil) okok            okok
         g) ok              ok
        _k) okako (lL04_    okako:    // kokakola
-        k) ok (L01         uok       // koks
+        k) ok (L01         uo`k      // koks with short uo, because of ambiguity
         k) ok (og          uok
         k) okosL01         okos
         k) ok (tēl         uok
@@ -1240,6 +1241,7 @@ L46L45L45) o (<<           uo
         s) op (r           op
        st) opo (s_         uopuo     // ..stopos
      _str) op (L01_        uop       // strops
+       _t) op              uo`p      // top with short uo because of ambiguity
        _t) op (āzL01_      op        // topāzs
        _t) op (b           op        // topbura
        _t) op (inam        op        // topinambūrs
diff --git a/espeak-ng-data/lang/bat/lv b/espeak-ng-data/lang/bat/lv
index a64ebfc0..7c551b33 100644
--- a/espeak-ng-data/lang/bat/lv
+++ b/espeak-ng-data/lang/bat/lv
@@ -10,4 +10,4 @@ formant 0 95 100 100 -5
 //tunes s5 c5 q5 e5
 tone 150 220 450 255 750 20 3500 255
 stressAmp 12 10 10 8 0 0 20 15
-stressLength 180 180 180 160 0 0 250 180
+stressLength 160 180 180 140 0 0 250 180
diff --git a/phsource/ph_latvian b/phsource/ph_latvian
index 8b867e6c..2f5045d8 100644
--- a/phsource/ph_latvian
+++ b/phsource/ph_latvian
@@ -8,7 +8,7 @@
 
 phoneme a
   vwl starttype #a endtype #a
-  length 120
+  length 130
   FMT(vwl_lv/a, 100)           // adjusted from aa_3
 endphoneme
 
@@ -51,7 +51,7 @@ endphoneme
 
 phoneme i:
   vwl starttype #i endtype #i
-  length 300
+  length 280
   FMT(vwl_lv/ii, 90) // was i_7
 endphoneme
 
@@ -101,14 +101,14 @@ endphoneme
 
 phoneme au
   vwl starttype #a endtype #u
-  length 275
+  length 290
   lng
   FMT(vdiph/aau, 100)
 endphoneme
 
 phoneme ei
   vwl starttype #e endtype #i
-  length 250
+  length 280
   lng
   FMT(vdiph/eei_2, 100)
 endphoneme
@@ -141,7 +141,7 @@ phoneme uo
   FMT(vdiph2/uaa, 100)
 endphoneme
 
-phoneme o`       // shorter version of uo
+phoneme uo`     // shorter version of uo
   vwl starttype #u endtype #a
   length 180
   lng
@@ -171,6 +171,25 @@ phoneme tS
   WAV(ustop/tsh,40)
 endphoneme
 
+phoneme h     // more quiet version of standard h
+  vls glt apr
+  lengthmod 3
+  ipa h
+
+  IF nextPh(#a) THEN
+    WAV(h/ha, 20)
+  ELIF nextPh(#e) THEN
+    WAV(h/he, 20)
+  ELIF nextPh(#i) THEN
+    WAV(h/hi, 20)
+  ELIF nextPh(#o) THEN
+    WAV(h/ho, 20)
+  ELIF nextPh(#u) THEN
+    WAV(h/hu, 20)
+  ENDIF
+  WAV(h/h_, 30)  // no vowel following
+endphoneme
+
 phoneme n- // more voiced variant of n
   vwl starttype #a endtype #a
   ipa nU+0329