X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ce1b03395777805f58ebb23b72c6f5e21ebd32..795b0f144495454aac0dc23e865f7a8f87f6dfa3:/src/html/m_pre.cpp
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index e09dda3655..5afcbbc6b7 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -1,25 +1,21 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: m_pre.cpp
+// Name: src/html/m_pre.cpp
// Purpose: wxHtml module for
...
tag (code citation)
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+ #pragma hdrstop
#endif
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
#endif
#include "wx/html/forcelnk.h"
@@ -32,30 +28,42 @@
FORCE_LINK_ME(m_pre)
// replaces '\t', ' ' and '\n' with HTML markup:
-static wxString HtmlizeWhitespaces(const wxString& str)
+static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str)
{
wxString out;
- size_t i = 0, j = 0, len = str.Len();
- for (i = 0; i < len; i++)
+ size_t len = str.Len();
+ size_t linepos = 0;
+ for (size_t i = 0; i < len; i++)
{
- switch (str[i])
+ switch ( str[i].GetValue() )
{
case wxT('<'):
while (i < len && str[i] != wxT('>'))
+ {
out << str[i++];
+ linepos++;
+ }
out << wxT('>');
+ linepos++;
break;
case wxT(' '):
out << wxT(" ");
+ linepos++;
break;
case wxT('\n'):
out << wxT("
");
+ linepos = 0;
break;
case wxT('\t'):
- for (j = 8 - i%8; j > 0; j--) out << wxT(" ");
+ {
+ for (size_t j = 8 - linepos % 8; j > 0; j--)
+ out << wxT(" ");
+ linepos += 8 - linepos % 8;
+ }
break;
default:
out << str[i];
+ linepos++;
break;
}
}
@@ -69,6 +77,7 @@ static wxString HtmlizeWhitespaces(const wxString& str)
TAG_HANDLER_BEGIN(PRE, "PRE")
+ TAG_HANDLER_CONSTR(PRE) { }
TAG_HANDLER_PROC(tag)
{
@@ -81,26 +90,24 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
fsize = m_WParser->GetFontSize();
c = m_WParser->GetContainer();
- m_WParser->SetFontUnderlined(FALSE);
- m_WParser->SetFontBold(FALSE);
- m_WParser->SetFontItalic(FALSE);
- m_WParser->SetFontFixed(TRUE);
+ m_WParser->SetFontUnderlined(false);
+ m_WParser->SetFontBold(false);
+ m_WParser->SetFontItalic(false);
+ m_WParser->SetFontFixed(true);
m_WParser->SetFontSize(3);
c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
m_WParser->CloseContainer();
c = m_WParser->OpenContainer();
+ c->SetWidthFloat(tag);
+ c = m_WParser->OpenContainer();
c->SetAlignHor(wxHTML_ALIGN_LEFT);
+ c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
- wxString srcMid =
- m_WParser->GetSource()->Mid(tag.GetBeginPos(),
- tag.GetEndPos1() - tag.GetBeginPos());
- // It is safe to temporarily change the source being parsed,
- // provided we restore the state back after parsing
- m_Parser->SetSourceAndSaveState(HtmlizeWhitespaces(srcMid));
- m_Parser->DoParsing();
- m_Parser->RestoreState();
+ wxString srcMid = m_WParser->GetInnerSource(tag);
+ ParseInnerSource(HtmlizeWhitespaces(srcMid));
+ m_WParser->CloseContainer();
m_WParser->CloseContainer();
c = m_WParser->OpenContainer();
@@ -111,7 +118,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
m_WParser->SetFontSize(fsize);
c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
- return TRUE;
+ return true;
}
TAG_HANDLER_END(PRE)