#ifdef __GNUG__
-#pragma implementation
+#pragma implementation "htmltag.h"
#endif
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
#pragma hdrstop
#endif
#define CACHE_INCREMENT 64
+bool wxIsCDATAElement(const wxChar *tag)
+{
+ return (wxStrcmp(tag, _T("SCRIPT")) == 0) ||
+ (wxStrcmp(tag, _T("STYLE")) == 0);
+}
+
wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
{
const wxChar *src = source.c_str();
- int i, tg, pos, stpos;
+ int tg, stpos;
int lng = source.Length();
- wxChar dummy[256];
+ wxChar tagBuffer[256];
m_Cache = NULL;
m_CacheSize = 0;
m_CachePos = 0;
- pos = 0;
- while (pos < lng)
+ int pos = 0;
+ while (pos < lng)
{
if (src[pos] == wxT('<')) // tag found:
{
m_Cache = (wxHtmlCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(wxHtmlCacheItem));
tg = m_CacheSize++;
m_Cache[tg].Key = stpos = pos++;
- dummy[0] = 0; i = 0;
- while (pos < lng &&
- src[pos] != wxT('>') &&
- src[pos] != wxT(' ') && src[pos] != wxT('\r') &&
- src[pos] != wxT('\n') && src[pos] != wxT('\t'))
+
+ int i;
+ for ( i = 0;
+ pos < lng && i < (int)WXSIZEOF(tagBuffer) - 1 &&
+ src[pos] != wxT('>') && !wxIsspace(src[pos]);
+ i++, pos++ )
{
- dummy[i] = src[pos++];
- if ((dummy[i] >= wxT('a')) && (dummy[i] <= wxT('z'))) dummy[i] -= (wxT('a') - wxT('A'));
- i++;
+ tagBuffer[i] = wxToupper(src[pos]);
}
- dummy[i] = 0;
+ tagBuffer[i] = _T('\0');
+
m_Cache[tg].Name = new wxChar[i+1];
- memcpy(m_Cache[tg].Name, dummy, (i+1)*sizeof(wxChar));
+ memcpy(m_Cache[tg].Name, tagBuffer, (i+1)*sizeof(wxChar));
while (pos < lng && src[pos] != wxT('>')) pos++;
m_Cache[tg].End1 = m_Cache[tg].End2 = -2;
// find matching begin tag:
for (i = tg; i >= 0; i--)
- if ((m_Cache[i].End1 == -1) && (wxStrcmp(m_Cache[i].Name, dummy+1) == 0))
+ if ((m_Cache[i].End1 == -1) && (wxStrcmp(m_Cache[i].Name, tagBuffer+1) == 0))
{
m_Cache[i].End1 = stpos;
m_Cache[i].End2 = pos + 1;
break;
}
}
- else
+ else
{
m_Cache[tg].End1 = m_Cache[tg].End2 = -1;
+
+ if (wxIsCDATAElement(tagBuffer))
+ {
+ // find next matching tag
+ int tag_len = wxStrlen(tagBuffer);
+ while (pos < lng)
+ {
+ // find the ending tag
+ while (pos + 1 < lng &&
+ (src[pos] != '<' || src[pos+1] != '/'))
+ ++pos;
+ if (src[pos] == '<')
+ ++pos;
+
+ // see if it matches
+ int match_pos = 0;
+ while (pos < lng && match_pos < tag_len && src[pos] != '>' && src[pos] != '<') {
+ if (wxToupper(src[pos]) == tagBuffer[match_pos]) {
+ ++match_pos;
+ }
+ else if (src[pos] == wxT(' ') || src[pos] == wxT('\n') ||
+ src[pos] == wxT('\r') || src[pos] == wxT('\t')) {
+ // need to skip over these
+ }
+ else {
+ match_pos = 0;
+ }
+ ++pos;
+ }
+
+ // found a match
+ if (match_pos == tag_len) {
+ pos = pos - tag_len - 3;
+ stpos = pos;
+ break;
+ }
+ else {
+ ++pos;
+ }
+ }
+ }
}
}
}
// ok, we're done, now we'll free .Name members of cache - we don't need it anymore:
- for (i = 0; i < m_CacheSize; i++)
+ for (int i = 0; i < m_CacheSize; i++)
{
delete[] m_Cache[i].Name;
m_Cache[i].Name = NULL;
void wxHtmlTagsCache::QueryTag(int at, int* end1, int* end2)
{
if (m_Cache == NULL) return;
- if (m_Cache[m_CachePos].Key != at)
+ if (m_Cache[m_CachePos].Key != at)
{
int delta = (at < m_Cache[m_CachePos].Key) ? -1 : 1;
- do
- {
- m_CachePos += delta;
+ do
+ {
+ m_CachePos += delta;
}
while (m_Cache[m_CachePos].Key != at);
}
IMPLEMENT_CLASS(wxHtmlTag,wxObject)
wxHtmlTag::wxHtmlTag(wxHtmlTag *parent,
- const wxString& source, int pos, int end_pos,
+ const wxString& source, int pos, int end_pos,
wxHtmlTagsCache *cache,
wxHtmlEntitiesParser *entParser) : wxObject()
{
m_Prev = NULL;
/* Find parameters and their values: */
-
+
int i;
wxChar c;
i = pos+1;
// find tag's name and convert it to uppercase:
- while ((i < end_pos) &&
- ((c = source[i++]) != wxT(' ') && c != wxT('\r') &&
+ while ((i < end_pos) &&
+ ((c = source[i++]) != wxT(' ') && c != wxT('\r') &&
c != wxT('\n') && c != wxT('\t') &&
- c != wxT('>')))
+ c != wxT('>')))
{
- if ((c >= wxT('a')) && (c <= wxT('z')))
+ if ((c >= wxT('a')) && (c <= wxT('z')))
c -= (wxT('a') - wxT('A'));
m_Name << c;
}
// if the tag has parameters, read them and "normalize" them,
- // i.e. convert to uppercase, replace whitespaces by spaces and
+ // i.e. convert to uppercase, replace whitespaces by spaces and
// remove whitespaces around '=':
if (source[i-1] != wxT('>'))
{
c == wxT('\n') || c == wxT('\t'))
wxString pname, pvalue;
wxChar quote;
- enum
+ enum
{
- ST_BEFORE_NAME = 1,
+ ST_BEFORE_NAME = 1,
ST_NAME,
ST_BEFORE_EQ,
ST_BEFORE_VALUE,
ST_VALUE
} state;
-
+
quote = 0;
state = ST_BEFORE_NAME;
while (i < end_pos)
{
c = source[i++];
- if (c == wxT('>') && !(state == ST_VALUE && quote != 0))
+ if (c == wxT('>') && !(state == ST_VALUE && quote != 0))
{
if (state == ST_BEFORE_EQ || state == ST_NAME)
{
break;
}
}
-
+
#undef IS_WHITE
}
m_Begin = i;
bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
{
wxString str = GetParam(par);
-
+
if (str.IsEmpty()) return FALSE;
if (str.GetChar(0) == wxT('#'))
{
wxString wxHtmlTag::GetAllParams() const
{
- // VS: this function is for backward compatiblity only,
+ // VS: this function is for backward compatiblity only,
// never used by wxHTML
wxString s;
size_t cnt = m_ParamNames.GetCount();
else
{
wxHtmlTag *cur = (wxHtmlTag*)this;
- while (cur->m_Prev)
+ while (cur->m_Prev)
cur = cur->m_Prev;
return cur;
}
else
{
wxHtmlTag *cur = (wxHtmlTag*)this;
- while (cur->m_Next)
+ while (cur->m_Next)
cur = cur->m_Next;
return cur;
}
if (m_Next) return m_Next;
wxHtmlTag *cur = m_Parent;
if (!cur) return NULL;
- while (cur->m_Parent && !cur->m_Next)
+ while (cur->m_Parent && !cur->m_Next)
cur = cur->m_Parent;
return cur->m_Next;
}
projects / wxWidgets.git / blobdiff