[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2005-03-21 19:10:37
Message-ID: 20050321191037.C616A5F6 () office ! kde ! org
[Download RAW message or body]

CVS commit by carewolf: 

Correct parsing of white-space immediately after pre tag. 
BUG: 81393


  M +4 -0      ChangeLog   1.406
  M +6 -8      html/htmltokenizer.cpp   1.299


--- kdelibs/khtml/ChangeLog  #1.405:1.406
@@ -1,2 +1,6 @@
+2005-03-21  Allan Sandfeld Jensen <kde@carewolf.com>
+
+        * html/htmltokenizer.cpp: Only skip first LF if immediately after PRE tag
+
 2005-03-18  Allan Sandfeld Jensen <kde@carewolf.com>
 

--- kdelibs/khtml/html/htmltokenizer.cpp  #1.298:1.299
@@ -1136,6 +1136,6 @@ void HTMLTokenizer::parseTag(TokenizerSt
             switch( tagID ) {
             case ID_PRE:
-                discard = LFDiscard;
                 prePos = 0;
+                discard = AllDiscard;
                 break;
             case ID_SCRIPT:
@@ -1365,10 +1365,8 @@ void HTMLTokenizer::write( const Tokeniz
             if ( pending ) {
                 // pre context always gets its spaces/linefeeds
-                if ( pre )
-                    addPending();
                 // only add in existing inline context or if
                 // we just started one, i.e. we're about to insert real text
-                else if ( !parser->selectMode() &&
-                          ( !parser->noSpaces() || dest > buffer )) {
+                if ( pre || script || (!parser->selectMode() &&
+                          ( !parser->noSpaces() || dest > buffer ))) {
                     addPending();
                     discard = AllDiscard;


[prev in list] [next in list] [prev in thread] [next in thread]