Merge branch 'development'

This commit is contained in:
Reece H. Dunn
2014-07-15 12:46:09 +01:00
176 changed files with 2665 additions and 1243 deletions
+4
View File
@@ -324,6 +324,7 @@ static keywtab_t keywords[] = {
{"vowel2", tPHONEME_FLAG, phVOWEL2},
{"palatal", tPHONEME_FLAG, phPALATAL},
{"long", tPHONEME_FLAG, phLONG},
{"dontlist", tPHONEME_FLAG, phDONTLIST},
{"brkafter", tPHONEME_FLAG, phBRKAFTER},
{"rhotic", tPHONEME_FLAG, phRHOTIC},
{"nonsyllabic",tPHONEME_FLAG, phNONSYLLABIC},
@@ -926,6 +927,9 @@ static void PrintPhonemesUsed(FILE *f, const char *dsource, const char *dictname
{
ph = ph_tab[ix];
if(ph->phflags & phDONTLIST) // "dontlist" attribute
continue;
if(ph->type > 1)
{
if((ph->type > phVOWEL) && (section == 0))