// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "winpars.h"
#endif
#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/html/htmlwin.h"
#include "wx/fontmap.h"
#include "wx/log.h"
+#include "wx/settings.h"
//-----------------------------------------------------------------------------
// wxHtmlWinParser
//-----------------------------------------------------------------------------
+IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser)
wxList wxHtmlWinParser::m_Modules;
m_DC = NULL;
m_CharHeight = m_CharWidth = 0;
m_UseLink = FALSE;
+#if !wxUSE_UNICODE
m_EncConv = NULL;
- m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
+ m_InputEnc = wxFONTENCODING_ISO8859_1;
+ m_OutputEnc = wxFONTENCODING_DEFAULT;
+#endif
+ m_lastWordCell = NULL;
{
int i, j, k, l, m;
{
m_FontsTable[i][j][k][l][m] = NULL;
m_FontsFacesTable[i][j][k][l][m] = wxEmptyString;
+#if !wxUSE_UNICODE
m_FontsEncTable[i][j][k][l][m] = wxFONTENCODING_DEFAULT;
- }
-#ifdef __WXMSW__
- static int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30};
-#elif defined(__WXMAC__)
- static int default_sizes[7] = {9, 12, 14, 18, 24, 30, 36};
-#else
- static int default_sizes[7] = {10, 12, 14, 16, 19, 24, 32};
#endif
- SetFonts("", "", default_sizes);
+ }
+
+ SetFonts(wxEmptyString, wxEmptyString, NULL);
}
// fill in wxHtmlParser's tables:
- wxNode *node = m_Modules.GetFirst();
+ wxList::compatibility_iterator node = m_Modules.GetFirst();
while (node)
{
wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node->GetData();
if (m_FontsTable[i][j][k][l][m] != NULL)
delete m_FontsTable[i][j][k][l][m];
}
+#if !wxUSE_UNICODE
delete m_EncConv;
+#endif
delete[] m_tmpStrBuf;
}
m_Modules.DeleteObject(module);
}
-void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
+void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face,
+ const int *sizes)
{
+ static int default_sizes[7] =
+ {
+ wxHTML_FONT_SIZE_1,
+ wxHTML_FONT_SIZE_2,
+ wxHTML_FONT_SIZE_3,
+ wxHTML_FONT_SIZE_4,
+ wxHTML_FONT_SIZE_5,
+ wxHTML_FONT_SIZE_6,
+ wxHTML_FONT_SIZE_7
+ };
+
+ if (sizes == NULL) sizes = default_sizes;
+
int i, j, k, l, m;
for (i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i];
m_FontFaceFixed = fixed_face;
m_FontFaceNormal = normal_face;
+#if !wxUSE_UNICODE
SetInputEncoding(m_InputEnc);
+#endif
for (i = 0; i < 2; i++)
for (j = 0; j < 2; j++)
}
}
+void wxHtmlWinParser::NormalizeFontSizes(int size)
+{
+ int f_sizes[7];
+ if (size == -1)
+ size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize();
+
+ f_sizes[0] = int(size * 0.6);
+ f_sizes[1] = int(size * 0.8);
+ f_sizes[2] = size;
+ f_sizes[3] = int(size * 1.2);
+ f_sizes[4] = int(size * 1.4);
+ f_sizes[5] = int(size * 1.6);
+ f_sizes[6] = int(size * 1.8);
+
+ SetFonts(wxEmptyString, wxEmptyString, f_sizes);
+}
+
void wxHtmlWinParser::InitParser(const wxString& source)
{
wxHtmlParser::InitParser(source);
- wxASSERT_MSG(m_DC != NULL, _T("no DC assigned to wxHtmlWinParser!!"));
+ wxASSERT_MSG(m_DC != NULL, wxT("no DC assigned to wxHtmlWinParser!!"));
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( wxT("H"), &m_CharWidth, &m_CharHeight);
/* NOTE : we're not using GetCharWidth/Height() because
of differences under X and win
*/
m_UseLink = FALSE;
- m_Link = wxHtmlLinkInfo("", "");
+ m_Link = wxHtmlLinkInfo( wxT(""), wxT("") );
m_LinkColor.Set(0, 0, 0xFF);
m_ActualColor.Set(0, 0, 0);
m_Align = wxHTML_ALIGN_LEFT;
m_tmpLastWasSpace = FALSE;
+ m_lastWordCell = NULL;
OpenContainer();
-
OpenContainer();
+
+#if !wxUSE_UNICODE
+ wxString charset = ExtractCharsetInformation(source);
+ if (!charset.empty())
+ {
+ wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charset);
+ if (enc != wxFONTENCODING_SYSTEM)
+ SetInputEncoding(enc);
+ }
+#endif
+
m_Container->InsertCell(new wxHtmlColourCell(m_ActualColor));
+ wxColour windowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ;
+ m_Container->InsertCell(
+ new wxHtmlColourCell(GetWindow() ?
+ GetWindow()->GetBackgroundColour() :
+ windowColour,
+ wxHTML_CLR_BACKGROUND));
m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
}
void wxHtmlWinParser::DoneParser()
{
m_Container = NULL;
- SetInputEncoding(wxFONTENCODING_DEFAULT); // for next call
+#if !wxUSE_UNICODE
+ SetInputEncoding(wxFONTENCODING_ISO8859_1); // for next call
+#endif
wxHtmlParser::DoneParser();
}
top = m_Container;
while (top->GetParent()) top = top->GetParent();
+ top->RemoveExtraSpacing(true, true);
+
return top;
}
{
temp[templen-1] = wxT(' ');
temp[templen] = 0;
-#if 0 // VS - WHY was this here?!
- if (templen == 1) continue;
-#endif
templen = 0;
+#if !wxUSE_UNICODE
if (m_EncConv)
m_EncConv->Convert(temp);
+#endif
size_t len = wxStrlen(temp);
for (size_t j = 0; j < len; j++)
if (temp[j] == nbsp)
if (m_UseLink)
c->SetLink(m_Link);
m_Container->InsertCell(c);
+ ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
+ m_lastWordCell = (wxHtmlWordCell*)c;
m_tmpLastWasSpace = TRUE;
}
}
if (templen && (templen > 1 || temp[0] != wxT(' ')))
{
temp[templen] = 0;
+#if !wxUSE_UNICODE
if (m_EncConv)
m_EncConv->Convert(temp);
+#endif
size_t len = wxStrlen(temp);
for (size_t j = 0; j < len; j++)
if (temp[j] == nbsp)
if (m_UseLink)
c->SetLink(m_Link);
m_Container->InsertCell(c);
+ ((wxHtmlWordCell*)c)->SetPreviousWord(m_lastWordCell);
+ m_lastWordCell = (wxHtmlWordCell*)c;
m_tmpLastWasSpace = FALSE;
}
}
wxString face = ff ? m_FontFaceFixed : m_FontFaceNormal;
wxString *faceptr = &(m_FontsFacesTable[fb][fi][fu][ff][fs]);
wxFont **fontptr = &(m_FontsTable[fb][fi][fu][ff][fs]);
+#if !wxUSE_UNICODE
wxFontEncoding *encptr = &(m_FontsEncTable[fb][fi][fu][ff][fs]);
+#endif
- if (*fontptr != NULL && (*faceptr != face || *encptr != m_OutputEnc))
+ if (*fontptr != NULL && (*faceptr != face
+#if !wxUSE_UNICODE
+ || *encptr != m_OutputEnc
+#endif
+ ))
{
delete *fontptr;
*fontptr = NULL;
if (*fontptr == NULL)
{
*faceptr = face;
- *encptr = m_OutputEnc;
*fontptr = new wxFont(
(int) (m_FontsSizes[fs] * m_PixelScale),
ff ? wxMODERN : wxSWISS,
fi ? wxITALIC : wxNORMAL,
fb ? wxBOLD : wxNORMAL,
- fu ? TRUE : FALSE, face,
- m_OutputEnc);
+ fu ? TRUE : FALSE, face
+#if wxUSE_UNICODE
+ );
+#else
+ , m_OutputEnc);
+ *encptr = m_OutputEnc;
+#endif
}
m_DC->SetFont(**fontptr);
return (*fontptr);
if (GetFontFixed()) m_FontFaceFixed = face;
else m_FontFaceNormal = face;
+#if !wxUSE_UNICODE
if (m_InputEnc != wxFONTENCODING_DEFAULT)
SetInputEncoding(m_InputEnc);
+#endif
}
+#if !wxUSE_UNICODE
void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
{
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
m_OutputEnc = altnorm;
- // okay, let convert to ISO_8859-1, available always
else
+ {
+#ifndef __WXMAC__
+ // okay, let convert to ISO_8859-1, available always
m_OutputEnc = wxFONTENCODING_DEFAULT;
+#else
+ m_OutputEnc = wxLocale::GetSystemEncoding() ;
+#endif
+ }
m_InputEnc = enc;
if (m_OutputEnc == wxFONTENCODING_DEFAULT)
m_EncConv = NULL;
}
}
-
+#endif
projects / wxWidgets.git / blobdiff