Add ability to speak next and previous lines/paragraphs when navigati…

source/braille.py

@@ -1659,6 +1659,8 @@ def nextLine(self):
 				return
 		dest.collapse()
 		self._setCursor(dest)
+		dest.expand(self._getReadingUnit())
+		_speakOnNavigatingByUnit(dest)
 
 	def previousLine(self, start=False):
 		dest = self._readingInfo.copy()
@@ -1677,11 +1679,13 @@ def previousLine(self, start=False):
 					pass
 				else:
 					dest = dest.obj.makeTextInfo(textInfos.POSITION_LAST)
-					dest.expand(unit)
-			else:  # no page turn support
+			else:
+				# no page turn supportcode ..\nvda
 				return
 		dest.collapse()
 		self._setCursor(dest)
+		dest.expand(self._getReadingUnit())
+		_speakOnNavigatingByUnit(dest)
 
 
 class CursorManagerRegion(TextInfoRegion):
@@ -3841,3 +3845,18 @@ def _speakOnRouting(info: textInfos.TextInfo):
 
 	info.expand(textInfos.UNIT_CHARACTER)
 	spellTextInfo(info)
+
+
+def _speakOnNavigatingByUnit(info: textInfos.TextInfo):
+	"""Speaks the reading unit after navigating by it with braille.
+
+	:param info: The reading unit TextInfo at the cursor position after navigating.
+	"""
+	if not config.conf["braille"]["speakOnNavigatingByUnit"]:
+		return
+	# Import late to avoid circular import.
+	from speech.speech import cancelSpeech, speakTextInfo
+
+	readingUnit = handler.buffer.regions[-1]._getReadingUnit()
+	cancelSpeech()
+	speakTextInfo(info, unit=readingUnit, reason=controlTypes.OutputReason.CARET)

source/config/configSpec.py

@@ -94,6 +94,7 @@
 	focusContextPresentation = option("changedContext", "fill", "scroll", default="changedContext")
 	interruptSpeechWhileScrolling = featureFlag(optionsEnum="BoolFlag", behaviorOfDefault="enabled")
 	speakOnRouting = boolean(default=false)
+	speakOnNavigatingByUnit = boolean(default=false)
 	showSelection = featureFlag(optionsEnum="BoolFlag", behaviorOfDefault="enabled")
 	reportLiveRegions = featureFlag(optionsEnum="BoolFlag", behaviorOfDefault="enabled")
 	fontFormattingDisplay = featureFlag(optionsEnum="FontFormattingBrailleModeFlag", behaviorOfDefault="LIBLOUIS")

source/globalCommands.py

@@ -3556,7 +3556,8 @@ def script_toggleBrailleMode(self, gesture: inputCore.InputGesture):
 
 	@script(
 		# Translators: Input help mode message for cycle through
-		# braille move system caret when routing review cursor command.
+		# braille move system caret when routing
+		#  review cursor command.
 		description=_("Cycle through the braille move system caret when routing review cursor states"),
 		category=SCRCAT_BRAILLE,
 	)
@@ -3654,6 +3655,22 @@ def script_braille_toggleSpeakOnRouting(self, gesture):
 			state = _("Disabled speak character when routing cursor in text")
 		ui.message(state)
 
+	@script(
+		# Translators: Input help mode message for toggle speaking when navigating by lines or paragraphs with braille.
+		description=_("Toggles on and off speaking when navigating by lines or paragraph with braille"),
+		category=SCRCAT_BRAILLE,
+	)
+	@gui.blockAction.when(gui.blockAction.Context.BRAILLE_MODE_SPEECH_OUTPUT)
+	def script_toggleSpeakingOnNavigatingByUnit(self, gesture: inputCore.InputGesture):
+		toggleBooleanValue(
+			configSection="braille",
+			configKey="speakOnNavigatingByUnit",
+			# Translators: The message announced when toggling the speaking on navigating by unit braille setting.
+			enabledMsg=_("Speak whenn navigating by line or paragraph with braille on"),
+			# Translators: The message announced when toggling the speaking on navigating by unit braille setting.
+			disabledMsg=_("Speak when navigating by line or paragraph with braille off"),
+		)
+
 	@script(
 		# Translators: Input help mode message for cycle braille cursor shape command.
 		description=_("Cycle through the braille cursor shapes"),

source/gui/settingsDialogs.py

@@ -4613,6 +4613,14 @@ def makeSettings(self, settingsSizer):
 		self.bindHelpEvent("BrailleSpeakOnRouting", self.speakOnRoutingCheckBox)
 		self.speakOnRoutingCheckBox.Value = config.conf["braille"]["speakOnRouting"]
 
+		# Translators: The label for a setting in braille settings to speak the current line or paragraph when navigating by them with braille.
+		speakOnNavigatingText = _("Speak &line or paragraph when navigating by them with braille")
+		self.speakOnNavigatingCheckBox = followCursorGroupHelper.addItem(
+			wx.CheckBox(self.followCursorGroupBox, label=speakOnNavigatingText),
+		)
+		self.bindHelpEvent("BrailleSpeakOnNavigating", self.speakOnNavigatingCheckBox)
+		self.speakOnNavigatingCheckBox.Value = config.conf["braille"]["speakOnNavigatingByUnit"]
+
 		self.followCursorGroupBox.Enable(
 			list(braille.BrailleMode)[self.brailleModes.GetSelection()] is braille.BrailleMode.FOLLOW_CURSORS,
 		)
@@ -4681,6 +4689,7 @@ def onSave(self):
 			self.paragraphStartMarkersComboBox.GetSelection()
 		]
 		config.conf["braille"]["speakOnRouting"] = self.speakOnRoutingCheckBox.Value
+		config.conf["braille"]["speakOnNavigatingByUnit"] = self.speakOnNavigatingCheckBox.Value
 		config.conf["braille"]["wordWrap"] = self.wordWrapCheckBox.Value
 		self.unicodeNormalizationCombo.saveCurrentValueToConf()
 		config.conf["braille"]["focusContextPresentation"] = self.focusContextPresentationValues[