Cleanup and apply fix to next word script as well.

nvaccess · Oct 19, 2021 · ec1e156 · ec1e156
1 parent 5bbf2e9
commit ec1e156
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/include/espeak b/include/espeak
diff --git a/source/globalCommands.py b/source/globalCommands.py
@@ -1324,15 +1324,15 @@ def script_review_currentLine(self,gesture):
 		category=SCRCAT_TEXTREVIEW,
 		gestures=("kb:numpad9", "kb(laptop):NVDA+downArrow", "ts(text):flickDown")
 	)
-	def script_review_nextLine(self,gesture):
+	def script_review_nextLine(self, gesture):
 		origInfo = api.getReviewPosition().copy()
 		origInfo.collapse()
 		info = origInfo.copy()
-		res=info.move(textInfos.UNIT_LINE,1)
+		res = info.move(textInfos.UNIT_LINE, 1)
 		newLine = info.copy()
 		newLine.expand(textInfos.UNIT_LINE)
-		# Some implementations of move by line 1 may succed one more time than expected,
-		# Landing on the exclosive end of the document.
+		# #12808: Some implementations of move forward by one line may succeed one more time than expected,
+		# Landing on the exclusive end of the document.
 		# Therefore, verify that expanding after the move does result in being on a new line,
 		# I.e. the new line starts after the original review cursor position.
 		if res == 0 or newLine.start <= origInfo.start:
@@ -1400,18 +1400,23 @@ def script_review_currentWord(self,gesture):
 		category=SCRCAT_TEXTREVIEW,
 		gestures=("kb:numpad6", "kb(laptop):NVDA+control+rightArrow", "ts(text):2finger_flickRight")
 	)
-	def script_review_nextWord(self,gesture):
-		info=api.getReviewPosition().copy()
-		info.expand(textInfos.UNIT_WORD)
-		info.collapse()
-		res=info.move(textInfos.UNIT_WORD,1)
-		if res==0:
+	def script_review_nextWord(self, gesture):
+		origInfo = api.getReviewPosition().copy()
+		origInfo.collapse()
+		info = origInfo.copy()
+		res = info.move(textInfos.UNIT_WORD, 1)
+		newWord = info.copy()
+		newWord.expand(textInfos.UNIT_WORD)
+		# #12808: Some implementations of move forward by one word may succeed one more time than expected,
+		# Landing on the exclusive end of the document.
+		# Therefore, verify that expanding after the move does result in being on a new word,
+		# I.e. the new word starts after the original review cursor position.
+		if res == 0 or newWord.start <= origInfo.start:
 			# Translators: a message reported when review cursor is at the bottom line of the current navigator object.
 			ui.reviewMessage(_("Bottom"))
 		else:
 			api.setReviewPosition(info)
-		info.expand(textInfos.UNIT_WORD)
-		speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET, unit=textInfos.UNIT_WORD)
+		speech.speakTextInfo(newWord, unit=textInfos.UNIT_WORD, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		description=_(
+0 −1		Makefile.am
+0 −29		android/res/values-fa/strings.xml
+0 −4		android/res/values/donottranslate.xml
+0 −4		android/src/com/reecedunn/espeak/preference/VoiceVariantPreference.java
+37 −40		chromium_extension/AudioStream.js
+1 −1		configure.ac
+10 −10		dictsource/fa_list
+2 −2		dictsource/fa_rules
+6 −67		dictsource/he_listx
+0 −2		dictsource/he_rules
+0 −4,101		dictsource/shn_list
+1 −1		docs/building.md
+2 −2		docs/mbrola.md
+3 −10		docs/voices.md
+1 −2		espeak-ng-data/lang/art/io
+2 −2		espeak-ng-data/lang/itc/la
+0 −1		espeak-ng-data/lang/urj/et
+0 −2		espeak-ng-data/lang/urj/fi
+0 −5		espeak-ng-data/voices/mb/mb-hb1
+0 −5		espeak-ng-data/voices/mb/mb-hb2
+0 −61		phsource/mbrola/he
+0 −1		phsource/mbrola/us
+2 −2		src/libespeak-ng/dictionary.c
+3 −3		src/libespeak-ng/numbers.c
+2 −0		src/libespeak-ng/phoneme.h
+3 −3		src/libespeak-ng/readclause.c
+27 −0		src/libespeak-ng/spect.h
+1 −1		src/libespeak-ng/speech.c
+8 −1		src/libespeak-ng/synthesize.h
+2 −1		src/libespeak-ng/tr_languages.c
+2 −2		src/libespeak-ng/translate.c
+1 −0		src/libespeak-ng/translate.h
+26 −46		src/libespeak-ng/voices.c
+0 −17		tests/common
+5 −6		tests/klatt.test
+1 −73		tests/language-phonemes.test
+2 −2		tests/language-pronunciation.test