Merge 8f70ef1 into 69c8c5b

LeonarddeR · web-flow · commit b57305ddcaf0 · 2023-09-24T01:19:52.000+10:00
diff --git a/source/synthDrivers/sapi4.py b/source/synthDrivers/sapi4.py
@@ -45,7 +45,9 @@
 	PitchCommand,
 	RateCommand,
 	VolumeCommand,
+	BaseProsodyCommand
 )
+from speech.types import SpeechSequence
 
 
 class SynthDriverBufSink(COMObject):
@@ -124,19 +126,32 @@ def __init__(self):
 	def terminate(self):
 		self._bufSink._allowDelete = True
 
-	def speak(self,speechSequence):
+	def speak(self, speechSequence: SpeechSequence):
 		textList=[]
 		charMode=False
 		item=None
 		oldPitch = self.pitch
 		oldVolume = self.volume
 		oldRate = self.rate
-
+		# #15500: Some SAPI4 voices reset all prosody when they receive any prosody command.
+		prosodyToAdd = [
+			c() for c in self.supportedCommands
+			if issubclass(c, BaseProsodyCommand)
+		]
+		unprocessedSequence = speechSequence
+		# Add all default values to the start and end of the sequence,
+		# but avoid duplicating the first command, if any.
+		speechSequence = [c for c in prosodyToAdd if not isinstance(unprocessedSequence[0], type(c))]
+		speechSequence.extend(unprocessedSequence)
+		# Also, add all default values to the end of the sequence.
+		speechSequence.extend(prosodyToAdd)
+		lastHandledIndexInSequence = 0
 		for item in speechSequence:
 			if isinstance(item,str):
 				textList.append(item.replace('\\','\\\\'))
 			elif isinstance(item, IndexCommand):
 				textList.append("\\mrk=%d\\"%item.index)
+				lastHandledIndexInSequence = item.index
 			elif isinstance(item, CharacterModeCommand):
 				textList.append("\\RmS=1\\" if item.state else "\\RmS=0\\")
 				charMode=item.state
@@ -162,9 +177,8 @@ def speak(self,speechSequence):
 				log.debugWarning("Unsupported speech command: %s"%item)
 			else:
 				log.error("Unknown speech: %s"%item)
-		if isinstance(item, IndexCommand):
-			# This is the index denoting the end of the speech sequence.
-			self._finalIndex=item.index
+		# lastHandledIndexInSequence is the index denoting the end of the speech sequence.
+		self._finalIndex = lastHandledIndexInSequence
 		if charMode:
 			# Some synths stay in character mode if we don't explicitly disable it.
 			textList.append("\\RmS=0\\")
