-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVL7LuAAoJENv8icfo4dtD7nsP/0b3TjBqUlYHJr2aUZjSStUB
 So/7wyT8watGxav+q+59QBXIb/1MMkABREPSsH1XbVLVuLEBtAtEd+aenIW7AuPK
 t4Q99Satb3Swcf39MQQjWrRGJP8mOTuxZklub6xUohT2eDPhIeNetgjYtrvmDCxu
 /HjjjAuR6hQbzUVusoGso6ca1X4DyDU3aTqXHk95vRoHw8cpW20T63VZgX3J6xec
 Cfjl9eETn0wPb8x1w1xS+V4D/xBVqOVy8iazj6MVFw2ZJGisdtxeqLsWyRy3anAb
 ainfbRu5lySDlvveGdgTD+mSJOqVLtwrOFdL82OArY76zCwF366pnzogRLsIGRgc
 EequlN4J22MWOtt3SUl55wcauXPlsj1uu/rmMQ98cR8L82Ew4oCWw4ZQwzZsH6vr
 IKD0IPKduHqRV/vByNUnTy6sx5bWpm9X+42Ax1vzS+A+miAEidbp/PVv6aKi5PVw
 j+R9ki9xL4X+4BxBKWxgMHeFYBmx/fs4Hy0+epdGCv/YI4qKQl2jsOHhZBcu/4ue
 hQq2DlVS8F2LNp2Gh+gvRCgzdiNscy3x3pwIUWP8IA8UYF83065J8IhU0A8uVCGO
 VgfxxdtzFfkQMcEbGyIo/x1hFCMEGSdqm6E8tFvkHSxgjHaK1REbfpAw7FpYVDU3
 qvCbpFP8tqY2rVuGwo+I
 =cU4/
 -----END PGP SIGNATURE-----

Merge tag '1.48.15' into android

espeak 1.48.15

When there is no TTS engine selected, mTts.getVoice() will throw
a NullPointerException. This is a workaround to cope with this bug
in Android.

Conflicts:
	dictsource/dict_phonemes

Language changes: en, fa, hr, pl, ta


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@389 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

Language changes: af, en, eu, fa, hi, hu, id, it, mr, pl, ta.
zh (numbers)


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@388 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

Changes to:
en, pt,
it,  implement ordinal numbers.
eu, stress positions.
es,  revert change to [t] and [k]
de, change to sounds "pr" and "kr".


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@387 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

Language changes: an, de, en, it, pt, ta, gu, hi, pa, ur.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@386 d46cf337-b52f-0410-862d-fd96e6ae7743

This reverts commit 6ac54860a1.

This change was preventing the voice data from being installed.

The Android 5.0 Text-to-speech output settings dialog checks that
the languages from CheckVoiceData use the ISO3 language and
country codes. This change matches that expectation.

This improves the performance of looking up a voice by name.

As of Android 5.0, TextToSpeech.setLanguage calls the new
TextToSpeechService.onGetDefaultVoiceNameFor(lang,country,variant)
and uses the specified voice name.

The default Android 5.0 implementation of onGetDefaultVoiceNameFor
does not work with eSpeak. This provides a working implementation.

This fixes the TextToSpeechTest.testLanguages tests on Android 5.0.

The default Android 5.0 implementation enumerates the available
locales. This enumerates the voices returned by eSpeak.

This changes the getLanguage helper to return the result from
getLanguage on all platform versions, disabling the deprecated
message on API 21 and above.

This adds method declarations for the new voice APIs, forwarding
them to the default implementations.