Merge 9b80b84 into d8dc04c

michaelDCurran · web-flow · commit 2543d7cb2142 · 2021-10-05T15:43:51.000+10:00
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
@@ -43,6 +43,12 @@
 import winVersion
 
 
+paragraphIndentIDs = {
+	UIAHandler.UIA_IndentationFirstLineAttributeId: "first-line-indent",
+	UIAHandler.UIA_IndentationLeadingAttributeId: "left-indent",
+	UIAHandler.UIA_IndentationTrailingAttributeId: "right-indent",
+}
+
 class UIATextInfo(textInfos.TextInfo):
 
 	_cache_controlFieldNVDAObjectClass=True
@@ -168,6 +174,8 @@ def _getFormatFieldAtRange(self,textRange,formatConfig,ignoreMixedValues=False):
 					UIAHandler.UIA_IsSuperscriptAttributeId,
 					UIAHandler.UIA_IsSubscriptAttributeId
 				})
+			if formatConfig["reportParagraphIndentation"]:
+				IDs.update(set(paragraphIndentIDs))
 			if formatConfig["reportAlignment"]:
 				IDs.add(UIAHandler.UIA_HorizontalTextAlignmentAttributeId)
 			if formatConfig["reportColor"]:
@@ -223,6 +231,21 @@ def _getFormatFieldAtRange(self,textRange,formatConfig,ignoreMixedValues=False):
 			val=fetcher.getValue(UIAHandler.UIA_StyleNameAttributeId,ignoreMixedValues=ignoreMixedValues)
 			if val!=UIAHandler.handler.reservedNotSupportedValue:
 				formatField["style"]=val
+		if formatConfig["reportParagraphIndentation"]:
+			for ID, fieldAttr in paragraphIndentIDs.items():
+				val = fetcher.getValue(ID, ignoreMixedValues=ignoreMixedValues)
+				if isinstance(val, float):
+					# val is in points (1/72 of an inch)
+					val /= 72.0
+					if languageHandler.useImperialMeasurements():
+						# Translators: a measurement in inches
+						valText = _("{val:.2f} in").format(val=val)
+					else:
+						# Convert from inches to centermetres
+						val *= 2.54
+						# Translators: a measurement in centermetres
+						valText = _("{val:.2f} cm").format(val=val)
+					formatField[fieldAttr] = valText
 		if formatConfig["reportAlignment"]:
 			val=fetcher.getValue(UIAHandler.UIA_HorizontalTextAlignmentAttributeId,ignoreMixedValues=ignoreMixedValues)
 			if val==UIAHandler.HorizontalTextAlignment_Left:
diff --git a/source/languageHandler.py b/source/languageHandler.py
@@ -43,6 +43,7 @@ class LOCALE(enum.IntEnum):
 	# https://docs.microsoft.com/en-us/windows/win32/intl/locale-information-constants
 	SLANGUAGE = 0x2
 	SLIST = 0xC
+	IMEASURE = 0xD
 	SLANGDISPLAYNAME = 0x6f
 	SENGLISHLANGUAGENAME = 0x00001001
 	SENGLISHCOUNTRYNAME = 0x00001002
@@ -437,6 +438,18 @@ def normalizeLanguage(lang) -> Optional[str]:
 		ld[1]=ld[1].upper()
 	return "_".join(ld)
 
+
+def useImperialMeasurements() -> bool:
+	"""
+	Whether or not measurements should be reported as imperial, rather than metric.
+	"""
+	bufLength = 2
+	buf = ctypes.create_unicode_buffer(bufLength)
+	if not winKernel.kernel32.GetLocaleInfoEx(None, LOCALE.IMEASURE, buf, bufLength):
+		raise RuntimeError("LOCALE.IMEASURE not supported")
+	return buf.value == '1'
+
+
 # Map Windows primary locale identifiers to locale names
 # Note these are only primary language codes (I.e. no country information)
 # For full locale identifiers we use Python's own locale.windows_locale.
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -53,6 +53,7 @@ If you need this functionality please assign a gesture to the appropriate script
 - When navigating the Windows system tray calendar, NVDA now reports the day of the week in full. (#12757)
 - When using a Chinese input method such as Taiwan - Microsoft Quick in Microsoft Word, scrolling the braille display forward and backward no longer incorrectly keeps jumping back to the original caret position. (#12855)
 - When accessing Microsoft Word documents via UIA, navigating by sentence (alt+downArrow / alt+upArrow) is again possible. (#9254)
+- When accessing MS Word with UIA, paragraph indenting is now reported. (#12899(
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ If you need this functionality please assign a gesture to the appropriate script`
`53`	`53`	`- When navigating the Windows system tray calendar, NVDA now reports the day of the week in full. (#12757)`
`54`	`54`	`- When using a Chinese input method such as Taiwan - Microsoft Quick in Microsoft Word, scrolling the braille display forward and backward no longer incorrectly keeps jumping back to the original caret position. (#12855)`
`55`	`55`	`- When accessing Microsoft Word documents via UIA, navigating by sentence (alt+downArrow / alt+upArrow) is again possible. (#9254)`
	`56`	`+- When accessing MS Word with UIA, paragraph indenting is now reported. (#12899(`
`56`	`57`	`-`
`57`	`58`
`58`	`59`