Browse Source

compiledata: remove unused feature names.

master
Reece H. Dunn 8 years ago
parent
commit
5e5289bcb5
3 changed files with 2 additions and 14 deletions
  1. 1
    11
      src/libespeak-ng/compiledata.c
  2. 0
    2
      src/libespeak-ng/phoneme.h
  3. 1
    1
      src/libespeak-ng/synthesize.c

+ 1
- 11
src/libespeak-ng/compiledata.c View File

kENDPHONEME, kENDPHONEME,
kENDPROCEDURE, kENDPROCEDURE,
kEQUIVALENTS, kEQUIVALENTS,
kPHONEMENUMBER,
kPHONEMETABLE, kPHONEMETABLE,
kINCLUDE, kINCLUDE,
kIMPORT_PH, kIMPORT_PH,
{ "stress", tPHONEME_TYPE, phSTRESS }, { "stress", tPHONEME_TYPE, phSTRESS },
{ "virtual", tPHONEME_TYPE, phVIRTUAL }, { "virtual", tPHONEME_TYPE, phVIRTUAL },


{ "fricative", tPHONEME_TYPE, phFRICATIVE }, // TODO (deprecated): use 'frc' instead
{ "vstop", tPHONEME_TYPE, phVSTOP },
{ "vfricative", tPHONEME_TYPE, phVFRICATIVE },
{ "delete_phoneme", tPHONEME_TYPE, phDELETED }, { "delete_phoneme", tPHONEME_TYPE, phDELETED },


// type of consonant // type of consonant
{ "nasal", tPHONEME_TYPE, phNASAL }, // TODO (deprecated): use 'nas' instead { "nasal", tPHONEME_TYPE, phNASAL }, // TODO (deprecated): use 'nas' instead


// keywords // keywords
{ "phonemenumber", tSTATEMENT, kPHONEMENUMBER },
{ "phonemetable", tSTATEMENT, kPHONEMETABLE }, { "phonemetable", tSTATEMENT, kPHONEMETABLE },
{ "include", tSTATEMENT, kINCLUDE }, { "include", tSTATEMENT, kINCLUDE },
{ (const char *)utf8_bom, tSTATEMENT, kUTF8_BOM }, { (const char *)utf8_bom, tSTATEMENT, kUTF8_BOM },


{ "PauseBefore", tINSTRN1, i_PAUSE_BEFORE }, { "PauseBefore", tINSTRN1, i_PAUSE_BEFORE },
{ "PauseAfter", tINSTRN1, i_PAUSE_AFTER }, { "PauseAfter", tINSTRN1, i_PAUSE_AFTER },
{ "Length", tINSTRN1, i_SET_LENGTH },
{ "Length", tINSTRN1, i_SET_LENGTH }, // TODO (deprecated): use 'length' instead
{ "length", tINSTRN1, i_SET_LENGTH }, { "length", tINSTRN1, i_SET_LENGTH },
{ "LongLength", tINSTRN1, i_LONG_LENGTH }, { "LongLength", tINSTRN1, i_LONG_LENGTH },
{ "LengthAdd", tINSTRN1, i_ADD_LENGTH }, { "LengthAdd", tINSTRN1, i_ADD_LENGTH },
{ "Lengthmod", tINSTRN1, i_LENGTH_MOD },
{ "lengthmod", tINSTRN1, i_LENGTH_MOD }, { "lengthmod", tINSTRN1, i_LENGTH_MOD },
{ "ipa", tINSTRN1, i_IPA_NAME }, { "ipa", tINSTRN1, i_IPA_NAME },


// flags // flags
{ "wavef", tPHONEME_FLAG, phWAVE },
{ "unstressed", tPHONEME_FLAG, phUNSTRESSED }, { "unstressed", tPHONEME_FLAG, phUNSTRESSED },
{ "sibilant", tPHONEME_FLAG, phSIBILANT }, // TODO (deprecated): use 'sib' instead { "sibilant", tPHONEME_FLAG, phSIBILANT }, // TODO (deprecated): use 'sib' instead
{ "nolink", tPHONEME_FLAG, phNOLINK }, { "nolink", tPHONEME_FLAG, phNOLINK },
{ "trill", tPHONEME_FLAG, phTRILL }, // TODO (deprecated): use 'trl' instead { "trill", tPHONEME_FLAG, phTRILL }, // TODO (deprecated): use 'trl' instead
{ "vowel2", tPHONEME_FLAG, phVOWEL2 },
{ "palatal", tPHONEME_FLAG, phPALATAL }, { "palatal", tPHONEME_FLAG, phPALATAL },
{ "long", tPHONEME_FLAG, phLONG }, { "long", tPHONEME_FLAG, phLONG },
{ "dontlist", tPHONEME_FLAG, phDONTLIST }, { "dontlist", tPHONEME_FLAG, phDONTLIST },


{ "flag1", tPHONEME_FLAG, phFLAG1 }, { "flag1", tPHONEME_FLAG, phFLAG1 },
{ "flag2", tPHONEME_FLAG, phFLAG2 }, { "flag2", tPHONEME_FLAG, phFLAG2 },
{ "flag3", tPHONEME_FLAG, phFLAG3 },


// vowel transition attributes // vowel transition attributes
{ "len=", tTRANSITION, 1 }, { "len=", tTRANSITION, 1 },
DecThenCount(); DecThenCount();
break; break;
case kINCLUDE: case kINCLUDE:
case kPHONEMENUMBER:
case kPHONEMETABLE: case kPHONEMETABLE:
error("Missing 'endphoneme' before '%s'", item_string); // drop through to endphoneme error("Missing 'endphoneme' before '%s'", item_string); // drop through to endphoneme
// fallthrough: // fallthrough:

+ 0
- 2
src/libespeak-ng/phoneme.h View File

#define phSIBILANT 0x20 #define phSIBILANT 0x20
#define phNOLINK 0x40 #define phNOLINK 0x40
#define phTRILL 0x80 #define phTRILL 0x80
#define phVOWEL2 0x100 // liquid that is considered a vowel
#define phPALATAL 0x200 #define phPALATAL 0x200
#define phSINGLE_INSTN 0x1000 // this phoneme has a single instruction program, with an implicit Return #define phSINGLE_INSTN 0x1000 // this phoneme has a single instruction program, with an implicit Return
#define phDONTLIST 0x2000 // don't list in dict_phonemes #define phDONTLIST 0x2000 // don't list in dict_phonemes


#define phFLAG1 0x10000000 #define phFLAG1 0x10000000
#define phFLAG2 0x20000000 #define phFLAG2 0x20000000
#define phFLAG3 0x40000000
#define phLOCAL 0x80000000 // used during compilation #define phLOCAL 0x80000000 // used during compilation


// fixed phoneme code numbers, these can be used from the program code // fixed phoneme code numbers, these can be used from the program code

+ 1
- 1
src/libespeak-ng/synthesize.c View File

} }
} }


if ((prev->type == phVOWEL) || (prev->ph->phflags & phVOWEL2) || (ph->phflags & phPREVOICE)) {
if ((prev->type == phVOWEL) || (ph->phflags & phPREVOICE)) {
// a period of voicing before the release // a period of voicing before the release
InterpretPhoneme(NULL, 0x01, p, &phdata, &worddata); InterpretPhoneme(NULL, 0x01, p, &phdata, &worddata);
fmtp.fmt_addr = phdata.sound_addr[pd_FMT]; fmtp.fmt_addr = phdata.sound_addr[pd_FMT];

Loading…
Cancel
Save