Commit e1f28c86 authored by Samuel Thibault's avatar Samuel Thibault Committed by Greg Kroah-Hartman
Browse files

speakup: Fix spurious space pronunciation on spelling letters 



This gathers emitting the caps start string, space, spelled letter
string, space, and caps stop string, into one printf, to avoid
sending to the synth a space character alone, which the synth would
then pronounce.

Similarly, emit space along control-letter and letter spelling.

Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Tested-by: default avatarZahari Yurukov <zahari.yurukov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c831c583

drivers/staging/speakup/main.c

+5 −8
Original line number Diff line number Diff line
@@ -449,20 +449,17 @@ static void speak_char(u16 ch) 
		pr_info("speak_char: cp == NULL!\n");

		return;

	}

	synth_buffer_add(SPACE);

	if (IS_CHAR(ch, B_CAP)) {

		spk_pitch_shift++;

		synth_printf("%s", spk_str_caps_start);

		synth_printf("%s", cp);

		synth_printf("%s", spk_str_caps_stop);

		synth_printf("%s %s %s",

			     spk_str_caps_start, cp, spk_str_caps_stop);

	} else {

		if (*cp == '^') {

			synth_printf("%s", spk_msg_get(MSG_CTRL));

			cp++;

		}

			synth_printf(" %s%s ", spk_msg_get(MSG_CTRL), cp);

		} else

			synth_printf(" %s ", cp);

	}

	synth_buffer_add(SPACE);

}



static u16 get_char(struct vc_data *vc, u16 *pos, u_char *attribs)