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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 9dc1a283a46e45c938393491f7ecc8c2cc27e73b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 21 00:17:27 2003 +0000

    	UCFindTextBreak will report false if we have a sequence of 0xa0 0x20 (nbsp, sp), so we explicity check for that case.  Filed 3386852 to track this problem, meanwhile added a work-around.  This problem was revealed after adding the fix for 3242508.
    
            Reviewed by Dave.
    
            * khtml/rendering/break_lines.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4861 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bd45263..beb2860 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2003-08-20  Richard Williamson   <rjw at apple.com>
+
+	UCFindTextBreak will report false if we have a sequence of 0xa0 0x20 (nbsp, sp), so we explicity check for that case.  Filed 3386852 to track this problem, meanwhile added a work-around.  This problem was revealed after adding the fix for 3242508.
+
+        Reviewed by Dave.
+
+        * khtml/rendering/break_lines.cpp:
+
 2003-08-20  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bd45263..beb2860 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-08-20  Richard Williamson   <rjw at apple.com>
+
+	UCFindTextBreak will report false if we have a sequence of 0xa0 0x20 (nbsp, sp), so we explicity check for that case.  Filed 3386852 to track this problem, meanwhile added a work-around.  This problem was revealed after adding the fix for 3242508.
+
+        Reviewed by Dave.
+
+        * khtml/rendering/break_lines.cpp:
+
 2003-08-20  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/break_lines.cpp b/WebCore/khtml/rendering/break_lines.cpp
index 3d03bd4..e077691 100644
--- a/WebCore/khtml/rendering/break_lines.cpp
+++ b/WebCore/khtml/rendering/break_lines.cpp
@@ -89,8 +89,11 @@ bool isBreakable( const QChar *s, int pos, int len)
     }
 
     // If current character, or the previous character aren't simple latin1 then
-    // use the UC line break locator.
-    if (ch > 0x7f || (pos > 0 && (s+pos-1)->unicode() > 0x7f)){
+    // use the UC line break locator.  UCFindTextBreak will report false if we
+    // have a sequence of 0xa0 0x20 (nbsp, sp), so we explicity check for that
+    // case.
+    unsigned short lastCh = pos > 0 ? (s+pos-1)->unicode() : 0;
+    if (ch > 0x7f || (lastCh > 0x7f && lastCh != 0xa0)){
         status = UCCreateTextBreakLocator (NULL, 0, kUCTextBreakLineMask, &breakLocator);
         if (status == 0){
             findStatus = UCFindTextBreak (breakLocator, kUCTextBreakLineMask, NULL, (const UniChar *)s, len, pos, &end);

-- 
WebKit Debian packaging