1.46.50 (from http://espeak.sourceforge.net/test/latest.html)

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 ह
-        ह          HV
+        ह          H
         ह (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=150>
-<td width=25><code>[b]</code><td width=150>
+<td width=25><code>[p]</code><td width=80>
+<td width=25><code>[b]</code><td width=80>
 <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=400>schwa
+<td width=60>alph<b>a</b><td width=80>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>[a#]</code><td><b>a</b>bout<td>This may be <code>[@]</code> or may be a more open schwa.
+<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>p<b>al</b>m
 <tr><td><code>[A@]</code><td>st<b>ar</b>t
 <tr><td><p>
@@ -161,8 +161,7 @@ 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>

docs/speak_lib.h

@@ -28,12 +28,6 @@
 #include <stdio.h>
 #include <stddef.h>
 
-#ifdef __WIN32__
-#define ESPEAK_API __declspec(dllexport)
-#else
-#define ESPEAK_API
-#endif
-
 #define ESPEAK_API_REVISION  6
 /*
 Revision 2
@@ -163,13 +157,11 @@ typedef enum {
 	EE_NOT_FOUND=2
 } espeak_ERROR;
 
-#define espeakINITIALIZE_PHONEME_EVENTS 0x0001
-#define espeakINITIALIZE_DONT_EXIT     0x8000
 
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output, int buflength, const char *path, int options);
+int espeak_Initialize(espeak_AUDIO_OUTPUT output, int buflength, const char *path, int options);
 /* Must be called before any synthesis functions are called.
    output: the audio data can either be played by eSpeak or passed back by the SynthCallback function.
 
@@ -177,8 +169,8 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output, int buflength, cons
 
    path: The directory which contains the espeak-data directory, or NULL for the default location.
 
-   options: bit 0:  1=allow espeakEVENT_PHONEME events.
-            bit 15: 1=don't exit if espeak_data is not found (used for --help)
+   options: bit 0: 1=allow espeakEVENT_PHONEME events.
+
 
    Returns: sample rate in Hz, or -1 (EE_INTERNAL_ERROR).
 */
@@ -188,7 +180,7 @@ typedef int (t_espeak_callback)(short*, int, espeak_EVENT*);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API void espeak_SetSynthCallback(t_espeak_callback* SynthCallback);
+void espeak_SetSynthCallback(t_espeak_callback* SynthCallback);
 /* Must be called before any synthesis functions are called.
    This specifies a function in the calling program which is called when a buffer of
    speech sound data has been produced. 
@@ -216,7 +208,7 @@ int SynthCallback(short *wav, int numsamples, espeak_EVENT *events);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API void espeak_SetUriCallback(int (*UriCallback)(int, const char*, const char*));
+void espeak_SetUriCallback(int (*UriCallback)(int, const char*, const char*));
 /* This function may be called before synthesis functions are used, in order to deal with
    <audio> tags.  It specifies a callback function which is called when an <audio> element is
    encountered and allows the calling program to indicate whether the sound file which
@@ -257,7 +249,7 @@ int UriCallback(int type, const char *uri, const char *base);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_Synth(const void *text,
+espeak_ERROR espeak_Synth(const void *text,
 	size_t size,
 	unsigned int position,
 	espeak_POSITION_TYPE position_type,
@@ -313,7 +305,7 @@ ESPEAK_API espeak_ERROR espeak_Synth(const void *text,
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_Synth_Mark(const void *text,
+espeak_ERROR espeak_Synth_Mark(const void *text,
 	size_t size,
 	const char *index_mark,
 	unsigned int end_position,
@@ -337,7 +329,7 @@ ESPEAK_API espeak_ERROR espeak_Synth_Mark(const void *text,
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_Key(const char *key_name);
+espeak_ERROR espeak_Key(const char *key_name);
 /* Speak the name of a keyboard key.
    If key_name is a single character, it speaks the name of the character.
    Otherwise, it speaks key_name as a text string.
@@ -351,7 +343,7 @@ ESPEAK_API espeak_ERROR espeak_Key(const char *key_name);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_Char(wchar_t character);
+espeak_ERROR espeak_Char(wchar_t character);
 /* Speak the name of the given character 
 
    Return: EE_OK: operation achieved 
@@ -396,7 +388,7 @@ typedef enum {
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative);
+espeak_ERROR espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative);
 /* Sets the value of the specified parameter.
    relative=0   Sets the absolute value of the parameter.
    relative=1   Sets a relative value of the parameter.
@@ -433,7 +425,7 @@ ESPEAK_API espeak_ERROR espeak_SetParameter(espeak_PARAMETER parameter, int valu
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API int espeak_GetParameter(espeak_PARAMETER parameter, int current);
+int espeak_GetParameter(espeak_PARAMETER parameter, int current);
 /* current=0  Returns the default value of the specified parameter.
    current=1  Returns the current value of the specified parameter, as set by SetParameter()
 */
@@ -441,7 +433,7 @@ ESPEAK_API int espeak_GetParameter(espeak_PARAMETER parameter, int current);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_SetPunctuationList(const wchar_t *punctlist);
+espeak_ERROR espeak_SetPunctuationList(const wchar_t *punctlist);
 /* Specified a list of punctuation characters whose names are to be spoken when the
    value of the Punctuation parameter is set to "some".
 
@@ -456,7 +448,7 @@ ESPEAK_API espeak_ERROR espeak_SetPunctuationList(const wchar_t *punctlist);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API void espeak_SetPhonemeTrace(int value, FILE *stream);
+void espeak_SetPhonemeTrace(int value, FILE *stream);
 /* Controls the output of phoneme symbols for the text
    value=0  No phoneme output (default)
    value=1  Output the translated phoneme symbols for the text
@@ -469,7 +461,7 @@ ESPEAK_API void espeak_SetPhonemeTrace(int value, FILE *stream);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API void espeak_CompileDictionary(const char *path, FILE *log, int flags);
+void espeak_CompileDictionary(const char *path, FILE *log, int flags);
 /* Compile pronunciation dictionary for a language which corresponds to the currently
    selected voice.  The required voice should be selected before calling this function.
 
@@ -522,7 +514,7 @@ typedef struct {
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec);
+const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec);
 /* Reads the voice files from espeak-data/voices and creates an array of espeak_VOICE pointers.
    The list is terminated by a NULL pointer
 
@@ -534,7 +526,7 @@ ESPEAK_API const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_SetVoiceByName(const char *name);
+espeak_ERROR espeak_SetVoiceByName(const char *name);
 /* Searches for a voice with a matching "name" field.  Language is not considered.
    "name" is a UTF8 string.
 
@@ -547,7 +539,7 @@ ESPEAK_API espeak_ERROR espeak_SetVoiceByName(const char *name);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_SetVoiceByProperties(espeak_VOICE *voice_spec);
+espeak_ERROR espeak_SetVoiceByProperties(espeak_VOICE *voice_spec);
 /* An espeak_VOICE structure is used to pass criteria to select a voice.  Any of the following
    fields may be set:
 
@@ -567,7 +559,7 @@ ESPEAK_API espeak_ERROR espeak_SetVoiceByProperties(espeak_VOICE *voice_spec);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_VOICE *espeak_GetCurrentVoice(void);
+espeak_VOICE *espeak_GetCurrentVoice(void);
 /* Returns the espeak_VOICE data for the currently selected voice.
    This is not affected by temporary voice changes caused by SSML elements such as <voice> and <s>
 */
@@ -575,7 +567,7 @@ ESPEAK_API espeak_VOICE *espeak_GetCurrentVoice(void);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_Cancel(void);
+espeak_ERROR espeak_Cancel(void);
 /* Stop immediately synthesis and audio output of the current text. When this
    function returns, the audio output is fully stopped and the synthesizer is ready to
    synthesize a new message.
@@ -588,14 +580,14 @@ ESPEAK_API espeak_ERROR espeak_Cancel(void);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API int espeak_IsPlaying(void);
+int espeak_IsPlaying(void);
 /* Returns 1 if audio is played, 0 otherwise.
 */
 
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_Synchronize(void);
+espeak_ERROR espeak_Synchronize(void);
 /* This function returns when all data have been spoken.
    Return: EE_OK: operation achieved 
 	   EE_INTERNAL_ERROR.
@@ -604,7 +596,7 @@ ESPEAK_API espeak_ERROR espeak_Synchronize(void);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API espeak_ERROR espeak_Terminate(void);
+espeak_ERROR espeak_Terminate(void);
 /* last function to be called.
    Return: EE_OK: operation achieved 
 	   EE_INTERNAL_ERROR.
@@ -614,8 +606,8 @@ ESPEAK_API espeak_ERROR espeak_Terminate(void);
 #ifdef __cplusplus
 extern "C"
 #endif
-ESPEAK_API const char *espeak_Info(const char **path_data);
+const char *espeak_Info(void* ptr);
 /* Returns the version number string.
-   path_data  returns the path to espeak_data
+   The parameter is for future use, and should be set to NULL
 */
 #endif

platforms/windows/windows_cmd/src/speech.h

@@ -38,7 +38,6 @@
 #define INCLUDE_MBROLA
 #define INCLUDE_SONIC
 
-
 // will look for espeak_data directory here, and also in user's home directory
 #define PATH_ESPEAK_DATA  "/usr/share/espeak-data"