X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f9297b0eead20a0bfee71df18e0d8f0cbc402fb..af237ae405f7598c7893d6f46caaf72e64ff8fcf:/src/html/m_pre.cpp
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 2cf0d2142c..1a0ef36813 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -1,28 +1,22 @@
/////////////////////////////////////////////////////////////////////////////
-// 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
-#include "wx/wx.h"
-#endif
+#if wxUSE_HTML && wxUSE_STREAMS
+#ifndef WX_PRECOMP
+#endif
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
@@ -33,124 +27,100 @@
FORCE_LINK_ME(m_pre)
-
-//-----------------------------------------------------------------------------
-// wxHtmlCodeCell
-//-----------------------------------------------------------------------------
-
-class wxHtmlPRECell : public wxHtmlCell
+// replaces '\t', ' ' and '\n' with HTML markup:
+static wxString LINKAGEMODE HtmlizeLinebreaks(const wxString& str)
{
- private:
- wxString** m_Text;
- // list of wxString objects.
- int m_LinesCnt;
- // number of lines
- int m_LineHeight;
- // height of single line of text
-
- public:
- wxHtmlPRECell(const wxString& s, wxDC& dc);
- ~wxHtmlPRECell();
- void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-};
-
-
-wxHtmlPRECell::wxHtmlPRECell(const wxString& s, wxDC& dc) : wxHtmlCell()
-{
- wxStringTokenizer tokenizer(s, "\n");
- wxString tmp;
- long int x, z;
- int i;
-
- m_LineHeight = dc.GetCharHeight();
- m_LinesCnt = 0;
- m_Text = NULL;
- m_Width = m_Height = 0;
-
- i = 0;
- while (tokenizer.HasMoreTokens())
+ wxString out;
+ 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 )
{
- if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
- tmp = tokenizer.NextToken();
- tmp.Replace(wxT("©"), wxT("(c)"), TRUE);
- tmp.Replace(wxT(" "), wxT(" "), TRUE);
- tmp.Replace(wxT("""), wxT("\""), TRUE);
- tmp.Replace(wxT("<"), wxT("<"), TRUE);
- tmp.Replace(wxT(">"), wxT(">"), TRUE);
- tmp.Replace(wxT("&"), wxT("&"), TRUE);
- tmp.Replace(wxT("\t"), wxT(" "), TRUE);
- tmp.Replace(wxT("\r"), wxT(""), TRUE);
- m_Text[i++] = new wxString(tmp);
-
- dc.GetTextExtent(tmp, &x, &z, &z);
- if (x > m_Width) m_Width = x;
- m_Height += m_LineHeight;
- m_LinesCnt++;
+ switch ( (*i).GetValue() )
+ {
+ case '<':
+ while ( i != end && *i != '>' )
+ {
+ out << *i++;
+ }
+ out << '>';
+ if ( i == end )
+ return out;
+ break;
+
+ // We need to translate any line break into exactly one
.
+ // Quoting HTML spec: "A line break is defined to be a carriage
+ // return (
), a line feed (
), or a carriage
+ // return/line feed pair."
+ case '\r':
+ {
+ wxString::const_iterator j(i + 1);
+ if ( j != end && *j == '\n' )
+ i = j;
+ }
+ // fall through
+ case '\n':
+ out << "
";
+ break;
+
+ default:
+ out << *i;
+ break;
+ }
}
-}
-
-
-wxHtmlPRECell::~wxHtmlPRECell()
-{
- for (int i = 0; i < m_LinesCnt; i++) delete m_Text[i];
- free(m_Text);
+ return out;
}
-void wxHtmlPRECell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
-{
- for (int i = 0; i < m_LinesCnt; i++)
- dc.DrawText(*(m_Text[i]), x + m_PosX, y + m_PosY + m_LineHeight * i);
-
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
-}
-
-
-
-
//-----------------------------------------------------------------------------
// The list handler:
//-----------------------------------------------------------------------------
TAG_HANDLER_BEGIN(PRE, "PRE")
+ TAG_HANDLER_CONSTR(PRE) { }
TAG_HANDLER_PROC(tag)
{
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->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_VERTICAL);
+ c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
- 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()));
+ wxString srcMid = m_WParser->GetInnerSource(tag);
- {
- wxString cit;
- wxEncodingConverter *encconv = m_WParser->GetEncodingConverter();
- cit = m_WParser->GetSource()->Mid(tag.GetBeginPos(),
- tag.GetEndPos1() - tag.GetBeginPos());
- if (encconv)
- c->InsertCell(new wxHtmlPRECell(encconv->Convert(cit),
- *(m_WParser->GetDC())));
- else
- c->InsertCell(new wxHtmlPRECell(cit,
- *(m_WParser->GetDC())));
- }
+ // 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);
@@ -158,9 +128,7 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
m_WParser->SetFontSize(fsize);
c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
- m_WParser->CloseContainer();
- m_WParser->OpenContainer();
- return TRUE;
+ return true;
}
TAG_HANDLER_END(PRE)