diff -ur festival.british/lib/email-mode.scm festival/lib/email-mode.scm --- festival.british/lib/email-mode.scm 2001-04-04 07:55:20.000000000 -0400 +++ festival/lib/email-mode.scm 2005-02-07 00:26:19.404860138 -0500 @@ -40,7 +40,7 @@ (define (email_init_func) "(email_init_func) Called on starting email text mode." - (voice_rab_diphone) + (voice_cmu_us_slt_arctic_hts) (set! email_previous_t2w_func token_to_words) (set! english_token_to_words email_token_to_words) (set! token_to_words english_token_to_words) @@ -67,13 +67,13 @@ ((and (string-matches name ">") (string-matches (item.feat token "whitespace") "[ \t\n]*\n *")) - (voice_don_diphone) + (voice_cmu_us_bdl_arctic_hts) nil ;; return nothing to say ) (t ;; for all other cases (if (string-matches (item.feat token "whitespace") ".*\n[ \n]*") - (voice_rab_diphone)) + (voice_cmu_us_slt_arctic_hts)) (email_previous_t2w_func token name)))) (set! tts_text_modes diff -ur festival.british/lib/festival.scm festival/lib/festival.scm --- festival.british/lib/festival.scm 2004-05-24 16:17:05.000000000 -0400 +++ festival/lib/festival.scm 2005-02-07 00:20:08.956012814 -0500 @@ -504,6 +504,10 @@ surrounded by double quotes (voice_rab_diphone) Select voice (Britsh Male) (voice_ked_diphone) Select voice (American Male) + (voice_cmu_us_bdl_arctic_hts) + Select voice (American Male) + (voice_cmu_us_slt_arctic_hts) + Select voice (American Female) ") (define (festival_warranty) diff -ur festival.british/lib/languages.scm festival/lib/languages.scm --- festival.british/lib/languages.scm 2002-04-19 17:47:23.000000000 -0400 +++ festival/lib/languages.scm 2005-02-07 00:22:23.056874083 -0500 @@ -58,10 +58,10 @@ (define (language_american_english) "(language_american_english) -Set up language parameters for Aemerican English." +Set up language parameters for American English." - (if (symbol-bound? 'voice_kal_diphone) - (set! female1 voice_kal_diphone)) + (if (symbol-bound? 'voice_cmu_us_slt_arctic_hts) + (set! female1 voice_cmu_us_slt_arctic_hts)) (set! male1 voice_ked_diphone) (male1) @@ -98,11 +98,12 @@ (define (select_language language) (cond - ((or (equal? language 'britishenglish) - (equal? language 'english)) ;; we all know its the *real* English + ((or (equal? language 'americanenglish) + (equal? language 'english)) ;; it may not be the *real* English + (language_american_english)) ;; but at least it's supported without + ;; non-free add-ons. + ((equal? language 'britishenglish) (language_british_english)) - ((equal? language 'americanenglish) - (language_american_english)) ((equal? language 'scotsgaelic) (language_scots_gaelic)) ((equal? language 'welsh) @@ -113,8 +114,8 @@ (language_klingon)) (t (print "Unsupported language, using English") - (language_british_english)))) + (language_american_english)))) -(defvar language_default language_british_english) +(defvar language_default language_american_english) (provide 'languages) diff -ur festival.british/lib/sable-mode.scm festival/lib/sable-mode.scm --- festival.british/lib/sable-mode.scm 2004-06-27 15:54:41.000000000 -0400 +++ festival/lib/sable-mode.scm 2005-02-07 00:39:28.331621048 -0500 @@ -222,20 +222,20 @@ (xxml_synth UTT) (set! sable_speaker_stack (cons sable_current_speaker sable_speaker_stack)) (cond - ((not equal? sable_current_language 'britishenglish) + ((not equal? sable_current_language 'americanenglish) (print "SABLE: choosen unknown voice, current voice unchanged")) ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male1) (set! sable_current_speaker 'voice_kal_diphone) (voice_kal_diphone)) ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male2) - (set! sable_current_speaker 'voice_don_diphone) - (voice_don_diphone)) + (set! sable_current_speaker 'voice_cmu_us_bdl_arctic_hts) + (voice_cmu_us_bdl_arctic_hts)) ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male3) (set! sable_current_speaker 'voice_ked_diphone) (voice_ked_diphone)) ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male4) - (set! sable_current_speaker 'voice_rab_diphone) - (voice_rab_diphone)) + (set! sable_current_speaker 'voice_cmu_us_jmk_arctic_hts) + (voice_cmu_us_jmk_arctic_hts)) ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male5) (set! sable_current_speaker 'voice_cmu_us_jmk_arctic_hts) (voice_cmu_us_jmk_arctic_hts)) @@ -246,11 +246,11 @@ (set! sable_current_speaker 'voice_cmu_us_awb_arctic_hts) (voice_cmu_us_awb_arctic_hts)) ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male8) - (set! sable_current_speaker 'voice_rab_diphone) + (set! sable_current_speaker 'voice_ked_diphone) (voice_ked_diphone)) ((equal? (car (xxml_attval "NAME" ATTLIST)) 'female1) (set! sable_current_speaker 'voice_cmu_us_slt_arctic_hts) - (voice_us1_mbrola)) + (voice_cmu_us_slt_arctic_hts)) (t (set! sable_current_speaker (intern (string-append "voice_" (car (xxml_attval "NAME" ATTLIST))))) (eval (list sable_current_speaker)))) @@ -467,7 +467,7 @@ "(sable_init_func) Initialisation for SABLE mode" (sable_init_globals) - (voice_kal_diphone) + (voice_cmu_us_slt_arctic_hts) (set! sable_previous_elements xxml_elements) (set! xxml_elements sable_elements) (set! sable_previous_token_to_words english_token_to_words) diff -ur festival.british/lib/soleml-mode.scm festival/lib/soleml-mode.scm --- festival.british/lib/soleml-mode.scm 2001-04-04 07:55:20.000000000 -0400 +++ festival/lib/soleml-mode.scm 2005-02-07 00:24:09.808251898 -0500 @@ -51,7 +51,7 @@ (define (voice_soleml) "(soleml_voice) Speaker specific initialisation for SOLE museum data." - (voice_rab_diphone) + (voice_cmu_us_slt_arctic_hts) ;; Utterances only come at end of file (set! eou_tree '((0))) )