[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 3b5905b37ee4d533b54a5ba7c55c3ee8af1b0efd
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 1 01:13:30 2003 +0000

    	Two whitespace handling fixes that improve <pre> handling,
    	especially of inline pres.
    
            Reviewed by rjw.
    
            * khtml/rendering/bidi.cpp:
            (RenderBlock::findNextLineBreak):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3534 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4173607..7f3785b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-01-31  David Hyatt  <hyatt at apple.com>
+
+	Two whitespace handling fixes that improve <pre> handling, 
+	especially of inline pres.
+	
+        Reviewed by rjw.
+
+        * khtml/rendering/bidi.cpp:
+        (RenderBlock::findNextLineBreak):
+        
 2003-01-31  Darin Adler  <darin at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4173607..7f3785b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-01-31  David Hyatt  <hyatt at apple.com>
+
+	Two whitespace handling fixes that improve <pre> handling, 
+	especially of inline pres.
+	
+        Reviewed by rjw.
+
+        * khtml/rendering/bidi.cpp:
+        (RenderBlock::findNextLineBreak):
+        
 2003-01-31  Darin Adler  <darin at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index e3bfb64..8408554 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1133,37 +1133,36 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, QPtrList<BidiIt
 #endif
 
     // eliminate spaces at beginning of line
-    if(!m_pre) {
         // remove leading spaces
-        while(!start.atEnd() &&
+    while(!start.atEnd() && start.obj->style()->whiteSpace() != PRE &&
 #ifndef QT_NO_UNICODETABLES
-            ( start.direction() == QChar::DirWS || start.obj->isSpecial() )
+          ( start.direction() == QChar::DirWS || start.obj->isSpecial() )
 #else
-            ( start.current() == ' ' || start.obj->isSpecial() )
+          ( start.current() == ' ' || start.obj->isSpecial() )
 #endif
-            ) {
-            if( start.obj->isSpecial() ) {
-                RenderObject *o = start.obj;
-                // add to special objects...
-                if(o->isFloating()) {
-                    insertSpecialObject(o);
-                    // check if it fits in the current line.
-                    // If it does, position it now, otherwise, position
-                    // it after moving to next line (in newLine() func)
-                    if (o->width()+o->marginLeft()+o->marginRight()+w+tmpW <= width) {
-                        positionNewFloats();
-                        width = lineWidth(m_height);
-                    }
-                } else if(o->isPositioned()) {
-                    o->containingBlock()->insertSpecialObject(o);
+          ) {
+        if( start.obj->isSpecial() ) {
+            RenderObject *o = start.obj;
+            // add to special objects...
+            if(o->isFloating()) {
+                insertSpecialObject(o);
+                // check if it fits in the current line.
+                // If it does, position it now, otherwise, position
+                // it after moving to next line (in newLine() func)
+                if (o->width()+o->marginLeft()+o->marginRight()+w+tmpW <= width) {
+                    positionNewFloats();
+                    width = lineWidth(m_height);
                 }
+            } else if(o->isPositioned()) {
+                o->containingBlock()->insertSpecialObject(o);
             }
-    
-            adjustEmbeddding = true;
-            ++start;
-            adjustEmbeddding = false;
         }
+
+        adjustEmbeddding = true;
+        ++start;
+        adjustEmbeddding = false;
     }
+    
     if ( start.atEnd() ){
         return start;
     }
@@ -1405,7 +1404,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, QPtrList<BidiIt
         } else
             KHTMLAssert( false );
 
-        if( w + tmpW > width+1 && o->style()->whiteSpace() != NOWRAP ) {
+        if( w + tmpW > width+1 && o->style()->whiteSpace() == NORMAL ) {
             //kdDebug() << " too wide w=" << w << " tmpW = " << tmpW << " width = " << width << endl;
             //kdDebug() << "start=" << start.obj << " current=" << o << endl;
             // if we have floats, try to get below them.

-- 
WebKit Debian packaging