summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2002-01-14 18:14:28 +0000
committerDaniel Veillard <veillard@src.gnome.org>2002-01-14 18:14:28 +0000
commitce2f32af4ce51f51d7cd468dbf49f04d27e063fe (patch)
tree1440a32333b490545e983a659fca3ac046da3131
parent7b27da1f551c8ea540b6dcb156e241820541ce51 (diff)
downloadlibxslt-ce2f32af4ce51f51d7cd468dbf49f04d27e063fe.tar.gz
libxslt-ce2f32af4ce51f51d7cd468dbf49f04d27e063fe.tar.bz2
libxslt-ce2f32af4ce51f51d7cd468dbf49f04d27e063fe.zip
releasing 1.0.10 updating the docs for the release. seems I inadvertantly
* configure.in: releasing 1.0.10 * doc/*: updating the docs for the release. * libxslt/namespaces.c libxslt/pattern.c libxslt/transform.c: seems I inadvertantly commited previously stuff from a failed attempt at fixing namespace nodes parents. Daniel
-rw-r--r--ChangeLog8
-rw-r--r--config.h.in84
-rw-r--r--configure.in6
-rw-r--r--doc/news.html9
-rw-r--r--doc/xslt.html10
-rw-r--r--libxslt/transform.c32
-rw-r--r--libxslt/xsltwin32config.h6
-rw-r--r--tests/reports/undefvar.err4
8 files changed, 110 insertions, 49 deletions
diff --git a/ChangeLog b/ChangeLog
index 390e35fb..2c035339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jan 14 18:35:18 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+ * configure.in: releasing 1.0.10
+ * doc/*: updating the docs for the release.
+ * libxslt/namespaces.c libxslt/pattern.c libxslt/transform.c:
+ seems I inadvertantly commited previously stuff from a failed
+ attempt at fixing namespace nodes parents.
+
Mon Jan 14 12:20:33 CET 2002 Daniel Veillard <daniel@veillard.com>
* libxslt/numbers.c: the xsl:number implementation incorrectly
diff --git a/config.h.in b/config.h.in
index 5c3dfd74..ce889f73 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,8 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
+
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
#undef HAVE_ISINF
#undef HAVE_ISNAN
#undef HAVE_POW
@@ -6,80 +10,78 @@
#undef HAVE_FABS
#undef WITH_DEBUGGER
-/* Define if you have the <ansidecl.h> header file. */
-#undef HAVE_ANSIDECL_H
+/* Define if you have the _stat function. */
+#undef HAVE__STAT
-/* Define if you have the `asctime' function. */
+/* Define if you have the asctime function. */
#undef HAVE_ASCTIME
-/* Define if you have the <dlfcn.h> header file. */
+/* Define if you have the gettimeofday function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define if you have the gmtime function. */
+#undef HAVE_GMTIME
+
+/* Define if you have the localtime function. */
+#undef HAVE_LOCALTIME
+
+/* Define if you have the mktime function. */
+#undef HAVE_MKTIME
+
+/* Define if you have the stat function. */
+#undef HAVE_STAT
+
+/* Define if you have the time function. */
+#undef HAVE_TIME
+
+/* Define if you have the <ansidecl.h> header file. */
+#undef HAVE_ANSIDECL_H
+
+/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if you have the <float.h> header file. */
+/* Define if you have the <float.h> header file. */
#undef HAVE_FLOAT_H
-/* Define if you have the <fp_class.h> header file. */
+/* Define if you have the <fp_class.h> header file. */
#undef HAVE_FP_CLASS_H
-/* Define if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if you have the `gmtime' function. */
-#undef HAVE_GMTIME
-
-/* Define if you have the <ieeefp.h> header file. */
+/* Define if you have the <ieeefp.h> header file. */
#undef HAVE_IEEEFP_H
-/* Define if you have the `localtime' function. */
-#undef HAVE_LOCALTIME
-
-/* Define if you have the <math.h> header file. */
+/* Define if you have the <math.h> header file. */
#undef HAVE_MATH_H
-/* Define if you have the `mktime' function. */
-#undef HAVE_MKTIME
-
-/* Define if you have the <nan.h> header file. */
+/* Define if you have the <nan.h> header file. */
#undef HAVE_NAN_H
-/* Define if you have the `stat' function. */
-#undef HAVE_STAT
-
-/* Define if you have the <stdarg.h> header file. */
+/* Define if you have the <stdarg.h> header file. */
#undef HAVE_STDARG_H
-/* Define if you have the <stdlib.h> header file. */
+/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define if you have the <string.h> header file. */
+/* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define if you have the <sys/stat.h> header file. */
+/* Define if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
-/* Define if you have the <sys/time.h> header file. */
+/* Define if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
-/* Define if you have the <sys/types.h> header file. */
+/* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
-/* Define if you have the `time' function. */
-#undef HAVE_TIME
-
-/* Define if you have the <time.h> header file. */
+/* Define if you have the <time.h> header file. */
#undef HAVE_TIME_H
-/* Define if you have the <unistd.h> header file. */
+/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define if you have the `_stat' function. */
-#undef HAVE__STAT
-
/* Name of package */
#undef PACKAGE
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
/* Version number of package */
#undef VERSION
+
diff --git a/configure.in b/configure.in
index 2a83cd34..ece2ceaa 100644
--- a/configure.in
+++ b/configure.in
@@ -6,12 +6,12 @@ dnl libexslt is an extension
dnl
LIBXSLT_MAJOR_VERSION=1
LIBXSLT_MINOR_VERSION=0
-LIBXSLT_MICRO_VERSION=9
+LIBXSLT_MICRO_VERSION=10
PACKAGE=libxslt
LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=7
-LIBEXSLT_MICRO_VERSION=2
-LIBXML_REQUIRED_VERSION=2.4.10
+LIBEXSLT_MICRO_VERSION=3
+LIBXML_REQUIRED_VERSION=2.4.13
LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
diff --git a/doc/news.html b/doc/news.html
index c4b395d4..bab6a1e0 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -65,6 +65,15 @@ A:link, A:visited, A:active { text-decoration: underline }
<td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd">
<h3>CVS only : check the <a href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
for a really accurate description</h3>
+<h3>1.0.10: Jan 14 2001</h3>
+<ul>
+<li>Windows fixes for Win32 from Igor</li>
+<li>Fixed the Solaris compilation trouble (Albert)</li>
+<li>Documentation changes and updates: John Fleck</li>
+<li>Added a stringparam option to avoid escaping hell at the shell
+ level</li>
+<li>A few bug fixes </li>
+</ul>
<h3>1.0.9: Dec 7 2001</h3>
<ul>
<li>Makefile patches from Peter Williams</li>
diff --git a/doc/xslt.html b/doc/xslt.html
index 641044d3..c0354ea1 100644
--- a/doc/xslt.html
+++ b/doc/xslt.html
@@ -233,6 +233,16 @@ platform, get in touch with me to upload the package. I will keep them in the
href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
for a really accurate description</h3>
+<h3>1.0.10: Jan 14 2001</h3>
+<ul>
+ <li>Windows fixes for Win32 from Igor</li>
+ <li>Fixed the Solaris compilation trouble (Albert)</li>
+ <li>Documentation changes and updates: John Fleck</li>
+ <li>Added a stringparam option to avoid escaping hell at the shell
+ level</li>
+ <li>A few bug fixes </li>
+</ul>
+
<h3>1.0.9: Dec 7 2001</h3>
<ul>
<li>Makefile patches from Peter Williams</li>
diff --git a/libxslt/transform.c b/libxslt/transform.c
index 58def814..4c2cc91a 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -808,6 +808,13 @@ xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node) {
case XML_COMMENT_NODE:
nbchild++;
break;
+ case XML_DTD_NODE:
+ /* Unlink the DTD, it's still reachable using doc->intSubset */
+ if (cur->next != NULL)
+ cur->next->prev = cur->prev;
+ if (cur->prev != NULL)
+ cur->prev->next = cur->next;
+ break;
default:
#ifdef WITH_XSLT_DEBUG_PROCESS
xsltGenericDebug(xsltGenericDebugContext,
@@ -2662,6 +2669,14 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
case XML_COMMENT_NODE:
xmlXPathNodeSetAdd(list, cur);
break;
+ case XML_DTD_NODE:
+ /* Unlink the DTD, it's still reachable
+ * using doc->intSubset */
+ if (cur->next != NULL)
+ cur->next->prev = cur->prev;
+ if (cur->prev != NULL)
+ cur->prev->next = cur->next;
+ break;
default:
#ifdef WITH_XSLT_DEBUG_PROCESS
xsltGenericDebug(xsltGenericDebugContext,
@@ -3298,6 +3313,23 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc,
if ((style == NULL) || (doc == NULL))
return (NULL);
+ if (doc->intSubset != NULL) {
+ /*
+ * Avoid hitting the DTD when scanning nodes
+ * but keep it linked as doc->intSubset
+ */
+ xmlNodePtr cur = doc->intSubset;
+ if (cur->next != NULL)
+ cur->next->prev = cur->prev;
+ if (cur->prev != NULL)
+ cur->prev->next = cur->next;
+ if (doc->children == cur)
+ doc->children = cur->next;
+ if (doc->last == cur)
+ doc->last = cur->prev;
+ cur->prev = cur->next = NULL;
+ }
+
if (userCtxt != NULL)
ctxt = userCtxt;
else
diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h
index fcea6215..abddcdb0 100644
--- a/libxslt/xsltwin32config.h
+++ b/libxslt/xsltwin32config.h
@@ -21,21 +21,21 @@ extern "C" {
*
* the version string like "1.2.3"
*/
-#define LIBXSLT_DOTTED_VERSION "1.0.9"
+#define LIBXSLT_DOTTED_VERSION "1.0.10"
/**
* LIBXSLT_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXSLT_VERSION 10009
+#define LIBXSLT_VERSION 10010
/**
* LIBXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXSLT_VERSION_STRING "10009"
+#define LIBXSLT_VERSION_STRING "10010"
/**
* WITH_XSLT_DEBUG:
diff --git a/tests/reports/undefvar.err b/tests/reports/undefvar.err
index b505a1d2..06a06271 100644
--- a/tests/reports/undefvar.err
+++ b/tests/reports/undefvar.err
@@ -1,6 +1,6 @@
runtime error: file ./undefvar.xsl line 6 element value-of
unregistered variable one
-xmlXPathRunEval: parameter error
-xmlXPathEval: 1 object left on the stack
+xmlXPathCompOpEval: parameter error
+xmlXPathCompiledEval: 1 object left on the stack
runtime error: file ./undefvar.xsl line 6 element value-of
xsltValueOf: text copy failed