#endif
#ifndef WXPRECOMP
-#include "wx/wx.h"
+ #include "wx/intl.h"
+ #include "wx/dc.h"
#endif
#include "wx/html/htmldefs.h"
wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser()
{
+ m_tmpStrBuf = NULL;
+ m_tmpStrBufSize = 0;
m_Window = wnd;
m_Container = NULL;
m_DC = NULL;
for (j = 0; j < 2; j++)
for (k = 0; k < 2; k++)
for (l = 0; l < 2; l++)
- for (m = 0; m < 7; m++) {
+ for (m = 0; m < 7; m++)
+ {
m_FontsTable[i][j][k][l][m] = NULL;
m_FontsFacesTable[i][j][k][l][m] = wxEmptyString;
m_FontsEncTable[i][j][k][l][m] = wxFONTENCODING_DEFAULT;
// fill in wxHtmlParser's tables:
wxNode *node = m_Modules.GetFirst();
- while (node) {
- wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node -> GetData();
- mod -> FillHandlersTable(this);
- node = node -> GetNext();
+ while (node)
+ {
+ wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node->GetData();
+ mod->FillHandlersTable(this);
+ node = node->GetNext();
}
}
for (j = 0; j < 2; j++)
for (k = 0; k < 2; k++)
for (l = 0; l < 2; l++)
- for (m = 0; m < 7; m++) {
- if (m_FontsTable[i][j][k][l][m] != NULL)
+ for (m = 0; m < 7; m++)
+ {
+ if (m_FontsTable[i][j][k][l][m] != NULL)
delete m_FontsTable[i][j][k][l][m];
}
- if (m_EncConv) delete m_EncConv;
+ delete m_EncConv;
+ delete[] m_tmpStrBuf;
}
for (i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i];
m_FontFaceFixed = fixed_face;
m_FontFaceNormal = normal_face;
-
+
SetInputEncoding(m_InputEnc);
for (i = 0; i < 2; i++)
for (k = 0; k < 2; k++)
for (l = 0; l < 2; l++)
for (m = 0; m < 7; m++) {
- if (m_FontsTable[i][j][k][l][m] != NULL) {
+ if (m_FontsTable[i][j][k][l][m] != NULL)
+ {
delete m_FontsTable[i][j][k][l][m];
m_FontsTable[i][j][k][l][m] = NULL;
}
m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
m_FontSize = 3; //default one
CreateCurrentFont(); // we're selecting default font into
- m_DC -> GetTextExtent("H", &m_CharWidth, &m_CharHeight);
+ m_DC->GetTextExtent("H", &m_CharWidth, &m_CharHeight);
/* NOTE : we're not using GetCharWidth/Height() because
of differences under X and win
*/
OpenContainer();
OpenContainer();
- m_Container -> InsertCell(new wxHtmlColourCell(m_ActualColor));
- m_Container -> InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
+ m_Container->InsertCell(new wxHtmlColourCell(m_ActualColor));
+ m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
}
OpenContainer();
top = m_Container;
- while (top -> GetParent()) top = top -> GetParent();
+ while (top->GetParent()) top = top->GetParent();
return top;
}
-
-void wxHtmlWinParser::AddText(const char* txt)
+void wxHtmlWinParser::AddText(const wxChar* txt)
{
wxHtmlCell *c;
- int i = 0, x, lng = strlen(txt);
- char temp[wxHTML_BUFLEN];
- register char d;
+ size_t i = 0,
+ x,
+ lng = wxStrlen(txt);
+ register wxChar d;
int templen = 0;
+ wxChar nbsp = GetEntitiesParser()->GetCharForCode(160 /* nbsp */);
+
+ if (lng+1 > m_tmpStrBufSize)
+ {
+ delete[] m_tmpStrBuf;
+ m_tmpStrBuf = new wxChar[lng+1];
+ m_tmpStrBufSize = lng+1;
+ }
+ wxChar *temp = m_tmpStrBuf;
- if (m_tmpLastWasSpace) {
- while ((i < lng) && ((txt[i] == '\n') || (txt[i] == '\r') || (txt[i] == ' ') || (txt[i] == '\t'))) i++;
+ if (m_tmpLastWasSpace)
+ {
+ while ((i < lng) &&
+ ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) || (txt[i] == wxT(' ')) ||
+ (txt[i] == wxT('\t')))) i++;
}
- while (i < lng) {
+ while (i < lng)
+ {
x = 0;
d = temp[templen++] = txt[i];
- if ((d == '\n') || (d == '\r') || (d == ' ') || (d == '\t')) {
+ if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
+ {
i++, x++;
- while ((i < lng) && ((txt[i] == '\n') || (txt[i] == '\r') || (txt[i] == ' ') || (txt[i] == '\t'))) i++, x++;
+ while ((i < lng) && ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) ||
+ (txt[i] == wxT(' ')) || (txt[i] == wxT('\t')))) i++, x++;
}
else i++;
- if (x) {
- temp[templen-1] = ' ';
+ if (x)
+ {
+ temp[templen-1] = wxT(' ');
temp[templen] = 0;
templen = 0;
- if (m_EncConv) m_EncConv -> Convert(temp);
- c = new wxHtmlWordCell(temp, *(GetDC()));
- if (m_UseLink) c -> SetLink(m_Link);
- m_Container -> InsertCell(c);
+ if (m_EncConv)
+ m_EncConv->Convert(temp);
+ wxString str = GetEntitiesParser()->Parse(temp);
+ size_t len = str.Len();
+ for (size_t j = 0; j < len; j++)
+ if (str.GetChar(j) == nbsp)
+ str[j] = wxT(' ');
+ c = new wxHtmlWordCell(str, *(GetDC()));
+ if (m_UseLink)
+ c->SetLink(m_Link);
+ m_Container->InsertCell(c);
m_tmpLastWasSpace = TRUE;
}
}
- if (templen) {
+ if (templen)
+ {
temp[templen] = 0;
- if (m_EncConv) m_EncConv -> Convert(temp);
- c = new wxHtmlWordCell(temp, *(GetDC()));
- if (m_UseLink) c -> SetLink(m_Link);
- m_Container -> InsertCell(c);
+ if (m_EncConv)
+ m_EncConv->Convert(temp);
+ wxString str = GetEntitiesParser()->Parse(temp);
+ size_t len = str.Len();
+ for (size_t j = 0; j < len; j++)
+ if (str.GetChar(j) == nbsp)
+ str[j] = wxT(' ');
+ c = new wxHtmlWordCell(str, *(GetDC()));
+ if (m_UseLink)
+ c->SetLink(m_Link);
+ m_Container->InsertCell(c);
m_tmpLastWasSpace = FALSE;
}
}
wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
{
m_Container = new wxHtmlContainerCell(m_Container);
- m_Container -> SetAlignHor(m_Align);
+ m_Container->SetAlignHor(m_Align);
m_tmpLastWasSpace = TRUE;
/* to avoid space being first character in paragraph */
return m_Container;
wxHtmlContainerCell* wxHtmlWinParser::CloseContainer()
{
- m_Container = m_Container -> GetParent();
+ m_Container = m_Container->GetParent();
return m_Container;
}
wxFont **fontptr = &(m_FontsTable[fb][fi][fu][ff][fs]);
wxFontEncoding *encptr = &(m_FontsEncTable[fb][fi][fu][ff][fs]);
- if (*fontptr != NULL && (*faceptr != face || *encptr != m_OutputEnc)) {
+ if (*fontptr != NULL && (*faceptr != face || *encptr != m_OutputEnc))
+ {
delete *fontptr;
*fontptr = NULL;
}
- if (*fontptr == NULL) {
+ if (*fontptr == NULL)
+ {
*faceptr = face;
*encptr = m_OutputEnc;
*fontptr = new wxFont(
- m_FontsSizes[fs] * m_PixelScale,
+ (int) (m_FontsSizes[fs] * m_PixelScale),
ff ? wxMODERN : wxSWISS,
fi ? wxITALIC : wxNORMAL,
fb ? wxBOLD : wxNORMAL,
fu ? TRUE : FALSE, face,
m_OutputEnc);
}
- m_DC -> SetFont(**fontptr);
+ m_DC->SetFont(**fontptr);
return (*fontptr);
}
void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link)
{
- m_Link = link;
+ m_Link = link;
m_UseLink = (link.GetHref() != wxEmptyString);
}
-void wxHtmlWinParser::SetFontFace(const wxString& face)
+void wxHtmlWinParser::SetFontFace(const wxString& face)
{
- if (GetFontFixed()) m_FontFaceFixed = face;
+ if (GetFontFixed()) m_FontFaceFixed = face;
else m_FontFaceNormal = face;
if (m_InputEnc != wxFONTENCODING_DEFAULT)
void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
{
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
- if (m_EncConv) {delete m_EncConv; m_EncConv = NULL;}
+ if (m_EncConv)
+ {
+ delete m_EncConv;
+ m_EncConv = NULL;
+ }
if (enc == wxFONTENCODING_DEFAULT) return;
wxFontEncoding altfix, altnorm;
bool availfix, availnorm;
-
- // exact match?
- availnorm = wxTheFontMapper -> IsEncodingAvailable(enc, m_FontFaceNormal);
- availfix = wxTheFontMapper -> IsEncodingAvailable(enc, m_FontFaceFixed);
- if (availnorm && availfix)
+
+ // exact match?
+ availnorm = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceNormal);
+ availfix = wxTheFontMapper->IsEncodingAvailable(enc, m_FontFaceFixed);
+ if (availnorm && availfix)
m_OutputEnc = enc;
-
+
// alternatives?
- else if (wxTheFontMapper -> GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) &&
- wxTheFontMapper -> GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) &&
+ else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) &&
+ wxTheFontMapper->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) &&
altnorm == altfix)
m_OutputEnc = altnorm;
-
+
// at least normal face?
else if (availnorm)
m_OutputEnc = enc;
- else if (wxTheFontMapper -> GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
+ else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
m_OutputEnc = altnorm;
-
+
// okay, let convert to ISO_8859-1, available always
else
m_OutputEnc = wxFONTENCODING_DEFAULT;
-
+
m_InputEnc = enc;
-
+ if (m_OutputEnc == wxFONTENCODING_DEFAULT)
+ GetEntitiesParser()->SetEncoding(wxFONTENCODING_SYSTEM);
+ else
+ GetEntitiesParser()->SetEncoding(m_OutputEnc);
+
if (m_InputEnc == m_OutputEnc) return;
m_EncConv = new wxEncodingConverter();
- if (!m_EncConv -> Init(m_InputEnc,
+ if (!m_EncConv->Init(m_InputEnc,
(m_OutputEnc == wxFONTENCODING_DEFAULT) ?
wxFONTENCODING_ISO8859_1 : m_OutputEnc,
- wxCONVERT_SUBSTITUTE))
+ wxCONVERT_SUBSTITUTE))
{ // total failture :-(
- wxLogError(_("Failed to display HTML document in %s encoding"),
- wxFontMapper::GetEncodingName(enc).c_str());
+ wxLogError(_("Failed to display HTML document in %s encoding"),
+ wxFontMapper::GetEncodingName(enc).c_str());
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
delete m_EncConv;
m_EncConv = NULL;
projects / wxWidgets.git / blobdiff