- libxslt/transform.c libxslt/xslt.c: avoiding some problems

  with blank node stripping when not allowed.
Daniel

ChangeLog

-Wed Jan 17 20:15:40 CET 2001
+Wed Jan 17 21:03:01 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* libxslt/transform.c libxslt/xslt.c: avoiding some problems
+	  with blank node stripping when not allowed.
+
+Wed Jan 17 20:15:40 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* libxslt/transform.c: modified apply-templates processing
 	  added select and sort support support.

libxslt/transform.c

@@ -793,18 +793,6 @@
 	    return;
 	}
 
-	/*
-	 * Cleanup of ignorable blank node detected
-	 */
-	if (delete != NULL) {
-#ifdef DEBUG_PROCESS
-	    xsltGenericDebug(xsltGenericDebugContext,
-		 "xsltApplyOneTemplate: removing ignorable blank node\n");
-#endif
-	    xmlUnlinkNode(delete);
-	    xmlFreeNode(delete);
-	    delete = NULL;
-	}
 	if (IS_XSLT_ELEM(cur)) {
 	    if (IS_XSLT_NAME(cur, "apply-templates")) {
 		ctxt->insert = insert;
@@ -844,7 +832,6 @@
 	     * For stylesheets, the set of whitespace-preserving
 	     * element names consists of just xsl:text.
 	     */
-	    if (!(IS_BLANK_NODE(cur))) {
 #ifdef DEBUG_PROCESS
 	    xsltGenericDebug(xsltGenericDebugContext,
 		 "xsltApplyOneTemplate: copy text %s\n", cur->content);
@@ -856,9 +843,6 @@
 		xsltGenericError(xsltGenericErrorContext,
 			"xsltApplyOneTemplate: text copy failed\n");
 	    }
-	    } else {
-		delete = cur;
-	    }
 	} else if (cur->type == XML_ELEMENT_NODE) {
 #ifdef DEBUG_PROCESS
 	    xsltGenericDebug(xsltGenericDebugContext,

libxslt/xslt.c

@@ -491,5 +491,6 @@
 	    }
 	} else if (cur->type == XML_TEXT_NODE) {
 	    if (IS_BLANK_NODE(cur)) {
+		if (xmlNodeGetSpacePreserve(cur) != 1) {
 		    delete = cur;
 		}
@@ -494,5 +495,6 @@
 		    delete = cur;
 		}
+	    }
 	} else if (cur->type != XML_ELEMENT_NODE) {
 	    delete = cur;
 	}