added code to recognize disable-output-escaping on certain text nodes (bug

* libxslt/transform.c: added code to recognize
  disable-output-escaping on certain text nodes (bug 140755)
* tests/general/bug-100.out: regenerated to account for change
  from next ChangeLog entry (bug 140558)

diff --git a/ChangeLog b/ChangeLog
index 76e51de..d949ddd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat May  1 10:35:03 PDT 2004 William Brack <wbrack@mmm.com.hk>
+
+       * libxslt/transform.c: added code to recognize
+         disable-output-escaping on certain text nodes (bug 140755)
+       * tests/general/bug-100.out: regenerated to account for change
+         from next ChangeLog entry (bug 140558)
+
 Wed Apr 28 18:17:24 PDT 2004 William Brack <wbrack@mmm.com.hk>
 
        * libxslt/xsltutils.c: suppressed any automatic linefeed after

diff --git a/libxslt/transform.c b/libxslt/transform.c
index 3ca96a6..20ed119 100644 (file)
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -960,7 +960,10 @@ xsltCopyTree(xsltTransformContextPtr ctxt, xmlNodePtr node,
         case XML_DOCB_DOCUMENT_NODE:
 #endif
            break;
-        case XML_TEXT_NODE:
+        case XML_TEXT_NODE: {
+           int noenc = (node->name == xmlStringTextNoenc);
+           return(xsltCopyTextString(ctxt, insert, node->content, noenc));
+           }
         case XML_CDATA_SECTION_NODE:
            return(xsltCopyTextString(ctxt, insert, node->content, 0));
         case XML_ATTRIBUTE_NODE:

diff --git a/tests/general/bug-100.out b/tests/general/bug-100.out
index cba12dd..478b115 100644 (file)
--- a/tests/general/bug-100.out
+++ b/tests/general/bug-100.out
@@ -1,3 +1,2 @@
 <?xml version="1.0"?>
 <!--libxslt:test element test worked-->
-