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

List:       kde-commits
Subject:    branches/KDE/3.4/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2005-07-17 10:19:54
Message-ID: 1121595594.106455.11137.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 435531 by amantia:

Backports:
- treat "<" as the end of a tag name. Fixes autoreplacement of opening/closing
tags in cases when a PHP area starts directly after a tag name. 
- fix off by one error when parsing after the a closing structure area (like "}" in \
PHP)


 M  +3 -1      ChangeLog  
 M  +1 -1      parsers/saparser.cpp  
 M  +1 -1      parsers/tag.cpp  


--- branches/KDE/3.4/kdewebdev/quanta/ChangeLog #435530:435531
@@ -8,7 +8,9 @@
         - allow CVS actions to be put on toolbars [#106023]
 	- open the files with the right encoding when restoring the last opened files on \
                startup [#104512]
 	- fix the Kommander XML scripts
-
+	- treat "<" as the end of a tag name. Fixes autoreplacement of opening/closing
+          tags in cases when a PHP area starts directly after a tag name. [#106911]
+	  
  - improvements:
 	- make single file/folder upload really quick [#105612]
 	- Paste as HTML Encoded encodes more chars to their corresponding entities \
                [#100547, #100103]
--- branches/KDE/3.4/kdewebdev/quanta/parsers/saparser.cpp #435530:435531
@@ -226,7 +226,7 @@
                 tag->name = foundText;
                 tag->setStr(foundText);
                 tag->setWrite(m_write);
-                tag->setTagPosition(s_line, groupKeywordPos, s_line, s_col);
+                tag->setTagPosition(s_line, groupKeywordPos, s_line, s_col - 1);
                 tag->setDtd(s_dtd);
                 tag->type = Tag::ScriptStructureEnd;
                 tag->single = true;
--- branches/KDE/3.4/kdewebdev/quanta/parsers/tag.cpp #435530:435531
@@ -205,7 +205,7 @@
  m_nameCol = m_area.bCol + 1;
  uint pos = 1;
  while (pos < strLength &&
-        !m_tagStr[pos].isSpace() && m_tagStr[pos] != '>' && m_tagStr[pos] != '\n')
+        !m_tagStr[pos].isSpace() && m_tagStr[pos] != '>' && m_tagStr[pos] != '<' && \
m_tagStr[pos] != '\n')  {
    pos++;
  }


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