no real change: put event handlers together at the end of the file

[wxWidgets.git] / src / html / m_pre.cpp

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index b2a5cb89e555bf48a42f0dbd536554bdb6e071d2..1a0ef36813be6f8df7a8f25c64c5aa332cc04cb9 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -33,26 +33,42 @@ static wxString LINKAGEMODE HtmlizeLinebreaks(const wxString& str)
     wxString out;
     out.reserve(str.length()); // we'll certainly need at least that
 
     wxString out;
     out.reserve(str.length()); // we'll certainly need at least that
 

-    size_t len = str.Len();
-    for (size_t i = 0; i < len; i++)
+    const wxString::const_iterator end = str.end();
+    for ( wxString::const_iterator i = str.begin(); i != end; ++i )

     {
     {

-        switch ( str[i].GetValue() )
+        switch ( (*i).GetValue() )

         {
             case '<':
         {
             case '<':

-                while (i < len && str[i] != '>')
+                while ( i != end && *i != '>' )

                 {
                 {

-                    out << str[i++];
+                    out << *i++;

                 }
                 out << '>';
                 }
                 out << '>';

+                if ( i == end )
+                    return out;

                 break;
                 break;

+
+            // We need to translate any line break into exactly one <br>.
+            // Quoting HTML spec: "A line break is defined to be a carriage
+            // return (&#x000D;), a line feed (&#x000A;), 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 << "<br>";
                 break;
             case '\n':
                 out << "<br>";
                 break;

+

             default:
             default:

-                out << str[i];
+                out << *i;

                 break;
         }
     }
                 break;
         }
     }

+

     return out;
 }
 
     return out;
 }