Add soft hyphen support for Win32.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14601 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d40e05a12661877e2e20053a22398d2343f7ae8a..3194c8db37f97ec17a7f36e5ef43b8ee82cce778 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-25  Dave Hyatt <hyatt@apple.com>
+
+        Make soft hyphens work on Win32 by special casing them
+        along with normal hyphens.
+
+        Reviewed by mjs
+
+        * rendering/break_lines.cpp:
+        (WebCore::nextBreakablePosition):
+
 2006-05-25  Dave Hyatt <hyatt@apple.com>
 
         Implement the fallback method containsCharacters for

diff --git a/WebCore/rendering/break_lines.cpp b/WebCore/rendering/break_lines.cpp
index c8ccfeaa29b0b4610520f405e41264508aa88136..d8b1f425da55d08664db00d47aca5e41713060f7 100644 (file)
--- a/WebCore/rendering/break_lines.cpp
+++ b/WebCore/rendering/break_lines.cpp
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include "break_lines.h"
+#include "RenderText.h"
 
 #include "DeprecatedString.h"
 
@@ -47,7 +48,7 @@ int nextBreakablePosition(const UChar* str, int pos, int len, bool breakNBSP)
         if (ch == ' ' || ch == '\n' || ch == '\t' || (breakNBSP && ch == 0xa0))
             break;
         // Match WinIE's breaking strategy, which is to always allow breaks after hyphens and question marks.
-        if (lastCh == '-' || lastCh == '?')
+        if (lastCh == '-' || lastCh == '?' || lastCh == SOFT_HYPHEN)
             break;
 #if __APPLE__
         // FIXME: Rewrite break location using ICU.