View | Details | Raw Unified
Collapse All | Expand All

(-) festival.orig/src/arch/festival/audspio.cc (+3 lines)
 Lines 43-48    Link Here  
#include "festival.h"
#include "festival.h"
#include "festivalP.h"
#include "festivalP.h"

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
#ifdef NO_SPOOLER
#ifdef NO_SPOOLER

        
void audsp_play_wave(EST_Wave *w) { cerr << "no spooler available\n"; }
void audsp_play_wave(EST_Wave *w) { cerr << "no spooler available\n"; }

        
LISP l_audio_mode(LISP mode) { return NIL; }
LISP l_audio_mode(LISP mode) { return NIL; }



(-) festival.orig/src/arch/festival/client.cc
      (+3 lines)




  

    

    

       Lines 49-54
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "festivalP.h"
#include "festivalP.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static EST_Regex ipnum("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");
static EST_Regex ipnum("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+");

        

        
int festival_socket_client(const char *host,int port)
int festival_socket_client(const char *host,int port)



(-) festival.orig/src/arch/festival/features.cc
      (+3 lines)




  

    

    

       Lines 79-84
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "festivalP.h"
#include "festivalP.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static LISP ff_pref_assoc(const char *name, LISP alist);
static LISP ff_pref_assoc(const char *name, LISP alist);

        

        
static LISP ff_docstrings = NULL;
static LISP ff_docstrings = NULL;



(-) festival.orig/src/arch/festival/festival.cc
      (+2 lines)




  

    

    

       Lines 46-51
       
    
  Link Here 
    

  

        
#include "siod.h"
#include "siod.h"

        
#include "ModuleDescription.h"
#include "ModuleDescription.h"

        

            

              
              
using namespace std;

            

            

              
              

            

        
static void festival_lisp_funcs(void);
static void festival_lisp_funcs(void);

        
static void festival_lisp_vars(void);
static void festival_lisp_vars(void);

        
static void festival_banner(void);
static void festival_banner(void);



(-) festival.orig/src/arch/festival/festivalP.h
      (-1 / +1 lines)




  

    

    

       Lines 50-56
      void festival_ngram_init(); 
    
  Link Here 
    

  

        
void festival_wfst_init();
void festival_wfst_init();

        
void festival_fringe_init(void);
void festival_fringe_init(void);

        

            

              
extern ostream *cslog; 

              
extern std::ostream *cslog; 

            

        

        
LISP l_audio_mode(LISP mode);
LISP l_audio_mode(LISP mode);

        
void audsp_play_wave(EST_Wave *w);
void audsp_play_wave(EST_Wave *w);



(-) festival.orig/src/arch/festival/ModuleDescription.cc
      (-1 / +2 lines)




  

    

    

       Lines 38-46
       
    
  Link Here 
    

  

        
 /*                                                                       */
 /*                                                                       */

        
 /*************************************************************************/
 /*************************************************************************/

        

            

              
#include <iostream.h>

              
#include <iostream>

            

        
#include "siod.h"
#include "siod.h"

        
#include "ModuleDescription.h"
#include "ModuleDescription.h"

            

              
              
using std::ostream;

            

        

        
// to make life easier
// to make life easier

        
static inline EST_String S(const char *s) { return EST_String(s); }
static inline EST_String S(const char *s) { return EST_String(s); }



(-) festival.orig/src/arch/festival/ngram.cc
      (+3 lines)




  

    

    

       Lines 40-45
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "festivalP.h"
#include "festivalP.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static LISP ngram_loaded_list = NIL;
static LISP ngram_loaded_list = NIL;

        
static EST_Ngrammar *load_ngram(const EST_String &filename);
static EST_Ngrammar *load_ngram(const EST_String &filename);

        
static LISP add_ngram(const EST_String &name,EST_Ngrammar *n);
static LISP add_ngram(const EST_String &name,EST_Ngrammar *n);



(-) festival.orig/src/arch/festival/Phone.cc
      (+4 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "festivalP.h"
#include "festivalP.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void check_phoneset(void);
static void check_phoneset(void);

        
static void ps_add_def(const EST_String &name, PhoneSet *ps);
static void ps_add_def(const EST_String &name, PhoneSet *ps);

        
static LISP lisp_select_phoneset(LISP phoneset);
static LISP lisp_select_phoneset(LISP phoneset);



(-) festival.orig/src/arch/festival/server.cc
      (+2 lines)




  

    

    

       Lines 54-59
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "festivalP.h"
#include "festivalP.h"

        

            

              
              
using namespace std;

            

            

              
              

            

        
#define DEFAULT_MAX_CLIENTS 10
#define DEFAULT_MAX_CLIENTS 10

        

        
/* The folloing gives a server that never forks */
/* The folloing gives a server that never forks */



(-) festival.orig/src/arch/festival/utterance.cc
      (+4 lines)




  

    

    

       Lines 42-47
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "festivalP.h"
#include "festivalP.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static LISP item_features(LISP sitem, LISP leval = NIL);
static LISP item_features(LISP sitem, LISP leval = NIL);

        
static LISP item_features(EST_Item *s, bool evaluate_ff=false);
static LISP item_features(EST_Item *s, bool evaluate_ff=false);

        
static LISP stream_tree_to_lisp(EST_Item *s);
static LISP stream_tree_to_lisp(EST_Item *s);



(-) festival.orig/src/arch/festival/wagon_interp.cc
      (-2 / +2 lines)




  

    

    

       Lines 155-162
      static int wagon_ask(EST_Item *s, LISP q 
    
  Link Here 
    

  

        
	    return FALSE;
	    return FALSE;

        
    else 
    else 

        
    {
    {

            

              
	cerr << "Decision tree: unknown question operator: \"" << 

              
	std::cerr << "Decision tree: unknown question operator: \"" << 

            

            

              
	    str_oper << "\"\n";

              
	    str_oper << "\"" << std::endl;

            

        
	festival_error();
	festival_error();

        
    }
    }

        
    return 0;
    return 0;



(-) festival.orig/src/arch/festival/wave.cc
      (+3 lines)




  

    

    

       Lines 47-52
       
    
  Link Here 
    

  

        
#include "winsock2.h"
#include "winsock2.h"

        
#endif
#endif

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void utt_save_f0_from_targets(EST_Utterance *u,EST_String &filename);
static void utt_save_f0_from_targets(EST_Utterance *u,EST_String &filename);

        
static float f0_interpolate(EST_Item *ptval, EST_Item *tval, float time);
static float f0_interpolate(EST_Item *ptval, EST_Item *tval, float time);

        



(-) festival.orig/src/arch/festival/wfst.cc
      (+3 lines)




  

    

    

       Lines 40-45
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "festivalP.h"
#include "festivalP.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static LISP wfst_loaded_list = NIL;
static LISP wfst_loaded_list = NIL;

        
static EST_WFST *load_wfst(const EST_String &filename);
static EST_WFST *load_wfst(const EST_String &filename);

        
static LISP add_wfst(const EST_String &name,EST_WFST *n);
static LISP add_wfst(const EST_String &name,EST_WFST *n);



(-) festival.orig/src/include/festival.h
      (-2 / +2 lines)




  

    

    

       Lines 40-46
       
    
  Link Here 
    

  

        
#define __FESTIVAL_H__
#define __FESTIVAL_H__

        

        
#include <stdlib.h>
#include <stdlib.h>

            

              
#include <fstream.h>

              
#include <fstream>

            

        
#include "EST.h"
#include "EST.h"

        
#include "EST_cutils.h"
#include "EST_cutils.h"

        
#include "siod.h"
#include "siod.h"

  

    

    

       Lines 55-61
      struct ModuleDescription; 
    
  Link Here 
    

  

        

        
/* An iostream for outputing debug messages, switchable    */
/* An iostream for outputing debug messages, switchable    */

        
/* to /dev/null or cerr                                    */
/* to /dev/null or cerr                                    */

            

              
extern ostream *cdebug;

              
extern std::ostream *cdebug;

            

        
#define cwarn cout
#define cwarn cout

        
extern "C" FILE* stddebug;
extern "C" FILE* stddebug;

        
extern int ft_server_socket;
extern int ft_server_socket;



(-) festival.orig/src/include/lexicon.h
      (-2 / +2 lines)




  

    

    

       Lines 99-110
      public: 
    
  Link Here 
    

  

        
		      const EST_String &word,
		      const EST_String &word,

        
		      int start,int mid, int end);
		      int start,int mid, int end);

        

            

              
    inline friend ostream& operator<<(ostream& s, Lexicon &p);

              
    inline friend std::ostream& operator<<(std::ostream& s, Lexicon &p);

            

        

        
    Lexicon & operator =(const Lexicon &a);
    Lexicon & operator =(const Lexicon &a);

        
};
};

        

            

              
inline ostream& operator<<(ostream& s, Lexicon &p)

              
inline std::ostream& operator<<(std::ostream& s, Lexicon &p)

            

        
{
{

        
    s << "[LEXICON " << p.lex_name() << "]" ;
    s << "[LEXICON " << p.lex_name() << "]" ;

        
    return s;
    return s;



(-) festival.orig/src/include/ModuleDescription.h
      (-3 / +3 lines)




  

    

    

       Lines 35-41
       
    
  Link Here 
    

  

        
#define __MODULEDESCRIPTION_H__
#define __MODULEDESCRIPTION_H__

        

        
#include <stdio.h>
#include <stdio.h>

            

              
#include <iostream.h>

              
#include <iostream>

            

        
#include "EST_String.h"
#include "EST_String.h"

        

        
/** Machine readable descriptions of modules. Useful for help messages
/** Machine readable descriptions of modules. Useful for help messages

  

    

    

       Lines 130-143
      struct ModuleDescription { 
    
  Link Here 
    

  

        
  /// Create a module description, initialising it properly.
  /// Create a module description, initialising it properly.

        
  static struct ModuleDescription *create();
  static struct ModuleDescription *create();

        
  /// Print the description to the strream.
  /// Print the description to the strream.

            

              
  static ostream &print(ostream &s, const ModuleDescription &desc);

              
  static std::ostream &print(std::ostream &s, const ModuleDescription &desc);

            

        

        
  static int print(FILE *s, const ModuleDescription &desc);
  static int print(FILE *s, const ModuleDescription &desc);

        

        
};
};

        

        
/// Output operator for descriptions.
/// Output operator for descriptions.

            

              
ostream &operator << (ostream &stream, const ModuleDescription &desc);

              
std::ostream &operator << (std::ostream &stream, const ModuleDescription &desc);

            

        

        
VAL_REGISTER_CLASS_DCLS(moddesc,ModuleDescription)
VAL_REGISTER_CLASS_DCLS(moddesc,ModuleDescription)

        
SIOD_REGISTER_CLASS_DCLS(moddesc,ModuleDescription)
SIOD_REGISTER_CLASS_DCLS(moddesc,ModuleDescription)



(-) festival.orig/src/include/Phone.h
      (-4 / +4 lines)




  

    

    

       Lines 55-66
      public: 
    
  Link Here 
    

  

        
       { return features.val_def(key,def); }
       { return features.val_def(key,def); }

        
    int match_features(Phone *foreign);
    int match_features(Phone *foreign);

        

            

              
    inline friend ostream& operator<<(ostream& s, Phone &p);

              
    inline friend std::ostream& operator<<(std::ostream& s, Phone &p);

            

        

        
    Phone & operator =(const Phone &a);
    Phone & operator =(const Phone &a);

        
};
};

        

            

              
inline ostream& operator<<(ostream& s, Phone &p)

              
inline std::ostream& operator<<(std::ostream& s, Phone &p)

            

        
{
{

        
    s << "[PHONE " << p.phone_name() << "]";
    s << "[PHONE " << p.phone_name() << "]";

        
//    s << p.features << endl;
//    s << p.features << endl;

  

    

    

       Lines 108-120
      public: 
    
  Link Here 
    

  

        
		           != NIL); }
		           != NIL); }

        
    void set_feature(const EST_String &name, LISP vals); 
    void set_feature(const EST_String &name, LISP vals); 

        

            

              
    inline friend ostream& operator<<(ostream& s, PhoneSet &p);

              
    inline friend std::ostream& operator<<(std::ostream& s, PhoneSet &p);

            

        

        
    Phone *find_matched_phone(Phone *phone);
    Phone *find_matched_phone(Phone *phone);

        
    PhoneSet & operator =(const PhoneSet &a);
    PhoneSet & operator =(const PhoneSet &a);

        
};
};

        

            

              
inline ostream& operator<<(ostream& s, PhoneSet &p)

              
inline std::ostream& operator<<(std::ostream& s, PhoneSet &p)

            

        
{
{

        
    s << p.phone_set_name(); return s;
    s << p.phone_set_name(); return s;

        
}
}



(-) festival.orig/src/main/audsp.cc
      (+3 lines)




  

    

    

       Lines 48-53
       
    
  Link Here 
    

  

        
#include "EST.h"
#include "EST.h"

        
#include "EST_unix.h"
#include "EST_unix.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
#ifdef NO_SPOOLER
#ifdef NO_SPOOLER

        

        
int main(int argc, char **argv)
int main(int argc, char **argv)



(-) festival.orig/src/main/festival_client.cc
      (+3 lines)




  

    

    

       Lines 48-53
      typedef HANDLE SERVER_FD; 
    
  Link Here 
    

  

        
typedef FILE *SERVER_FD;
typedef FILE *SERVER_FD;

        
#endif
#endif

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void festival_client_main(int argc, char **argv);
static void festival_client_main(int argc, char **argv);

        
static void copy_to_server(FILE *fdin,SERVER_FD serverfd);
static void copy_to_server(FILE *fdin,SERVER_FD serverfd);

        
static void ttw_file(SERVER_FD serverfd, const EST_String &file);
static void ttw_file(SERVER_FD serverfd, const EST_String &file);



(-) festival.orig/src/main/festival_main.cc
      (-1 / +1 lines)




  

    

    

       Lines 218-224
      static void festival_script_mode(int arg 
    
  Link Here 
    

  

        

        
    if (argc < 2)
    if (argc < 2)

        
    {   
    {   

            

              
	cerr << "festival: script_mode has no file to interpret" << endl;

              
	std::cerr << "festival: script_mode has no file to interpret" << std::endl;

            

        
	return;
	return;

        
    }
    }

        



(-) festival.orig/src/modules/base/ff.cc
      (+3 lines)




  

    

    

       Lines 41-46
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "modules.h"
#include "modules.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static EST_String stressname("stress");
static EST_String stressname("stress");

        
static EST_Val val_string0("0");
static EST_Val val_string0("0");

        
static EST_Val val_string1("1");
static EST_Val val_string1("1");



(-) festival.orig/src/modules/base/modules.cc
      (+3 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        
#include "modules.h"
#include "modules.h"

        
#include "intonation.h"
#include "intonation.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void create_words(EST_Utterance *u);
static void create_words(EST_Utterance *u);

        
static void create_segments(EST_Utterance *u);
static void create_segments(EST_Utterance *u);

        
static void create_wave(EST_Utterance *u);
static void create_wave(EST_Utterance *u);



(-) festival.orig/src/modules/base/parameters.cc
      (+2 lines)




  

    

    

       Lines 45-50
       
    
  Link Here 
    

  

        
// this isn't as efficient as it might be, but we aren't going to be
// this isn't as efficient as it might be, but we aren't going to be

        
// doing this inside any loops
// doing this inside any loops

        

            

              
              
using std::cerr;

            

            

              
              

            

        
LISP lisp_parameter_get(const EST_String parameter_name)
LISP lisp_parameter_get(const EST_String parameter_name)

        
{
{

        
  LISP parameter_get = siod_get_lval("Parameter.get", "Parameter.get not defined");
  LISP parameter_get = siod_get_lval("Parameter.get", "Parameter.get not defined");



(-) festival.orig/src/modules/base/phrasify.cc
      (-1 / +4 lines)




  

    

    

       Lines 41-46
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "modules.h"
#include "modules.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void phrasing_none(EST_Utterance *u);
static void phrasing_none(EST_Utterance *u);

        
static void phrasing_by_cart(EST_Utterance *u);
static void phrasing_by_cart(EST_Utterance *u);

        
static void phrasing_by_probmodels(EST_Utterance *u);
static void phrasing_by_probmodels(EST_Utterance *u);

  

    

    

       Lines 218-224
      static void phrasing_by_probmodels(EST_U 
    
  Link Here 
    

  

        
	    EST_Val npbreak = wagon_predict(w,phrase_type_tree);
	    EST_Val npbreak = wagon_predict(w,phrase_type_tree);

        
	    w->set("pbreak",npbreak.string());  // may reset to BB
	    w->set("pbreak",npbreak.string());  // may reset to BB

        
	}
	}

            

              
	pbreak = (EST_String)w->f("pbreak");

              
	pbreak = EST_String(w->f("pbreak"));

            

        
	if (pbreak == "B")
	if (pbreak == "B")

        
	    w->set("blevel",3);
	    w->set("blevel",3);

        
	else if (pbreak == "mB")
	else if (pbreak == "mB")



(-) festival.orig/src/modules/base/phrinfo.cc
      (+3 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        
#include "modules.h"
#include "modules.h"

        
#include "text.h"
#include "text.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static EST_Item *make_phrase_node(EST_Utterance *u,
static EST_Item *make_phrase_node(EST_Utterance *u,

        
					 const EST_String &name,
					 const EST_String &name,

        
					 LISP feats);
					 LISP feats);



(-) festival.orig/src/modules/base/pos.cc
      (+3 lines)




  

    

    

       Lines 41-46
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "lexicon.h"
#include "lexicon.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static EST_VTCandidate *pos_candlist(EST_Item *s,EST_Features &f);
static EST_VTCandidate *pos_candlist(EST_Item *s,EST_Features &f);

        
static EST_VTPath *pos_npath(EST_VTPath *p,EST_VTCandidate *c,EST_Features &f);
static EST_VTPath *pos_npath(EST_VTPath *p,EST_VTCandidate *c,EST_Features &f);

        
static double find_np_prob(EST_VTPath *p,int n,int *state);
static double find_np_prob(EST_VTPath *p,int n,int *state);



(-) festival.orig/src/modules/base/word.cc
      (-4 / +7 lines)




  

    

    

       Lines 42-47
       
    
  Link Here 
    

  

        
#include "lexicon.h"
#include "lexicon.h"

        
#include "modules.h"
#include "modules.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static EST_Item *add_syllable(EST_Utterance *u, int stress);
static EST_Item *add_syllable(EST_Utterance *u, int stress);

        
static LISP specified_word_pronunciation(EST_Item *w, LISP lpos);
static LISP specified_word_pronunciation(EST_Item *w, LISP lpos);

        

  

    

    

       Lines 64-73
      LISP FT_Classic_Word_Utt(LISP utt) 
    
  Link Here 
    

  

        
    for (w=u->relation("Word")->first(); w != 0; w = next(w))
    for (w=u->relation("Word")->first(); w != 0; w = next(w))

        
    {
    {

        
	lpos = NIL;
	lpos = NIL;

            

              
	pos = (EST_String)ffeature(w,"hg_pos");

              
	pos = EST_String(ffeature(w,"hg_pos"));

            

        
                        // explicit homograph pos disambiguation
                        // explicit homograph pos disambiguation

        
	if (pos == "0")
	if (pos == "0")

            

              
	    pos = (EST_String)ffeature(w,"pos");

              
	    pos = EST_String(ffeature(w,"pos"));

            

        
	if (pos != "0")
	if (pos != "0")

        
	    lpos = rintern(pos);
	    lpos = rintern(pos);

        

  

    

    

       Lines 100-107
      static LISP specified_word_pronunciation 
    
  Link Here 
    

  

        
    //  from which a list can be read.
    //  from which a list can be read.

        
    EST_String p;
    EST_String p;

        

            

              
    if (((p = (EST_String)ffeature(w,"phonemes")) != "0") ||

              
    if (((p = EST_String(ffeature(w,"phonemes"))) != "0") ||

            

            

              
	((p = (EST_String)ffeature(w,"R:Token.parent.phonemes")) != "0"))

              
	((p = EST_String(ffeature(w,"R:Token.parent.phonemes"))) != "0"))

            

        
    {
    {

        
	LISP phones = read_from_lstring(strintern(p));
	LISP phones = read_from_lstring(strintern(p));

        



(-) festival.orig/src/modules/clunits/acost.cc
      (+2 lines)




  

    

    

       Lines 49-54
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "clunits.h"
#include "clunits.h"

        

            

              
              
using namespace std;

            

            

              
              

            

        
static void find_unit_distances(LISP units, const EST_String &fname);
static void find_unit_distances(LISP units, const EST_String &fname);

        

        
static float duration_penalty_weight=1.0;
static float duration_penalty_weight=1.0;



(-) festival.orig/src/modules/clunits/cldb.cc
      (+2 lines)




  

    

    

       Lines 44-49
       
    
  Link Here 
    

  

        
#include "EST_FileType.h"
#include "EST_FileType.h"

        
#include "clunits.h"
#include "clunits.h"

        

            

              
              
using namespace std;

            

            

              
              

            

        
VAL_REGISTER_CLASS(clunitsdb,CLDB)
VAL_REGISTER_CLASS(clunitsdb,CLDB)

        
SIOD_REGISTER_CLASS(clunitsdb,CLDB)
SIOD_REGISTER_CLASS(clunitsdb,CLDB)

        
static void cl_load_catalogue(CLDB *cldb,EST_String &indexfile);
static void cl_load_catalogue(CLDB *cldb,EST_String &indexfile);



(-) festival.orig/src/modules/clunits/clunits.cc
      (+3 lines)




  

    

    

       Lines 78-83
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "clunits.h"
#include "clunits.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void setup_clunits_params();
static void setup_clunits_params();

        
static EST_VTCandidate *TS_candlist(EST_Item *s,EST_Features &f);
static EST_VTCandidate *TS_candlist(EST_Item *s,EST_Features &f);

        
static EST_VTPath *TS_npath(EST_VTPath *p,EST_VTCandidate *c,EST_Features &f);
static EST_VTPath *TS_npath(EST_VTPath *p,EST_VTCandidate *c,EST_Features &f);



(-) festival.orig/src/modules/donovan/donovan.cc
      (-4 / +6 lines)




  

    

    

       Lines 44-54
       
    
  Link Here 
    

  

        
/* Note the FreeSpeech code is GNU Copyright not like the above          */
/* Note the FreeSpeech code is GNU Copyright not like the above          */

        
/*                                                                       */
/*                                                                       */

        
/*=======================================================================*/
/*=======================================================================*/

            

              
#include <iostream.h>

              
#include <iostream>

            

            

              
#include <fstream.h>

              

            

        
#include "festival.h"
#include "festival.h"

        
#include "donovan.h"
#include "donovan.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static CONFIG *make_config(void);
static CONFIG *make_config(void);

        
static void delete_config(CONFIG *config);
static void delete_config(CONFIG *config);

        
static SPN *make_spn(EST_Utterance &u);
static SPN *make_spn(EST_Utterance &u);

  

    

    

       Lines 111-117
      LISP FT_Donovan_Synthesize_Utt(LISP utt) 
    
  Link Here 
    

  

        

        
    if (nindex == 0)
    if (nindex == 0)

        
    {
    {

            

              
	cerr << "Festival: no donovan diphones loaded\n";

              
	cerr << "Festival: no donovan diphones loaded" << endl;

            

        
	festival_error();
	festival_error();

        
    }
    }

        

  

    

    

       Lines 307-313
      void as_realloc(int nframes, int npp, AC 
    
  Link Here 
    

  

        
    (void)npp;
    (void)npp;

        
    (void)as;
    (void)as;

        

            

              
    cerr << "Donovan diphones: as_realloc called unexpectedly\n";

              
    cerr << "Donovan diphones: as_realloc called unexpectedly" << endl;

            

        
    festival_error();
    festival_error();

        

        
}
}



(-) festival.orig/src/modules/Duration/duration.cc
      (+2 lines)




  

    

    

       Lines 41-46
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "durationP.h"
#include "durationP.h"

        

            

              
              
using namespace std;

            

            

              
              

            

        
LISP FT_Duration_Ave_Utt(LISP utt)
LISP FT_Duration_Ave_Utt(LISP utt)

        
{
{

        
    // Predict average duration on segments
    // Predict average duration on segments



(-) festival.orig/src/modules/Duration/dur_aux.cc
      (+2 lines)




  

    

    

       Lines 41-46
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "durationP.h"
#include "durationP.h"

        

            

              
              
using std::cerr;

            

            

              
              

            

        
float dur_get_stretch(void)
float dur_get_stretch(void)

        
{
{

        
    LISP lstretch = ft_get_param("Duration_Stretch");
    LISP lstretch = ft_get_param("Duration_Stretch");



(-) festival.orig/src/modules/Duration/Klatt.cc
      (+4 lines)




  

    

    

       Lines 56-61
      which I think is neater. 
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "durationP.h"
#include "durationP.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void klatt_dur_debug(EST_Item *s);
static void klatt_dur_debug(EST_Item *s);

        

        
static float rule2(EST_Item *seg);
static float rule2(EST_Item *seg);



(-) festival.orig/src/modules/Intonation/duffint.cc
      (+3 lines)




  

    

    

       Lines 41-46
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "intonation.h"
#include "intonation.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::endl;

            

            

              
              

            

        
LISP FT_Intonation_Default_Utt(LISP utt)
LISP FT_Intonation_Default_Utt(LISP utt)

        
{
{

        
    return utt;
    return utt;



(-) festival.orig/src/modules/Intonation/gen_int.cc
      (+3 lines)




  

    

    

       Lines 49-54
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "intonation.h"
#include "intonation.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void check_targs(EST_Utterance *u);
static void check_targs(EST_Utterance *u);

        
static EST_Item *find_nearest_seg(EST_Utterance *u,float pos);
static EST_Item *find_nearest_seg(EST_Utterance *u,float pos);

        



(-) festival.orig/src/modules/Intonation/int_tree.cc
      (-7 / +10 lines)




  

    

    

       Lines 47-52
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "intonation.h"
#include "intonation.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
enum lr_tpos {tp_start, tp_mid, tp_end};
enum lr_tpos {tp_start, tp_mid, tp_end};

        

        
static EST_String accent_specified(EST_Item *s);
static EST_String accent_specified(EST_Item *s);

  

    

    

       Lines 87-97
      LISP FT_Intonation_Tree_Utt(LISP utt) 
    
  Link Here 
    

  

        
    for (s=u->relation("Syllable")->first(); s != 0; s=next(s))
    for (s=u->relation("Syllable")->first(); s != 0; s=next(s))

        
    {
    {

        
	if ((paccent = accent_specified(s)) == "0") // check if pre-specified
	if ((paccent = accent_specified(s)) == "0") // check if pre-specified

            

              
	    paccent = (EST_String)wagon_predict(s,accent_tree);

              
	    paccent = EST_String(wagon_predict(s,accent_tree));

            

        
	if (paccent != "NONE")
	if (paccent != "NONE")

        
	    add_IntEvent(u,s,paccent);
	    add_IntEvent(u,s,paccent);

        
	if ((ptone = tone_specified(s)) == "0")
	if ((ptone = tone_specified(s)) == "0")

            

              
	    ptone = (EST_String)wagon_predict(s,endtone_tree);

              
	    ptone = EST_String(wagon_predict(s,endtone_tree));

            

        
	if (ptone != "NONE")
	if (ptone != "NONE")

        
	    add_IntEvent(u,s,ptone);
	    add_IntEvent(u,s,ptone);

        
    }
    }

  

    

    

       Lines 107-117
      static EST_String accent_specified(EST_I 
    
  Link Here 
    

  

        
    EST_Item *token = parent(word,"Token");
    EST_Item *token = parent(word,"Token");

        
    EST_String paccent("0");
    EST_String paccent("0");

        
    if (token)
    if (token)

            

              
	paccent = (EST_String)ffeature(token,"accent");

              
	paccent = EST_String(ffeature(token,"accent"));

            

        
	
	

        
    if (paccent == "0")
    if (paccent == "0")

        
    {
    {

            

              
	paccent = (EST_String)ffeature(word,"accent");

              
	paccent = EST_String(ffeature(word,"accent"));

            

        
	if (paccent == "0")
	if (paccent == "0")

        
	    return paccent;
	    return paccent;

        
    }
    }

  

    

    

       Lines 139-149
      static EST_String tone_specified(EST_Ite 
    
  Link Here 
    

  

        
    EST_Item *token = parent(word,"Token");
    EST_Item *token = parent(word,"Token");

        
    EST_String ptone("0");
    EST_String ptone("0");

        
    if (token)
    if (token)

            

              
	ptone = (EST_String)ffeature(token,"tone");

              
	ptone = EST_String(ffeature(token,"tone"));

            

        

        
    if (ptone == "0")
    if (ptone == "0")

        
    {
    {

            

              
	ptone = (EST_String)ffeature(word,"tone");

              
	ptone = EST_String(ffeature(word,"tone"));

            

        
	if (ptone == "0")
	if (ptone == "0")

        
	    return ptone;
	    return ptone;

        
    }
    }

  

    

    

       Lines 272-278
      static void add_target_at(EST_Utterance  
    
  Link Here 
    

  

        
	add_target(u,seg,seg->F("end"),val);
	add_target(u,seg,seg->F("end"),val);

        
    else
    else

        
    {
    {

            

              
	cerr << "add_target_at: unknown position type\n";

              
	cerr << "add_target_at: unknown position type" << endl;

            

        
	festival_error();
	festival_error();

        
    }
    }

        
}
}



(-) festival.orig/src/modules/Intonation/simple.cc
      (-2 / +2 lines)




  

    

    

       Lines 52-58
      LISP FT_Intonation_Simple_Utt(LISP utt) 
    
  Link Here 
    

  

        
    LISP accent_tree;
    LISP accent_tree;

        
    EST_Val paccent;
    EST_Val paccent;

        

            

              
    *cdebug << "Simple intonation module" << endl;

              
    *cdebug << "Simple intonation module" << std::endl;

            

        

        
    accent_tree = siod_get_lval("int_accent_cart_tree","no accent tree");
    accent_tree = siod_get_lval("int_accent_cart_tree","no accent tree");

        

  

    

    

       Lines 80-86
      LISP FT_Int_Targets_Simple_Utt(LISP utt) 
    
  Link Here 
    

  

        
    LISP simple_params;
    LISP simple_params;

        
    float f0_mean, f0_std;
    float f0_mean, f0_std;

        

            

              
    *cdebug << "Simple int targets module" << endl;

              
    *cdebug << "Simple int targets module" << std::endl;

            

        

        
    // Create some down step accents
    // Create some down step accents

        
    simple_params = siod_get_lval("int_simple_params","no simple params");
    simple_params = siod_get_lval("int_simple_params","no simple params");



(-) festival.orig/src/modules/Lexicon/complex.cc
      (+2 lines)




  

    

    

       Lines 44-49
       
    
  Link Here 
    

  

        
#include "lexiconP.h"
#include "lexiconP.h"

        
#include "lts.h"
#include "lts.h"

        

            

              
              
using namespace std;

            

            

              
              

            

        
static LISP check_and_fix(LISP entry);
static LISP check_and_fix(LISP entry);

        
static void check_sylphones(const char *name,LISP syls);
static void check_sylphones(const char *name,LISP syls);

        



(-) festival.orig/src/modules/Lexicon/lexicon.cc
      (+4 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        
#include "lexiconP.h"
#include "lexiconP.h"

        
#include "lts.h"
#include "lts.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static int bl_match_entry(LISP entry,const EST_String &word);
static int bl_match_entry(LISP entry,const EST_String &word);

        
static int match_features(LISP req_feats, LISP act_feats);
static int match_features(LISP req_feats, LISP act_feats);

        



(-) festival.orig/src/modules/Lexicon/lts_rules.cc
      (+2 lines)




  

    

    

       Lines 58-63
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "lts.h"
#include "lts.h"

        

            

              
              
using namespace std;

            

            

              
              

            

        
class LTS_Ruleset{
class LTS_Ruleset{

        
  private:
  private:

        
    EST_String p_name;
    EST_String p_name;



(-) festival.orig/src/modules/rxp/ttsxml.cc
      (+3 lines)




  

    

    

       Lines 46-51
       
    
  Link Here 
    

  

        
#include "text.h"
#include "text.h"

        
#include "rxp.h"
#include "rxp.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
// So we can share the known_ids table.
// So we can share the known_ids table.

        
#include "ling_class/EST_utterance_xml.h"
#include "ling_class/EST_utterance_xml.h"

        



(-) festival.orig/src/modules/Text/text.cc
      (+3 lines)




  

    

    

       Lines 49-54
       
    
  Link Here 
    

  

        
#include "festival.h"
#include "festival.h"

        
#include "text.h"
#include "text.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void tts_raw_token(EST_Item *t);
static void tts_raw_token(EST_Item *t);

        
static void tts_raw_utt(LISP utt);
static void tts_raw_utt(LISP utt);

        



(-) festival.orig/src/modules/Text/text_modes.cc
      (+3 lines)




  

    

    

       Lines 52-57
       
    
  Link Here 
    

  

        
#include "text.h"
#include "text.h"

        
#include "lexicon.h"
#include "lexicon.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static void um_apply_filter(const EST_String &filtername,
static void um_apply_filter(const EST_String &filtername,

        
			    const EST_String &infile,
			    const EST_String &infile,

        
			    const EST_String &outname);
			    const EST_String &outname);



(-) festival.orig/src/modules/Text/token.cc
      (-4 / +4 lines)




  

    

    

       Lines 84-90
      LISP FT_Welsh_Token_Utt(LISP utt) 
    
  Link Here 
    

  

        
LISP FT_Spanish_Token_Utt(LISP utt)
LISP FT_Spanish_Token_Utt(LISP utt)

        
{
{

        
    (void)utt;
    (void)utt;

            

              
    cerr << "TOKEN: Spanish tokenization not yet supported\n";

              
    std::cerr << "TOKEN: Spanish tokenization not yet supported" << std::endl;

            

        
    festival_error();
    festival_error();

        

        
    // never happens
    // never happens

  

    

    

       Lines 136-142
      LISP FT_English_Token_Utt(LISP utt) 
    
  Link Here 
    

  

        
    LISP words,w,eou_tree,l;
    LISP words,w,eou_tree,l;

        
    EST_Item *new_word;
    EST_Item *new_word;

        

            

              
    *cdebug << "Token module (English)" << endl;

              
    *cdebug << "Token module (English)" << std::endl;

            

        

        
    eou_tree = siod_get_lval("eou_tree","No end of utterance tree");
    eou_tree = siod_get_lval("eou_tree","No end of utterance tree");

        
    user_token_to_word_func = siod_get_lval("token_to_words",NULL);
    user_token_to_word_func = siod_get_lval("token_to_words",NULL);

  

    

    

       Lines 230-236
      static LISP builtin_word_it(EST_Item *to 
    
  Link Here 
    

  

        
	else
	else

        
	    return cons(strintern(tok),NIL);
	    return cons(strintern(tok),NIL);

        
    }
    }

            

              
    else if ((token_pos = (EST_String)ffeature(token,"token_pos")) == "ordinal")

              
    else if ((token_pos = EST_String(ffeature(token,"token_pos"))) == "ordinal")

            

        
	return say_num_as_ordinal(tok);
	return say_num_as_ordinal(tok);

        
    else if (token_pos == "year")
    else if (token_pos == "year")

        
	return say_num_as_year(tok);
	return say_num_as_year(tok);

  

    

    

       Lines 471-477
      static LISP say_num_as_ordinal(const EST 
    
  Link Here 
    

  

        
    {
    {

        
	// I don't think I've forgotten anything 
	// I don't think I've forgotten anything 

        
	*cdebug << "Token: can't make ordinal from \"" << lastword 
	*cdebug << "Token: can't make ordinal from \"" << lastword 

            

              
	    << "\"" << endl;

              
	    << "\"" << std::endl;

            

        
	CAR(last) = strintern(EST_String(lastword)+"th");
	CAR(last) = strintern(EST_String(lastword)+"th");

        
    }
    }

        



(-) festival.orig/src/modules/Text/tok_ext.cc
      (+3 lines)




  

    

    

       Lines 48-53
       
    
  Link Here 
    

  

        
#include "lexicon.h"
#include "lexicon.h"

        
#include "text.h"
#include "text.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static int rhc = 10;
static int rhc = 10;

        
static int lhc = 10;
static int lhc = 10;

        



(-) festival.orig/src/modules/Text/xxml.cc
      (-2 / +5 lines)




  

    

    

       Lines 48-53
       
    
  Link Here 
    

  

        
#include "text.h"
#include "text.h"

        
#include "lexicon.h"
#include "lexicon.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static LISP xxml_get_attribute(const EST_String &remainder);
static LISP xxml_get_attribute(const EST_String &remainder);

        
static char *xxml_process_line(const char *line);
static char *xxml_process_line(const char *line);

        
static void tts_xxml_token(EST_Item *t);
static void tts_xxml_token(EST_Item *t);

  

    

    

       Lines 93-99
      void tts_file_xxml(LISP filename) 
    
  Link Here 
    

  

        
	    cerr << "xxml parse error: unexpected end of file \n";
	    cerr << "xxml parse error: unexpected end of file \n";

        
	    festival_error();
	    festival_error();

        
	}
	}

            

              
	line = (EST_String)ts.get_upto_eoln();

              
	line = EST_String(ts.get_upto_eoln());

            

        
	type = line.at(0,1);
	type = line.at(0,1);

        
	remainder = line.after(0);
	remainder = line.after(0);

        
	if (type == "-")
	if (type == "-")

  

    

    

       Lines 159-165
      static LISP xxml_get_attribute(const EST 
    
  Link Here 
    

  

        
    EST_Token t;
    EST_Token t;

        

        
    ts.open_string(remainder);
    ts.open_string(remainder);

            

              
    name = (EST_String)ts.get();

              
    name = EST_String(ts.get());

            

        
    if ((t=ts.get()) == "IMPLIED")
    if ((t=ts.get()) == "IMPLIED")

        
	att = cons(rintern(name),cons(NIL,NIL));
	att = cons(rintern(name),cons(NIL,NIL));

        
    else if (t == "TOKEN")
    else if (t == "TOKEN")



(-) festival.orig/src/modules/UniSyn/us_features.cc
      (+3 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        
#include "EST_error.h"
#include "EST_error.h"

        
#include "us_features.h"
#include "us_features.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
void add_feature_function(EST_Relation &r, const EST_String &fname,
void add_feature_function(EST_Relation &r, const EST_String &fname,

        
			  const EST_String &funcname)
			  const EST_String &funcname)

        
{
{



(-) festival.orig/src/modules/UniSyn_diphone/UniSyn_diphone.cc
      (-5 / +7 lines)




  

    

    

       Lines 42-47
       
    
  Link Here 
    

  

        
#include "us_diphone.h"
#include "us_diphone.h"

        
#include "festival.h"
#include "festival.h"

        

            

              
              
using std::endl;

            

            

              
              

            

        
extern USDiphIndex *diph_index;
extern USDiphIndex *diph_index;

        
LISP us_dbs = NIL;
LISP us_dbs = NIL;

        
LISP us_make_group_file(LISP lname, LISP params);
LISP us_make_group_file(LISP lname, LISP params);

  

    

    

       Lines 114-120
      LISP us_diphone_init(LISP args) 
    
  Link Here 
    

  

        
	d_index->grouped = true;
	d_index->grouped = true;

        
	if (d_index->ts.open(d_index->index_file) != 0)
	if (d_index->ts.open(d_index->index_file) != 0)

        
	{
	{

            

              
	    cerr << "US DB: can't open grouped diphone file " 

              
	    std::cerr << "US DB: can't open grouped diphone file " 

            

        
		<< d_index->index_file << endl;
		<< d_index->index_file << endl;

        
	    festival_error();
	    festival_error();

        
	}
	}

  

    

    

       Lines 123-132
      LISP us_diphone_init(LISP args) 
    
  Link Here 
    

  

        
    }
    }

        
    else
    else

        
    {
    {

            

              
	*cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl;

              
	*cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl

            

            

              
	*cdebug << "index grouped:" << d_index->grouped << endl;

              
	        << "index grouped:" << d_index->grouped << endl

            

            

              
	*cdebug << "true:" << true << endl;

              
	        << "true:" << true << endl

            

            

              
	*cdebug << "false:" << false << endl;

              
	        << "false:" << false << endl;

            

        
	
	

        
	d_index->coef_dir = get_param_str("coef_dir",args,"");
	d_index->coef_dir = get_param_str("coef_dir",args,"");

        
	d_index->sig_dir = get_param_str("sig_dir",args,"");
	d_index->sig_dir = get_param_str("sig_dir",args,"");



(-) festival.orig/src/modules/UniSyn_diphone/us_diphone_index.cc
      (-2 / +6 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        
#include "us_diphone.h"
#include "us_diphone.h"

        
#include "Phone.h"
#include "Phone.h"

        

            

              
              
using std::cout;

            

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
static bool US_full_coefs = false;
static bool US_full_coefs = false;

        
USDiphIndex *diph_index = 0;
USDiphIndex *diph_index = 0;

        
extern LISP us_dbs;
extern LISP us_dbs;

  

    

    

       Lines 106-114
      static EST_String get_diphone_name(EST_I 
    
  Link Here 
    

  

        

        
    if (!item)
    if (!item)

        
	return "";
	return "";

            

              
    else if ((d1 = (EST_String)item->f(dname+"_"+dir,def)) != "0")

              
    else if ((d1 = EST_String(item->f(dname+"_"+dir,def))) != "0")

            

        
	return d1;
	return d1;

            

              
    else if ((d1 = (EST_String)item->f(dname,def)) != "0")

              
    else if ((d1 = EST_String(item->f(dname,def))) != "0")

            

        
	return d1;
	return d1;

        
    else
    else

        
	return item->f("name","0").string();
	return item->f("name","0").string();



(-) festival.orig/src/modules/UniSyn_diphone/us_diphone_unit.cc
      (+3 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        
#include "us_diphone.h"
#include "us_diphone.h"

        
#include "Phone.h"
#include "Phone.h"

        

            

              
              
using std::cerr;

            

            

              
              
using std::endl;

            

            

              
              

            

        
extern USDiphIndex *diph_index;
extern USDiphIndex *diph_index;

        

        
void dur_to_end(EST_Relation &r)
void dur_to_end(EST_Relation &r)