Index: kdelibs/khtml/rendering/break_lines.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/rendering/break_lines.cpp,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- kdelibs/khtml/rendering/break_lines.cpp 17 Nov 2000 19:33:33 -0000 1.2
+++ kdelibs/khtml/rendering/break_lines.cpp 11 Apr 2002 08:38:24 -0000 1.4
@@ -1,6 +1,4 @@
#include
-#include
-#include
#ifdef HAVE_THAI_BREAKS
#include "ThBreakIterator.h"
@@ -33,8 +31,8 @@
#endif
{
const QChar *c = s+pos;
- char ch = c->latin1();
- if ( !ch ) {
+ unsigned short ch = c->unicode();
+ if ( ch > 0xff ) {
// not latin1, need to do more sophisticated checks for asian fonts
unsigned char row = c->row();
if ( row == 0x0e ) {
@@ -67,12 +65,12 @@
} else
return false;
}
- if ( row < 0x11 ) // no asian font
- return false;
if ( row > 0x2d && row < 0xfb || row == 0x11 )
// asian line breaking. Everywhere allowed except directly
// in front of a punctuation character.
return true;
+ else // no asian font
+ return c->isSpace();
} else {
if ( ch == ' ' || ch == '\n' )
return true;