[espeak-ng/espeak-ng] Pull request updated by jaacoppi:

#796 More code cleanups

[espeak-ng/espeak-ng] Pull request opened by jaacoppi:

#796 More code cleanups

[espeak-ng:master] New Comment on Issue #793 There needs to be a way to explicitly set stress only via rules to support unstressed languages and other non-European languages.
By valdisvi:

You can adjust length of long vowels by redefining length of phoneme :, length of : is declared in phsource/phonemes file as 70 ms in phsource/ph_cherokee file. For mentioned example I wonder, why after replacement hị²go²wah²ta: becomes xcgoxcwahxcta with ị missing, but hi²go²wah²ta: becomes xcgoxcwahxcta as expected.

[espeak-ng:master] New Comment on Issue #793 There needs to be a way to explicitly set stress only via rules to support unstressed languages and other non-European languages.
By valdisvi:

I cannot it reproduce on my computer and that change should not affect translation of text to phonemes. Have you made clean compilation e.g. make clean; make -B for your project?

[espeak-ng:master] New Comment on Issue #793 There needs to be a way to explicitly set stress only via rules to support unstressed languages and other non-European languages.
By michael-conrad:

As stress is relative, for sound it is the same. Only difference is that phonetic output is longer/more cluttered.

Which really doesn't help with setting an explicit stress via rules alone and not having the espeak-ng library "do things behind the language maintainers back".

And vowel length can change have a dramatic change of meanings of words in some languages:

• hị²go²wah²ta: You are seeing it. (inanimate / non-alive)
• hi²go²wah²ta: You are seeing him or her. (animate / alive)

Cherokee, for instance, has a specific long/short vowel cadence requirement, where long vowels are generally held twice as long as short vowels. That is the only pronunciation difference between long and short vowels and as such is significant.

[espeak-ng:master] New Comment on Issue #793 There needs to be a way to explicitly set stress only via rules to support unstressed languages and other non-European languages.
By michael-conrad:

Cherokee no longer processes phoneme rules correctly.

This is due to the patch which added Cherokee to tr_languages.c applying of "L3".

It seems to be discarding the first phoneme and replacing the following tone marking with literal pronunciations?

Without patch in place:

~/espeak-ng/bin/espeak-ng -X -v chr 'ạ²ktạ²ha.'
Replace: ² > xc
Replace: ² > xc
Translate 'ạxcktạxcha'
 36	ạ      [0]

 22	xc       [2]

  1	k        [k]

  1	t        [t]

 36	ạ      [0]

 22	xc       [2]

  1	h        [h]

  1	a        [0:]
 22	a (_     [0~43]

02kt'02h0~43

With patch in place:

~/espeak-ng/bin/espeak-ng -X -v chr 'ạ²ktạ²ha.'
Replace: ² > xc
Replace: ² > xc
Found: 'x' [E2ks]
Found: 'c' [si:]
Translate 'xcha'
 22	xc       [2]

  1	h        [h]

  1	a        [0:]
 22	a (_     [0~43]

,0~43_:(en),Eks_:s,i:(chr)kt'0~2h'0~43

1 New Commit:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
5e709818847c: Add common abbreviations in Russian to the test

Modified: tests/translate.test

[espeak-ng:master] New Comment on Issue #794 espeak-ng: symbol lookup error: espeak-ng: undefined symbol: espeak_ng_SetVoiceByFile
By valdisvi:

Can you provide full terminal output what is produced when you are building it?

1 New Commit:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
a90234c9eaca: Add to test abbreviations explicitly defined in lv_list file

Modified: tests/translate.test

[espeak-ng:master] New Comment on Pull Request #795 Various code cleanups
By jaacoppi:

Thanks. More testing is a good thing. I just feel I'm not proficient enough to write them myself.

I'll be committing more of these cleanups later. The simpler the codebase, the easier it is to rewrite the readclause/translateclause tokenizer someday.

12 New Commits:

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
516144d63aa6: code cleanup: combine Wavegen_Klatt() and Wavegen_Klatt2().

Wavegen_Klatt2() only had one if-statement and then called
Wavegen_Klatt(). Wavegen_Klatt() was never called directly.

Modified: src/libespeak-ng/klatt.c
Modified: src/libespeak-ng/klatt.h
Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
1b7c3303ef4f: code cleanup: pass WGEN_DATA wdata as a parameter instead of using a global

Contributes to #68.

Modified: src/libespeak-ng/klatt.c
Modified: src/libespeak-ng/klatt.h
Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
388be80da77e: code cleanup: pass voice_t wvoice as a parameter instead of using a global

SetSynth_Klatt() was using wvoice in two ways:
1) global wvoice was used directly
2) global wvoice was also passed in Wavegen_Klatt() as an argument "v"

Now the code only uses the function argument wvoice

Contributes to #68.

Modified: src/libespeak-ng/klatt.c
Modified: src/libespeak-ng/klatt.h
Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
9232f1911e80: code cleanup: remove unnecessary references to out_start.

Unsigned char *out_start is a global only used in speech.c.

Modified: src/libespeak-ng/klatt.c
Modified: src/libespeak-ng/speech.c
Modified: src/libespeak-ng/synthesize.h
Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
3b4cca483224: code cleanup: combine Wavegen() and Wavegen2().

Wavegen2() only had one if-statement and then called
Wavegen(). Wavegen() was never called directly.

Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
992745508e0c: code cleanup: pass voice_t wvoice as a parameter to Wavegen() instead of using a
global

Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
c0ff3696b950: code cleanup: change global int current_phoneme table to static

It's only used in SpeakNextClause() and related to SelectPhonemeTable().

Another solution void be to keep SelectPhonemeTable() as a void function
and do a current_phoneme_table = voice->phoneme_tab_ix after the call to
SelectPhonemeTable().

Modified: src/libespeak-ng/phoneme.h
Modified: src/libespeak-ng/synthdata.c
Modified: src/libespeak-ng/synthdata.h
Modified: src/libespeak-ng/synthesize.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
65847bd25100: code cleanup: remove phoneme_tab_flags

It is memset and set once, but never checked or used for anything.

Modified: src/libespeak-ng/phoneme.h
Modified: src/libespeak-ng/synthdata.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
713e8a9e2c93: code cleanup: remove unused parameter from SetUpPhonemeTable.

See commit 65847bd251004f0a1d5d1. Bool recursing is not used for
anything anymore. Fixes a (compiler warning.

Modified: src/libespeak-ng/synthdata.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
a4041952c522: code cleanup: remove unused references to f_log

f_log is only used in compiledict.c.

Modified: src/libespeak-ng/synthesize.c
Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Juho Hiltunen <jaacoppi@...>:
5d03047c1955: code cleanup: remove unused int vowel_transition[4]

There's two variables with the same name:
1) in struct PHONEME_DATA, used by *phdata, *phdata_next and *phdata_prev
2) an unnecessary one that's only being memset() twice but never used
for anything

Modified: src/libespeak-ng/synthdata.c
Modified: src/libespeak-ng/synthesize.c
Modified: src/libespeak-ng/synthesize.h

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
bddd8a8bde78: Merge pull request #795

Modified: src/libespeak-ng/klatt.c
Modified: src/libespeak-ng/klatt.h
Modified: src/libespeak-ng/phoneme.h
Modified: src/libespeak-ng/speech.c
Modified: src/libespeak-ng/synthdata.c
Modified: src/libespeak-ng/synthdata.h
Modified: src/libespeak-ng/synthesize.c
Modified: src/libespeak-ng/synthesize.h
Modified: src/libespeak-ng/wavegen.c

[espeak-ng/espeak-ng] Pull request closed by valdisvi:

#795 Various code cleanups

Various code cleanups: change globals to function arguments, combine functions and remove unused code.

Most changes are with the voice output (klatt.c, wavegen.c etc). There might not be enough test cases to detect if an error has been made here.

[espeak-ng:master] New Comment on Pull Request #795 Various code cleanups
By valdisvi:

To make it less risky, before that I added additional test for Klatt voice. As all tests passed, I merged it.

1 New Commit:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
02174e2f7670: Add test for Klatt voices

Added: tests/klatt.test
Modified: .gitignore
Modified: Makefile.am

[espeak-ng:master] New Comment on Issue #793 There needs to be a way to explicitly set stress only via rules to support unstressed languages and other non-European languages.
By valdisvi:

As stress is relative, for sound it is the same. Only difference is that phonetic output is longer/more cluttered.

[espeak-ng:master] New Comment on Issue #793 There needs to be a way to explicitly set stress only via rules to support unstressed languages and other non-European languages.
By michael-conrad:

Doesn't look correct to me! It has all the syllables marked as stressed instead of non of them being marked for stress.

3 New Commits:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
9adc6e157e21: docs: fix link

Modified: docs/guide.md

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
e6af1e7c593f: docs: make direct links to guides from description to make list of docs shorter

Modified: README.md

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
30d5735db5aa: docs: fix link and make it more descriptive

Modified: docs/guide.md

[espeak-ng:master] New Comment on Issue #337 Why my espeak-ng program doesn't say anything?
By valdisvi:

I have created more detailed guides for usage and error solutions here.

2 New Commits:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
3aa4c10ef8cb: docs: remove entry about binaries, move dependencies into dependencies chapter

Modified: docs/building.md

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
b694576fd1b4: docs: add dedicated user guide for installation and usage

Added: docs/guide.md
Modified: README.md
Modified: docs/index.md

1 New Commit:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
df282f8f3dac: docs: add dedicated user guide for installation and usage

Added: docs/guide.md
Modified: README.md
Modified: docs/index.md

[espeak-ng/espeak-ng] Pull request updated by jaacoppi:

#795 Various code cleanups

Various code cleanups: change globals to function arguments, combine functions and remove unused code.

Most changes are with the voice output (klatt.c, wavegen.c etc). There might not be enough test cases to detect if an error has been made here.

1 New Commit:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
e7cc4d360964: docs: add examples how to use eSpeak NG as a C library

Added: docs/integration.md
Modified: README.md
Modified: docs/index.md

1 New Commit:

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
aec8baf093a8: docs: add examples how to use eSpeak NG as a C library

Added: docs/integration.md
Modified: README.md
Modified: docs/index.md

[espeak-ng/espeak-ng] Pull request opened by jaacoppi:

#795 Various code cleanups

Various code cleanups: change globals to function arguments, combine functions and remove unused code.

Most changesa re with the voice output (klatt.c, wavegen.c etc). There might not be enough test cases to detect if an error has been made here.

[espeak-ng/espeak-ng] Pull request updated by jaacoppi:

#795 Various code cleanups

Various code cleanups: change globals to function arguments, combine functions and remove unused code.

Most changes are with the voice output (klatt.c, wavegen.c etc). There might not be enough test cases to detect if an error has been made here.

[espeak-ng:master] New Comment on Issue #793 There needs to be a way to explicitly set stress only via rules to support unstressed languages and other non-European languages.
By valdisvi:

Hm..., it works well for me:

espeak-ng -v chr -X "wị²dị²jị²yạ²ga."
Replace: ² > xc
Replace: ² > xc
Replace: ² > xc
Replace: ² > xc
Translate 'wịxcdịxcjịxcyạxcga'
  1	w        [w]

 36	ị      [i]

 22	xc       [2]

  1	d        [d]

 36	ị      [i]

 22	xc       [2]

  1	j        [dZ]

 36	ị      [i]

 22	xc       [2]

  1	y        [j]

 36	ạ      [0]

 22	xc       [2]

  1	g        [g]

  1	a        [0:]
 22	a (_     [0~43]

w'i2d'i2dZ'i2j'02g'0~43_

3 New Commits:

[espeak-ng:master] By Tobias Platen <tplaten@...>:
a6dbed81682e: add output hooks for wavegen

Modified: src/include/espeak-ng/espeak_ng.h
Modified: src/libespeak-ng/synthesize.c
Modified: src/libespeak-ng/synthesize.h
Modified: src/libespeak-ng/wavegen.c

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
1b73cebeb9c9: Disable secondary stress for Cherokee

Modified: src/libespeak-ng/tr_languages.c

[espeak-ng:master] By Valdis Vitolins <valdis.vitolins@...>:
04caefe54e6b: Merge pull request #791

Modified: src/include/espeak-ng/espeak_ng.h
Modified: src/libespeak-ng/synthesize.c
Modified: src/libespeak-ng/synthesize.h
Modified: src/libespeak-ng/wavegen.c

[espeak-ng/espeak-ng] Pull request closed by valdisvi:

#791 add output hooks for wavegen

I've added some hooks to wavegen, which can be used to output aligned speech. This information can be used by prosody transplantation tools similar to MBROLIGN. There is also a function to set a constant f0 in Hz, which may be used by some prosody transplantation tools. If none of the functions is called, the behaviour of espeak-ng is unchanged.

[espeak-ng:master] New Comment on Pull Request #791 add output hooks for wavegen
By valdisvi:

Thanks! This approach seems more general to do integration with other tools than #749.

[espeak-ng/espeak-ng] Pull request closed by jaacoppi:

#380 Move LOPT_DIERESES and LOPT_SONORANT_MIN from tr_languages.c to language files

Contributes to #218.