diff --git a/src/libespeak-ng/dictionary.c b/src/libespeak-ng/dictionary.c index 8d50e7b9..ae0157d9 100644 --- a/src/libespeak-ng/dictionary.c +++ b/src/libespeak-ng/dictionary.c @@ -33,6 +33,7 @@ #include "readclause.h" #include "synthdata.h" +#include "numbers.h" #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/numbers.c b/src/libespeak-ng/numbers.c index 06ba264c..851f6165 100644 --- a/src/libespeak-ng/numbers.c +++ b/src/libespeak-ng/numbers.c @@ -32,6 +32,7 @@ #include #include "readclause.h" +#include "numbers.h" #include "phoneme.h" #include "voice.h" diff --git a/src/libespeak-ng/numbers.h b/src/libespeak-ng/numbers.h new file mode 100644 index 00000000..822ab272 --- /dev/null +++ b/src/libespeak-ng/numbers.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2005 to 2015 by Jonathan Duddington + * email: jonsd@users.sourceforge.net + * Copyright (C) 2015-2018 Reece H. Dunn + * Copyright (C) 2018 Juho Hiltunen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see: . + */ + +#ifndef ESPEAK_NG_NUMBERS_H +#define ESPEAK_NG_NUMBERS_H + +#ifdef __cplusplus +extern "C" +{ +#endif + +void LookupAccentedLetter(Translator *tr, unsigned int letter, char *ph_buf); +void LookupLetter(Translator *tr, unsigned int letter, int next_byte, char *ph_buf1, int control); +int IsSuperscript(int letter); +void SetSpellingStress(Translator *tr, char *phonemes, int control, int n_chars); +int TranslateRoman(Translator *tr, char *word, char *ph_out, WORD_TAB *wtab); +int TranslateNumber(Translator *tr, char *word1, char *ph_out, unsigned int *flags, WORD_TAB *wtab, int control); +int TranslateLetter(Translator *tr, char *word, char *phonemes, int control); + + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/src/libespeak-ng/translate.c b/src/libespeak-ng/translate.c index 5e7268ac..c5a7278c 100644 --- a/src/libespeak-ng/translate.c +++ b/src/libespeak-ng/translate.c @@ -34,6 +34,7 @@ #include "readclause.h" #include "phonemelist.h" +#include "numbers.h" #include "speech.h" #include "phoneme.h" diff --git a/src/libespeak-ng/translate.h b/src/libespeak-ng/translate.h index 4ac71987..2a272720 100644 --- a/src/libespeak-ng/translate.h +++ b/src/libespeak-ng/translate.h @@ -710,7 +710,6 @@ int IsDigit(unsigned int c); int IsDigit09(unsigned int c); int IsAlpha(unsigned int c); int IsVowel(Translator *tr, int c); -int IsSuperscript(int letter); int isspace2(unsigned int c); const char *GetTranslatedPhonemeString(int phoneme_mode); ALPHABET *AlphabetFromChar(int c); @@ -722,14 +721,7 @@ void ProcessLanguageOptions(LANGUAGE_OPTIONS *langopts); int Lookup(Translator *tr, const char *word, char *ph_out); int LookupFlags(Translator *tr, const char *word, unsigned int **flags_out); -int TranslateNumber(Translator *tr, char *word1, char *ph_out, unsigned int *flags, WORD_TAB *wtab, int control); -int TranslateRoman(Translator *tr, char *word, char *ph_out, WORD_TAB *wtab); - void ChangeWordStress(Translator *tr, char *word, int new_stress); -void SetSpellingStress(Translator *tr, char *phonemes, int control, int n_chars); -int TranslateLetter(Translator *tr, char *letter, char *phonemes, int control); -void LookupLetter(Translator *tr, unsigned int letter, int next_byte, char *ph_buf, int control); -void LookupAccentedLetter(Translator *tr, unsigned int letter, char *ph_buf); int LoadDictionary(Translator *tr, const char *name, int no_error); int LookupDictList(Translator *tr, char **wordptr, char *ph_out, unsigned int *flags, int end_flags, WORD_TAB *wtab);