Juho Hiltunen
da287fb851
Unify terminology for stress
...
synthesize.h now contains the definitions STRESS_IS_... that should be used with code related to syllable stress.
Note that isBreak and other defines were renumbered so that stress definitions could have values 0-6.
Possible TODOs:
1. Unify with terms used with phonemes, i.e. keywords like isDiminished in compiledata.c and stress_type in phsource/phonemes
2. Add functionality and documentation about STRESS_IS_PRIORITY and STRESS_IS_EMPHASIZED
2018-01-14 15:26:03 +02:00
Reece H. Dunn
5e2c963006
Fix pronouncing words like 'newsletter'. Reverts 60a584c032.
2017-12-07 20:52:01 +00:00
Reece H. Dunn
b5c415a98d
Rename OPCODE_ to INSTN_.
2017-10-28 12:38:39 +01:00
Reece H. Dunn
c59c9633de
Fix -Wuninitialized warnings.
2017-10-11 22:01:41 +01:00
Reece H. Dunn
b11480c09d
compiledata.c: Fix -Wmissing-prototypes warnings.
2017-10-11 07:56:22 +01:00
Reece H. Dunn
68724badf3
encoding.c: Fix -Wmissing-prototypes warnings.
2017-10-11 07:41:31 +01:00
Reece H. Dunn
74f9f5e34b
wavegen.c: Fix -Wmissing-prototypes warnings.
2017-10-10 21:37:46 +01:00
Reece H. Dunn
d89fa59bed
Enable and fix -Wunused-variable warnings.
2017-10-05 07:23:17 +01:00
Reece H. Dunn
57108e1ed7
Add n_points guards in the LoadEnvelope2 loop.
...
Clang static analysis reports these as 'Result of operation is
garbage or undefined' errors.
2017-09-13 07:28:58 +01:00
Reece H. Dunn
4a882e21d3
Don't update env_x/y if no points were read.
...
Clang static analysis reports an 'Assigned value is garbage or
undefined' for this. If no points were read from the file, the
`n_points` variable is 0 and `env_x[n_points-1]` performs an
out-of-bounds access.
2017-09-13 07:13:29 +01:00
Reece H. Dunn
19b2bebc02
Don't save an intonation if it was not found.
...
Clang static analysis reports an 'Assigned value is garbage or
undefined' error. This happens if the default_tune data has not
been copied in the kTUNE case.
Extending this further, it does not make sense to save the tune
data if the tune was not found, or if the tune already exists.
2017-09-13 07:03:18 +01:00
Reece H. Dunn
51c8a2d7d9
Rename the isVel check to isVelar.
2017-03-02 06:41:51 +00:00
Reece H. Dunn
901bc0d1ba
Allow 'apr liquid' to be used together in a phoneme.
2017-01-30 20:27:10 +00:00
Reece H. Dunn
9448834298
Use '_' to indicate no parent phoneme table in the 'phonemetable' command.
2017-01-30 19:14:00 +00:00
Reece H. Dunn
574ecbd634
Inline the InstnPlusPhoneme function.
2017-01-29 10:53:33 +00:00
Reece H. Dunn
e7374059e5
Use the stress condition values with i_CHANGE_IF.
2017-01-29 10:43:02 +00:00
Reece H. Dunn
f2bb482782
Use OPCODE for the RETURN and CONTINUE opcodes.
2017-01-29 10:29:48 +00:00
Reece H. Dunn
8338cdd250
Better document the other condition checks (isDiminished, etc.).
2017-01-29 10:09:16 +00:00
Reece H. Dunn
5d2e2a2f8f
Use the place of articulation constants to specify the place-based conditions.
2017-01-29 00:29:17 +00:00
Reece H. Dunn
f0d4a98b96
Use an explicit is phoneme type constant to specify the type-based conditions.
2017-01-29 00:09:54 +00:00
Reece H. Dunn
98703c30de
Use the phflag bit offset constants to specify the phflag-based conditions.
2017-01-29 00:04:44 +00:00
Reece H. Dunn
5600019a54
Remove unused conditional tests.
2017-01-28 21:16:08 +00:00
Reece H. Dunn
0415c46a8f
Replace 'nonsyllabic' with 'nsy'.
2017-01-28 19:56:52 +00:00
Reece H. Dunn
bcdf6ff734
Don't replace rhotic with rzd. 'rhotic' is used on r-type consonants.
2017-01-28 19:54:13 +00:00
Reece H. Dunn
241860553d
Replace 'long' with 'lng'.
2017-01-28 19:44:06 +00:00
Reece H. Dunn
e585de6c52
Replace 'palatal' with 'pzd'.
2017-01-28 19:28:50 +00:00
Reece H. Dunn
8457f010d0
Replace 'trill' with 'trl'.
2017-01-28 16:03:13 +00:00
Reece H. Dunn
c8023301f2
Replace 'sibilant' with 'sib'.
2017-01-28 15:32:44 +00:00
Reece H. Dunn
22935752fa
Replace 'Length' with 'length'.
2017-01-28 14:16:33 +00:00
Reece H. Dunn
bcc639fcfc
Replace 'nasal' with 'nas'.
2017-01-28 13:58:57 +00:00
Reece H. Dunn
fe74d0b41b
Replace 'stop' with 'stp'.
2017-01-28 13:51:34 +00:00
Reece H. Dunn
14f7513840
Replace 'vowel' with 'vwl'.
2017-01-28 13:40:22 +00:00
Reece H. Dunn
130a87cbe6
compiledata: Generate an error if import phoneme will override settings.
2017-01-28 13:05:15 +00:00
Reece H. Dunn
a9030650ba
compiledata: Generate an error if the imported phoneme cannot be found.
2017-01-28 12:51:16 +00:00
Reece H. Dunn
b4297c2851
compiledata: Display the actual error from phoneme_add_feature.
2017-01-28 12:37:41 +00:00
Reece H. Dunn
0ee9c84fe3
compiledata: ensure that voicingswitch is not used with vowels.
2017-01-28 12:25:56 +00:00
Reece H. Dunn
dd422ffbdb
Ensure phoneme type is set before start/endtype.
...
The eSpeak code uses `end_type` for the `voicingswitch` property
when used with consonants. It also allows `endtype` to be specified
in consonants if it is the same as `starttype`.
This code adds a check in the `starttype` and `endtype` handlers
to ensure that the phoneme type has been set to preserve the
eSpeak behaviour for these properties.
2017-01-28 12:03:54 +00:00
Reece H. Dunn
1c75e58bda
Remove the dontlist phoneme feature flag.
...
The 'dontlist' feature was used by the now removed PrintPhonemesUsed
function to not display that phoneme in the list. It was also only
used by the English phonemetable.
2017-01-28 10:19:53 +00:00
Reece H. Dunn
36308f6b38
phoneme: recognise the est, hlg and lng length phonemes.
2017-01-27 21:03:03 +00:00
Reece H. Dunn
6a0ea584ea
Don't store the unused phoneme equivalence tables in the phoneme data files.
2017-01-27 20:44:06 +00:00
Reece H. Dunn
6c526be3c8
Don't compile the unused phoneme equivalence tables.
2017-01-27 20:37:22 +00:00
Reece H. Dunn
b3a1bcda4b
phoneme: pass the feature enum value to phoneme_add_feature.
2017-01-26 19:58:23 +00:00
Reece H. Dunn
b47600d951
phoneme_add_feature: recognise diacritic features.
2017-01-26 07:40:05 +00:00
Reece H. Dunn
a091c20852
Remove the unused isSeqFlag1 logic checks.
2017-01-25 23:44:19 +00:00
Reece H. Dunn
5e5289bcb5
compiledata: remove unused feature names.
2017-01-25 23:24:02 +00:00
Reece H. Dunn
9dc3d27497
phoneme_add_feature: support setting the voice features.
...
The 'fortis' feature is not used, so it has been removed.
2017-01-25 21:16:53 +00:00
Reece H. Dunn
a48633dc81
phoneme_add_feature: support setting the place of articulation.
2017-01-25 21:06:04 +00:00
Reece H. Dunn
56b9eeeb72
phoneme_add_feature: support the lat and sib phonemes.
2017-01-25 20:12:16 +00:00
Reece H. Dunn
c203f517f4
phoneme_add_feature: support the eSpeak model for manners of articulation.
2017-01-25 20:07:04 +00:00
Reece H. Dunn
40556d41be
phonemes: use phoneme_add_feature if the keyword is not recognised.
2017-01-25 19:11:53 +00:00
Juho Hiltunen