Browse Source

Remove the unused isSeqFlag1 logic checks.

master
Reece H. Dunn 8 years ago
parent
commit
a091c20852
3 changed files with 1 additions and 21 deletions
  1. 0
    1
      src/libespeak-ng/compiledata.c
  2. 1
    19
      src/libespeak-ng/synthdata.c
  3. 0
    1
      src/libespeak-ng/synthesize.h

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

@@ -138,7 +138,6 @@ static keywtab_t k_properties[] = {
{ "isVoiced", 0, i_isVoiced }, // voiced consonant, or vowel
{ "isFirstVowel", 0, i_isFirstVowel },
{ "isSecondVowel", 0, i_isSecondVowel },
{ "isSeqFlag1", 0, i_isSeqFlag1 },
{ "isTranslationGiven", 0, i_IsTranslationGiven }, // phoneme translation given in **_list or as [[...]]

{ NULL, 0, 0 }

+ 1
- 19
src/libespeak-ng/synthdata.c View File

@@ -1,7 +1,7 @@
/*
* Copyright (C) 2005 to 2014 by Jonathan Duddington
* email: [email protected]
* Copyright (C) 2015-2016 Reece H. Dunn
* Copyright (C) 2015-2017 Reece H. Dunn
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -684,24 +684,6 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
return CountVowelPosition(plist) == 1;
case 14: // isSecondVowel
return CountVowelPosition(plist) == 2;
case 15: // isSeqFlag1
// is this preceded by a sequence if 1 or more vowels which have 'flag1' ? (lang=hi)
if (plist->sourceix != 0)
return false; // this is the first phoneme in the word, so no.

count = 0;
for (;;) {
plist--;
if (plist->ph->type == phVOWEL) {
if (plist->ph->phflags & phFLAG1)
count++;
else
break; // stop when we find a vowel without flag1
}
if (plist->sourceix != 0)
break;
}
return count > 0;
case 0x10: // isTranslationGiven
return (plist->synthflags & SFLAG_DICTIONARY) != 0;
}

+ 0
- 1
src/libespeak-ng/synthesize.h View File

@@ -328,7 +328,6 @@ typedef struct {
#define i_isVoiced 0x8c
#define i_isFirstVowel 0x8d
#define i_isSecondVowel 0x8e
#define i_isSeqFlag1 0x8f
#define i_IsTranslationGiven 0x90

// place of articulation

Loading…
Cancel
Save