X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/html/m_pre.cpp?ds=sidebyside diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index 27fa27a31a..c4a33f8c82 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 __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP #endif #include "wx/html/forcelnk.h" @@ -32,33 +28,34 @@ FORCE_LINK_ME(m_pre) // replaces '\t', ' ' and '\n' with HTML markup: -static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str) +static wxString LINKAGEMODE HtmlizeLinebreaks(const wxString& str) { wxString out; - size_t i = 0, j = 0, len = str.Len(); - for (i = 0; i < len; i++) + out.reserve(str.length()); // we'll certainly need at least that + + const wxString::const_iterator end = str.end(); + for ( wxString::const_iterator i = str.begin(); i != end; ++i ) { - switch (str[i]) + switch ( (*i).GetValue() ) { - case wxT('<'): - while (i < len && str[i] != wxT('>')) - out << str[i++]; - out << wxT('>'); + case '<': + while ( i != end && *i != '>' ) + { + out << *i++; + } + out << '>'; + if ( i == end ) + return out; 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(" "); + case '\n': + out << "
"; break; default: - out << str[i]; + out << *i; break; } } + return out; } @@ -75,37 +72,42 @@ TAG_HANDLER_BEGIN(PRE, "PRE") { wxHtmlContainerCell *c; - int fixed = m_WParser->GetFontFixed(), - italic = m_WParser->GetFontItalic(), - underlined = m_WParser->GetFontUnderlined(), - bold = m_WParser->GetFontBold(), - fsize = m_WParser->GetFontSize(); + const int fixed = m_WParser->GetFontFixed(); + const int italic = m_WParser->GetFontItalic(); + const int underlined = m_WParser->GetFontUnderlined(); + const int bold = m_WParser->GetFontBold(); + const int fsize = m_WParser->GetFontSize(); + const wxHtmlWinParser::WhitespaceMode whitespace = + m_WParser->GetWhitespaceMode(); c = m_WParser->GetContainer(); - m_WParser->SetFontUnderlined(FALSE); - m_WParser->SetFontBold(FALSE); - m_WParser->SetFontItalic(FALSE); - m_WParser->SetFontFixed(TRUE); + m_WParser->SetWhitespaceMode(wxHtmlWinParser::Whitespace_Pre); + 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); + + // setting Whitespace_Pre mode takes care of spaces and TABs, but + // not linebreaks, so we have to translate them into
by + // calling HtmlizeLinebreaks() here + ParseInnerSource(HtmlizeLinebreaks(srcMid)); + m_WParser->CloseContainer(); m_WParser->CloseContainer(); c = m_WParser->OpenContainer(); + m_WParser->SetWhitespaceMode(whitespace); m_WParser->SetFontUnderlined(underlined); m_WParser->SetFontBold(bold); m_WParser->SetFontItalic(italic); @@ -113,7 +115,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)