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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit c966d404bd86b74ba2d052e23ca180d0e0d582e2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Mar 23 02:07:51 2003 +0000

    	Loosen up the DTD for <dl>, <dt>, and <dd> so that they can
    	occur anywhere in a document and be independent of one
    	another.
    
            Reviewed by darin/gramps
    
            * khtml/html/dtd.cpp:
            (DOM::checkChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3899 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0409e28..1cd2dd7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-03-22  David Hyatt  <hyatt at apple.com>
 
+	Loosen up the DTD for <dl>, <dt>, and <dd> so that they can
+	occur anywhere in a document and be independent of one 
+	another.
+	
+        Reviewed by darin/gramps
+
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
+2003-03-22  David Hyatt  <hyatt at apple.com>
+
 	Bottom border/padding was incorrectly being used in float
         computations.  The fix is trivial... positioning of floats
 	occurs before you add in the bottom border/padding rather
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0409e28..1cd2dd7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-03-22  David Hyatt  <hyatt at apple.com>
 
+	Loosen up the DTD for <dl>, <dt>, and <dd> so that they can
+	occur anywhere in a document and be independent of one 
+	another.
+	
+        Reviewed by darin/gramps
+
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
+2003-03-22  David Hyatt  <hyatt at apple.com>
+
 	Bottom border/padding was incorrectly being used in float
         computations.  The fix is trivial... positioning of floats
 	occurs before you add in the bottom border/padding rather
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index e36211a..a2924bf 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -376,6 +376,8 @@ static const ushort tag_list_1[] = {
     ID_BUTTON,
     ID_COMMENT,
     ID_LI,
+    ID_DT,
+    ID_DD,
     ID_XMP,
     ID_INS,
     ID_DEL,
@@ -501,14 +503,6 @@ static const ushort tag_list_4[] = {
     0
 };
 
-static const ushort tag_list_6[] = {
-    ID_TEXT,
-    ID_DT,
-    ID_DD,
-    ID_COMMENT,
-    0
-};
-
 static const ushort tag_list_7[] = {
     ID_TEXT,
     ID_OPTGROUP,
@@ -665,7 +659,7 @@ bool DOM::checkChild(ushort tagID, ushort childID)
         return check_array(childID, tag_list_1);
     case ID_DL:
         // DL: _6 +
-        return check_array(childID, tag_list_6);
+        return check_array(childID, tag_list_1);
     case ID_DIR:
     case ID_MENU:
         // (DIR|MENU): LI + - _3

-- 
WebKit Debian packaging