Merge branch 't3542' into next. Incubates #3542

nvaccess · Oct 2, 2013 · 746c47c · 746c47c
2 parents 04f091e + afd0995
commit 746c47c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/nvdaHelper/vbufBackends/mshtml/mshtml.cpp b/nvdaHelper/vbufBackends/mshtml/mshtml.cpp
@@ -778,6 +778,8 @@ VBufStorage_fieldNode_t* MshtmlVBufBackend_t::fillVBuf(VBufStorage_buffer_t* buf
 	wstring nodeName=tempBSTR;
 	SysFreeString(tempBSTR);
 	tempBSTR=NULL;
+	for(wstring::iterator i=nodeName.begin();i!=nodeName.end();++i) 
+		*i=towupper(*i);
 	LOG_DEBUG(L"Got IHTMLDOMNode::nodeName of "<<nodeName);
 
 	//We can safely ignore script and comment tags
@@ -1064,7 +1066,7 @@ VBufStorage_fieldNode_t* MshtmlVBufBackend_t::fillVBuf(VBufStorage_buffer_t* buf
 	} else if(nodeName.compare(L"BR")==0) {
 		LOG_DEBUG(L"node is a br tag, adding a line feed as its text.");
 		contentString=L"\n";
-	} else if (nodeName.compare(L"math")==0) {
+	} else if (nodeName.compare(L"MATH")==0) {
 		contentString=IAName;
 	} else if(IARole==ROLE_SYSTEM_APPLICATION||IARole==ROLE_SYSTEM_DIALOG||IARole==ROLE_SYSTEM_OUTLINE) {
 		contentString=L" ";

diff --git a/source/NVDAObjects/IAccessible/MSHTML.py b/source/NVDAObjects/IAccessible/MSHTML.py
@@ -121,6 +121,8 @@ def locateHTMLElementByID(document,ID):
 	except COMError as e:
 		log.debugWarning("document.body.nodeName failed with COMError %s"%e)
 		return None
+	if nodeName:
+		nodeName=nodeName.upper()
 	if nodeName=="FRAMESET":
 		tag="frame"
 	else:
@@ -805,7 +807,10 @@ def _get_table(self):
 			raise NotImplementedError
 		HTMLNode=self.HTMLNode
 		while HTMLNode:
-			if HTMLNode.nodeName=="TABLE": return MSHTML(HTMLNode=HTMLNode)
+			nodeName=HTMLNode.nodeName
+			if nodeName:
+				nodeName=nodeName.upper()
+			if nodeName=="TABLE": return MSHTML(HTMLNode=HTMLNode)
 			HTMLNode=HTMLNode.parentNode
 		raise NotImplementedError
 
@@ -820,6 +825,8 @@ def _get_HTMLNodeName(self):
 				self._HTMLNodeName=self.HTMLNode.nodeName
 			except (COMError,NameError):
 				return ""
+			if self._HTMLNodeName:
+				self._HTMLNodeName=self._HTMLNodeName.upper()
 		return self._HTMLNodeName
 
 	def _get_devInfo(self):
@@ -859,6 +866,8 @@ def _get_name(self):
 			nodeName=child.nodeName
 		except (COMError,NameError):
 			return super(Fieldset,self).name
+		if nodeName:
+			nodeName=nodeName.upper()
 		if nodeName!="LEGEND":
 			return super(Fieldset,self).name
 		try: