mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-13 09:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

phoneme_add_feature: rename phFORTIS to phVOICELESS to reflect its actual usage.

Browse Source
This commit is contained in:
Reece H. Dunn
2017-01-25 21:18:18 +00:00
parent 9dc3d27497
commit 93fd4caf19
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/phoneme.c
+2 -2
View File
@@ -171,8 +171,8 @@ phoneme_add_feature(PHONEME_TAB *phoneme,
case vcd:
phoneme->phflags |= phVOICED;
break;
case vls: // FIXME: This should be a phVOICELESS (!phVOICED) flag. Fortis/lenis are a different thing.
phoneme->phflags |= phFORTIS;
case vls:
phoneme->phflags != phVOICELESS;
break;
// invalid phoneme feature
default:
src/libespeak-ng/phoneme.h
+1 -1
View File
@@ -41,7 +41,7 @@ extern "C"
#define phARTICULATION 0xf0000
#define phWAVE 0x01
#define phUNSTRESSED 0x02
#define phFORTIS 0x08
#define phVOICELESS 0x08
#define phVOICED 0x10
#define phSIBILANT 0x20
#define phNOLINK 0x40
src/libespeak-ng/setlengths.c
+3 -3
View File
@@ -519,7 +519,7 @@ void CalcLengths(Translator *tr)
p->prepause = 15;
}
if (next->type == phPAUSE && prev->type == phNASAL && !(p->ph->phflags&phFORTIS))
if (next->type == phPAUSE && prev->type == phNASAL && !(p->ph->phflags&phVOICELESS))
p->prepause = 25;
if (prev->ph->phflags & phBRKAFTER)
@@ -567,7 +567,7 @@ void CalcLengths(Translator *tr)
if (prev->type == phNASAL)
p->prepause = 12;
if (prev->type == phSTOP && !(prev->ph->phflags & phFORTIS))
if (prev->type == phSTOP && !(prev->ph->phflags & phVOICELESS))
p->prepause = 0;
}
}
@@ -684,7 +684,7 @@ void CalcLengths(Translator *tr)
} else {
length_mod = tr->langopts.length_mods[next2type *10+ next->ph->length_mod];
if ((next->type == phNASAL) && (next2->type == phSTOP || next2->type == phVSTOP) && (next3->ph->phflags & phFORTIS))
if ((next->type == phNASAL) && (next2->type == phSTOP || next2->type == phVSTOP) && (next3->ph->phflags & phVOICELESS))
length_mod -= 15;
}