diff -urN festival-orig/lib/languages.scm festival/lib/languages.scm --- festival-orig/lib/languages.scm Sun May 30 15:39:53 1999 +++ festival/lib/languages.scm Thu Apr 27 19:15:30 2000 @@ -98,11 +98,12 @@ (define (select_language language) (cond - ((or (equal? language 'britishenglish) - (equal? language 'english)) ;; we all know its the *real* English + ((equal? language 'britishenglish) (language_british_english)) - ((equal? language 'americanenglish) - (language_american_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 'scotsgaelic) (language_scots_gaelic)) ((equal? language 'welsh) @@ -112,9 +113,9 @@ ((equal? language 'klingon) (language_klingon)) (t - (print "Unspoorted language, using English") - (language_british_english)))) + (print "Unsupported language, using English") + (language_american_english)))) -(defvar language_default language_british_english) +(defvar language_default language_american_english) (provide 'languages) diff -urN festival-orig/lib/sable-mode.scm festival/lib/sable-mode.scm --- festival-orig/lib/sable-mode.scm Tue Nov 16 21:50:22 1999 +++ festival/lib/sable-mode.scm Thu Apr 27 19:10:44 2000 @@ -99,6 +99,10 @@ (medium 1.0) (quiet 0.5))) +;; Modified default to use American English and the "kal" voice. +;; Not because of personal preference, but because we don't want to rely on +;; the (non-free) British support. +;; --bero (define (sable_init_globals) (set! utts nil) (set! sable_omitted_mode nil) @@ -107,10 +111,10 @@ (set! sable_vol_context nil) (set! sable_vol_type 'no_change) (set! sable_vol_factor 1.0) - (set! sable_current_language 'britishenglish) + (set! sable_current_language 'americanenglish) (set! sable_unsupported_language nil) (set! sable_language_stack nil) - (set! sable_current_speaker 'voice_rab_diphone) + (set! sable_current_speaker 'voice_kal_diphone) (set! sable_speaker_stack nil) ) @@ -196,9 +200,9 @@ (select_language 'spanish)) ((or (string-equal language "ENGLISH") (string-equal language "EN")) - (set! sable_current_language 'britishenglish) + (set! sable_current_language 'americanenglish) (set! sable_unsupported_language nil) - (select_language 'britishenglish)) + (select_language 'americanenglish)) (t ;; skip languages you don't know ;; BUG: if current language isn't English this wont work (apply_hooks tts_hooks @@ -222,21 +226,40 @@ (xxml_synth UTT) (set! sable_speaker_stack (cons sable_current_speaker sable_speaker_stack)) (cond - ((not equal? sable_current_language 'britishenglish) - (print "SABLE: choosen unknown voice, current voice unchanged")) - ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male1) - (set! sable_current_speaker 'voice_rab_diphone) - (voice_rab_diphone)) - ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male2) - (set! sable_current_speaker 'voice_don_diphone) - (voice_don_diphone)) - ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male3) - (set! sable_current_speaker 'voice_ked_diphone) - (voice_ked_diphone)) +;; Removed the following: +;; ((not equal? sable_current_language 'britishenglish) +;; (print "SABLE: choosen unknown voice, current voice unchanged")) +;; After all, we have several american voices... +;; -- bero + ((equal? sable_current_language 'britishenglish) + (cond + ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male1) + (set! sable_current_speaker 'voice_rab_diphone) + (voice_rab_diphone)) + ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male2) + (set! sable_current_speaker 'voice_don_diphone) + (voice_don_diphone)) + ((equal? (car (xxml_attval "NAME" ATTLIST)) 'male3) + (set! sable_current_speaker 'voice_ked_diphone) + (voice_ked_diphone)) + (t + (print "SABLE: selecting unknown voice") + (set! sable_current_speaker voice_rab_diphone) + (voice_rab_diphone)))) + ((equal? sable_current_language 'americanenglish) + (cond + ((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_ked_diphone) + (voice_ked_diphone)) + (t + (print "SABLE: selecting unknown voice") + (set! sable_current_speaker voice_kal_diphone) + (voice_kal_diphone)))) (t - (print "SABLE: selecting unknown voice") - (set! sable_current_speaker voice_rab_diphone) - (voice_rab_diphone))) + (print "SABLE: choosen unknown voice, current voice unchanged"))) (sable_setup_voice_params) nil) (")SPEAKER" (ATTLIST UTT)