From aad57ea1cc59144475cc80538523121d97b293d4 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sat, 11 Jul 2020 10:05:40 -0400
Subject: voice:  Further enhancements for multi-lingual voice generation

 * configure: allow use of full tts engine names when making selection
 * voice.pl:  fixes for espeak-ng
 * build.pm:  Add a list of "standard" voices for tooling use

The latter will be used by the nightly builder infrastructure to
determine what voices to generate.

Change-Id: Iff55288f94a30fbe08d8345b730969b7264b5e0f
---
 tools/configure | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'tools/configure')

diff --git a/tools/configure b/tools/configure
index aab3e59dfb..96d45a9173 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1167,8 +1167,8 @@ voiceconfig () {
         DEFAULT_CHOICE="O"
     fi
 
-    if [ "$FESTIVAL" = "$FLITE" ] && [ "$FLITE" = "$ESPEAK" ] && [ "$ESPEAK" = "$SAPI" ] && [ "$SAPI" = "$MIMIC"] && [ "$MIMIC" = "$SWIFT" ] && [ "$SWIFT" = "$RBSPEAK" ] && [ "$RBSPEAK" = "$GTTS" ] ; then
-        echo "You need Festival, eSpeak, Mimic, Flite, or rbspeak in your path, or SAPI available to build voice files"
+    if [ "$FESTIVAL" = "$FLITE" ] && [ "$FLITE" = "$ESPEAK" ] && [ "$ESPEAK" = "$SAPI" ] && [ "$SAPI" = "$MIMIC"] && [ "$MIMIC" = "$SWIFT" ] && [ "$SWIFT" = "$GTTS" ] && [ "$GTTS" = "$RBSPEAK" ] ; then
+        echo "You need Festival, eSpeak, Mimic, Flite, gtts, or rbspeak in your path, or SAPI available to build voice files"
         exit 3
     fi
 
@@ -1181,42 +1181,42 @@ voiceconfig () {
         advopts="$advopts --tts=$option"
     fi
     case "$option" in
-        [Ll])
+        [Ll]|flite)
         TTS_ENGINE="flite"
         NOISEFLOOR="500" # TODO: check this value
         TTS_OPTS=$FLITE_OPTS
         ;;
-        [Ee])
+        [Ee]|espeak)
         TTS_ENGINE="espeak"
         NOISEFLOOR="500"
         TTS_OPTS=$ESPEAK_OPTS
         ;;
-        [Ff])
+        [Ff]|festival)
         TTS_ENGINE="festival"
         NOISEFLOOR="500"
         TTS_OPTS=$FESTIVAL_OPTS
         ;;
-        [Mm])
+        [Mm]|mimic)
         TTS_ENGINE="mimic"
         NOISEFLOOR="500"
         TTS_OPTS=$MIMIC_OPTS
         ;;
-        [Ss])
+        [Ss]|sapi)
         TTS_ENGINE="sapi"
         NOISEFLOOR="500"
         TTS_OPTS=$SAPI_OPTS
         ;;
-	[Ww])
+	[Ww]|swift)
         TTS_ENGINE="swift"
         NOISEFLOOR="500"
         TTS_OPTS=$SWIFT_OPTS
 	;;
-	[Gg)
+	[Gg]|gtts)
         TTS_ENGINE="gtts"
         NOISEFLOOR="500"
         TTS_OPTS=$GTTS_OPTS
 	;;
-	[Oo])
+	[Oo]|rbspeak)
         TTS_ENGINE="rbspeak"
         NOISEFLOOR="500"
         TTS_OPTS=$RBSPEAK_OPTS
-- 
cgit v1.2.3