X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..b00403b401b75f95b6984cf5d0f6d71492f0a1f9:/src/html/winpars.cpp diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index ce9bd29032..916c43a989 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -1,54 +1,60 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: winpars.cpp +// Name: src/html/winpars.cpp // Purpose: wxHtmlParser class (generic parser) // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#include "wx/wxprec.h" - -#include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ -#pragma hdrstop -#endif - -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/dc.h" + #include "wx/log.h" + #include "wx/settings.h" #endif #include "wx/html/htmldefs.h" #include "wx/html/winpars.h" #include "wx/html/htmlwin.h" #include "wx/fontmap.h" -#include "wx/log.h" +#include "wx/uri.h" //----------------------------------------------------------------------------- // wxHtmlWinParser //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser) wxList wxHtmlWinParser::m_Modules; -wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() +wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindowInterface *wndIface) { - m_Window = wnd; + m_tmpStrBuf = NULL; + m_tmpStrBufSize = 0; + m_windowInterface = wndIface; m_Container = NULL; m_DC = NULL; m_CharHeight = m_CharWidth = 0; - m_UseLink = FALSE; + m_UseLink = false; +#if !wxUSE_UNICODE + m_nbsp = 0; m_EncConv = NULL; - m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; + m_InputEnc = wxFONTENCODING_ISO8859_1; + m_OutputEnc = wxFONTENCODING_DEFAULT; +#endif + m_whitespaceMode = Whitespace_Normal; + m_lastWordCell = NULL; + m_posColumn = 0; { int i, j, k, l, m; @@ -56,25 +62,21 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() 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; +#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(); - while (node) + wxList::compatibility_iterator node = m_Modules.GetFirst(); + while (node) { wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node->GetData(); mod->FillHandlersTable(this); @@ -82,7 +84,6 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser() } } - wxHtmlWinParser::~wxHtmlWinParser() { int i, j, k, l, m; @@ -91,91 +92,185 @@ wxHtmlWinParser::~wxHtmlWinParser() 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; +#if !wxUSE_UNICODE + delete m_EncConv; +#endif + delete[] m_tmpStrBuf; } - void wxHtmlWinParser::AddModule(wxHtmlTagsModule *module) { m_Modules.Append(module); } - - void wxHtmlWinParser::RemoveModule(wxHtmlTagsModule *module) { m_Modules.DeleteObject(module); } +// build all HTML font sizes (1..7) from the given base size +static void wxBuildFontSizes(int *sizes, int size) +{ + // using a fixed factor (1.2, from CSS2) is a bad idea as explained at + // http://www.w3.org/TR/CSS21/fonts.html#font-size-props but this is by far + // simplest thing to do so still do it like this for now + sizes[0] = int(size * 0.75); // exception to 1.2 rule, otherwise too small + sizes[1] = int(size * 0.83); + sizes[2] = size; + sizes[3] = int(size * 1.2); + sizes[4] = int(size * 1.44); + sizes[5] = int(size * 1.73); + sizes[6] = int(size * 2); +} +static int wxGetDefaultHTMLFontSize() +{ + // base the default font size on the size of the default system font but + // also ensure that we have a font of reasonable size, otherwise small HTML + // fonts are unreadable + int size = wxNORMAL_FONT->GetPointSize(); + if ( size < 10 ) + size = 10; + return size; +} -void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) +void wxHtmlWinParser::SetFonts(const wxString& normal_face, + const wxString& fixed_face, + const int *sizes) { + static int default_sizes[7] = { 0 }; + if ( !sizes ) + { + if ( !default_sizes[0] ) + wxBuildFontSizes(default_sizes, wxGetDefaultHTMLFontSize()); + + sizes = default_sizes; + } + int i, j, k, l, m; - for (i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i]; + 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++) 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; } } } +void wxHtmlWinParser::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) +{ + if (size == -1) + size = wxGetDefaultHTMLFontSize(); + + int f_sizes[7]; + wxBuildFontSizes(f_sizes, size); + + wxString normal = normal_face; + if ( normal.empty() ) + normal = wxNORMAL_FONT->GetFaceName(); + SetFonts(normal, fixed_face, 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); - /* NOTE : we're not using GetCharWidth/Height() because - of differences under X and win - */ - m_UseLink = FALSE; - m_Link = wxHtmlLinkInfo("", ""); + // we're not using GetCharWidth/Height() because of + // differences under X and win + wxCoord w,h; + m_DC->GetTextExtent( wxT("H"), &w, &h); + m_CharWidth = w; + m_CharHeight = h; + + m_UseLink = false; + m_Link = wxHtmlLinkInfo( wxEmptyString ); m_LinkColor.Set(0, 0, 0xFF); m_ActualColor.Set(0, 0, 0); m_Align = wxHTML_ALIGN_LEFT; - m_tmpLastWasSpace = FALSE; + m_ScriptMode = wxHTML_SCRIPT_NORMAL; + m_ScriptBaseline = 0; + m_tmpLastWasSpace = false; + m_lastWordCell = NULL; + // open the toplevel container that contains everything else and that + // is never closed (this makes parser's life easier): OpenContainer(); + // then open the first container into which page's content will go: 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 + ( + m_windowInterface + ? m_windowInterface->GetHTMLBackgroundColour() + : 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(); } - +#if WXWIN_COMPATIBILITY_2_6 +wxHtmlWindow *wxHtmlWinParser::GetWindow() +{ + if (!m_windowInterface) + return NULL; + return wxDynamicCast(m_windowInterface->GetHTMLWindow(), wxHtmlWindow); +} +#endif wxObject* wxHtmlWinParser::GetProduct() { @@ -186,72 +281,245 @@ wxObject* wxHtmlWinParser::GetProduct() top = m_Container; while (top->GetParent()) top = top->GetParent(); + top->RemoveExtraSpacing(true, true); + return top; } +wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type, + const wxString& url) const +{ + if ( !m_windowInterface ) + return wxHtmlParser::OpenURL(type, url); + + wxString myurl(url); + wxHtmlOpeningStatus status; + for (;;) + { + wxString myfullurl(myurl); + + // consider url as absolute path first + wxURI current(myurl); + myfullurl = current.BuildUnescapedURI(); + + // if not absolute then ... + if( current.IsReference() ) + { + wxString basepath = GetFS()->GetPath(); + wxURI base(basepath); + + // ... try to apply base path if valid ... + if( !base.IsReference() ) + { + wxURI path(myfullurl); + path.Resolve( base ); + myfullurl = path.BuildUnescapedURI(); + } + else + { + // ... or force such addition if not included already + if( !current.GetPath().Contains(base.GetPath()) ) + { + basepath += myurl; + wxURI connected( basepath ); + myfullurl = connected.BuildUnescapedURI(); + } + } + } + + wxString redirect; + status = m_windowInterface->OnHTMLOpeningURL(type, myfullurl, &redirect); + if ( status != wxHTML_REDIRECT ) + break; + + myurl = redirect; + } + + if ( status == wxHTML_BLOCK ) + return NULL; + + int flags = wxFS_READ; + if (type == wxHTML_URL_IMAGE) + flags |= wxFS_SEEKABLE; + return GetFS()->OpenFile(myurl, flags); +} -void wxHtmlWinParser::AddText(const char* txt) +#define NBSP_UNICODE_VALUE (wxChar(160)) +#if !wxUSE_UNICODE + #define CUR_NBSP_VALUE m_nbsp +#else + #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE +#endif + +void wxHtmlWinParser::AddText(const wxString& txt) { - wxHtmlCell *c; - int i = 0, x, lng = strlen(txt); - char temp[wxHTML_BUFLEN]; - register char d; - int templen = 0; - - if (m_tmpLastWasSpace) +#if !wxUSE_UNICODE + if ( m_nbsp == 0 ) + m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE); +#endif + + if ( m_whitespaceMode == Whitespace_Normal ) { - while ((i < lng) && - ((txt[i] == '\n') || (txt[i] == '\r') || (txt[i] == ' ') || - (txt[i] == '\t'))) i++; - } + int templen = 0; + + size_t lng = txt.length(); + if (lng+1 > m_tmpStrBufSize) + { + delete[] m_tmpStrBuf; + m_tmpStrBuf = new wxChar[lng+1]; + m_tmpStrBufSize = lng+1; + } + wxChar *temp = m_tmpStrBuf; + + wxString::const_iterator i = txt.begin(); + const wxString::const_iterator end = txt.end(); + + if (m_tmpLastWasSpace) + { + while ( (i < end) && + (*i == wxT('\n') || *i == wxT('\r') || *i == wxT(' ') || + *i == wxT('\t')) ) + { + ++i; + } + } - while (i < lng) + while (i < end) + { + size_t x = 0; + const wxChar d = temp[templen++] = *i; + if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t'))) + { + ++i, ++x; + while ( (i < end) && + (*i == wxT('\n') || *i == wxT('\r') || + *i == wxT(' ') || *i == wxT('\t')) ) + { + ++i; + ++x; + } + } + else + { + ++i; + } + + if (x) + { + temp[templen-1] = wxT(' '); + FlushWordBuf(temp, templen); + m_tmpLastWasSpace = true; + } + } + + if (templen && (templen > 1 || temp[0] != wxT(' '))) + { + FlushWordBuf(temp, templen); + m_tmpLastWasSpace = false; + } + } + else // m_whitespaceMode == Whitespace_Pre { - x = 0; - d = temp[templen++] = txt[i]; - if ((d == '\n') || (d == '\r') || (d == ' ') || (d == '\t')) - { - i++, x++; - while ((i < lng) && ((txt[i] == '\n') || (txt[i] == '\r') || - (txt[i] == ' ') || (txt[i] == '\t'))) i++, x++; + if ( txt.find(CUR_NBSP_VALUE) != wxString::npos ) + { + // we need to substitute spaces for   here just like we + // did in the Whitespace_Normal branch above + wxString txt2(txt); + txt2.Replace(CUR_NBSP_VALUE, ' '); + AddPreBlock(txt2); } - else i++; - - if (x) - { - temp[templen-1] = ' '; - temp[templen] = 0; - templen = 0; - if (m_EncConv) - m_EncConv->Convert(temp); - c = new wxHtmlWordCell(GetEntitiesParser()->Parse(temp), *(GetDC())); - if (m_UseLink) - c->SetLink(m_Link); - m_Container->InsertCell(c); - m_tmpLastWasSpace = TRUE; + else + { + AddPreBlock(txt); } + + // don't eat any whitespace in 
 block
+        m_tmpLastWasSpace = false;
     }
-    if (templen) 
+}
+
+void wxHtmlWinParser::FlushWordBuf(wxChar *buf, int& len)
+{
+    buf[len] = 0;
+
+    for ( int i = 0; i < len; i++ )
     {
-        temp[templen] = 0;
-        if (m_EncConv) 
-            m_EncConv->Convert(temp);
-        c = new wxHtmlWordCell(GetEntitiesParser()->Parse(temp), *(GetDC()));
-        if (m_UseLink) 
-            c->SetLink(m_Link);
-        m_Container->InsertCell(c);
-        m_tmpLastWasSpace = FALSE;
+        if ( buf[i] == CUR_NBSP_VALUE )
+            buf[i] = ' ';
     }
+
+#if !wxUSE_UNICODE
+    if (m_EncConv)
+        m_EncConv->Convert(buf);
+#endif
+
+    AddWord(wxString(buf, len));
+
+    len = 0;
 }
 
+void wxHtmlWinParser::AddWord(wxHtmlWordCell *word)
+{
+    ApplyStateToCell(word);
+
+    m_Container->InsertCell(word);
+    word->SetPreviousWord(m_lastWordCell);
+    m_lastWordCell = word;
+}
+
+void wxHtmlWinParser::AddPreBlock(const wxString& text)
+{
+    if ( text.find('\t') != wxString::npos )
+    {
+        wxString text2;
+        text2.reserve(text.length());
+
+        const wxString::const_iterator end = text.end();
+        wxString::const_iterator copyFrom = text.begin();
+        size_t pos = 0;
+        int posColumn = m_posColumn;
+        for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos )
+        {
+            if ( *i == '\t' )
+            {
+                if ( copyFrom != i )
+                    text2.append(copyFrom, i);
+
+                const unsigned SPACES_PER_TAB = 8;
+                const size_t expandTo = SPACES_PER_TAB - posColumn % SPACES_PER_TAB;
+                text2.append(expandTo, ' ');
+
+                posColumn += expandTo;
+                copyFrom = i + 1;
+            }
+            else
+            {
+                ++posColumn;
+            }
+        }
+        if ( copyFrom != text.end() )
+            text2.append(copyFrom, text.end());
+
+        AddWord(new wxHtmlWordWithTabsCell(text2, text, m_posColumn, *(GetDC())));
+
+        m_posColumn = posColumn;
+    }
+    else
+    {
+        // no special formatting needed
+        AddWord(text);
+        m_posColumn += text.length();
+    }
+}
 
 
 wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
 {
     m_Container = new wxHtmlContainerCell(m_Container);
     m_Container->SetAlignHor(m_Align);
-    m_tmpLastWasSpace = TRUE;
+    m_posColumn = 0;
+    m_tmpLastWasSpace = true;
         /* to avoid space being first character in paragraph */
     return m_Container;
 }
@@ -260,7 +528,7 @@ wxHtmlContainerCell* wxHtmlWinParser::OpenContainer()
 
 wxHtmlContainerCell* wxHtmlWinParser::SetContainer(wxHtmlContainerCell *c)
 {
-    m_tmpLastWasSpace = TRUE;
+    m_tmpLastWasSpace = true;
         /* to avoid space being first character in paragraph */
     return m_Container = c;
 }
@@ -276,12 +544,46 @@ wxHtmlContainerCell* wxHtmlWinParser::CloseContainer()
 
 void wxHtmlWinParser::SetFontSize(int s)
 {
-    if (s < 1) s = 1;
-    else if (s > 7) s = 7;
+    if (s < 1)
+        s = 1;
+    else if (s > 7)
+        s = 7;
     m_FontSize = s;
 }
 
 
+void wxHtmlWinParser::SetDC(wxDC *dc, double pixel_scale, double font_scale)
+{
+    m_DC = dc;
+    m_PixelScale = pixel_scale;
+    m_FontScale = font_scale;
+}
+
+void wxHtmlWinParser::SetFontPointSize(int pt)
+{
+    if (pt <= m_FontsSizes[0])
+        m_FontSize = 1;
+    else if (pt >= m_FontsSizes[6])
+        m_FontSize = 7;
+    else
+    {
+        // Find the font closest to the given value with a simple linear search
+        // (binary search is not worth it here for so small number of elements)
+        for ( int n = 0; n < 6; n++ )
+        {
+            if ( (pt > m_FontsSizes[n]) && (pt <= m_FontsSizes[n + 1]) )
+            {
+                // In this range, find out which entry it is closest to
+                if ( (pt - m_FontsSizes[n]) < (m_FontsSizes[n + 1] - pt) )
+                    m_FontSize = n;
+                else
+                    m_FontSize = n + 1;
+
+                break;
+            }
+        }
+    }
+}
 
 wxFont* wxHtmlWinParser::CreateCurrentFont()
 {
@@ -294,25 +596,34 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
     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;
+        wxDELETE(*fontptr);
     }
 
-    if (*fontptr == NULL) 
+    if (*fontptr == NULL)
     {
         *faceptr = face;
-        *encptr = m_OutputEnc;
         *fontptr = new wxFont(
-                       (int) (m_FontsSizes[fs] * m_PixelScale),
+                       (int) (m_FontsSizes[fs] * m_FontScale),
                        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);
@@ -322,80 +633,110 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
 
 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; 
-    else m_FontFaceNormal = face;
+    if (GetFontFixed())
+        m_FontFaceFixed = face;
+    else
+        m_FontFaceNormal = face;
 
+#if !wxUSE_UNICODE
     if (m_InputEnc != wxFONTENCODING_DEFAULT)
         SetInputEncoding(m_InputEnc);
+#endif
 }
 
+void wxHtmlWinParser::ApplyStateToCell(wxHtmlCell *cell)
+{
+    // set the link:
+    if (m_UseLink)
+        cell->SetLink(GetLink());
+
+    // apply current script mode settings:
+    cell->SetScriptMode(GetScriptMode(), GetScriptBaseline());
+}
 
 
+#if !wxUSE_UNICODE
 void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
 {
+    // the character used for non-breakable space may change:
+    m_nbsp = 0;
+
     m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
-    if (m_EncConv) 
-    {
-        delete m_EncConv; 
-        m_EncConv = NULL;
-    }
+    wxDELETE(m_EncConv);
 
-    if (enc == wxFONTENCODING_DEFAULT) return;
+    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) 
+
+    availnorm = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceNormal);
+    availfix = wxFontMapper::Get()->IsEncodingAvailable(enc, m_FontFaceFixed);
+
+    if (availnorm && availfix)
+    {
+        // exact match?
         m_OutputEnc = enc;
-    
-    // alternatives?
-    else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE) &&
-             wxTheFontMapper->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, FALSE) &&
+    }
+
+    else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, false) &&
+             wxFontMapper::Get()->GetAltForEncoding(enc, &altfix, m_FontFaceFixed, false) &&
              altnorm == altfix)
+    {
+        // alternatives?
         m_OutputEnc = altnorm;
-    
-    // at least normal face?
+    }
     else if (availnorm)
+    {
+        // at least normal face?
         m_OutputEnc = enc;
-    else if (wxTheFontMapper->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
+    }
+    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's 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)
+    {
         GetEntitiesParser()->SetEncoding(wxFONTENCODING_SYSTEM);
+    }
     else
+    {
         GetEntitiesParser()->SetEncoding(m_OutputEnc);
-    
-    if (m_InputEnc == m_OutputEnc) return;
+    }
+
+    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))  
-    { // total failture :-(
-        wxLogError(_("Failed to display HTML document in %s encoding"), 
-	           wxFontMapper::GetEncodingName(enc).c_str());
+                           wxCONVERT_SUBSTITUTE))
+    { // total failure :-(
+        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;
+        wxDELETE(m_EncConv);
     }
 }
-
+#endif
 
 
 
@@ -406,27 +747,28 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
 
 IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler)
 
-
-
 //-----------------------------------------------------------------------------
 // wxHtmlTagsModule
 //-----------------------------------------------------------------------------
 
+// NB: This is *NOT* winpars.cpp's initialization and shutdown code!!
+//     This module is an ancestor for tag handlers modules defined
+//     in m_*.cpp files with TAGS_MODULE_BEGIN...TAGS_MODULE_END construct.
+//
+//     Do not add any winpars.cpp shutdown or initialization code to it,
+//     create a new module instead!
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule)
 
-
 bool wxHtmlTagsModule::OnInit()
 {
     wxHtmlWinParser::AddModule(this);
-    return TRUE;
+    return true;
 }
 
-
-
 void wxHtmlTagsModule::OnExit()
 {
     wxHtmlWinParser::RemoveModule(this);
 }
-#endif
 
+#endif