Added inSpeech and inBraille properties to OutputMode, and used them instead of bitwise ands in speech and braille code

Author: SaschaCowley

source/braille.py

@@ -1148,7 +1148,7 @@ def _setCursor(self, info: textInfos.TextInfo):
 
 	def _getTypeformFromFormatField(self, field, formatConfig):
 		typeform = louis.plain_text
-		if not (formatConfig["fontAttributeReporting"] & OutputMode.BRAILLE):
+		if not OutputMode(formatConfig["fontAttributeReporting"]).inBraille:
 			return typeform
 		if field.get("bold", False):
 			typeform |= louis.bold

source/config/configFlags.py

@@ -11,7 +11,7 @@
 the default value.
 """
 
-from enum import unique
+from enum import unique, property as enum_property
 from utils.displayString import (
 	DisplayStringIntEnum,
 	DisplayStringStrEnum,
@@ -246,3 +246,21 @@ def _displayStringLabels(self):
 			# Translators: A label for an option to choose a method of reporting information, e.g. font attributes.
 			self.SPEECH_AND_BRAILLE: _("Speech and braille"),
 		}
+	
+	@enum_property
+	def inSpeech(self) -> bool:
+		"""Check if the output mode includes speech.
+
+		Returns:
+				bool: True if the output mode includes speech, False otherwise.
+		"""
+		return self & self.SPEECH != 0
+	
+	@enum_property
+	def inBraille(self) -> bool:
+		"""Check if the output mode includes braille.
+
+		Returns:
+				bool: True if the output mode includes braille, False otherwise.
+		"""
+		return self & self.BRAILLE != 0

source/speech/speech.py

@@ -2718,7 +2718,7 @@ def getFormatFieldSpeech(  # noqa: C901
 				# Translators: Reported when text is no longer marked as emphasised 
 				else _("not emphasised"))
 			textList.append(text)
-	if formatConfig["fontAttributeReporting"] & OutputMode.SPEECH:
+	if OutputMode(formatConfig["fontAttributeReporting"]).inSpeech:
 		bold=attrs.get("bold")
 		oldBold=attrsCache.get("bold") if attrsCache is not None else None
 		if (bold or oldBold is not None) and bold!=oldBold: