[1.39.29]

Allow combining accent characters inside a word (don't cause the word to be spelled).
Add command line options:  --path    --phonout


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@204 d46cf337-b52f-0410-862d-fd96e6ae7743

src/wavegen.cpp

@@ -901,12 +901,13 @@ int PeaksToHarmspect(wavegen_peaks_t *peaks, int pitch, int *htab, int control)
 		}
 	}
 
-// increase bass, up to the F1 peak
-h=1;
-for(f=pitch; f<peaks[1].freq; f+=pitch)
-{
-	htab[h++] += (peaks[1].height * 16);
-}
+	// increase bass, up to the F1 peak
+	h=1;
+	x = peaks[1].height * 24;
+	for(f=pitch; f<peaks[1].freq; f+=pitch)
+	{
+		htab[h++] += x;
+	}
 
 	// find the nearest harmonic for HF peaks where we don't use shape
 	for(; pk<N_PEAKS; pk++)