Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	dictsource/pt_list
	dictsource/pt_rules
	phsource/compile_report
	phsource/vowel/uu#_2
	src/synthdata.cpp
	src/translate.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>