AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed parsing of tags with whitespace around = sign

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2001-03-09 23:40:36 +00:00
parent 132cb64021
commit b076dc01d2
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/html/htmltag.cpp
View File

@ -139,6 +139,7 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCac
if (source[i] == '/') { m_Ending = TRUE; i++; } if (source[i] == '/') { m_Ending = TRUE; i++; }
else m_Ending = FALSE; else m_Ending = FALSE;
// find tag's name and convert it to uppercase:
while ((i < end_pos) && while ((i < end_pos) &&
((c = source[i++]) != ' ' && c != '\r' && c != '\n' && c != '\t' && ((c = source[i++]) != ' ' && c != '\r' && c != '\n' && c != '\t' &&
c != '>')) c != '>'))
@ -147,6 +148,9 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCac
m_Name += c; m_Name += c;
} }
// if the tag has parameters, read them and "normalize" them,
// i.e. convert to uppercase, replace whitespaces by spaces and
// remove whitespaces around '=':
if (source[i-1] != '>') if (source[i-1] != '>')
while ((i < end_pos) && ((c = source[i++]) != '>')) while ((i < end_pos) && ((c = source[i++]) != '>'))
{ {
@ -155,6 +159,19 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCac
m_Params += c; m_Params += c;
if (c == '"') if (c == '"')
{ {
// remove spaces around the '=' character:
if (m_Params.Length() > 1 &&
m_Params[m_Params.Length()-2] == ' ')
{
m_Params.RemoveLast();
while (m_Params.Length() > 0 && m_Params.Last() == ' ')
m_Params.RemoveLast();
m_Params += '"';
}
while ((i < end_pos) && (source[i++] == ' ')) {}
if (i < end_pos) i--;
// ...and copy the value to m_Params:
while ((i < end_pos) && ((c = source[i++]) != '"')) m_Params += c; while ((i < end_pos) && ((c = source[i++]) != '"')) m_Params += c;
m_Params += c; m_Params += c;
} }