From 9c703b53e7a019fd9173739a66f4a55f877a2e90 Mon Sep 17 00:00:00 2001
From: Valdis Vitolins <valdis.vitolins@odo.lv>
Date: Tue, 26 May 2020 23:16:03 +0300
Subject: [PATCH] Merge pull request #759

Cherokee: Adjust base pitch to be higher (seems to effect consonents).

Also removed the pause after each syllable as it no longer seems needed
with the higher base pitch.

Adjusted the tone start/stop values based on Praat pitch analysis
on the newer base pitch.
---
 dictsource/chr_rules        | 16 ++++++++--------
 espeak-ng-data/lang/iro/chr |  2 +-
 phsource/ph_cherokee        | 20 ++++++++------------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/dictsource/chr_rules b/dictsource/chr_rules
index 309eefdc..63ef3340 100644
--- a/dictsource/chr_rules
+++ b/dictsource/chr_rules
@@ -19,19 +19,19 @@
 
 //CED pp xi-xii
 .group x
-	xb	1_|
+	xb	1
 	
-	xc	2_|
+	xc	2
 	
-	xcxd	23_|
-	xdxc	32_|
+	xcxd	23
+	xdxc	32
 	
-	xd	3_|
+	xd	3
 	
-	xdxf	34_|
-	xfxd	43_|
+	xdxf	34
+	xfxd	43
 	
-	xf	4_|
+	xf	4
 
 //CED page x
 .group ɂ
diff --git a/espeak-ng-data/lang/iro/chr b/espeak-ng-data/lang/iro/chr
index 03222382..ec91aca6 100644
--- a/espeak-ng-data/lang/iro/chr
+++ b/espeak-ng-data/lang/iro/chr
@@ -11,7 +11,7 @@ phonemes chr
 stressRule 9 
 intonation 3
 //pitch 30 90
-pitch 70 140
+pitch 90 160
 
 tunes	chrs chrc chrq chre
 
diff --git a/phsource/ph_cherokee b/phsource/ph_cherokee
index f21f24e8..ac4cca01 100644
--- a/phsource/ph_cherokee
+++ b/phsource/ph_cherokee
@@ -36,53 +36,49 @@
 //int amp_env = 0;
 //IF (pitch1 >= pitch2) the pitch values get swapped (???)
 
-phoneme 1 // low fall (¹)
+phoneme 1 // low fall (¹), long vowels only
   stress
   ipa ˨˩
-	//Tone(106, 85, envelope/p_fall, NULL) //need a pitch contour of 106-88 for a
-	Tone(49, 28, envelope/p_fall, NULL) //need a pitch contour of 106-88 for a
+	Tone(28, 7, envelope/p_fall, NULL) //need a pitch contour of 106-88 for a
 endphoneme
 
 
 phoneme 2 // low (²)
   stress
   ipa ˨
-  //Tone(105, 93, envelope/p_fall, NULL) //need a pitch contour of 104-96 for a
-  Tone(49, 36, envelope/p_fall, NULL) //need a pitch contour of 104-96 for a
+  Tone(26, 16, envelope/p_fall, NULL) //need a pitch contour of 104-96 for a
 endphoneme
 
 phoneme 23 // rising (²³)
   stress
   ipa ˨˧
-  Tone(38, 52, envelope/p_rise, NULL) //need a pitch contour of 97-109 for a
+  Tone(15, 29, envelope/p_rise, NULL) //need a pitch contour of 97-109 for a
 endphoneme
 
 phoneme 32 // falling (³²)
   stress
   ipa ˧˨
-  //Tone(128, 96, envelope/p_fall, NULL) //need a pitch contour of 122-97 for a
-  Tone(69, 37, envelope/p_fall, NULL) //need a pitch contour of 122-97 for a
+  Tone(46, 16, envelope/p_fall, NULL) //need a pitch contour of 122-97 for a
 endphoneme
 
 phoneme 3 // high (³) 
   stress
   ipa ˧
   //Tone(109, 116, envelope/p_rise, NULL) //need a pitch contour of 108-112 for a
-  Tone(50, 55, envelope/p_rise, NULL) //need a pitch contour of 108-112 for a
+  Tone(29, 34, envelope/p_rise, NULL) //need a pitch contour of 108-112 for a
 endphoneme
 
 phoneme 4 // extra high rise (⁴)
   stress
   ipa ˧˦
-  Tone(52, 73, envelope/p_rise, NULL) //need a pitch contour of 109-127 for a
+  Tone(29, 50, envelope/p_rise, NULL) //need a pitch contour of 109-127 for a
 endphoneme
 
 phoneme 43 // extra high fall (⁴³) - end of word tone
   stress
   ipa ˦˧
   //need a pitch contour of 122-75 for a~
-  //Tone(127, 71, envelope/p_fall, NULL)
-  Tone(67, 19, envelope/p_fall, NULL)
+  Tone(45, 0, envelope/p_fall, NULL)
 endphoneme
 
 //*******************************************************************