From fc4de8735125510cf1fc95825ea0d61002d2fcc4 Mon Sep 17 00:00:00 2001 From: kipp Date: Thu, 9 Jul 1998 17:05:36 +0000 Subject: [PATCH] Added a temporary hack to normalize nested lists git-svn-id: svn://10.0.0.236/trunk@5231 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/CNavDTD.cpp | 6 +++++- mozilla/parser/htmlparser/src/CNavDTD.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index b25a0eb37a8..ab1599c33c5 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -1124,7 +1124,11 @@ PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) { break; //singletons can't contain anything... case eHTMLTag_li: - if (eHTMLTag_li == aChild) { + if ((eHTMLTag_li == aChild) || + (eHTMLTag_ul == aChild) || // XXX this is temporary!!! + (eHTMLTag_ol == aChild) || + (eHTMLTag_menu == aChild) || + (eHTMLTag_dir == aChild)) { return PR_FALSE; } result=PRBool(!strchr(gHeadingTags,aChild)); break; diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index b25a0eb37a8..ab1599c33c5 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -1124,7 +1124,11 @@ PRBool CNavDTD::CanContain(PRInt32 aParent,PRInt32 aChild) { break; //singletons can't contain anything... case eHTMLTag_li: - if (eHTMLTag_li == aChild) { + if ((eHTMLTag_li == aChild) || + (eHTMLTag_ul == aChild) || // XXX this is temporary!!! + (eHTMLTag_ol == aChild) || + (eHTMLTag_menu == aChild) || + (eHTMLTag_dir == aChild)) { return PR_FALSE; } result=PRBool(!strchr(gHeadingTags,aChild)); break;