diff --git a/dictsource/hi_list b/dictsource/hi_list index ee9eb364..e28b4e50 100644 --- a/dictsource/hi_list +++ b/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@ diff --git a/dictsource/hi_rules b/dictsource/hi_rules index 9144dc17..ffbd8801 100644 --- a/dictsource/hi_rules +++ b/dictsource/hi_rules @@ -346,7 +346,7 @@ स (B s .group ह - ह HV + ह H ह (B H diff --git a/docs/phonemes.html b/docs/phonemes.html index c0ab5fc7..0c3f80e4 100644 --- a/docs/phonemes.html +++ b/docs/phonemes.html @@ -24,8 +24,8 @@ Phoneme mnemonics can be used directly in the text input to espeak -[p] -[b] +[p] +[b] [t] [d] @@ -92,7 +92,7 @@ In rhotic accents, such as General American, the phonemes [3:], [A@], [e@]
[@] -alphaschwa +alphaschwa
[3] betterrhotic schwa. In British English this is the same as [@], but it includes 'r' colouring in American and other rhotic accents. In these cases a separate [r] 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 [3:], [A@], [e@]
[a]trap
[aa]bathThis is [a] in some accents, [A:] in others. -
[a#]aboutThis may be [@] or may be a more open schwa. +
[a2]aboutThis may be [@] or may be a more open schwa.
[A:]palm
[A@]start

@@ -161,8 +161,7 @@ Other languages will have their own vowel definitions, eg:

-

- [:] can be used to lengthen a vowel, eg [e:] + diff --git a/docs/speak_lib.h b/docs/speak_lib.h index 8cf7f807..9ca01f59 100644 --- a/docs/speak_lib.h +++ b/docs/speak_lib.h @@ -28,12 +28,6 @@ #include #include -#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