Attachment #13699 for bug #22053

Lines 218-224 Link Here

(-)festival.org/src/modules/base/phrasify.cc (-1 / +1 lines)
218	EST_Val npbreak = wagon_predict(w,phrase_type_tree);	218	EST_Val npbreak = wagon_predict(w,phrase_type_tree);
219	w->set("pbreak",npbreak.string()); // may reset to BB	219	w->set("pbreak",npbreak.string()); // may reset to BB
220	}	220	}
221	pbreak = w->f("pbreak");	221	pbreak = (EST_String)w->f("pbreak");
222	if (pbreak == "B")	222	if (pbreak == "B")
223	w->set("blevel",3);	223	w->set("blevel",3);
224	else if (pbreak == "mB")	224	else if (pbreak == "mB")




    for (w=u->relation("Word")->first(); w != 0; w = next(w))
    {
	lpos = NIL;
	pos = (EST_String)ffeature(w,"hg_pos");
                        // explicit homograph pos disambiguation
	if (pos == "0")
	    pos = (EST_String)ffeature(w,"pos");
	if (pos != "0")
	    lpos = rintern(pos);


    //  from which a list can be read.
    EST_String p;

    if (((p = (EST_String)ffeature(w,"phonemes")) != "0") ||
	((p = (EST_String)ffeature(w,"R:Token.parent.phonemes")) != "0"))
    {
	LISP phones = read_from_lstring(strintern(p));





    for (s=u->relation("Syllable")->first(); s != 0; s=next(s))
    {
	if ((paccent = accent_specified(s)) == "0") // check if pre-specified
	    paccent = (EST_String)wagon_predict(s,accent_tree);
	if (paccent != "NONE")
	    add_IntEvent(u,s,paccent);
	if ((ptone = tone_specified(s)) == "0")
	    ptone = (EST_String)wagon_predict(s,endtone_tree);
	if (ptone != "NONE")
	    add_IntEvent(u,s,ptone);
    }

    EST_Item *token = parent(word,"Token");
    EST_String paccent("0");
    if (token)
	paccent = (EST_String)ffeature(token,"accent");
	
    if (paccent == "0")
    {
	paccent = (EST_String)ffeature(word,"accent");
	if (paccent == "0")
	    return paccent;
    }

    EST_Item *token = parent(word,"Token");
    EST_String ptone("0");
    if (token)
	ptone = (EST_String)ffeature(token,"tone");

    if (ptone == "0")
    {
	ptone = (EST_String)ffeature(word,"tone");
	if (ptone == "0")
	    return ptone;
    }

Lines 230-236 Link Here

(-)festival.org/src/modules/Text/token.cc (-2 / +2 lines)
230	else	230	else
231	return cons(strintern(tok),NIL);	231	return cons(strintern(tok),NIL);
232	}	232	}
233	else if ((token_pos = ffeature(token,"token_pos")) == "ordinal")	233	else if ((token_pos = (EST_String)ffeature(token,"token_pos")) == "ordinal")
234	return say_num_as_ordinal(tok);	234	return say_num_as_ordinal(tok);
235	else if (token_pos == "year")	235	else if (token_pos == "year")
236	return say_num_as_year(tok);	236	return say_num_as_year(tok);
Lines 404-410 Link Here
404	const char *tokch = tok;	404	const char *tokch = tok;
405		405
406	for (i=0; i<tok.length(); i++)	406	for (i=0; i<tok.length(); i++)
407	if (strchr(PunctuationChars,tokch[i]) == NULL)	407	if (strchr((const char *)PunctuationChars,tokch[i]) == NULL)
408	return FALSE;	408	return FALSE;
409		409
410	return TRUE;	410	return TRUE;

Lines 93-99 Link Here

(-)festival.org/src/modules/Text/xxml.cc (-2 / +2 lines)
93	cerr << "xxml parse error: unexpected end of file \n";	93	cerr << "xxml parse error: unexpected end of file \n";
94	festival_error();	94	festival_error();
95	}	95	}
96	line = ts.get_upto_eoln();	96	line = (EST_String)ts.get_upto_eoln();
97	type = line.at(0,1);	97	type = line.at(0,1);
98	remainder = line.after(0);	98	remainder = line.after(0);
99	if (type == "-")	99	if (type == "-")
Lines 159-165 Link Here
159	EST_Token t;	159	EST_Token t;
160		160
161	ts.open_string(remainder);	161	ts.open_string(remainder);
162	name = ts.get();	162	name = (EST_String)ts.get();
163	if ((t=ts.get()) == "IMPLIED")	163	if ((t=ts.get()) == "IMPLIED")
164	att = cons(rintern(name),cons(NIL,NIL));	164	att = cons(rintern(name),cons(NIL,NIL));
165	else if (t == "TOKEN")	165	else if (t == "TOKEN")

Lines 106-114 Link Here

(-)festival.org/src/modules/UniSyn_diphone/us_diphone_index.cc (-2 / +2 lines)
106		106
107	if (!item)	107	if (!item)
108	return "";	108	return "";
109	else if ((d1 = item->f(dname+"_"+dir,def)) != "0")	109	else if ((d1 = (EST_String)item->f(dname+"_"+dir,def)) != "0")
110	return d1;	110	return d1;
111	else if ((d1 = item->f(dname,def)) != "0")	111	else if ((d1 = (EST_String)item->f(dname,def)) != "0")
112	return d1;	112	return d1;
113	else	113	else
114	return item->f("name","0").string();	114	return item->f("name","0").string();

Return to bug 22053

Lines 64-73 Link Here

(-)festival.org/src/modules/base/word.cc (-4 / +4 lines)
64	for (w=u->relation("Word")->first(); w != 0; w = next(w))	64	for (w=u->relation("Word")->first(); w != 0; w = next(w))
65	{	65	{
66	lpos = NIL;	66	lpos = NIL;
67	pos = ffeature(w,"hg_pos");	67	pos = (EST_String)ffeature(w,"hg_pos");
68	// explicit homograph pos disambiguation	68	// explicit homograph pos disambiguation
69	if (pos == "0")	69	if (pos == "0")
70	pos = ffeature(w,"pos");	70	pos = (EST_String)ffeature(w,"pos");
71	if (pos != "0")	71	if (pos != "0")
72	lpos = rintern(pos);	72	lpos = rintern(pos);
73		73
Lines 100-107 Link Here
100	// from which a list can be read.	100	// from which a list can be read.
101	EST_String p;	101	EST_String p;
102		102
103	if (((p = ffeature(w,"phonemes")) != "0") \|\|	103	if (((p = (EST_String)ffeature(w,"phonemes")) != "0") \|\|
104	((p = ffeature(w,"R:Token.parent.phonemes")) != "0"))	104	((p = (EST_String)ffeature(w,"R:Token.parent.phonemes")) != "0"))
105	{	105	{
106	LISP phones = read_from_lstring(strintern(p));	106	LISP phones = read_from_lstring(strintern(p));
107		107

Lines 87-97 Link Here

(-)festival.org/src/modules/Intonation/int_tree.cc (-6 / +6 lines)
87	for (s=u->relation("Syllable")->first(); s != 0; s=next(s))	87	for (s=u->relation("Syllable")->first(); s != 0; s=next(s))
88	{	88	{
89	if ((paccent = accent_specified(s)) == "0") // check if pre-specified	89	if ((paccent = accent_specified(s)) == "0") // check if pre-specified
90	paccent = wagon_predict(s,accent_tree);	90	paccent = (EST_String)wagon_predict(s,accent_tree);
91	if (paccent != "NONE")	91	if (paccent != "NONE")
92	add_IntEvent(u,s,paccent);	92	add_IntEvent(u,s,paccent);
93	if ((ptone = tone_specified(s)) == "0")	93	if ((ptone = tone_specified(s)) == "0")
94	ptone = wagon_predict(s,endtone_tree);	94	ptone = (EST_String)wagon_predict(s,endtone_tree);
95	if (ptone != "NONE")	95	if (ptone != "NONE")
96	add_IntEvent(u,s,ptone);	96	add_IntEvent(u,s,ptone);
97	}	97	}
Lines 107-117 Link Here
107	EST_Item *token = parent(word,"Token");	107	EST_Item *token = parent(word,"Token");
108	EST_String paccent("0");	108	EST_String paccent("0");
109	if (token)	109	if (token)
110	paccent = ffeature(token,"accent");	110	paccent = (EST_String)ffeature(token,"accent");
111		111
112	if (paccent == "0")	112	if (paccent == "0")
113	{	113	{
114	paccent = ffeature(word,"accent");	114	paccent = (EST_String)ffeature(word,"accent");
115	if (paccent == "0")	115	if (paccent == "0")
116	return paccent;	116	return paccent;
117	}	117	}
Lines 139-149 Link Here
139	EST_Item *token = parent(word,"Token");	139	EST_Item *token = parent(word,"Token");
140	EST_String ptone("0");	140	EST_String ptone("0");
141	if (token)	141	if (token)
142	ptone = ffeature(token,"tone");	142	ptone = (EST_String)ffeature(token,"tone");
143		143
144	if (ptone == "0")	144	if (ptone == "0")
145	{	145	{
146	ptone = ffeature(word,"tone");	146	ptone = (EST_String)ffeature(word,"tone");
147	if (ptone == "0")	147	if (ptone == "0")
148	return ptone;	148	return ptone;
149	}	149	}