X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..65dc921d3f1080b8b5c6ca49d2cce228d6924480:/src/html/m_pre.cpp?ds=inline diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index f87983853a..313d8a88bc 100644 --- a/src/html/m_pre.cpp +++ b/src/html/m_pre.cpp @@ -15,7 +15,7 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -31,6 +31,38 @@ FORCE_LINK_ME(m_pre) +// replaces '\t', ' ' and '\n' with HTML markup: +static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str) +{ + wxString out; + size_t i = 0, j = 0, len = str.Len(); + for (i = 0; i < len; i++) + { + switch (str[i]) + { + case wxT('<'): + while (i < len && str[i] != wxT('>')) + out << str[i++]; + out << wxT('>'); + break; + case wxT(' '): + out << wxT(" "); + break; + case wxT('\n'): + out << wxT("
"); + break; + case wxT('\t'): + for (j = 8 - i%8; j > 0; j--) out << wxT(" "); + break; + default: + out << str[i]; + break; + } + } + return out; +} + + //----------------------------------------------------------------------------- // The list handler: //----------------------------------------------------------------------------- @@ -59,21 +91,16 @@ TAG_HANDLER_BEGIN(PRE, "PRE") m_WParser->CloseContainer(); c = m_WParser->OpenContainer(); c->SetAlignHor(wxHTML_ALIGN_LEFT); + c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); - wxString src, srcMid; - - src = *m_WParser->GetSource(); - srcMid = src.Mid(tag.GetBeginPos(), - tag.GetEndPos1() - tag.GetBeginPos()); - srcMid.Replace(wxT("\t"), wxT(" ")); - srcMid.Replace(wxT(" "), wxT(" ")); - srcMid.Replace(wxT("\n"), wxT("
")); - + 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->SetSource(srcMid); + m_Parser->SetSourceAndSaveState(HtmlizeWhitespaces(srcMid)); m_Parser->DoParsing(); - m_Parser->SetSource(src); + m_Parser->RestoreState(); m_WParser->CloseContainer(); c = m_WParser->OpenContainer();