Merge 12f8527 into cb8d3ad

michaelDCurran · web-flow · commit c9f42c9068e1 · 2025-03-17T08:17:01.000Z
diff --git a/nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp b/nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp
@@ -609,6 +609,19 @@ VBufStorage_fieldNode_t* GeckoVBufBackend_t::fillVBuf(
 		}
 	}
 
+	// Force equation role back to graphic role if the underlying tag is img.
+	// #16007: Many publishers were setting role=math on images with alt text.
+	// We want to just treat these as normal images.
+	// We do this very early in the rendering so that all our graphic rules apply.
+	if(role == ROLE_SYSTEM_EQUATION) {
+		if(auto it = IA2AttribsMap.find(L"tag");
+			it != IA2AttribsMap.end()
+			&&it->second==L"img"
+		) {
+			role = ROLE_SYSTEM_GRAPHIC;
+		}
+	}
+
 	if (roleString) {
 		roleAttr = roleString;
 	} else {
diff --git a/source/NVDAObjects/IAccessible/ia2Web.py b/source/NVDAObjects/IAccessible/ia2Web.py
@@ -373,6 +373,18 @@ def _get_mathMl(self):
 			)
 			raise LookupError
 
+	def _get_role(self):
+		if self.IA2Attributes.get("tag") == "img":
+			try:
+				mathMl = self.mathMl
+			except LookupError:
+				mathMl = None
+			if mathMl is None:
+				# #16007: Many publishers were setting role=math on plain images with alt text.
+				# We want to just treat these as normal images.
+				return controlTypes.Role.GRAPHIC
+		return super().role
+
 
 class Switch(Ia2Web):
 	# role="switch" gets mapped to IA2_ROLE_TOGGLE_BUTTON, but it uses the
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -134,6 +134,7 @@ In any document, if the cursor is on the last line, it will be moved to the end
 * Fixed an issue where some SAPI4 voices (e.g. IBM TTS Chinese) cannot be loaded. (#17726, @gexgd0419)
 * In Excel, the element list dialog (`NVDA+f7`) no longer fails to list comment or formulas on some non-English systems. (#11366, @CyrilleB79)
 * NVDA can now restore the audio ducking behavior when speaking a new utterance, when another app such as Magnifier changes the behavior system-wide. (#17747, @gexgd0419)
+* Math equations only represented by an image and alt text with no mathml for rich navigation, are now treated like normal images, rather than math with no content, allowing the user to jump to them with `g` and to be able to arrow through the alt text by character. (#16007)
 
 ### Changes for Developers
 
