From kde-commits  Wed Jun 29 12:41:49 2005
From: Allan Sandfeld Jensen <kde () carewolf ! com>
Date: Wed, 29 Jun 2005 12:41:49 +0000
To: kde-commits
Subject: KDE/kdelibs/khtml
Message-Id: <1120048909.906312.30161.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112004892430170

SVN commit 429926 by carewolf:

Fix a bug with continueing earlie discard after a new tag.
BUG:


 M  +4 -5      ChangeLog  
 M  +2 -0      html/htmltokenizer.cpp  


--- trunk/KDE/kdelibs/khtml/ChangeLog #429925:429926
@@ -1,3 +1,7 @@
+2005-06-29  Allan Sandfeld Jensen <kde@carewolf.com>
+
+        * html/htmltokenizer.cpp: Reset discard when encountering tags or entities
+
 2005-06-28  Allan Sandfeld Jensen <kde@carewolf.com>
 
         * html/html_tableimpl.cpp (appendChild): Always add TBody to XHTML rows
@@ -26,11 +30,6 @@
 
         * ecma/kjs_events.cpp: Respect the DOM for MouseEvent::Button atleast when simulating Mozilla
 
-2005-06-20  Allan Sandfeld Jensen <kde@carewolf.com>
-
-        * html/doctypes.gperf: Add Xhtml doctypes
-        * html/html_documentimpl.cpp: Recognize XHTML served as HTML parsing type
-
 2005-06-20  David Faure  <faure@kde.org>
 
         * ecma/kjs_window.cpp (openWindow):  Treat empty string the same
--- trunk/KDE/kdelibs/khtml/html/htmltokenizer.cpp #429925:429926
@@ -1427,12 +1427,14 @@
             ++src;
             if ( pending )
                 addPending();
+            discard = NoneDiscard;
             parseEntity(src, dest, true);
         }
         else if ( cc == '<' && !src.escaped())
         {
             tagStartLineno = lineno+src.lineCount();
             ++src;
+            discard = NoneDiscard;
             startTag = true;
         }
         else if (( cc == '\n' ) || ( cc == '\r' ))