[Jtidy-cvs] SF.net SVN: jtidy:[1197] branches/CodeUpdateAndJava5/src/main/java/org/w3c/ tidy/ParserImpl.java

[<ad...@us...>]

Revision: 1197
          http://jtidy.svn.sourceforge.net/jtidy/?rev=1197&view=rev
Author:   aditsu
Date:     2010-11-15 15:09:23 +0000 (Mon, 15 Nov 2010)

Log Message:
-----------
fixed test 511679 - automatically close <pre> when closing ancestor tags

Modified Paths:
--------------
    branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java

Modified: branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java
===================================================================
--- branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java	2010-11-15 14:17:00 UTC (rev 1196)
+++ branches/CodeUpdateAndJava5/src/main/java/org/w3c/tidy/ParserImpl.java	2010-11-15 15:09:23 UTC (rev 1197)
@@ -1914,10 +1914,12 @@
 
             lexer.inlineDup(null); // tell lexer to insert inlines if needed
 
-            while ((node = lexer.getToken(Lexer.PREFORMATTED)) != null)
-            {
-                if (node.tag == pre.tag && node.type == NodeType.EndTag)
-                {
+            while ((node = lexer.getToken(Lexer.PREFORMATTED)) != null) {
+            	if (node.type == NodeType.EndTag && (node.tag == pre.tag || pre.isDescendantOf(node.getId()))) {
+            		if (node.tag != pre.tag) {
+            			lexer.report.warning(lexer, pre, node, ErrorCode.MISSING_ENDTAG_BEFORE);
+            			lexer.ungetToken();
+            		}
                     Node.trimSpaces(lexer, pre);
                     pre.closed = true;
                     return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.