Changes by Mitz Pettel.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 25 Jun 2005 04:47:05 +0000 (04:47 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 25 Jun 2005 04:47:05 +0000 (04:47 +0000)
        Reviewed by me.

        Test cases added:
        * layout-tests/fast/text/international/bidi-CS-after-AN-expected.txt: Added.
        * layout-tests/fast/text/international/bidi-CS-after-AN.html: Added.

        - fixed <http://bugzilla.opendarwin.org/show_bug.cgi?id=3693>
          Bug_72578 in KHTML: bidi algorithm misbehaves with CS after AN

        * khtml/rendering/bidi.cpp: (khtml::RenderBlock::bidiReorderLine): Rolled in the
        patch from the KDE tree.

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

LayoutTests/fast/text/international/bidi-CS-after-AN-expected.txt [new file with mode: 0644]
LayoutTests/fast/text/international/bidi-CS-after-AN.html [new file with mode: 0644]
WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/bidi.cpp

diff --git a/LayoutTests/fast/text/international/bidi-CS-after-AN-expected.txt b/LayoutTests/fast/text/international/bidi-CS-after-AN-expected.txt
new file mode 100644 (file)
index 0000000..af83728
--- /dev/null
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x84
+  RenderBlock {HTML} at (0,0) size 800x84
+    RenderBody {BODY} at (8,16) size 784x52
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {TEXT} at (0,0) size 471x18
+          text run at (0,0) width 471: "The following should look like: Arabic characters 123.4 Arabic characters."
+      RenderBlock {P} at (0,34) size 784x18
+        RenderText {TEXT} at (0,0) size 74x18
+          text run at (0,0) width 18: " \x{644}\x{645}\x{646}"
+          text run at (18,0) width 36: "123.4"
+          text run at (54,0) width 20: "\x{627}\x{628}\x{62C} "
diff --git a/LayoutTests/fast/text/international/bidi-CS-after-AN.html b/LayoutTests/fast/text/international/bidi-CS-after-AN.html
new file mode 100644 (file)
index 0000000..caab71d
--- /dev/null
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>CS after AN</title>
+</head>
+<body>
+<p>
+The following should look like: Arabic characters 123.4 Arabic characters.
+</p>
+<p>
+&#x0627;&#x0628;&#x062C; 123.4 &#x0644;&#x0645;&#x0646;
+</p>
+</body >
index c914453e9d04c3d5cc84e7dba09c140f9ed5b4b1..68ed5ca849643ad7a32ac64b1046b5858933aa40 100644 (file)
@@ -1,3 +1,18 @@
+2005-06-24  Darin Adler  <darin@apple.com>
+
+        Changes by Mitz Pettel.
+        Reviewed by me.
+
+        Test cases added:
+        * layout-tests/fast/text/international/bidi-CS-after-AN-expected.txt: Added.
+        * layout-tests/fast/text/international/bidi-CS-after-AN.html: Added.
+
+        - fixed <http://bugzilla.opendarwin.org/show_bug.cgi?id=3693>
+          Bug_72578 in KHTML: bidi algorithm misbehaves with CS after AN
+
+        * khtml/rendering/bidi.cpp: (khtml::RenderBlock::bidiReorderLine): Rolled in the
+        patch from the KDE tree.
+
 2005-06-24  Justin Garcia  <justin.garcia@apple.com>
 
         - <http://bugzilla.opendarwin.org/show_bug.cgi?id=3673> 
index ca4687e078fadd3529681e623777c81ae6734851..9ad3e700b2fe268d49a54cb55a7fc05751e3008d 100644 (file)
@@ -1104,7 +1104,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
                     break;
                 case QChar::DirCS:
                     if(bidi.status.eor == QChar::DirAN) {
-                        bidi.eor = bidi.current; bidi.status.eor = QChar::DirR; break;
+                        bidi.eor = bidi.current; break;
                     }
                 case QChar::DirES:
                 case QChar::DirET: