# HG changeset patch # User Daniel Veillard <veillard@src.gnome.org> # Date 1044379209 0 # Tue Feb 04 17:20:09 2003 +0000 # Node ID f85619d8cc53fe608a8bd19e515e4419fe845a53 # Parent 2e57e78d910e8fb2c09dbaf9cf343e68da596442 change of policy w.r.t. mails small cleanup fixed a couple of bugs raised * README: change of policy w.r.t. mails * configure.in: small cleanup * libxslt/transform.c libxslt/xslt.c libxslt/variables.c: fixed a couple of bugs raised by Eric van der Vlist in #104114 * tests/exslt/*/*.out: slight change to the tests Daniel diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 4 18:15:01 CET 2003 Daniel Veillard <daniel@veillard.com> + + * README: change of policy w.r.t. mails + * configure.in: small cleanup + * libxslt/transform.c libxslt/xslt.c libxslt/variables.c: fixed + a couple of bugs raised by Eric van der Vlist in #104114 + * tests/exslt/*/*.out: slight change to the tests + Tue Feb 4 17:18:54 CET 2003 Daniel Veillard <daniel@veillard.com> * doc/xsltproc.1 doc/xsltproc.xml: fixing bug #104096, put diff --git a/README b/README --- a/README +++ b/README @@ -1,5 +1,5 @@ - XSLT support for libxml2 (XML toolkit from the GNOME project) + XSLT support for libxml2 (XML toolkit from the GNOME project) Full documentation is available on-line at http://xmlsoft.org/XSLT/ @@ -15,6 +15,10 @@ The list archive is at: http://mail.gnome.org/archives/xslt/ +All technical answers asked privately will be automatically answered on +the list and archived for public access unless pricacy is explicitely +required and justified. + Daniel Veillard $Id$ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -426,7 +426,7 @@ RELDATE=`date +'%a %b %e %Y'` AC_SUBST(RELDATE) -rm -f rm COPYING.LIB COPYING +rm -f COPYING.LIB COPYING ln -s Copyright COPYING diff --git a/libxslt/transform.c b/libxslt/transform.c --- a/libxslt/transform.c +++ b/libxslt/transform.c @@ -806,7 +806,7 @@ case XML_XINCLUDE_END: return(NULL); } - if (xmlStrEqual(node->name, (const xmlChar *) "fake node libxslt")) { + if (xmlStrEqual(node->name, (const xmlChar *) " fake node libxslt")) { if (node->children != NULL) copy = xsltCopyTreeList(ctxt, node->children, insert); else @@ -1170,7 +1170,7 @@ xsltTemplatePtr template; xmlNodePtr oldNode; - if (xmlStrEqual(node->name, BAD_CAST "fake node libxslt")) { + if (xmlStrEqual(node->name, BAD_CAST " fake node libxslt")) { xmlNodePtr children; children = node->children; @@ -2155,7 +2155,7 @@ case XML_HTML_DOCUMENT_NODE: break; case XML_ELEMENT_NODE: - if (xmlStrEqual(node->name, BAD_CAST "fake node libxslt")) + if (xmlStrEqual(node->name, BAD_CAST " fake node libxslt")) return; #ifdef WITH_XSLT_DEBUG_PROCESS diff --git a/libxslt/variables.c b/libxslt/variables.c --- a/libxslt/variables.c +++ b/libxslt/variables.c @@ -365,7 +365,7 @@ xmlDocPtr oldoutput; container = xmlNewDocNode(ctxt->document->doc, NULL, - (const xmlChar *) "fake node libxslt", NULL); + (const xmlChar *) " fake node libxslt", NULL); if (container == NULL) return(NULL); container->parent = NULL; @@ -495,7 +495,7 @@ xmlDocPtr oldoutput; container = xmlNewDocNode(ctxt->document->doc, NULL, - (const xmlChar *) "fake node libxslt", NULL); + (const xmlChar *) " fake node libxslt", NULL); if (container == NULL) return(NULL); container->parent = NULL; diff --git a/libxslt/xslt.c b/libxslt/xslt.c --- a/libxslt/xslt.c +++ b/libxslt/xslt.c @@ -550,6 +550,9 @@ while (cur != NULL) { if (xmlStrEqual(cur->href, XSLT_NAMESPACE)) goto skip_ns; + if ((cur->prefix != NULL) && + (xsltCheckExtPrefix(style, cur->prefix))) + goto skip_ns; for (i = 0;i < style->exclPrefixNr;i++) { if (xmlStrEqual(cur->href, style->exclPrefixTab[i])) goto skip_ns; diff --git a/tests/exslt/common/node-set.2.out b/tests/exslt/common/node-set.2.out --- a/tests/exslt/common/node-set.2.out +++ b/tests/exslt/common/node-set.2.out @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<out xmlns:exslt="http://exslt.org/common">4</out> +<out xmlns:exslt="http://exslt.org/common">3</out> diff --git a/tests/exslt/functions/function.1.out b/tests/exslt/functions/function.1.out --- a/tests/exslt/functions/function.1.out +++ b/tests/exslt/functions/function.1.out @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<out xmlns:func="http://exslt.org/functions" xmlns:my="my://own.uri">17</out> +<out xmlns:my="my://own.uri">17</out> diff --git a/tests/exslt/functions/function.2.out b/tests/exslt/functions/function.2.out --- a/tests/exslt/functions/function.2.out +++ b/tests/exslt/functions/function.2.out @@ -1,4 +1,4 @@ <?xml version="1.0"?> -<out xmlns:func="http://exslt.org/functions"><el>17</el>; +<out><el>17</el>; <at>7</at>; 24</out> diff --git a/tests/exslt/functions/function.4.out b/tests/exslt/functions/function.4.out --- a/tests/exslt/functions/function.4.out +++ b/tests/exslt/functions/function.4.out @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<out xmlns:func="http://exslt.org/functions">120</out> +<out>120</out> diff --git a/tests/exslt/functions/function.5.out b/tests/exslt/functions/function.5.out --- a/tests/exslt/functions/function.5.out +++ b/tests/exslt/functions/function.5.out @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<out xmlns:func="http://exslt.org/functions">15</out> +<out>15</out> diff --git a/tests/exslt/functions/function.6.out b/tests/exslt/functions/function.6.out --- a/tests/exslt/functions/function.6.out +++ b/tests/exslt/functions/function.6.out @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<out xmlns:func="http://exslt.org/functions">; +<out>; <true>true</true>; <false>false</false>; <true>true</true>;