Merge a42f051 into 9717b81

CyrilleB79 · web-flow · commit b37a9abacc12 · 2024-02-07T11:54:54.000Z
diff --git a/source/characterProcessing.py b/source/characterProcessing.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2010-2023 NV Access Limited, World Light Information Limited,
+# Copyright (C) 2010-2024 NV Access Limited, World Light Information Limited,
 # Hong Kong Blind Union, Babbage B.V., Julien Cochuyt, Cyrille Bougot
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
@@ -528,13 +528,7 @@ def __init__(self, locale):
 		multiChars.sort(key=lambda identifier: len(identifier), reverse=True)
 
 		# Build the regexp.
-		patterns = [
-			# Strip repeated spaces from the end of the line to stop them from being picked up by repeated.
-			r"(?P<rstripSpace>  +$)",
-			# Repeated characters: more than 3 repeats.
-			r"(?P<repeated>(?P<repTmp>%s)(?P=repTmp){3,})" % characters
-		]
-		# Complex symbols.
+		patterns = []# Complex symbols.
 		# Each complex symbol has its own named group so we know which symbol matched.
 		patterns.extend(
 			u"(?P<c{index}>{pattern})".format(index=index, pattern=symbol.pattern)
@@ -546,6 +540,12 @@ def __init__(self, locale):
 			multiChars="|".join(re.escape(identifier) for identifier in multiChars),
 			singleChars=characters
 		))
+		patterns.extend([
+			# Strip repeated spaces from the end of the line to stop them from being picked up by repeated.
+			r"(?P<rstripSpace>  +$)",
+			# Repeated characters: more than 3 repeats.
+			r"(?P<repeated>(?P<repTmp>%s)(?P=repTmp){3,})" % characters
+		])
 		pattern = "|".join(patterns)
 		try:
 			self._regexp = re.compile(pattern, re.UNICODE)
diff --git a/source/locale/en/symbols.dic b/source/locale/en/symbols.dic
@@ -11,6 +11,8 @@ complexSymbols:
 # Phrase endings.
 ; phrase ending	(?<=[^\s;]);(?=\s|$)
 : phrase ending	(?<=[^\s:]):(?=\s|$)
+# Series of dots used for visual presentation, e.g. in table of contents
+padding .	\.{4,}
 # Others
 decimal point	(?<![^\d -])\.(?=\d)
 in-word '	(?<=[^\W_])['’]
@@ -25,6 +27,7 @@ symbols:
 ? sentence ending	question	all	always
 ; phrase ending	semi	most	always
 : phrase ending	colon	most	always
+padding .	padding dots	all	always
 decimal point		none	always
 in-word '	tick	all	norep
 negative number	minus	none	norep
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -20,6 +20,7 @@ What's New in NVDA
 - Add-on Store:
   - The minimum and the last tested NVDA version for an add-on are now displayed in the "other details" area. (#15776, @Nael-Sayegh)
   -
+- Padding dots commonly used in tables of contents are not reported anymore at low punctuation levels. (#15845, @CyrilleB79)
 -
 
 == Bug Fixes ==

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ What's New in NVDA`
`20`	`20`	`- Add-on Store:`
`21`	`21`	`- The minimum and the last tested NVDA version for an add-on are now displayed in the "other details" area. (#15776, @Nael-Sayegh)`
`22`	`22`	`-`
	`23`	`+- Padding dots commonly used in tables of contents are not reported anymore at low punctuation levels. (#15845, @CyrilleB79)`
`23`	`24`	`-`
`24`	`25`
`25`	`26`	`== Bug Fixes ==`