mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-03 06:12:55 +00:00
[1.43.31]
*_list files: added attribute $sentence. *_rules files: added attributes $w_alt, $p_alt. phoneme definitions: added attribute no_pause. -X command-line option: Show the matching of multiple-word entries in *_list files. espeakedit: Add menu option to compile the intonation data file (the data is not yet used). Start language: Bulgarian. lang=bg (Bulgarian): Add feature in espeakedit to make bg_listx from a lexicon of words which have stress position mark-up. espeakedit: Change the frame-length field from Spin Control to Text Control to allow better access from screen-readers. Language options: add an option to the Regressive Voicing option to de-voice the final consonant of words. Don't speak "dot" if an ellipsis is followed by a dot. Intonation: change the internal pitch unit to give finer control, and align with the values displayed in the espeakedit Prosody window. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@243 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
+16
-13
@@ -56,7 +56,7 @@ ProsodyDisplay::ProsodyDisplay(wxWindow *parent, const wxPoint& pos, const wxSiz
|
||||
|
||||
linewidth = size.GetWidth();
|
||||
scalex = 0.5;
|
||||
scaley = double(LINESEP*6)/80.0;
|
||||
scaley = double(LINESEP*6)/160.0;
|
||||
selected_ph = -1;
|
||||
// SetBackgroundColour(* wxWHITE);
|
||||
|
||||
@@ -77,18 +77,18 @@ void InitProsodyDisplay()
|
||||
menu_envelopes = new wxMenu;
|
||||
// entries match those in envelope_data[] in intonation.cpp
|
||||
menu_envelopes->Append(0x100,_T("Fall"));
|
||||
menu_envelopes->Append(0x101,_T("Rise"));
|
||||
menu_envelopes->Append(0x102,_T("Fall-rise"));
|
||||
menu_envelopes->Append(0x103,_T("Fall-rise (R)"));
|
||||
menu_envelopes->Append(0x104,_T("Fall-rise 2"));
|
||||
menu_envelopes->Append(0x105,_T("Fall-rise 2(R)"));
|
||||
menu_envelopes->Append(0x106,_T("Rise-fall"));
|
||||
menu_envelopes->Append(0x102,_T("Rise"));
|
||||
menu_envelopes->Append(0x104,_T("Fall-rise"));
|
||||
menu_envelopes->Append(0x105,_T("Fall-rise (R)"));
|
||||
menu_envelopes->Append(0x106,_T("Fall-rise 2"));
|
||||
menu_envelopes->Append(0x107,_T("Fall-rise 2(R)"));
|
||||
menu_envelopes->Append(0x108,_T("Rise-fall"));
|
||||
|
||||
menu_envelopes->Append(0x108,_T("Fall-rise 3"));
|
||||
menu_envelopes->Append(0x10a,_T("Fall-rise 4"));
|
||||
menu_envelopes->Append(0x10c,_T("Fall 2"));
|
||||
menu_envelopes->Append(0x10e,_T("Rise 2"));
|
||||
menu_envelopes->Append(0x110,_T("Rise-fall-rise"));
|
||||
menu_envelopes->Append(0x10a,_T("Fall-rise 3"));
|
||||
menu_envelopes->Append(0x10c,_T("Fall-rise 4"));
|
||||
menu_envelopes->Append(0x10e,_T("Fall 2"));
|
||||
menu_envelopes->Append(0x110,_T("Rise 2"));
|
||||
menu_envelopes->Append(0x112,_T("Rise-fall-rise"));
|
||||
|
||||
menu_prosody = new wxMenu;
|
||||
menu_prosody->Append(1,_T("Pitch envelope"),menu_envelopes);
|
||||
@@ -129,6 +129,7 @@ void ProsodyDisplay::SelectPh(int index)
|
||||
// A phoneme has been selected
|
||||
PHONEME_LIST *p;
|
||||
const char *emphasized;
|
||||
int y1, y2;
|
||||
char buf[120];
|
||||
|
||||
if(index < 0) return;
|
||||
@@ -140,8 +141,10 @@ void ProsodyDisplay::SelectPh(int index)
|
||||
if(p->stresslevel & 8)
|
||||
emphasized = "*";
|
||||
|
||||
y1 = p->pitch1;
|
||||
y2 = p->pitch2;
|
||||
sprintf(buf,"Stress %s%d Amp %2d LenMod %2d Pitch %3d %3d [env=%d] Flags %.2x ",
|
||||
emphasized,p->stresslevel&0x7,p->amp,p->length,p->pitch1,p->pitch2,p->env,p->ph->phflags);
|
||||
emphasized,p->stresslevel&0x7,p->amp,p->length,y1,y2,p->env,p->ph->phflags);
|
||||
wxLogStatus(wxString(buf,wxConvLocal));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user