Commit Graph
61 Commits
Author SHA1 Message Date
Juho Hiltunen 21e391b631 move GetSsmlAttributes() 2018-03-03 23:43:14 +02:00
Juho Hiltunen d6ed3a3320 move PopParamStack() 2018-03-03 23:42:58 +02:00
Juho Hiltunen b793920ff7 move PushParamStack() 2018-03-03 23:41:55 +02:00
Juho Hiltunen 2b10dba10f move ProcessParamStack() 2018-03-03 23:40:52 +02:00
Juho Hiltunen da125f1a1b move GetVoiceFromStack() 2018-03-03 23:39:09 +02:00
Juho Hiltunen 16a5b5d15c move attr_prosody_value() 2018-03-03 23:38:52 +02:00
Juho Hiltunen fdc2bb06d9 move GetVoiceAttributes() 2018-03-03 23:38:34 +02:00
Juho Hiltunen f00d5798de add ssml.h for defines 2018-03-03 23:38:09 +02:00
Juho Hiltunen a4eca79304 moved attrcopy_utf8() 2018-03-03 23:31:13 +02:00
Juho Hiltunen 07a19b3208 moved attrnumber() from readclause.c to ssml.c 2018-03-03 23:30:16 +02:00
Juho Hiltunen a8239c4502 start moving SSML related parsing to ssml.c
move: attrcmp() and attrlookup()
new file ssml.c added to Makefile.am
2018-03-03 23:29:10 +02:00
Reece H. Dunn 18515a0429 Merge remote-tracking branch 'jaacoppi/bugfix' 2018-02-20 07:17:54 +00:00
Juho Hiltunen 8999a3b8fb when end_clause_after_tag is set: end clause after the tag, not before the tag
Fixes #401.
2018-02-19 20:51:29 +02:00
Juho Hiltunen 78749f14f8 readability fix: use boolean instead of 0 and 1 for loop control 2018-02-17 18:17:00 +02:00
Reece H. Dunn 255147ee75 readclause.c: Fix -Wmissing-prototypes warnings. 2017-10-11 07:26:35 +01:00
Reece H. Dunn 74f9f5e34b wavegen.c: Fix -Wmissing-prototypes warnings. 2017-10-10 21:37:46 +01:00
Reece H. Dunn d89fa59bed Enable and fix -Wunused-variable warnings. 2017-10-05 07:23:17 +01:00
Anthony Cornehl 897fad64c1 Remove definitions for towlower/towupper
The definitions for towlower() and towupper() are defined in /usr/include/wctype.h on FreeBSD platforms. I just removed the define and used  the ucd_ equivilent where towlower/towupper were found.

/bin/sh ./libtool  --tag=CC   --mode=compile cc -DHAVE_CONFIG_H -I.    -fPIC -fvisibility=hidden -pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"/usr/local/share/espeak-
ng-data\" -DLIBESPEAK_NG_EXPORT  -Isrc/include -Isrc/include/compat -I src/ucd-tools/src/include -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L -Wno-endif-lab
els    -g -O2 -std=c99 -MT src/libespeak-ng/src_libespeak_ng_la-readclause.lo -MD -MP -MF src/libespeak-ng/.deps/src_libespeak_ng_la-readclause.Tpo -c -o src/libespeak-n
g/src_libespeak_ng_la-readclause.lo `test -f 'src/libespeak-ng/readclause.c' || echo './'`src/libespeak-ng/readclause.c
libtool: compile:  cc -DHAVE_CONFIG_H -I. -fPIC -fvisibility=hidden -pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"/usr/local/share/espeak-ng-data\" -DLIBESPEAK_NG_EXPO
RT -Isrc/include -Isrc/include/compat -I src/ucd-tools/src/include -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L -Wno-endif-labels -g -O2 -std=c99 -MT src/li
bespeak-ng/src_libespeak_ng_la-readclause.lo -MD -MP -MF src/libespeak-ng/.deps/src_libespeak_ng_la-readclause.Tpo -c src/libespeak-ng/readclause.c  -fPIC -DPIC -o src/l
ibespeak-ng/.libs/src_libespeak_ng_la-readclause.o
In file included from src/libespeak-ng/readclause.c:32:
In file included from src/include/compat/wctype.h:30:
/usr/include/wctype.h:73:8: error: conflicting types for 'ucd_tolower'
wint_t  towlower(wint_t);
        ^
src/include/compat/wchar.h:37:18: note: expanded from macro 'towlower'
                 ^
src/ucd-tools/src/include/ucd/ucd.h:503:13: note: previous declaration is here
codepoint_t ucd_tolower(codepoint_t c);
            ^
In file included from src/libespeak-ng/readclause.c:32:
In file included from src/include/compat/wctype.h:30:
/usr/include/wctype.h:74:8: error: conflicting types for 'ucd_toupper'
wint_t  towupper(wint_t);
        ^
src/include/compat/wchar.h:38:18: note: expanded from macro 'towupper'
                 ^
src/ucd-tools/src/include/ucd/ucd.h:491:13: note: previous declaration is here
codepoint_t ucd_toupper(codepoint_t c);
            ^
src/libespeak-ng/readclause.c:366:19: warning: implicit declaration of function 'mkstemp' is invalid in C99 [-Wimplicit-function-declaration]
                        if ((fd_temp = mkstemp(fname_temp)) >= 0)
                                       ^
1 warning and 2 errors generated.
2017-08-31 17:42:17 -07:00
Reece H. Dunn c8f83c6b1f Add ucd/ucd.h to readclause.c, to fix building on Android. 2017-08-20 22:47:56 +01:00
Reece H. Dunn cec0e773a4 Remove the tokenizer code. This is not currently used, and should be designed from espeak's behaviour. 2017-08-16 19:04:26 +01:00
Reece H. Dunn 9af96da469 Make the encoding.h API public. 2017-05-02 18:40:16 +01:00
Reece H. Dunn 1c4ce3dcd3 tokenizer.c: create and use a clause_type_from_codepoint function, with tests. 2017-04-19 22:33:32 +01:00
Reece H. Dunn 92f703d98b Use defines instead of hard-coded numbers for more clause logic. 2017-04-18 07:14:45 +01:00
Reece H. Dunn 8749891069 Better specify the CLAUSE_ flags returned by ReadClause. 2017-04-17 22:04:45 +01:00
Reece H. Dunn 9dabf64680 encoding.c: Support determining the string length for length < 0. 2017-04-01 13:23:09 +01:00
Reece H. Dunn 7c16ac543c Use the text decoder API in readclause.c. 2017-03-31 13:17:37 +01:00
Reece H. Dunn 8933185de4 Remove the unused f_in argument to the Read/Translate/SpeakNextClause functions. 2017-03-31 07:13:36 +01:00
Reece H. Dunn 0b0661cef0 Use the encoding.c tables for 8-bit encodings.
1.  Store the encoding enumeration values in the Translation
    object, instead of the charset table.

2.  Use the encoding.c charset table data instead of the ones
    in translate.c.

3.  Remove the charset language file option -- it is only used
    in the Arabic language file, but is used incorrectly there.

4.  Specify ISO 8859-6 for the 8-bit encoding for Arabic instead
    of UTF-8, so that espeakCHARS_8BIT and espeakCHARS_AUTO work
    correctly for Arabic.
2017-03-31 00:01:14 +01:00
Reece H. Dunn 1378a81a06 Remove the wchar tables from readclause, now the standard is* and to* APIs are being used. 2017-02-13 19:48:57 +00:00
Reece H. Dunn 5975f07095 Replace the *2 wchar/wctype APIs with their standard versions. These will be fixed using compatibility headers. 2017-02-13 07:43:23 +00:00
Reece H. Dunn c80829a5fd Remove the NEED_WCHAR_FUNCTIONS code for wchar/wctype compatibility. 2017-02-11 08:39:29 +00:00
Reece H. Dunn f6147085cd Use enumeration constants for the voice gender field values. 2017-02-05 19:06:27 +00:00
Reece H. Dunn df6a2228b7 Use -EISDIR instead of -2 in GetFileLength for directories. 2017-02-04 16:02:56 +00:00
Reece H. Dunn 4920ecc79c Move espeak-data to espeak-ng-data to avoid conflicting with upstream espeak. 2016-09-10 09:44:13 +01:00
Ondřej Lysoněk 3817ee1e16 Moved speak_lib.h to espeak-ng directory
Moved include/espeak/speak_lib.h to include/espeak-ng/speak_lib.h and
created a symlink from the original location.
2016-08-28 10:57:10 +01:00
Reece H. Dunn dc87e7b775 Use a HAVE_MKSTEMP configure check instead of PLATFORM_POSIX. 2016-01-30 10:51:24 +00:00
Reece H. Dunn 0b187e217e Use the same logic when calling sox in readclause.c as compiledata.c for portability. 2016-01-30 10:46:56 +00:00
Reece H. Dunn ebb052a808 Use the error.h API in LoadSoundFile and check more return values. [Coverity] 2016-01-22 07:24:30 +00:00
Reece H. Dunn 96c43f3eb2 Clean up the include files to make them consistent. 2016-01-16 17:54:39 +00:00
Reece H. Dunn 9c5820f72a Create an initial compatibility shim for unistd.h. 2016-01-15 07:22:46 +00:00
Reece H. Dunn 9c7179189b Add a stdint.h compatibility shim. 2016-01-09 13:09:50 +00:00
Reece H. Dunn 5bbab7e0d3 Check fread return value in LoadSoundFile(readclause.c) [clang scan-build] 2016-01-06 21:32:46 +00:00
Reece H. Dunn bd52c12c49 Remove a dead assignment in ProcessSsmlTag(readclause.c) [clang scan-build] 2016-01-06 21:26:33 +00:00
Reece H. Dunn 72db232ec3 Move include/espeak{-ng => }/speak_lib.h. 2016-01-04 19:45:23 +00:00
Reece H. Dunn c2811d074e Make LoadPhData return an espeak_ng_STATUS code. 2016-01-01 13:17:11 +00:00
Reece H. Dunn 522e7c4d51 Revert commit 14a2fb39cf
This commit has been reported to cause distortions in phoneme
pitches and speeds.
2015-12-28 17:54:17 +00:00
Reece H. Dunn 5d295bdd30 Merge remote-tracking branch 'nyqvist/master'
Conflicts:
	src/libespeak-ng/compiledict.c
	src/libespeak-ng/readclause.c
	src/libespeak-ng/speak_lib.c
	src/libespeak-ng/voices.c
	src/libespeak-ng/wave_sada.c
	src/libespeak-ng/wavegen.c
2015-12-28 13:14:46 +00:00
Reece H. Dunn 5bbc0d3743 Remove the PLATFORM_RISCOS code.
This is from the old espeak RiscOS port that has been removed.

If/when the espeak-ng program is ported to RiscOS, this will be
done in a different, more maintainable way.
2015-12-28 12:46:14 +00:00
Fredrik Nyqvist 14a2fb39cf Declare variables at their first point of use
Also use size_t instead of int in some places
where it make sense
2015-12-28 12:05:17 +01:00
Reece H. Dunn 3e99752d0c Check and fix source code formatting. 2015-12-27 22:34:53 +00:00