Merge branch 'brailcom:master' into pipewire

.gitignore

@@ -65,6 +65,7 @@
 /po/stamp-it
 /po/stamp-po
 /py-compile
+/run-spd-say
 /run-speechd
 /so_locations
 /speech-dispatcher.pc

README.md

@@ -88,6 +88,20 @@ To build and install speech-dispatcher and all of it's components, read the
 file [INSTALL](INSTALL).
 
 
+To try speech-dispatcher without installing it (e.g. to avoid disturbing an
+existing speech-dispatcher instance), you can run
+
+```
+./run-speechd -t 0 -s
+```
+
+and in another terminal run
+
+```
+./run-spd-say foo
+```
+
+
 People
 ------
 

config/modules/espeak-ng-mbrola-generic.conf

@@ -40,7 +40,7 @@ GenericSoundIconFolder "/usr/share/sounds/sound-icons/"
 # Note that if an empty string is specified, then $PUNCT will be blank 
 # which is a default situation for espeak.
 
-GenericPunctNone ""
+GenericPunctNone "--punct=\"\""
 GenericPunctSome "--punct=\"()[]{};:\""
 GenericPunctMost "--punct=\"()[]{};:\""
 GenericPunctAll "--punct"

configure.ac

@@ -583,7 +583,8 @@ AM_CONDITIONAL([USE_LIBSYSTEMD], [test "x$use_libsystemd" = "xyes"])
 AM_CONDITIONAL(BUILD_HTML_DOC, [test "$EMAIL" = [email protected]])
 
 AC_CONFIG_FILES([Makefile
-		 run-speechd
+                 run-speechd
+                 run-spd-say
                  speech-dispatcher.pc
                  config/Makefile
                  config/clients/Makefile
@@ -607,7 +608,7 @@ AC_CONFIG_FILES([Makefile
                  src/modules/Makefile
                  src/server/Makefile
                  src/tests/Makefile],
-	 	[chmod +x run-speechd])
+                [chmod +x run-speechd run-spd-say])
 AC_OUTPUT
 AC_MSG_NOTICE([output modules to be built are $output_modules])
 AC_MSG_NOTICE([audio methods to be built are $audio_methods])

doc/speech-dispatcher.texi

@@ -869,6 +869,16 @@ only if they are followed by a space. This way for example
 ``file123.tmp'' would not be cut in two parts, but ``The horse
 raced around the fence, that was lately painted green, fell.''
 would be. (This is an interesting sentence, by the way.)
+
+Note: Due to
+@uref{https://gist.github.com/guest271314/8279ddaeeb44b9ef5f1855f6f1588d33,Bug #102 (Empty options yield to a warning)},
+to remove extended silence between sentences a workaround is to
+include charcters that are not used in the text to speech output in the configuration,
+for example in a @code{~/.config/speech-dispatcher/modules/piper.conf} file
+
+@example
+    GenericDelimiters  "|"
+@end example
 @end itemize
 
 @node Configuration of the Generic Output Module,  , Configuration files of output modules, Output Modules Configuration

include/spd_audio_plugin.h

@@ -54,6 +54,23 @@ typedef struct {
 } AudioID;
 
 /* These methods are called from a single thread, except stop which can be called from another thread */
+/* open is called first, which returns an AudioID, which is passed to other methods, so plugins can extend
+ * the AudioID structure as they see fit to include their own data.
+ *
+ * Then if feed_sync_overlap is available, begin is called first to set up the
+ * format, and several calls to feed_sync_overlap are made to feed audio
+ * progressively with overlapping to avoid any underrun. Eventually, end is called.
+ *
+ * If feed_sync_overlap is not available, begin is called first to set up the format,
+ * and several calls to feed_sync are made to feed audio progressively, but we
+ * don't have overlap so we may have underrun. Eventually, end is called.
+ *
+ * If neither feed_sync_overlap nor feed_sync are available, play is called with
+ * the whole piece. That doesn't allow pipelining, thus risking underruns.
+ *
+ * If stop is called, the playback currently happening should be stopped as soon
+ * as possible.
+ */
 typedef struct spd_audio_plugin {
 	const char *name;
 	AudioID *(*open) (void **pars);
@@ -64,6 +81,7 @@ typedef struct spd_audio_plugin {
 	int (*close) (AudioID * id);
 	int (*set_volume) (AudioID * id, int);
 	void (*set_loglevel) (int level);
+	/* Return the command that sd_generic modules can use to play sound */
 	char const *(*get_playcmd) (void);
 
 	/* Optional */

locale/cy/orca.dic

@@ -0,0 +1,31 @@
+# This file was automatically generated by make import-orca
+# DO NOT MODIFY IT!
+# See locale/README.md to know how to import dictionaries
+
+# locale/cy/orca.dic
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# This file is distributed under the same license as the orca package.
+
+symbols:
+ 	bwlch	char
+\\n	llinell newydd	char
+!	ebychnod	all	always
+"	dyfynnod	most
+$	doler	some
+%	canran	some
+&	a	some
+'	collnod	all
+(	cromfach chwith	most
+)	cromfach dde	most
+*	seren	some
++	plws	some
+,	coma	all	always
+-	llinell doriad	most
+/	slaes	some
+=	hafalnod	some
+?	cwestiwn	all	always
+\[	braced chwith	most
+\\\\	slaes ôl	most
+]	braced dde	most
+{	bres chwith	most
+}	brês dde	most

locale/dz/orca.dic

@@ -0,0 +1,39 @@
+# This file was automatically generated by make import-orca
+# DO NOT MODIFY IT!
+# See locale/README.md to know how to import dictionaries
+
+# locale/dz/orca.dic
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# This file is distributed under the same license as the orca package.
+
+symbols:
+ 	བར་སྣང་།	char
+\\n	གྱལ་རིམ་གསརཔ།	char
+\\t	ཨེབ་ལྡེ།	char
+!	ཚོར་རྟགས།	all	always
+"	འདྲེན་ཚིག	most
+$	ཌོ་ལར།	some
+%	བརྒྱ་ཆ།	some
+&	དང་རྟགས།	some
+'	འབྲེལ་སྒྲའི་རྟགས།	all
+(	གཡོན་གྱི་གུག་ཤད། [	most
+)	གཡས་ཀྱི་གུག་ཤད། ]	most
+*	སྐར་རྟགས།	some
++	བསྡོམས་རྟགས།	some
+,	ལྷོད་རྟགས།	all	always
+-	འབྲེལ་རྟགས།	most
+.	ཚག	all	always
+/	གཡོ་ཤད།	some
+:	ཀོ་ལཱན།	most	always
+;	སེ་མི་ཀོ་ལཱན།	most	always
+=	མཉམ་རྟགས།	some
+?	དྲི་བ།	all	always
+@	ལུ།	some
+\[	གཡོན་གྱི་གུག་ཤད། (	most
+\\\\	གཡོ་ཤད་ལོག་པ།	most
+]	གཡས་ཀྱི་གུག་ཤད། )	most
+^	ཀེ་རེཊི།	some
+{	གཡོན་གྱི་གུག་ཤད། {	most
+}	གཡས་ཀྱི་གུག་ཤད། }	most
+~	སྣ་སྒྲ་ཅན་གྱི་རྟགས།	most
+§	དབྱེ་ཚན་	some

locale/eo/orca.dic

@@ -0,0 +1,68 @@
+# This file was automatically generated by make import-orca
+# DO NOT MODIFY IT!
+# See locale/README.md to know how to import dictionaries
+
+# locale/eo/orca.dic
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# This file is distributed under the same license as the orca package.
+
+symbols:
+ 	spaco	char
+\\n	nova lineo	char
+\\t	langeto	char
+!	krisigno	all	always
+"	citilo	most
+\\#	numero	some
+$	dolaro	some
+%	elcento	some
+&	kaj	some
+'	apostrofo	all
+(	maldekstra krampo	most
+)	dekstra krampo	most
+*	stelo	some
+,	komo	all	always
+-	haltostreko	most
+.	punkto	all	always
+/	oblikvo	some
+:	dupunkto	most	always
+;	punktokomo	most	always
+<	malpli-signo	most
+=	egalsigno	some
+>	pli-signo	most
+?	demando	all	always
+@	heliko	some
+\[	maldekstra kvadrata krampo	most
+\\\\	deklivo	most
+]	dekstra kvadrata krampo	most
+^	ĉapelo	some
+_	substreko	most
+`	maldekstra korno	most
+{	maldekstra kurba krampo	most
+|	vertikala streko	most
+}	dekstra kurba krampo	most
+~	tildo	most
+ 	nerompebla spaceto	char
+¡	inversa krisigno	some
+¢	cendoj	some
+£	pundoj	some
+¤	valutsigno	all
+¥	eno	some
+©	kopirajto	some
+¬	logika neo	some
+¯	makrono	most
+°	gradoj	some
+±	plus-minus-signo	some
+´	dekstra korno	most
+µ	muo	some
+¸	subhoko	most
+¼	kvarono	none
+½	duono	none
+¾	tri kvaronoj	none
+ƒ	florino	all
+‡	duobla obeluso	some
+•	bulmarko	none
+‣	triangula bulmarko	none
+‰	elmilo	some
+⁃	steketa bulmarko	none
+€	eŭro	some
+™	registrita marko	some

locale/et/orca.dic

@@ -0,0 +1,49 @@
+# This file was automatically generated by make import-orca
+# DO NOT MODIFY IT!
+# See locale/README.md to know how to import dictionaries
+
+# locale/et/orca.dic
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# This file is distributed under the same license as the orca package.
+
+symbols:
+ 	tühik	char
+\\n	reavahetus	char
+\\t	tabulaator	char
+!	hüüumärk	all	always
+"	jutumärk	most
+%	protsent	some
+'	apostroof	all
+(	vasak sulg	most
+)	parem sulg	most
+*	tärn	some
++	pluss	some
+,	koma	all	always
+-	mõttekriips	most
+.	punkt	all	always
+/	kaldkriips	some
+:	koolon	most	always
+;	semikoolon	most	always
+=	võrdusmärk	some
+?	küsimärk	all	always
+\[	vasak nurksulg	most
+\\\\	langkriips	most
+]	parem nurksulg	most
+^	katus	some
+_	alakriips	most
+`	graavis	most
+{	vasak loogiline sulg	most
+|	püstkriips	most
+}	parem loogiline sulg	most
+ 	murdmatu tühik	char
+§	paragrahv	some
+©	autoriõigus	some
+°	kraadi	some
+²	ruudus	none
+³	kuubis	none
+µ	müü	some
+·	keskpunkt	none
+¼	üks neljandik	none
+½	üks kahendik	none
+¾	kolm neljandikku	none
+‰	promilli	some

locale/gu/orca.dic

@@ -0,0 +1,38 @@
+# This file was automatically generated by make import-orca
+# DO NOT MODIFY IT!
+# See locale/README.md to know how to import dictionaries
+
+# locale/gu/orca.dic
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# This file is distributed under the same license as the orca package.
+
+symbols:
+ 	જગ્યા	char
+\\n	નવીલીટી	char
+\\t	ટેબ	char
+!	ઉદ્ગાર	all	always
+"	ક્વોટ	most
+$	ડોલર	some
+%	ટકા	some
+&	અને	some
+'	અવતરણ	all
+(	ડાબો કૌંસ	most
+)	જમણો કૌંસ	most
+*	તારો	some
++	વત્તા	some
+,	અલ્પવિરામ	all	always
+-	ડેશ	most
+.	ટપકું	all	always
+/	સ્લેશ	some
+:	કોલન	most	always
+;	સેમીકોલન	most	always
+=	બરાબર	some
+?	પ્રશ્ન	all	always
+@	એટ	some
+\[	ડાબો કૌંસ	most
+\\\\	બેકસ્લેશ	most
+]	જમણો કૌંસ	most
+^	કેરેટ	some
+{	ડાબો કૌંસ	most
+}	જમણો કૌંસ	most
+~	ટીલ્ડા	most

locale/is/orca-chars.dic

@@ -0,0 +1,10 @@
+# This file was automatically generated by make import-orca
+# DO NOT MODIFY IT!
+# See locale/README.md to know how to import dictionaries
+
+# locale/is/orca.dic
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# This file is distributed under the same license as the orca package.
+
+symbols:
+×	sinnum	some

locale/is/orca.dic

@@ -0,0 +1,25 @@
+# This file was automatically generated by make import-orca
+# DO NOT MODIFY IT!
+# See locale/README.md to know how to import dictionaries
+
+# locale/is/orca.dic
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# This file is distributed under the same license as the orca package.
+
+symbols:
+¡	viðsnúið upphrópunarmerki	some
+¢	sent	some
+¤	gjaldmiðilstákn	all
+§	hluti	some
+©	höfundarréttur	some
+®	skráð vörumerki	some
+°	gráður	some
+±	plús eða mínus	some
+µ	mjú	some
+¶	málsgreinarmerki	most
+¼	einn fjórði	none
+½	helmingur	none
+¾	þrír fjórðu	none
+¿	spurningamerki á hvolfi	some
+™	vörumerki	some
+✓	hakmerki	none