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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 3f8fa8404d3a83a03f15db7c3d764dbd4cc78dc3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 29 16:49:18 2003 +0000

            Reviewed by John.
    
            - fixed 3437292 -- Safari uses wrong characters for &and; and &or; entities
    
            * khtml/html/kentities.gperf: Corrected values for &and; and &or; entities.
            Checked all the rest against a list on the W3C site, and those are the only two that were wrong.
            * khtml/html/kentities.c: Regnenerated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 95a9d0a..eb42954 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-09-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3437292 -- Safari uses wrong characters for &and; and &or; entities
+
+        * khtml/html/kentities.gperf: Corrected values for &and; and &or; entities.
+        Checked all the rest against a list on the W3C site, and those are the only two that were wrong.
+        * khtml/html/kentities.c: Regnenerated.
+
 2003-09-26  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 95a9d0a..eb42954 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-09-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3437292 -- Safari uses wrong characters for &and; and &or; entities
+
+        * khtml/html/kentities.gperf: Corrected values for &and; and &or; entities.
+        Checked all the rest against a list on the W3C site, and those are the only two that were wrong.
+        * khtml/html/kentities.c: Regnenerated.
+
 2003-09-26  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/html/kentities.c b/WebCore/khtml/html/kentities.c
index 07ffb54..e3989b1 100644
--- a/WebCore/khtml/html/kentities.c
+++ b/WebCore/khtml/html/kentities.c
@@ -202,7 +202,7 @@ static const struct entity wordlist[] =
     {"Theta", 0x0398},
     {"sect", 0x00a7},
     {"there4", 0x2234},
-    {"or", 0x22a6},
+    {"or", 0x2228},
     {"isin", 0x2208},
     {"mu", 0x03bc},
     {"theta", 0x03b8},
@@ -279,7 +279,7 @@ static const struct entity wordlist[] =
     {"Agrave", 0x00c0},
     {"sim", 0x223c},
     {"Alpha", 0x0391},
-    {"and", 0x22a5},
+    {"and", 0x2227},
     {"cedil", 0x00b8},
     {"Ccedil", 0x00c7},
     {"shy", 0x00ad},
diff --git a/WebCore/khtml/html/kentities.gperf b/WebCore/khtml/html/kentities.gperf
index 5b2f1df..8b4660d 100644
--- a/WebCore/khtml/html/kentities.gperf
+++ b/WebCore/khtml/html/kentities.gperf
@@ -103,7 +103,7 @@ agrave, 0x00e0
 alefsym, 0x2135
 alpha, 0x03b1
 amp, 38
-and, 0x22a5
+and, 0x2227
 ang, 0x2220
 apos, 0x0027
 aring, 0x00e5
@@ -210,7 +210,7 @@ oline, 0x203e
 omega, 0x03c9
 omicron, 0x03bf
 oplus, 0x2295
-or, 0x22a6
+or, 0x2228
 ordf, 0x00aa
 ordm, 0x00ba
 oslash, 0x00f8

-- 
WebKit Debian packaging