Merge branch 'development'

Conflicts:
	docs/speak_lib.h

dictsource/hi_list

@@ -162,7 +162,7 @@ _dpt      _d@s@ml'o:_        // ?? what is Hi for "." ?
 श      S@
 ष      s.@   //  retroflex [S]
 स      s@
-ह      H@-
+ह      H@
 क़      q@
 ख़      x@
 ग़      Q@

dictsource/hi_rules

@@ -346,7 +346,7 @@
         स (B       s
 
 .group ह
-        ह          H
+        ह          HV
         ह (B       H
 
 

docs/phonemes.html

@@ -24,8 +24,8 @@ Phoneme mnemonics can be used directly in the text input to <strong>espeak</stro
 <table>
 <tbody valign=top>
 <tr>
-<td width=25><code>[p]</code><td width=80>
-<td width=25><code>[b]</code><td width=80>
+<td width=25><code>[p]</code><td width=150>
+<td width=25><code>[b]</code><td width=150>
 <tr>
 <td><code>[t]</code><td>
 <td><code>[d]</code><td>
@@ -92,7 +92,7 @@ In rhotic accents, such as General American, the phonemes <code>[3:], [A@], [e@]
 <table>
 <tbody valign=top>
 <tr><td width=25><code>[@]</code>
-<td width=60>alph<b>a</b><td width=80>schwa
+<td width=60>alph<b>a</b><td width=400>schwa
 
 <tr><td><code>[3]</code>
 <td>bett<b>er</b><td>rhotic schwa. In British English this is the same as <code>[@]</code>, but it includes 'r' colouring in American and other rhotic accents.  In these cases a separate <code>[r]</code> should not be included unless it is followed immediately by another vowel.
@@ -105,7 +105,7 @@ In rhotic accents, such as General American, the phonemes <code>[3:], [A@], [e@]
 
 <tr><td><code>[a]</code><td>tr<b>a</b>p
 <tr><td><code>[aa]</code><td>b<b>a</b>th<td>This is <code>[a]</code> in some accents, <code>[A:]</code> in others.
-<tr><td><code>[a2]</code><td><b>a</b>bout<td>This may be <code>[@]</code> or may be a more open schwa.
+<tr><td><code>[a#]</code><td><b>a</b>bout<td>This may be <code>[@]</code> or may be a more open schwa.
 <tr><td><code>[A:]</code><td>p<b>al</b>m
 <tr><td><code>[A@]</code><td>st<b>ar</b>t
 <tr><td><p>
@@ -161,7 +161,8 @@ Other languages will have their own vowel definitions, eg:
 
 </tbody>
 </table>
-
+<p>
+<code> [:] </code> can be used to lengthen a vowel, eg <code> [e:]</code>
 
 </body>
 </html>

src/phonemelist.cpp

@@ -341,10 +341,13 @@ void MakePhonemeList(Translator *tr, int post_pause, int start_sentence)
 			ph = phoneme_tab[plist3->phcode];
 			plist3[0].ph = ph;
 
-			if((plist3->phcode == phonSWITCH) && !(plist3->synthflags & SFLAG_EMBEDDED))  // ?? phonSWITCH can't have SFLAG_EMBEDDED ??
+			if(plist3->phcode == phonSWITCH)
 			{
-				if((plist3[1].phcode == phonSWITCH) || ((plist3[1].type == phPAUSE) && (plist3[2].phcode == phonSWITCH)))
-					continue;  // next phoneme is also a phonSWITCH, so ignore
+				if(!(plist3->synthflags & SFLAG_EMBEDDED))   // ?? phonSWITCH can't have SFLAG_EMBEDDED ??
+				{
+					if((plist3[1].phcode == phonSWITCH) || ((plist3[1].type == phPAUSE) && (plist3[2].phcode == phonSWITCH)))
+						continue;  // next phoneme is also a phonSWITCH, so ignore
+				}
 
 				// change phoneme table
 				SelectPhonemeTable(plist3->tone_ph);

src/readclause.cpp

@@ -643,7 +643,7 @@ static const char *LookupCharName(Translator *tr, int c, int only)
 		}
 	}
 
-	if((only==0) && (phonemes[0] == 0) && (tr->translator_name != L('e','n')))
+	if((only==0) && ((phonemes[0] == 0) || (phonemes[0] == phonSWITCH)) && (tr->translator_name != L('e','n')))
 	{
 		// not found, try English
 		SetTranslator2("en");