54 Commits
Author SHA1 Message Date
Juho Hiltunen 268f5899c8 fixup e2862bbc
Changing da_rules was accidentally included in the commit.
2022-10-22 17:31:29 +03:00
Juho Hiltunen e2862bbc51 cleanup: refactor checking FLAG_COMBINE into a function 2022-10-22 11:49:27 +03:00
Valdis Vitolins a99937f6c4 Remove Byte Order Marks from source files 2019-12-16 22:38:24 +02:00
Reece H. Dunn 691645b408 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2014-03-04 17:43:41 +00:00
jonsd 6bc5e798c1 [1.48.03]
Fix bug, use of the command-line  "espeakedit --compile" produced phoneme data
in which vowels started at full amplitude instead of gradual increase.

Fix bug:  SSML <break time=""> with values greater than 23 seconds were ignored
due to arithmetic overflow.

Phoneme definition files:
Added new function:  ChangeNextPhoneme().

Language changes include: da, en, fa, gu, hu, it, nl, pt, ta

Started new language: eu (Basque).

*_rules files:
Allow $p_alt1, $p_alt2, etc in pre-conditions.  The rule matches if the
characters before the current point in the word occur as an entry in the
*_list file with the corresponding $alt attibute.

Added condition $list.  This is similar to $p_alt etc, but examines
all words in the *_list file which don't have the $only attribute.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@374 d46cf337-b52f-0410-862d-fd96e6ae7743
2014-03-04 16:52:26 +00:00
Reece H. Dunn f2d6de1d91 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2014-02-02 13:44:02 +00:00
jonsd 16a90bd323 [1.48.01]
Language changes: bn, en, da, it, pt.
Started new language, gd (Scottish Gaelic).
 

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@371 d46cf337-b52f-0410-862d-fd96e6ae7743
2014-02-02 11:15:16 +00:00
Reece H. Dunn 17e389e7f1 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-06-13 14:46:46 +01:00
jonsd 507caaaca2 [1.47.11d]
Language updates: da, en, nl, pt, vi


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@363 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-06-11 11:24:57 +00:00
Reece H. Dunn 7245bda467 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-04-16 08:49:57 +01:00
jonsd eeb49d1d5f [1.47.06]
Language changes: da, en. nl, pt.

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@343 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-04-15 22:03:02 +00:00
Reece H. Dunn 5b4c90f6c1 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-04-01 00:37:36 +01:00
jonsd 394869c5c2 [1.47.03f]
Fix, speak letter names of Hangul (Korean) characters.
Fix, ChangePhoneme(NULL) caused problems for word-gap options.
Recognize Arabic comma U+060C.
Languages changes: pt, nl, bn, te, da.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@336 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-03-31 23:05:17 +00:00
Reece H. Dunn a7f93e1845 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-29 12:09:33 +00:00
jonsd 665afbf8d2 [1.47.03e]
lang=zh: Fix: was speaking Chinese character names as character codes.
lang=hr, sr: Fix: speak Cyrillic character names in the local langauge.
Phoneme definitions: add new statement type  "LengthAdd <signed number>".


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@335 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-03-29 11:23:30 +00:00
Reece H. Dunn 29320ae2ea Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/te_list
	dictsource/te_rules
	phsource/compile_report
2013-03-27 00:33:34 +00:00
jonsd 473e9abc15 [1.47.03d]
Lang=ml, change aspirated voiced consonants.
Lang=ko, define temporary replacements for undefined consonant phonemes.
Lang=bn, fix numbers.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@334 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-03-27 00:16:39 +00:00
Reece H. Dunn b51fe6f892 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-16 15:52:46 +00:00
jonsd e75e5d9258 [1.46.51]
Language changes: da.
Fixed crash bug (in lang=hi), affects prevVowel(), isFirstVowel, etc in phoneme definitions.



git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@317 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-03-16 00:20:29 +00:00
Reece H. Dunn 9468e46243 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-13 16:27:55 +00:00
jonsd 790c9a1754 [1.46.47]
Fix bug in SAPI5 version: speed suddenly changes to very slow when speaking a word which contains foreign characters.
Language changes: da, fa, hu, pt, ur.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@313 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-03-13 15:35:29 +00:00
Reece H. Dunn ed3b3b4020 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-07 10:54:25 +00:00
jonsd 2d64d32893 [1.46.43]
language changes: da, pt


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@309 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-03-07 10:32:34 +00:00
Reece H. Dunn 2ec786ae07 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-01-30 16:32:01 +00:00
jonsd a3ad82219d [1.46.32]
Language changes: en, pt, da, an, fa.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@298 d46cf337-b52f-0410-862d-fd96e6ae7743
2013-01-30 15:25:35 +00:00
jonsd 4d64bf10a1 [1.46.15]
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@280 d46cf337-b52f-0410-862d-fd96e6ae7743
2012-04-12 00:12:09 +00:00
Reece Dunn bc2f90455f 1.46.15 2012-04-08 09:44:25 +01:00
Reece Dunn 75cddbde96 Merge branch 'master' into development 2011-10-29 10:34:21 +01:00
jonsd f68774298b [1.45.47]
Fixed crash on re-initializing libespeak.

lang=hu, experimental, if the last two words of a clause (before punctuation) both have capital letters, then make the last word unstressed.  This is useful for people names, but may be wrong for other cases.

lang=en-us, distinguish phonemes [aI@] and [aI3] (compare "diet", "tired").

lang=de, fix automatic devoicing of word-final 'b', 'd', 'g'.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@276 d46cf337-b52f-0410-862d-fd96e6ae7743
2011-10-24 15:25:34 +00:00
Reece Dunn f0cf914a15 1.45.44 -- from the espeak and espeakedit zip file sources 2011-09-17 16:31:41 +01:00
jonsd b9611e1fb6 [1.45.37]
Keep the original voice variant across SSML xml:lang changes.

Use the original language sub-type (eg. en-sc) when SSML xml:lang changes to a compatible language.

SSML <emphasis>, increase volume for "strong" and "x-strong".

Fix bug where </emphasis> was ignored at end of clause.

Fix: $dot attribute was ignored for multi-word entries in *_list files.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@269 d46cf337-b52f-0410-862d-fd96e6ae7743
2011-08-09 17:49:17 +00:00
jonsd d892e39be5 [1.45.27]
Lang=hi, Suppress some [@] vowels.
Include batch of changes from Jerouris.
Fix crash with large number of nbsp characters.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@266 d46cf337-b52f-0410-862d-fd96e6ae7743
2011-05-19 14:56:50 +00:00
jonsd fc0bd7fe79 [1.44.42]
Phoneme definitions.
New keyword "prevoice", always add murmer before a voiced stop, not only after a vowel.
Fixed bug in nextVowel() condition.
Fixed bug is condition "isRhotic".


Command line options.
On Windows, --  means don't treat following arguments as options.
--help output now should the espeak-data path.

Tools->Lexicon.  Redesign Lexicon processing for Russian and Bulgarian.

Numbers.  Fixes for Hungarian ordinal numbers.

Fixed bug where double .. was ignored.

Fixed bug in reporting word event lengths in callbacks.
Fixed bug in reporting marker event positions in callbacks, when non-ascii text.

SSML.
Allow single as well as double quotes around strings.
Fix bugs in SSML "prosody rate".

Speed.
Only use Sonic speedups greater than x2.
Use custom eSpeak speed settings when Sonic speedup is used.

Mbrola.  Look for Mbrola voice also at /usr/share/mbrola/xx/xx

espeakedit.  Try "aplay" and then "play" to play sound.

Languages:
Kannada (kn) now in official release.
Esperanto (eo) change prosody.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@257 d46cf337-b52f-0410-862d-fd96e6ae7743
2011-03-13 13:30:04 +00:00
jonsd b89d8bde63 [1.44.18]
Change in format of *_dict files.  'Word-boundary' at the start of a rule from *_rules is not implied by a new rule type RULE_PRE_ATSTART.
espeakedit: Improvements to Tools->Process Lexicon->Italian which makes the file dictsource/it_listx.
lang=hu, fixes for ordinal numbers.
Speed-up, add files sonic.cpp, sonic.h



git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@255 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-12-03 17:42:02 +00:00
jonsd 1649824b33 [1.44.13]
Speed increase.  Added the "sonic" routines by Bill Cox to reduce the length of eSpeak's sound output data, so as to make the speaking speed faster.

Ordinal numbers: Some languages (el,es) use the ordinal form of hundreds and tens part of a number, as well as the units part.  Added language option NUM2_MULTIPLE_ORDINAL.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@254 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-11-17 14:31:24 +00:00
jonsd 14e212f3a1 espeak 1.44.05 release version
Fix error in big-endian data conversion program, producing bad data.

Make geminated voiced stops (eg. [bb] ) longer at fast speeds.

Provide conditional compilation of the mbrola interface, define macro INCLUDE_MBROLA in speech.h

Mbrola: also look for mbrola voices in /usr/share/mbrola/voices

Pad TUNES and frame_t structures to a multiple of 4 bytes.

lang=da, Don't weaken unvoiced stops before pause.
lang=el, Remove final unstressed [a] if the next word starts with [a].
lang=pt, Change final [U] to [w] if next word starts with a vowel.


espeak 1.44.03

Fixes:
Lang=el, mk.  Was speaking words as individual letters.
Lang=pl.  Fix prounciation of 'ć' and 'ci'.
Fix crash in big-endian data conversion program.
Fix problem where changing voices reduces the speaking rate, at fast rates.

speak_lib.h:  add macro definitions for minimum, maximum, and normal speaking rate values.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@253 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-09-15 14:03:05 +00:00
jonsd eb7b132e9a [1.44.02]
Fix: crash with very long numbers.
Very long nubers ( > 14 digits) now spoken as individual digits.
Fix: bracket was interfering with recognizing last-word in a clause.
Lang=el fix: all words were spoken as individual letters.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@252 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-08-14 09:07:11 +00:00
jonsd 4423576af2 [1.43.63]
Phoneme definitions.  Add "equivalents" table to translate phonemes from a foreign language (eg. English) into the equivalant phonemes of this language. This is used when *_rules and *_list files indicate that a word uses pronunciation rules from a different language.

Unpronouncable words can be recognised by rules in *_rule files.  This feature is now used for en, de, es.

Lang=ta, hi.  Letter-names for combining vowel characters are distinguished from stand-alone vowel characters by a preceding beep.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@251 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-08-02 09:09:25 +00:00
jonsd ebf0535e6d [1.43.57]
Indicate language changes in IPA phoneme output.

Phoneme definitions FMT(), second parameter is amplitude percentage.

Phoneme definitions CALL(),  If phoneme type is not defined, copy the static attributes from the called phoneme.

Unpronouncable word check: stop when an apostrophe is reached.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@250 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-07-18 22:43:04 +00:00
jonsd 3bf61040b9 [1.43.52]
espeakedit --compile  also compiles the intonation data

Added feature to produce phonemes as International Phonetic Alphabet.
phoneme definitions: Added "ipa" instruction to specify IPA phoneme name.

When spelling as individual characters, calculate the stress position for each character name.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@249 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-07-05 09:01:28 +00:00
jonsd a9fedd94db [1.43.48]
Add mbrowrap.cpp to emulate the mbrola library which is available in Windows, but not on Linux.  mbrola voices in command-line espeak and libespeak now call mbrola directly rather than generating phoneme information as text.  Mbrola phonemes as text is still available with the new --pho command-line option.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@248 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-06-28 15:50:12 +00:00
jonsd 5a4cbf98ec Add some missing files to SVN repository.
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@245 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-06-25 18:50:41 +00:00
jonsd 18240ae109 [1.43.46]
Fix: Speak punctuation option also caused text after [[ to be spoken as phoneme codes even if espeakPHONEMES flag is not set.

Speak sequences of letters and dots as individual letters, and don't speak 'dot', eg. "u.s.a."

Don't announce punctuation in the alternative text inside <audio ... </audio>

Vowelcharts, show the positions of multiple FMT() in vowel phonemes definitions.

Phoneme definitions:
New attributes:  flag1, flag2, flag3
New attribute: nopause. Prevents the insertion of a short pause when this phoneme starts a word which follows a vowel.
New conditions: isFlag1, isFlag2, isFlag3, isSibilant.
New statement: InsertPhoneme()

Phonemes: improve syllablic [m-] [n-] [N-]

*_rules: add attributes  $p_alt .. $p_alt3,  $w_alt .. $w_alt3

*_list:  add attributes:  $sentence, $atstart

klatt synthesizer: implement echo.

espeakedit, Prosody display: Indicate stressed and secondary-stress syllables.

espeakedit: remember window size and position.

Intonation:
New file, 'phsource/intonation' to define 'tunes' which can be used from voice files.

espeakedit: add Compile -> Intonationm data

Speed: Increase range to 80 to 450, with default=175.
Improve speaking at high speeds.

lang=en: Reduce consecutive unstressed syllables to 'diminished' stress, only in unstressed words.

lang=de: Change 'r' phoneme.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@244 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-06-20 13:15:35 +00:00
jonsd cec2c415da [1.43.31]
*_list files: added attribute $sentence.
*_rules files: added attributes $w_alt, $p_alt.
phoneme definitions: added attribute no_pause.

-X command-line option: Show the matching of multiple-word entries in *_list files.

espeakedit: Add menu option to compile the intonation data file (the data is not yet used).

Start language: Bulgarian.

lang=bg (Bulgarian): Add feature in espeakedit to make bg_listx from a lexicon of words which have stress position mark-up.

espeakedit: Change the frame-length field from Spin Control to Text Control to allow better access from screen-readers.

Language options: add an option to the Regressive Voicing option to de-voice the final consonant of words.

Don't speak "dot" if an ellipsis is followed by a dot.

Intonation: change the internal pitch unit to give finer control, and align with the values displayed in the espeakedit Prosody window.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@243 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-05-21 23:21:06 +00:00
jonsd 19b774ffc6 [1.43.16]
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@242 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-04-03 22:20:25 +00:00
jonsd 805c5dfdee [1.43.03] release
Fix crash when embedded control codes are followed by numbers of 5 or more digits.

Fix lang=hu,  First character of an abbreviation is missed after an ordinal number (eg."2. cd")

Fix XML tag not recognized after "..." when announce punctuation is enabled.

Fix lang=zh-yue, 'p' 't' 'k' after a vowel give a long pause.

Fix lang=ru, "o" missing in unstressed syllables.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@241 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-03-13 21:45:17 +00:00
jonsd 9ffdc46fa0 [1.43.10]
Fix --compile-debug option.

Add more syntax checks for --compile option.  Detect empty pre-rule.  Detech missing match-rule.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@240 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-03-12 12:11:45 +00:00
jonsd aaa5d61737 [1.43.02 release]
Language improvements include Danish rules.

Fixed phoneme [n^] for Klatt synthesizer, was producing noise burst.

espeakedit: Display error details after Compile Dictionary.
espeakedit: Fix: After speaking a word which changes language, Compile
    Dictionary may compile the wrong dictionary.

Don't consider multiple spaces as thousands separator (eg. 2  000 )

Lang=Hungarian, don't allow dot as thousands separator.
Lang-Hungarian, Fix suffixes -a, -e, -az, -ez, -azt, -ezt after numbers.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@239 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-03-09 00:31:31 +00:00
jonsd 7aab0f05c0 [1.43.03]
Fix: "  50000", with leading spaces was spoken as "50".


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@238 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-02-24 12:18:40 +00:00
jonsd 2698461aa4 [1.42.42]
Don't recognize space as a thousands separator if it's tab, newline, or multiple spaces.
Don't recognuze space as a thousands separator if not followed by exactly 3 digits.

Unrecognized HTML tags should not add a space (eg. <font> <b> inside a word).

lang=hu: fixes for when numbers are ordinal.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@236 d46cf337-b52f-0410-862d-fd96e6ae7743
2010-02-13 11:14:41 +00:00