[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdelibs/khtml/rendering
From:       Lars Knoll <knoll () kde ! org>
Date:       2004-05-06 22:08:10
Message-ID: 20040506220810.8C6051BC4 () office ! kde ! org
[Download RAW message or body]

CVS commit by knoll: 

backport BiDi fix to the 3.2 branch.


  M +8 -4      bidi.cpp   1.177.2.9


--- kdelibs/khtml/rendering/bidi.cpp  #1.177.2.8:1.177.2.9
@@ -705,5 +705,8 @@ void RenderBlock::bidiReorderLine(const 
 
 #if BIDI_DEBUG > 1
-        kdDebug(6041) << "directions: dir=" << dir << " current=" << dirCurrent << " \
last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong \
<< " embedding=" << (int)context->dir << " level =" << (int)context->level << endl; + \
kdDebug(6041) << "pos=" << current.pos << " sor=" << sor.pos << " directions: dir=" \
<< dir << " current=" << dirCurrent +                      << " last=" << status.last \
<< " eor=" << eor.pos << "/" << status.eor +                      << " lastStrong=" \
<< status.lastStrong << " embedding=" << (int)context->dir +                      << \
" level =" << (int)context->level << endl;  #endif
         switch(dirCurrent) {
@@ -796,5 +799,6 @@ void RenderBlock::bidiReorderLine(const 
                     if( !(status.eor == QChar::DirR) && !(status.eor == \
QChar::DirAL) ) {  //last stuff takes embedding dir
-                        if(context->dir == QChar::DirR || status.lastStrong == \
QChar::DirR) { +                        if(context->dir == QChar::DirR
+                           || status.lastStrong == QChar::DirR || status.lastStrong \
== QChar::DirAL) {  appendRun();
                             dir = QChar::DirR;
@@ -905,5 +909,5 @@ void RenderBlock::bidiReorderLine(const 
                 case QChar::DirCS:
                     if(status.eor == QChar::DirAN) {
-                        eor = current; status.eor = QChar::DirR; break;
+                        eor = current; break;
                     }
                 case QChar::DirES:


[prev in list] [next in list] [prev in thread] [next in thread]