X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1309ba6c7ec76b4507cf1f2e8656749e3de1befa..eff112a64082e20a581fb489980b76e1d7bb0d5e:/src/html/m_pre.cpp

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index a474a1ec38..5afcbbc6b7 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 <PRE> ... </PRE> 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,12 +27,57 @@
 
 FORCE_LINK_ME(m_pre)
 
+// replaces '\t', ' ' and '\n' with HTML markup:
+static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str)
+{
+    wxString out;
+    size_t len = str.Len();
+    size_t linepos = 0;
+    for (size_t i = 0; i < len; 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("&nbsp;");
+                linepos++;
+                break;
+            case wxT('\n'):
+                out << wxT("<br>");
+                linepos = 0;
+                break;
+            case wxT('\t'):
+                {
+                    for (size_t j = 8 - linepos % 8; j > 0; j--)
+                        out << wxT("&nbsp;");
+                    linepos += 8 - linepos % 8;
+                }
+                break;
+            default:
+                out << str[i];
+                linepos++;
+                break;
+        }
+    }
+    return out;
+}
+
+
 //-----------------------------------------------------------------------------
 // The list handler:
 //-----------------------------------------------------------------------------
 
 
 TAG_HANDLER_BEGIN(PRE, "PRE")
+    TAG_HANDLER_CONSTR(PRE) { }
 
     TAG_HANDLER_PROC(tag)
     {
@@ -51,32 +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->GetInnerSource(tag);
+        ParseInnerSource(HtmlizeWhitespaces(srcMid));
 
-        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("&nbsp;"));
-        srcMid.Replace(wxT("\n"), wxT("<br>"));
-
-        // It is safe to temporarily change the source being parsed,
-        // provided we restore the state back after parsing
-        m_Parser->SetSource(srcMid);
-        m_Parser->DoParsing();
-        m_Parser->SetSource(src);
-        
+        m_WParser->CloseContainer();
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
 
@@ -87,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)