Merge 7549414 into 68b7196

LeonarddeR · web-flow · commit b9ed18e76b14 · 2024-05-22T12:52:41.000+10:00
diff --git a/source/braille.py b/source/braille.py
@@ -499,20 +499,20 @@ def update(self):
 			mode |= louis.compbrlAtCursor
 
 		converter: UnicodeNormalizationOffsetConverter | None = None
-		if config.conf["braille"]["unicodeNormalization"] and not isUnicodeNormalized(self.rawText):
-			converter = UnicodeNormalizationOffsetConverter(self.rawText)
+		textToTranslate = self.rawText
+		textToTranslateTypeforms = self.rawTextTypeforms
+		cursorPos = self.cursorPos
+		if config.conf["braille"]["unicodeNormalization"] and not isUnicodeNormalized(textToTranslate):
+			converter = UnicodeNormalizationOffsetConverter(textToTranslate)
 			textToTranslate = converter.encoded
-			# Typeforms must be adapted to represent normalized characters.
-			textToTranslateTypeforms = [
-				self.rawTextTypeforms[strOffset] for strOffset in converter.computedEncodedToStrOffsets
-			]
-			# Convert the cursor position to a normalized offset.
-			cursorPos = converter.strToEncodedOffsets(self.cursorPos)
-		else:
-			textToTranslate = self.rawText
-			textToTranslateTypeforms = self.rawTextTypeforms
-			cursorPos = self.cursorPos
-
+			if textToTranslateTypeforms is not None:
+				# Typeforms must be adapted to represent normalized characters.
+				textToTranslateTypeforms = [
+					textToTranslateTypeforms[strOffset] for strOffset in converter.computedEncodedToStrOffsets
+				]
+			if cursorPos is not None:
+				# Convert the cursor position to a normalized offset.
+				cursorPos = converter.strToEncodedOffsets(cursorPos)
 		self.brailleCells, brailleToRawPos, rawToBraillePos, self.brailleCursorPos = louisHelper.translate(
 			[handler.table.fileName, "braille-patterns.cti"],
 			textToTranslate,
