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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 850e6c21d5d6024b8d254e4e94e4f5049c3d07ec
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 20 19:30:04 2001 +0000

    Fixed "double letter" problem that resulted from a too-naive fix of the
    "underline" bug. Both should be fixed now.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@466 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index dfc9c13..f97de56 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -851,7 +851,11 @@ void RenderFlow::layoutInlineChildren()
             if(!m_pre) {
                 // remove leading spaces
 #ifndef QT_NO_UNICODETABLES
+#ifdef _KWQ_
+                while(!start.atEnd() && start.current() == ' ' )
+#else
                 while(!start.atEnd() && start.direction() == QChar::DirWS )
+#endif
 #else
                 while(!start.atEnd() && start.current() == ' ' )
 #endif
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index d0eef1d..5175efd 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -82,8 +82,13 @@ public:
 
     enum Direction {
         // NOTE: alphabetical order
-        DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
-        DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+        //DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+        //DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+        //
+        // Until we understand the implications better, I say we go with the qt
+        // ordering here
+        DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
+        DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
     };
 
     // constants ---------------------------------------------------------------
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index d0eef1d..5175efd 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -82,8 +82,13 @@ public:
 
     enum Direction {
         // NOTE: alphabetical order
-        DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
-        DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+        //DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+        //DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+        //
+        // Until we understand the implications better, I say we go with the qt
+        // ordering here
+        DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
+        DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
     };
 
     // constants ---------------------------------------------------------------
diff --git a/WebCore/src/kdelibs/khtml/rendering/bidi.cpp b/WebCore/src/kdelibs/khtml/rendering/bidi.cpp
index dfc9c13..f97de56 100644
--- a/WebCore/src/kdelibs/khtml/rendering/bidi.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/bidi.cpp
@@ -851,7 +851,11 @@ void RenderFlow::layoutInlineChildren()
             if(!m_pre) {
                 // remove leading spaces
 #ifndef QT_NO_UNICODETABLES
+#ifdef _KWQ_
+                while(!start.atEnd() && start.current() == ' ' )
+#else
                 while(!start.atEnd() && start.direction() == QChar::DirWS )
+#endif
 #else
                 while(!start.atEnd() && start.current() == ' ' )
 #endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index d0eef1d..5175efd 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -82,8 +82,13 @@ public:
 
     enum Direction {
         // NOTE: alphabetical order
-        DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
-        DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+        //DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+        //DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
+        //
+        // Until we understand the implications better, I say we go with the qt
+        // ordering here
+        DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
+        DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
     };
 
     // constants ---------------------------------------------------------------

-- 
WebKit Debian packaging