--- festival/src/modules/base/phrasify.cc.bak 2001-04-04 13:55:20.000000000 +0200 +++ festival/src/modules/base/phrasify.cc 2004-07-20 14:23:33.026032684 +0200 @@ -218,7 +218,7 @@ EST_Val npbreak = wagon_predict(w,phrase_type_tree); w->set("pbreak",npbreak.string()); // may reset to BB } - pbreak = w->f("pbreak"); + pbreak = w->f("pbreak").string(); if (pbreak == "B") w->set("blevel",3); else if (pbreak == "mB") --- festival/src/modules/base/word.cc.bak 2001-04-04 13:55:20.000000000 +0200 +++ festival/src/modules/base/word.cc 2004-07-20 14:24:58.889677557 +0200 @@ -64,10 +64,10 @@ for (w=u->relation("Word")->first(); w != 0; w = next(w)) { lpos = NIL; - pos = ffeature(w,"hg_pos"); + pos = ffeature(w,"hg_pos").string(); // explicit homograph pos disambiguation if (pos == "0") - pos = ffeature(w,"pos"); + pos = ffeature(w,"pos").string(); if (pos != "0") lpos = rintern(pos); @@ -100,8 +100,8 @@ // from which a list can be read. EST_String p; - if (((p = ffeature(w,"phonemes")) != "0") || - ((p = ffeature(w,"R:Token.parent.phonemes")) != "0")) + if (((p = ffeature(w,"phonemes").string()) != "0") || + ((p = ffeature(w,"R:Token.parent.phonemes").string()) != "0")) { LISP phones = read_from_lstring(strintern(p)); --- festival/src/modules/Intonation/int_tree.cc.bak 2001-04-04 13:55:20.000000000 +0200 +++ festival/src/modules/Intonation/int_tree.cc 2004-07-20 14:27:33.990842436 +0200 @@ -87,11 +87,11 @@ for (s=u->relation("Syllable")->first(); s != 0; s=next(s)) { if ((paccent = accent_specified(s)) == "0") // check if pre-specified - paccent = wagon_predict(s,accent_tree); + paccent = wagon_predict(s,accent_tree).string(); if (paccent != "NONE") add_IntEvent(u,s,paccent); if ((ptone = tone_specified(s)) == "0") - ptone = wagon_predict(s,endtone_tree); + ptone = wagon_predict(s,endtone_tree).string(); if (ptone != "NONE") add_IntEvent(u,s,ptone); } @@ -107,11 +107,11 @@ EST_Item *token = parent(word,"Token"); EST_String paccent("0"); if (token) - paccent = ffeature(token,"accent"); + paccent = ffeature(token,"accent").string(); if (paccent == "0") { - paccent = ffeature(word,"accent"); + paccent = ffeature(word,"accent").string(); if (paccent == "0") return paccent; } @@ -139,11 +139,11 @@ EST_Item *token = parent(word,"Token"); EST_String ptone("0"); if (token) - ptone = ffeature(token,"tone"); + ptone = ffeature(token,"tone").string(); if (ptone == "0") { - ptone = ffeature(word,"tone"); + ptone = ffeature(word,"tone").string(); if (ptone == "0") return ptone; } --- festival/src/modules/Text/token.cc.bak 2001-04-04 13:55:20.000000000 +0200 +++ festival/src/modules/Text/token.cc 2004-07-20 14:30:38.743230008 +0200 @@ -230,7 +230,7 @@ else return cons(strintern(tok),NIL); } - else if ((token_pos = ffeature(token,"token_pos")) == "ordinal") + else if ((token_pos = ffeature(token,"token_pos").string()) == "ordinal") return say_num_as_ordinal(tok); else if (token_pos == "year") return say_num_as_year(tok); --- festival/src/modules/Text/xxml.cc.bak 2001-04-04 13:55:20.000000000 +0200 +++ festival/src/modules/Text/xxml.cc 2004-07-20 14:32:24.428023747 +0200 @@ -93,7 +93,7 @@ cerr << "xxml parse error: unexpected end of file \n"; festival_error(); } - line = ts.get_upto_eoln(); + line = ts.get_upto_eoln().string(); type = line.at(0,1); remainder = line.after(0); if (type == "-") @@ -159,7 +159,7 @@ EST_Token t; ts.open_string(remainder); - name = ts.get(); + name = ts.get().string(); if ((t=ts.get()) == "IMPLIED") att = cons(rintern(name),cons(NIL,NIL)); else if (t == "TOKEN") --- festival/src/modules/UniSyn_diphone/us_diphone_index.cc.bak 2002-07-02 13:18:30.000000000 +0200 +++ festival/src/modules/UniSyn_diphone/us_diphone_index.cc 2004-07-20 14:36:14.589752363 +0200 @@ -106,9 +106,9 @@ if (!item) return ""; - else if ((d1 = item->f(dname+"_"+dir,def)) != "0") + else if ((d1 = item->f(dname+"_"+dir,def).string()) != "0") return d1; - else if ((d1 = item->f(dname,def)) != "0") + else if ((d1 = item->f(dname,def).string()) != "0") return d1; else return item->f("name","0").string();