[xml/sgml-commit] r312 - in packages/libxslt/trunk: . debian doc
doc/EXSLT doc/EXSLT/html doc/tutorial2 libexslt libxslt
tests/exslt/date
Mike Hommey
glandium-guest at haydn.debian.org
Wed Sep 14 02:22:44 UTC 2005
Author: glandium-guest
Date: 2004-10-30 22:45:45 -0600 (Sat, 30 Oct 2004)
New Revision: 312
Added:
packages/libxslt/trunk/doc/EXSLT/html/home.png
packages/libxslt/trunk/doc/EXSLT/html/left.png
packages/libxslt/trunk/doc/EXSLT/html/right.png
packages/libxslt/trunk/doc/EXSLT/html/up.png
Modified:
packages/libxslt/trunk/ChangeLog
packages/libxslt/trunk/NEWS
packages/libxslt/trunk/config.h.in
packages/libxslt/trunk/configure
packages/libxslt/trunk/configure.in
packages/libxslt/trunk/debian/changelog
packages/libxslt/trunk/doc/EXSLT/APIchunk0.html
packages/libxslt/trunk/doc/EXSLT/APIfiles.html
packages/libxslt/trunk/doc/EXSLT/APIsymbols.html
packages/libxslt/trunk/doc/EXSLT/html/libexslt-exslt.html
packages/libxslt/trunk/doc/EXSLT/libexslt-api.xml
packages/libxslt/trunk/doc/EXSLT/libexslt-refs.xml
packages/libxslt/trunk/doc/Makefile.am
packages/libxslt/trunk/doc/Makefile.in
packages/libxslt/trunk/doc/libxslt.xsa
packages/libxslt/trunk/doc/news.html
packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.c
packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.html
packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.xml
packages/libxslt/trunk/doc/xslt.html
packages/libxslt/trunk/doc/xsltproc.1
packages/libxslt/trunk/doc/xsltproc.xml
packages/libxslt/trunk/libexslt/crypto.c
packages/libxslt/trunk/libexslt/date.c
packages/libxslt/trunk/libexslt/exsltconfig.h
packages/libxslt/trunk/libexslt/functions.c
packages/libxslt/trunk/libxslt.spec
packages/libxslt/trunk/libxslt.spec.in
packages/libxslt/trunk/libxslt/keys.c
packages/libxslt/trunk/libxslt/namespaces.c
packages/libxslt/trunk/libxslt/numbers.c
packages/libxslt/trunk/libxslt/pattern.c
packages/libxslt/trunk/libxslt/templates.c
packages/libxslt/trunk/libxslt/transform.c
packages/libxslt/trunk/libxslt/variables.c
packages/libxslt/trunk/libxslt/xsltconfig.h
packages/libxslt/trunk/libxslt/xsltwin32config.h
packages/libxslt/trunk/ltmain.sh
packages/libxslt/trunk/tests/exslt/date/sum.2.out
Log:
New upstream release
Modified: packages/libxslt/trunk/ChangeLog
===================================================================
--- packages/libxslt/trunk/ChangeLog 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/ChangeLog 2004-10-31 04:45:45 UTC (rev 312)
@@ -1,3 +1,75 @@
+Fri Oct 29 17:03:26 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * configure.in NEWS doc/*: preparing release of libxslt-1.1.12
+ * libexslt/crypto.c: mini change to avoid breaking apibuild.py
+ * libxslt/templates.c: small fix, first step in adressing #153660
+
+Fri Oct 29 14:18:35 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * doc/xsltproc.1 doc/xsltproc.xml: indicate - means stdin closing
+ #156626
+
+Wed Oct 27 17:00:54 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/transform.c: another dictionnary/string interning fix
+
+Wed Oct 27 00:00:07 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/transform.c: fix to force string interning on generated
+ documents
+
+Sat Oct 23 09:36:12 PDT 2004 William Brack <wbrack at mmm.com.hk>
+
+ * libexslt/crypto.c, libexslt/functions.c, libxslt/keys.c,
+ libxslt/numbers.c, libxslt/pattern.c, libxslt/transform.c,
+ libxslt/variables.c: changed some variable names for warning
+ cleanup when -ansi flag is not present.
+ * libxslt/namespaces.c: fixed potential NULL pointer reference
+ pointed out by Dennis Dams (bug 156187)
+
+Mon Oct 18 17:04:27 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt.spec.in doc/Makefile.am: fix for RedHat bug #136072
+ to include EXSLT doc in libxslt package.
+
+Thu Oct 14 22:43:22 PDT 2004 William Brack <wbrack at mmm.com.hk>
+
+ * configure.in, config.h.in, libexslt/date.c: changed date.c to use
+ gmtime_r if available (bug 129983)
+ * libexslt/functions.c: fixed a namespace problem concerning a
+ function with a namespace-qualified name (bug 155197)
+
+Tue Oct 12 03:54:44 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/namespaces.c: fixed a bug in namespace lookup exhibited
+ by the recent namespace tests in libxml2
+
+Thu Oct 7 16:15:15 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/transform.c: fixed a problem of tree structure raised
+ by the new libxml2 tree checking code.
+
+Thu Sep 30 11:28:03 PDT 2004 William Brack <wbrack at mmm.com.hk>
+
+ * libexslt/date.c: fixed problem with negative periods
+ (bug 154021)
+ * tests/exslt/date/sum.2.out: changed expected output, now
+ agrees with comments in sum.2.xml test data file
+
+Thu Sep 30 08:19:28 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/templates.c: patch from Mark Vakoc about an incorrect
+ attribute document pointer.
+
+Thu Sep 30 08:13:57 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * doc/tutorial2/libxslt_pipes.*: updated the tutorial from Panagiotis
+ Louridas
+
+Thu Sep 30 00:10:09 CEST 2004 Daniel Veillard <daniel at veillard.com>
+
+ * configure.in doc/*: release of 1.1.11, rebuilt the docs
+
Wed Sep 29 15:42:33 CEST 2004 Daniel Veillard <daniel at veillard.com>
* libxslt/pattern.c: try to fix #153137 but without a test case
Modified: packages/libxslt/trunk/NEWS
===================================================================
--- packages/libxslt/trunk/NEWS 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/NEWS 2004-10-31 04:45:45 UTC (rev 312)
@@ -10,6 +10,18 @@
to the CVS at
http://cvs.gnome.org/viewcvs/libxslt/
code base.Those are the public releases made:
+1.1.12: Oct 29 2004:
+ - build fixes: warnings removal (William).
+ - bug fixes: attribute document pointer fix (Mark Vakoc), exslt date
+ negative periods (William Brack), generated tree structure fixes,
+ namespace lookup fix, use reentrant gmtime_r (William Brack),
+ exslt:funtion namespace fix (William), potential NULL pointer reference
+ (Dennis Dams, William), force string interning on generated
+ documents.
+ - documentation: update of the second tutorial (Panagiotis Louridas), add
+ exslt doc in rpm packages, fix the xsltproc man page.
+
+
1.1.11: Sep 29 2004:
- bug fixes: xsl:include problems (William Brack), UTF8 number pattern
(William), date-time validation (William), namespace fix (William),
Modified: packages/libxslt/trunk/config.h.in
===================================================================
--- packages/libxslt/trunk/config.h.in 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/config.h.in 2004-10-31 04:45:45 UTC (rev 312)
@@ -33,8 +33,8 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
-/* Define to 1 if you have the `gmtime' function. */
-#undef HAVE_GMTIME
+/* Define to 1 if you have the `gmtime_r' function. */
+#undef HAVE_GMTIME_R
/* Define to 1 if you have the <ieeefp.h> header file. */
#undef HAVE_IEEEFP_H
Modified: packages/libxslt/trunk/configure
===================================================================
--- packages/libxslt/trunk/configure 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/configure 2004-10-31 04:45:45 UTC (rev 312)
@@ -1590,12 +1590,12 @@
LIBXSLT_MAJOR_VERSION=1
LIBXSLT_MINOR_VERSION=1
-LIBXSLT_MICRO_VERSION=11
+LIBXSLT_MICRO_VERSION=12
PACKAGE=libxslt
LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=8
-LIBEXSLT_MICRO_VERSION=9
-LIBXML_REQUIRED_VERSION=2.6.8
+LIBEXSLT_MICRO_VERSION=10
+LIBXML_REQUIRED_VERSION=2.6.15 # needs new API xmlNewDocPI
LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
@@ -21798,7 +21798,7 @@
-for ac_func in mktime localtime localtime_r asctime time gmtime ftime
+for ac_func in mktime localtime localtime_r asctime time gmtime_r ftime
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -22010,6 +22010,7 @@
done
+
if test "${NEED_TRIO}" = "1" ; then
echo Reusing trio library for string functions
WITH_TRIO=1
Modified: packages/libxslt/trunk/configure.in
===================================================================
--- packages/libxslt/trunk/configure.in 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/configure.in 2004-10-31 04:45:45 UTC (rev 312)
@@ -10,12 +10,12 @@
dnl
LIBXSLT_MAJOR_VERSION=1
LIBXSLT_MINOR_VERSION=1
-LIBXSLT_MICRO_VERSION=11
+LIBXSLT_MICRO_VERSION=12
PACKAGE=libxslt
LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=8
-LIBEXSLT_MICRO_VERSION=9
-LIBXML_REQUIRED_VERSION=2.6.8
+LIBEXSLT_MICRO_VERSION=10
+LIBXML_REQUIRED_VERSION=2.6.15 # needs new API xmlNewDocPI
LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
@@ -140,11 +140,12 @@
AC_CHECK_FUNC(fabs, , AC_CHECK_LIB(m, fabs,
[M_LIBS="-lm"; AC_DEFINE(HAVE_FABS)]))
AC_CHECK_FUNCS(gettimeofday)
-AC_CHECK_FUNCS(mktime localtime localtime_r asctime time gmtime ftime)
+AC_CHECK_FUNCS(mktime localtime localtime_r asctime time gmtime_r ftime)
dnl Checking the standard string functions availability
AC_CHECK_FUNCS(printf sprintf fprintf snprintf vfprintf vsprintf vsnprintf sscanf,,
NEED_TRIO=1)
+
dnl
dnl Check for trio string functions
dnl
Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/debian/changelog 2004-10-31 04:45:45 UTC (rev 312)
@@ -1,3 +1,9 @@
+libxslt (1.1.12-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Mike Hommey <mh at glandium.org> Sun, 31 Oct 2004 13:44:02 +0900
+
libxslt (1.1.11-1) experimental; urgency=low
* New upstream release
Modified: packages/libxslt/trunk/doc/EXSLT/APIchunk0.html
===================================================================
--- packages/libxslt/trunk/doc/EXSLT/APIchunk0.html 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/EXSLT/APIchunk0.html 2004-10-31 04:45:45 UTC (rev 312)
@@ -12,6 +12,7 @@
</dd></dl><h2>Letter D:</h2><dl><dt>Dates</dt><dd><a href="html/libexslt-exslt.html#exsltDateRegister">exsltDateRegister</a><br />
</dd><dt>Dynamic</dt><dd><a href="html/libexslt-exslt.html#exsltDynRegister">exsltDynRegister</a><br />
</dd></dl><h2>Letter E:</h2><dl><dt>EXSLT</dt><dd><a href="html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a><br />
+<a href="html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a><br />
@@ -29,6 +30,7 @@
</dd></dl><h2>Letter F:</h2><dl><dt>Functions</dt><dd><a href="html/libexslt-exslt.html#exsltFuncRegister">exsltFuncRegister</a><br />
</dd></dl><h2>Letter M:</h2><dl><dt>Math</dt><dd><a href="html/libexslt-exslt.html#exsltMathRegister">exsltMathRegister</a><br />
</dd></dl><h2>Letter N:</h2><dl><dt>Namespace</dt><dd><a href="html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a><br />
+<a href="html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a><br />
@@ -53,6 +55,7 @@
</dd></dl><h2>Letter a:</h2><dl><dt>all</dt><dd><a href="html/libexslt-exslt.html#exsltRegisterAll">exsltRegisterAll</a><br />
</dd><dt>available</dt><dd><a href="html/libexslt-exslt.html#exsltRegisterAll">exsltRegisterAll</a><br />
</dd></dl><h2>Letter c:</h2><dl><dt>common</dt><dd><a href="html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a><br />
+</dd><dt>crypto</dt><dd><a href="html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a><br />
</dd></dl><h2>Letter d:</h2><dl><dt>date</dt><dd><a href="html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a><br />
</dd><dt>dynamic</dt><dd><a href="html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a><br />
</dd></dl><h2>Letter e:</h2><dl><dt>extension</dt><dd><a href="html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a><br />
@@ -60,6 +63,7 @@
</dd><dt>extensions</dt><dd><a href="html/libexslt-exslt.html#SAXON_NAMESPACE">SAXON_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#exsltRegisterAll">exsltRegisterAll</a><br />
</dd></dl><h2>Letter f:</h2><dl><dt>for</dt><dd><a href="html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a><br />
+<a href="html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a><br />
@@ -68,6 +72,7 @@
<a href="html/libexslt-exslt.html#EXSLT_STRINGS_NAMESPACE">EXSLT_STRINGS_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#SAXON_NAMESPACE">SAXON_NAMESPACE</a><br />
</dd><dt>functions</dt><dd><a href="html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a><br />
+<a href="html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a><br />
Modified: packages/libxslt/trunk/doc/EXSLT/APIfiles.html
===================================================================
--- packages/libxslt/trunk/doc/EXSLT/APIfiles.html 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/EXSLT/APIfiles.html 2004-10-31 04:45:45 UTC (rev 312)
@@ -8,6 +8,7 @@
H3 {font-family: Verdana,Arial,Helvetica}
A:link, A:visited, A:active { text-decoration: underline }
</style><title>List of Symbols per Module for libexslt</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="../epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="../gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="../w3c.png" alt="W3C logo" /></a><a href="http://www.redhat.com"><img src="../redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/XSLT/"><img src="../Libxslt-Logo-180x168.gif" alt="Made with Libxslt Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The EXSLT C library for Gnome</h1><h2>List of Symbols per Module for libexslt</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="../search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="intro.html">Introduction</a></li><li><a href="docs.html">Documentation</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="../index.html" style="font-weight:bold">libxslt</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="ChangeLog.html">ChangeLog</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xslt/">Mail archive</a></li><li><a href="http://xmlsoft.org/">XML libxml2</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxslt">Bug Tracker</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading17">XSLT with PHP</a></li><li><a href="http://www.mod-xslt2.com/">Apache module</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://xsldbg.sourceforge.net/">Xsldbg Debugger</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table></td></tr></table></td><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"><h2><a name="exslt" id="exslt">Module exslt</a>:</h2><p><a href="html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a><br />
+<a href="html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a><br />
@@ -16,6 +17,7 @@
<a href="html/libexslt-exslt.html#EXSLT_STRINGS_NAMESPACE">EXSLT_STRINGS_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#SAXON_NAMESPACE">SAXON_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#exsltCommonRegister">exsltCommonRegister</a><br />
+<a href="html/libexslt-exslt.html#exsltCryptoRegister">exsltCryptoRegister</a><br />
<a href="html/libexslt-exslt.html#exsltDateRegister">exsltDateRegister</a><br />
<a href="html/libexslt-exslt.html#exsltDynRegister">exsltDynRegister</a><br />
<a href="html/libexslt-exslt.html#exsltFuncRegister">exsltFuncRegister</a><br />
Modified: packages/libxslt/trunk/doc/EXSLT/APIsymbols.html
===================================================================
--- packages/libxslt/trunk/doc/EXSLT/APIsymbols.html 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/EXSLT/APIsymbols.html 2004-10-31 04:45:45 UTC (rev 312)
@@ -11,6 +11,7 @@
<a href="html/libexslt-exsltexports.html#EXSLTPUBFUN">EXSLTPUBFUN</a><br />
<a href="html/libexslt-exsltexports.html#EXSLTPUBVAR">EXSLTPUBVAR</a><br />
<a href="html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a><br />
+<a href="html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a><br />
<a href="html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a><br />
@@ -21,6 +22,7 @@
</p><h2>Letter S:</h2><p><a href="html/libexslt-exslt.html#SAXON_NAMESPACE">SAXON_NAMESPACE</a><br />
</p><h2>Letter _:</h2><p><a href="html/libexslt-exsltexports.html#_REENTRANT">_REENTRANT</a><br />
</p><h2>Letter e:</h2><p><a href="html/libexslt-exslt.html#exsltCommonRegister">exsltCommonRegister</a><br />
+<a href="html/libexslt-exslt.html#exsltCryptoRegister">exsltCryptoRegister</a><br />
<a href="html/libexslt-exslt.html#exsltDateRegister">exsltDateRegister</a><br />
<a href="html/libexslt-exslt.html#exsltDynRegister">exsltDynRegister</a><br />
<a href="html/libexslt-exslt.html#exsltFuncRegister">exsltFuncRegister</a><br />
Copied: packages/libxslt/trunk/doc/EXSLT/html/home.png (from rev 311, packages/libxslt/branches/upstream/current/doc/EXSLT/html/home.png)
Property changes on: packages/libxslt/trunk/doc/EXSLT/html/home.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: packages/libxslt/trunk/doc/EXSLT/html/left.png (from rev 311, packages/libxslt/branches/upstream/current/doc/EXSLT/html/left.png)
Property changes on: packages/libxslt/trunk/doc/EXSLT/html/left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: packages/libxslt/trunk/doc/EXSLT/html/libexslt-exslt.html
===================================================================
--- packages/libxslt/trunk/doc/EXSLT/html/libexslt-exslt.html 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/EXSLT/html/libexslt-exslt.html 2004-10-31 04:45:45 UTC (rev 312)
@@ -7,7 +7,8 @@
H2 {font-family: Verdana,Arial,Helvetica}
H3 {font-family: Verdana,Arial,Helvetica}
A:link, A:visited, A:active { text-decoration: underline }
- </style><title>Module exslt from libexslt</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="../../epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="../../gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="../../w3c.png" alt="W3C logo" /></a><a href="http://www.redhat.com"><img src="../../redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/XSLT/"><img src="../../Libxslt-Logo-180x168.gif" alt="Made with Libxslt Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The EXSLT C library for Gnome</h1><h2>Module exslt from libexslt</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="../search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a style="font-weight:bold" href="../index.html">Main Menu</a></li><li><a style="font-weight:bold" href="../docs.html">Developer Menu</a></li><li><a style="font-weight:bold" href="index.html">API Menu</a></li><li><a href="../ChangeLog.html">ChangeLog</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xslt/">Mail archive</a></li><li><a href="http://xmlsoft.org/">XML libxml2</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxslt">Bug Tracker</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading17">XSLT with PHP</a></li><li><a href="http://www.mod-xslt2.com/">Apache module</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://xsldbg.sourceforge.net/">Xsldbg Debugger</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="../APIchunk0.html">Alphabetic</a></li><li><a href="../APIconstructors.html">Constructors</a></li><li><a href="../APIfunctions.html">Functions/Types</a></li><li><a href="../APIfiles.html">Modules</a></li><li><a href="../APIsymbols.html">Symbols</a></li></ul></td></tr></table></td></tr></table></td><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"><table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"><td><a accesskey="u" href="index.html"><img src="up.png" width="24" height="24" border="0" alt="Up" /></a></td><th align="left"><a href="index.html">API documentation</a></th><td><a accesskey="h" href="../index.html"><img src="home.png" width="24" height="24" border="0" alt="Home" /></a></td><th align="center"><a href="../index.html">Home</a></th><th align="right"><a href="libexslt-exsltexports.html">exsltexports</a></th><td><a accesskey="n" href="libexslt-exsltexports.html"><img src="right.png" width="24" height="24" border="0" alt="Next" /></a></td></tr></table><h2>Table of Contents</h2><pre class="programlisting">#define <a href="#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_MATH_NAMESPACE">EXSLT_MATH_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_SETS_NAMESPACE">EXSLT_SETS_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_STRINGS_NAMESPACE">EXSLT_STRINGS_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#SAXON_NAMESPACE">SAXON_NAMESPACE</a></pre><pre class="programlisting">void <a href="#exsltCommonRegister">exsltCommonRegister</a> (void)</pre>
+ </style><title>Module exslt from libexslt</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="../../epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="../../gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="../../w3c.png" alt="W3C logo" /></a><a href="http://www.redhat.com"><img src="../../redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/XSLT/"><img src="../../Libxslt-Logo-180x168.gif" alt="Made with Libxslt Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The EXSLT C library for Gnome</h1><h2>Module exslt from libexslt</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="../search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a style="font-weight:bold" href="../index.html">Main Menu</a></li><li><a style="font-weight:bold" href="../docs.html">Developer Menu</a></li><li><a style="font-weight:bold" href="index.html">API Menu</a></li><li><a href="../ChangeLog.html">ChangeLog</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xslt/">Mail archive</a></li><li><a href="http://xmlsoft.org/">XML libxml2</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxslt">Bug Tracker</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading17">XSLT with PHP</a></li><li><a href="http://www.mod-xslt2.com/">Apache module</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://xsldbg.sourceforge.net/">Xsldbg Debugger</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="../APIchunk0.html">Alphabetic</a></li><li><a href="../APIconstructors.html">Constructors</a></li><li><a href="../APIfunctions.html">Functions/Types</a></li><li><a href="../APIfiles.html">Modules</a></li><li><a href="../APIsymbols.html">Symbols</a></li></ul></td></tr></table></td></tr></table></td><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"><table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"><td><a accesskey="u" href="index.html"><img src="up.png" width="24" height="24" border="0" alt="Up" /></a></td><th align="left"><a href="index.html">API documentation</a></th><td><a accesskey="h" href="../index.html"><img src="home.png" width="24" height="24" border="0" alt="Home" /></a></td><th align="center"><a href="../index.html">Home</a></th><th align="right"><a href="libexslt-exsltexports.html">exsltexports</a></th><td><a accesskey="n" href="libexslt-exsltexports.html"><img src="right.png" width="24" height="24" border="0" alt="Next" /></a></td></tr></table><h2>Table of Contents</h2><pre class="programlisting">#define <a href="#EXSLT_COMMON_NAMESPACE">EXSLT_COMMON_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_CRYPTO_NAMESPACE">EXSLT_CRYPTO_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_DATE_NAMESPACE">EXSLT_DATE_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_DYNAMIC_NAMESPACE">EXSLT_DYNAMIC_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_FUNCTIONS_NAMESPACE">EXSLT_FUNCTIONS_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_MATH_NAMESPACE">EXSLT_MATH_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_SETS_NAMESPACE">EXSLT_SETS_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#EXSLT_STRINGS_NAMESPACE">EXSLT_STRINGS_NAMESPACE</a></pre><pre class="programlisting">#define <a href="#SAXON_NAMESPACE">SAXON_NAMESPACE</a></pre><pre class="programlisting">void <a href="#exsltCommonRegister">exsltCommonRegister</a> (void)</pre>
+<pre class="programlisting">void <a href="#exsltCryptoRegister">exsltCryptoRegister</a> (void)</pre>
<pre class="programlisting">void <a href="#exsltDateRegister">exsltDateRegister</a> (void)</pre>
<pre class="programlisting">void <a href="#exsltDynRegister">exsltDynRegister</a> (void)</pre>
<pre class="programlisting">void <a href="#exsltFuncRegister">exsltFuncRegister</a> (void)</pre>
@@ -18,6 +19,7 @@
<pre class="programlisting">void <a href="#exsltStrRegister">exsltStrRegister</a> (void)</pre>
<h2>Description</h2>
<h3><a name="EXSLT_COMMON_NAMESPACE" id="EXSLT_COMMON_NAMESPACE"></a>Macro: EXSLT_COMMON_NAMESPACE</h3><pre>#define EXSLT_COMMON_NAMESPACE</pre><p>Namespace for EXSLT common functions</p>
+<h3><a name="EXSLT_CRYPTO_NAMESPACE" id="EXSLT_CRYPTO_NAMESPACE"></a>Macro: EXSLT_CRYPTO_NAMESPACE</h3><pre>#define EXSLT_CRYPTO_NAMESPACE</pre><p>Namespace for EXSLT crypto functions</p>
<h3><a name="EXSLT_DATE_NAMESPACE" id="EXSLT_DATE_NAMESPACE"></a>Macro: EXSLT_DATE_NAMESPACE</h3><pre>#define EXSLT_DATE_NAMESPACE</pre><p>Namespace for EXSLT date functions</p>
<h3><a name="EXSLT_DYNAMIC_NAMESPACE" id="EXSLT_DYNAMIC_NAMESPACE"></a>Macro: EXSLT_DYNAMIC_NAMESPACE</h3><pre>#define EXSLT_DYNAMIC_NAMESPACE</pre><p>Namespace for EXSLT dynamic functions</p>
<h3><a name="EXSLT_FUNCTIONS_NAMESPACE" id="EXSLT_FUNCTIONS_NAMESPACE"></a>Macro: EXSLT_FUNCTIONS_NAMESPACE</h3><pre>#define EXSLT_FUNCTIONS_NAMESPACE</pre><p>Namespace for EXSLT functions extension functions</p>
@@ -27,6 +29,8 @@
<h3><a name="SAXON_NAMESPACE" id="SAXON_NAMESPACE"></a>Macro: SAXON_NAMESPACE</h3><pre>#define SAXON_NAMESPACE</pre><p>Namespace for SAXON extensions functions</p>
<h3><a name="exsltCommonRegister" id="exsltCommonRegister"></a>Function: exsltCommonRegister</h3><pre class="programlisting">void exsltCommonRegister (void)<br />
</pre><p>Registers the EXSLT - Common module</p>
+<h3><a name="exsltCryptoRegister" id="exsltCryptoRegister"></a>Function: exsltCryptoRegister</h3><pre class="programlisting">void exsltCryptoRegister (void)<br />
+</pre><p></p>
<h3><a name="exsltDateRegister" id="exsltDateRegister"></a>Function: exsltDateRegister</h3><pre class="programlisting">void exsltDateRegister (void)<br />
</pre><p>Registers the EXSLT - Dates and Times module</p>
<h3><a name="exsltDynRegister" id="exsltDynRegister"></a>Function: exsltDynRegister</h3><pre class="programlisting">void exsltDynRegister (void)<br />
Copied: packages/libxslt/trunk/doc/EXSLT/html/right.png (from rev 311, packages/libxslt/branches/upstream/current/doc/EXSLT/html/right.png)
Property changes on: packages/libxslt/trunk/doc/EXSLT/html/right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: packages/libxslt/trunk/doc/EXSLT/html/up.png (from rev 311, packages/libxslt/branches/upstream/current/doc/EXSLT/html/up.png)
Property changes on: packages/libxslt/trunk/doc/EXSLT/html/up.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: packages/libxslt/trunk/doc/EXSLT/libexslt-api.xml
===================================================================
--- packages/libxslt/trunk/doc/EXSLT/libexslt-api.xml 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/EXSLT/libexslt-api.xml 2004-10-31 04:45:45 UTC (rev 312)
@@ -6,9 +6,10 @@
<exports symbol='EXSLT_DATE_NAMESPACE' type='macro'/>
<exports symbol='EXSLT_FUNCTIONS_NAMESPACE' type='macro'/>
<exports symbol='EXSLT_STRINGS_NAMESPACE' type='macro'/>
+ <exports symbol='SAXON_NAMESPACE' type='macro'/>
<exports symbol='EXSLT_SETS_NAMESPACE' type='macro'/>
<exports symbol='EXSLT_DYNAMIC_NAMESPACE' type='macro'/>
- <exports symbol='SAXON_NAMESPACE' type='macro'/>
+ <exports symbol='EXSLT_CRYPTO_NAMESPACE' type='macro'/>
<exports symbol='EXSLT_MATH_NAMESPACE' type='macro'/>
<exports symbol='exsltLibxmlVersion' type='variable'/>
<exports symbol='exsltLibexsltVersion' type='variable'/>
@@ -20,9 +21,10 @@
<exports symbol='exsltStrRegister' type='function'/>
<exports symbol='exsltFuncRegister' type='function'/>
<exports symbol='exsltSaxonRegister' type='function'/>
+ <exports symbol='exsltRegisterAll' type='function'/>
<exports symbol='exsltSetsRegister' type='function'/>
<exports symbol='exsltDateRegister' type='function'/>
- <exports symbol='exsltRegisterAll' type='function'/>
+ <exports symbol='exsltCryptoRegister' type='function'/>
</file>
<file name='exsltexports'>
<exports symbol='LIBEXSLT_PUBLIC' type='macro'/>
@@ -42,6 +44,9 @@
<macro name='EXSLT_COMMON_NAMESPACE' file='exslt'>
<info>Namespace for EXSLT common functions</info>
</macro>
+ <macro name='EXSLT_CRYPTO_NAMESPACE' file='exslt'>
+ <info>Namespace for EXSLT crypto functions</info>
+ </macro>
<macro name='EXSLT_DATE_NAMESPACE' file='exslt'>
<info>Namespace for EXSLT date functions</info>
</macro>
@@ -75,6 +80,10 @@
<info>Registers the EXSLT - Common module</info>
<return type='void'/>
</function>
+ <function name='exsltCryptoRegister' file='exslt'>
+ <info></info>
+ <return type='void'/>
+ </function>
<function name='exsltDateRegister' file='exslt'>
<info>Registers the EXSLT - Dates and Times module</info>
<return type='void'/>
Modified: packages/libxslt/trunk/doc/EXSLT/libexslt-refs.xml
===================================================================
--- packages/libxslt/trunk/doc/EXSLT/libexslt-refs.xml 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/EXSLT/libexslt-refs.xml 2004-10-31 04:45:45 UTC (rev 312)
@@ -5,6 +5,7 @@
<reference name='EXSLTPUBFUN' href='html/libexslt-exsltexports.html#EXSLTPUBFUN'/>
<reference name='EXSLTPUBVAR' href='html/libexslt-exsltexports.html#EXSLTPUBVAR'/>
<reference name='EXSLT_COMMON_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_COMMON_NAMESPACE'/>
+ <reference name='EXSLT_CRYPTO_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_CRYPTO_NAMESPACE'/>
<reference name='EXSLT_DATE_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_DATE_NAMESPACE'/>
<reference name='EXSLT_DYNAMIC_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_DYNAMIC_NAMESPACE'/>
<reference name='EXSLT_FUNCTIONS_NAMESPACE' href='html/libexslt-exslt.html#EXSLT_FUNCTIONS_NAMESPACE'/>
@@ -15,6 +16,7 @@
<reference name='SAXON_NAMESPACE' href='html/libexslt-exslt.html#SAXON_NAMESPACE'/>
<reference name='_REENTRANT' href='html/libexslt-exsltexports.html#_REENTRANT'/>
<reference name='exsltCommonRegister' href='html/libexslt-exslt.html#exsltCommonRegister'/>
+ <reference name='exsltCryptoRegister' href='html/libexslt-exslt.html#exsltCryptoRegister'/>
<reference name='exsltDateRegister' href='html/libexslt-exslt.html#exsltDateRegister'/>
<reference name='exsltDynRegister' href='html/libexslt-exslt.html#exsltDynRegister'/>
<reference name='exsltFuncRegister' href='html/libexslt-exslt.html#exsltFuncRegister'/>
@@ -34,6 +36,7 @@
<ref name='EXSLTPUBFUN'/>
<ref name='EXSLTPUBVAR'/>
<ref name='EXSLT_COMMON_NAMESPACE'/>
+ <ref name='EXSLT_CRYPTO_NAMESPACE'/>
<ref name='EXSLT_DATE_NAMESPACE'/>
<ref name='EXSLT_DYNAMIC_NAMESPACE'/>
<ref name='EXSLT_FUNCTIONS_NAMESPACE'/>
@@ -52,6 +55,7 @@
</letter>
<letter name='e'>
<ref name='exsltCommonRegister'/>
+ <ref name='exsltCryptoRegister'/>
<ref name='exsltDateRegister'/>
<ref name='exsltDynRegister'/>
<ref name='exsltFuncRegister'/>
@@ -73,6 +77,7 @@
<files>
<file name='exslt'>
<ref name='EXSLT_COMMON_NAMESPACE'/>
+ <ref name='EXSLT_CRYPTO_NAMESPACE'/>
<ref name='EXSLT_DATE_NAMESPACE'/>
<ref name='EXSLT_DYNAMIC_NAMESPACE'/>
<ref name='EXSLT_FUNCTIONS_NAMESPACE'/>
@@ -81,6 +86,7 @@
<ref name='EXSLT_STRINGS_NAMESPACE'/>
<ref name='SAXON_NAMESPACE'/>
<ref name='exsltCommonRegister'/>
+ <ref name='exsltCryptoRegister'/>
<ref name='exsltDateRegister'/>
<ref name='exsltDynRegister'/>
<ref name='exsltFuncRegister'/>
@@ -120,6 +126,7 @@
<letter name='E'>
<word name='EXSLT'>
<ref name='EXSLT_COMMON_NAMESPACE'/>
+ <ref name='EXSLT_CRYPTO_NAMESPACE'/>
<ref name='EXSLT_DATE_NAMESPACE'/>
<ref name='EXSLT_DYNAMIC_NAMESPACE'/>
<ref name='EXSLT_FUNCTIONS_NAMESPACE'/>
@@ -149,6 +156,7 @@
<letter name='N'>
<word name='Namespace'>
<ref name='EXSLT_COMMON_NAMESPACE'/>
+ <ref name='EXSLT_CRYPTO_NAMESPACE'/>
<ref name='EXSLT_DATE_NAMESPACE'/>
<ref name='EXSLT_DYNAMIC_NAMESPACE'/>
<ref name='EXSLT_FUNCTIONS_NAMESPACE'/>
@@ -200,6 +208,9 @@
<word name='common'>
<ref name='EXSLT_COMMON_NAMESPACE'/>
</word>
+ <word name='crypto'>
+ <ref name='EXSLT_CRYPTO_NAMESPACE'/>
+ </word>
</letter>
<letter name='d'>
<word name='date'>
@@ -222,6 +233,7 @@
<letter name='f'>
<word name='for'>
<ref name='EXSLT_COMMON_NAMESPACE'/>
+ <ref name='EXSLT_CRYPTO_NAMESPACE'/>
<ref name='EXSLT_DATE_NAMESPACE'/>
<ref name='EXSLT_DYNAMIC_NAMESPACE'/>
<ref name='EXSLT_FUNCTIONS_NAMESPACE'/>
@@ -232,6 +244,7 @@
</word>
<word name='functions'>
<ref name='EXSLT_COMMON_NAMESPACE'/>
+ <ref name='EXSLT_CRYPTO_NAMESPACE'/>
<ref name='EXSLT_DATE_NAMESPACE'/>
<ref name='EXSLT_DYNAMIC_NAMESPACE'/>
<ref name='EXSLT_FUNCTIONS_NAMESPACE'/>
Modified: packages/libxslt/trunk/doc/Makefile.am
===================================================================
--- packages/libxslt/trunk/doc/Makefile.am 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/Makefile.am 2004-10-31 04:45:45 UTC (rev 312)
@@ -31,7 +31,9 @@
EXTRA_DIST = \
api.xsl \
apibuild.py \
- EXSLT/exslt.html \
+ EXSLT/*.html \
+ EXSLT/html/*.html \
+ EXSLT/html/*.png \
EXSLT/libexslt-api.xml \
EXSLT/libexslt-refs.xml \
libxslt-api.xml \
Modified: packages/libxslt/trunk/doc/Makefile.in
===================================================================
--- packages/libxslt/trunk/doc/Makefile.in 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/Makefile.in 2004-10-31 04:45:45 UTC (rev 312)
@@ -240,7 +240,9 @@
EXTRA_DIST = \
api.xsl \
apibuild.py \
- EXSLT/exslt.html \
+ EXSLT/*.html \
+ EXSLT/html/*.html \
+ EXSLT/html/*.png \
EXSLT/libexslt-api.xml \
EXSLT/libexslt-refs.xml \
libxslt-api.xml \
@@ -349,7 +351,7 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/EXSLT
+ $(mkdir_p) $(distdir)/EXSLT $(distdir)/EXSLT/html
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Modified: packages/libxslt/trunk/doc/libxslt.xsa
===================================================================
--- packages/libxslt/trunk/doc/libxslt.xsa 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/libxslt.xsa 2004-10-31 04:45:45 UTC (rev 312)
@@ -8,13 +8,15 @@
</vendor>
<product id="libxslt">
<name>libxslt</name>
- <version>1.1.10</version>
- <last-release> Aug 31 2004</last-release>
+ <version>1.1.11</version>
+ <last-release> Sep 29 2004</last-release>
<info-url>http://xmlsoft.org/XSLT/</info-url>
- <changes> - build fix: NUL in c file blocking compilation on Solaris, Windows build
- (Igor Zlatkovic)
- - fix: key initialization problem (William Brack)
- - documentation: fixed missing man page description for --path
+ <changes> - bug fixes: xsl:include problems (William Brack), UTF8 number pattern
+ (William), date-time validation (William), namespace fix (William),
+ various Exslt date fixes (William), error callback fixes, leak with
+ namespaced global variable, attempt to fix a weird problem #153137
+ - improvements: exslt:date-sum tests (Derek Poon)
+ - documentation: second tutorial by Panagiotis Lourida
</changes>
</product>
Modified: packages/libxslt/trunk/doc/news.html
===================================================================
--- packages/libxslt/trunk/doc/news.html 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/news.html 2004-10-31 04:45:45 UTC (rev 312)
@@ -9,7 +9,16 @@
A:link, A:visited, A:active { text-decoration: underline }
</style><title>News</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C logo" /></a><a href="http://www.redhat.com"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/XSLT/"><img src="Libxslt-Logo-180x168.gif" alt="Made with Libxslt Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XSLT C library for Gnome</h1><h2>News</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="intro.html">Introduction</a></li><li><a href="docs.html">Documentation</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="news.html">News</a></li><li><a href="xsltproc2.html">The xsltproc tool</a></li><li><a href="docbook.html">DocBook</a></li><li><a href="API.html">The programming API</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="internals.html">Library internals</a></li><li><a href="extensions.html">Writing extensions</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="EXSLT/index.html" style="font-weight:bold">libexslt</a></li><li><a href="xslt.html">flat page</a>, <a href="site.xsl">stylesheet</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="ChangeLog.html">ChangeLog</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="tutorial/libxslttutorial.html">Tutorial</a>,
<a href="tutorial2/libxslt_pipes.html">Tutorial2</a></li><li><a href="xsltproc.html">Man page for xsltproc</a></li><li><a href="http://mail.gnome.org/archives/xslt/">Mail archive</a></li><li><a href="http://xmlsoft.org/">XML libxml2</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxslt">Bug Tracker</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading17">XSLT with PHP</a></li><li><a href="http://www.mod-xslt2.com/">Apache module</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://xsldbg.sourceforge.net/">Xsldbg Debugger</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table></td></tr></table></td><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"><p>The <a href="ChangeLog.html">change log</a> describes the recents commits
-to the <a href="http://cvs.gnome.org/viewcvs/libxslt/">CVS</a> code base.</p><p>Those are the public releases made:</p><h3>1.1.11: Sep 29 2004</h3><ul><li>bug fixes: xsl:include problems (William Brack), UTF8 number pattern
+to the <a href="http://cvs.gnome.org/viewcvs/libxslt/">CVS</a> code base.</p><p>Those are the public releases made:</p><h3>1.1.12: Oct 29 2004</h3><ul><li>build fixes: warnings removal (William).</li>
+ <li>bug fixes: attribute document pointer fix (Mark Vakoc), exslt date
+ negative periods (William Brack), generated tree structure fixes,
+ namespace lookup fix, use reentrant gmtime_r (William Brack),
+ exslt:funtion namespace fix (William), potential NULL pointer reference
+ (Dennis Dams, William), force string interning on generated
+ documents.</li>
+ <li>documentation: update of the second tutorial (Panagiotis Louridas), add
+ exslt doc in rpm packages, fix the xsltproc man page.</li>
+</ul><h3>1.1.11: Sep 29 2004</h3><ul><li>bug fixes: xsl:include problems (William Brack), UTF8 number pattern
(William), date-time validation (William), namespace fix (William),
various Exslt date fixes (William), error callback fixes, leak with
namespaced global variable, attempt to fix a weird problem #153137</li>
Modified: packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.c
===================================================================
--- packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -4,34 +4,25 @@
*
* Writen by Panos Louridas, based on libxslt_tutorial.c by John Fleck.
*
- * Copyright (c) 2004 Panagiotis Louridas
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions: </para>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Cambridge, MA 02139, USA.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
*/
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <malloc.h>
-#include <stdarg.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
Modified: packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.html
===================================================================
--- packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.html 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.html 2004-10-31 04:45:45 UTC (rev 312)
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>libxslt: An Extended Tutorial</title><meta name="generator" content="DocBook XSL Stylesheets V1.66.0"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="libxslt"></a>libxslt: An Extended Tutorial</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Panos</span> <span class="surname">Louridas</span></h3></div></div><div><p class="copyright">Copyright © 2004 Panagiotis Louridas</p></div><div><div class="legalnotice"><a name="id2719420"></a><p>Permission is hereby granted, free of charge, to
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>libxslt: An Extended Tutorial</title><meta name="generator" content="DocBook XSL Stylesheets V1.66.0"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="article" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="libxslt"></a>libxslt: An Extended Tutorial</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Panos</span> <span class="surname">Louridas</span></h3></div></div><div><p class="copyright">Copyright © 2004 Panagiotis Louridas</p></div><div><div class="legalnotice"><a name="id2839296"></a><p>Permission is hereby granted, free of charge, to
any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software
without restriction, including without limitation the rights to use,
@@ -13,8 +13,9 @@
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2651891">Introduction</a></span></dt><dt><span class="sect1"><a href="#id2651985">Setting the Scene</a></span></dt><dt><span class="sect1"><a href="#id2679350">Program Start</a></span></dt><dt><span class="sect1"><a href="#id2679483">Arguments Collection</a></span></dt><dt><span class="sect1"><a href="#id2679522">Parsing</a></span></dt><dt><span class="sect1"><a href="#id2651161">File Processing</a></span></dt><dt><span class="sect1"><a href="#id2651276">*NIX Compiling and Linking</a></span></dt><dt><span class="sect1"><a href="#id2651380">MS-Windows Compiling and Linking</a></span></dt><dd><dl><dt><span class="sect2"><a href="#windows-build">Building the Ports in
-MS-Windows</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2719828">The Complete Program</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2651891"></a>Introduction</h2></div></div></div><p>The Extensible Stylesheet Language Transformations (XSLT)
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2771767">Introduction</a></span></dt><dt><span class="sect1"><a href="#id2771862">Setting the Scene</a></span></dt><dt><span class="sect1"><a href="#id2799225">Program Start</a></span></dt><dt><span class="sect1"><a href="#id2799358">Arguments Collection</a></span></dt><dt><span class="sect1"><a href="#id2799396">Parsing</a></span></dt><dt><span class="sect1"><a href="#id2771038">File Processing</a></span></dt><dt><span class="sect1"><a href="#id2771153">*NIX Compiling and Linking</a></span></dt><dt><span class="sect1"><a href="#windows-build">MS-Windows Compiling and
+Linking</a></span></dt><dd><dl><dt><span class="sect2"><a href="#windows-ports-build">Building the Ports in
+MS-Windows</a></span></dt></dl></dd><dt><span class="sect1"><a href="#id2839739">zlib, iconv and All That</a></span></dt><dt><span class="sect1"><a href="#id2839841">The Complete Program</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2771767"></a>Introduction</h2></div></div></div><p>The Extensible Stylesheet Language Transformations (XSLT)
specification defines an XML template language for transforming XML
documents. An XSLT engine reads an XSLT file and an XML document and
transforms the document accordingly.</p><p>We want to perform a series of XSLT transformations to a series
@@ -49,7 +50,7 @@
mean Linux, BSD, and other members of the
family. The gcc suite is used in the *NIX platform
and the Microsoft compiler and linker are used in the
-MS-Windows platform.</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2651985"></a>Setting the Scene</h2></div></div></div><p>
+MS-Windows platform.</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2771862"></a>Setting the Scene</h2></div></div></div><p>
We need to include the necessary libraries:
</p><pre class="programlisting">
@@ -57,7 +58,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
- #include <malloc.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
@@ -91,7 +91,7 @@
printf(" --param name value: pass a (parameter,value) pair\n");
}
</pre><p>
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2679350"></a>Program Start</h2></div></div></div><p>We need to define a few variables that are used throughout the
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2799225"></a>Program Start</h2></div></div></div><p>We need to define a few variables that are used throughout the
program:
</p><pre class="programlisting">
int main(int argc, char **argv) {
@@ -140,7 +140,7 @@
later on. The array memory is allocated with
<tt class="function">calloc</tt> to ensure contents are initialised to
zero.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2679483"></a>Arguments Collection</h2></div></div></div><p>If the program gets no arguments at all, we print the usage
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2799358"></a>Arguments Collection</h2></div></div></div><p>If the program gets no arguments at all, we print the usage
description, set the program return value to 1 and exit. Instead of
returning directly we go to (literally) to the end of the program text
where some housekeeping takes place.</p><p>
@@ -187,7 +187,7 @@
is set to the user request, if any. After processing all the parameter
key-value pairs we set the last element of the <tt class="varname">params</tt>
array to null.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2679522"></a>Parsing</h2></div></div></div><p>The rest of the argument list is taken to be stylesheets and
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2799396"></a>Parsing</h2></div></div></div><p>The rest of the argument list is taken to be stylesheets and
files to be transformed. Stylesheets are identified by their suffix,
which is expected to be xsl (case sensitive). All other files are
assumed to be XML documents, regardless of suffix.</p><p>
@@ -223,7 +223,7 @@
parsed using the <tt class="function">xmlParseFile</tt> function that takes
as argument the file's name; the resulting <span class="type">xmlDocPtr</span> is
placed in the <tt class="varname">files</tt> array.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2651161"></a>File Processing</h2></div></div></div><p>All stylesheets are applied to each file one after the
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2771038"></a>File Processing</h2></div></div></div><p>All stylesheets are applied to each file one after the
other. Stylesheets are applied with the
<tt class="function">xsltApplyStylesheet</tt> function that takes as
argument the stylesheet to be applied, the file to be transformed and
@@ -282,23 +282,35 @@
allocated for the XML parser is reclaimed by a call to
<tt class="function">xmlCleanupParser</tt>. Before returning we deallocate
the memory allocated for the holding the pointers to the XML documents
-and stylesheets.</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2651276"></a>*NIX Compiling and Linking</h2></div></div></div><p>Compiling and linking in a *NIX environment
+and stylesheets.</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2771153"></a>*NIX Compiling and Linking</h2></div></div></div><p>Compiling and linking in a *NIX environment
is easy, as the required libraries are almost certain to be already in
place (remember that libxml and libxslt are used by the GNOME project,
so they are present in most installations). The program can be
dynamically linked so that its footprint is minimized, or statically
-linked, so that it stands by itself, carrying all required code. For
-dynamic linking the following one liner will do:</p><p>
-<b class="userinput"><tt>gcc -o libxslt_pipes -Wall -I/usr/include/libxml2 -lxslt -lxml2 -L/usr/lib
-libxslt_pipes.c</tt></b>
+linked, so that it stands by itself, carrying all required code.</p><p>For dynamic linking the following one liner will do:</p><p>
+<b class="userinput"><tt>gcc -o libxslt_pipes -Wall -I/usr/include/libxml2 -lxslt
+-lxml2 -L/usr/lib libxslt_pipes.c</tt></b>
</p><p>We assume that the necessary header files are in <tt class="filename">/usr/include/libxml2</tt> and that the
required libraries (<tt class="filename">libxslt.so</tt>,
-<tt class="filename">libxsml2.so</tt>) are in <tt class="filename">/usr/lib</tt>.</p><p>For static linking we must list more libraries in the command
-line, as the libraries on which the libxsl and libxslt libraries
-depend are also needed. Still, an one-liner will do:</p><p>
+<tt class="filename">libxml2.so</tt>) are in <tt class="filename">/usr/lib</tt>.</p><p>In general, a program may need to link to additional libraries,
+depending on the processing it actually performs. A good way to start
+is to use the <span><b class="command">xslt-config</b></span> script. The
+<tt class="option">--help</tt> option displays usage
+information. Running</p><p>
+ <b class="userinput"><tt>
+ xslt-config --cflags
+ </tt></b>
+</p><p>we get compile flags, while running</p><p>
+ <b class="userinput"><tt>
+ xslt-config --libs
+ </tt></b>
+</p><p>we get the library settings for the linker.</p><p>For static linking we must list more libraries than we did for
+dynamic linking, as the libraries on which the libxsl and libxslt
+libraries depend are also needed. Using <span><b class="command">xslt-config</b></span>
+on a particular installation we create the following one-liner:</p><p>
<b class="userinput"><tt>
gcc -o libxslt_pipes -Wall -I/usr/include/libxml2 libxslt_pipes.c
--static -lxslt -lxml2 -lpthread -lz -lm
+-static -L/usr/lib -lxslt -lxml2 -lz -lpthread -lm
</tt></b>
</p><p>If we get warnings to the effect that some function in
statically linked applications requires at runtime the shared
@@ -311,7 +323,8 @@
and building a uClibc toolchain first (if the reason for trying to get
a statically linked version of the program is to embed it somewhere,
using uClibc might be a good idea anyway).
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2651380"></a>MS-Windows Compiling and Linking</h2></div></div></div><p>Compiling and linking in MS-Windows requires
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="windows-build"></a>MS-Windows Compiling and
+Linking</h2></div></div></div><p>Compiling and linking in MS-Windows requires
some attention. First, the MS-Windows ports must be
downloaded and installed in the programming workstation. The ports are
available in <a href="http://www.zlatkovic.com/libxml.en.html" target="_top">Igor
@@ -351,7 +364,7 @@
likely to crash unexpectedly. Alternatively, you may wish to compile
all iconv, zlib, libxml and libxslt yourself, using the new runtime
library. This is not a tall order, and some details are given
-<a href="#windows-build" title="Building the Ports in
+<a href="#windows-ports-build" title="Building the Ports in
MS-Windows">below</a>.</p><p>There are three kinds of libraries in MS-Windows. Dynamically
Linked Libraries (DLLs), like <tt class="filename">msvcrt.dll</tt> we met
above, are used for dynamic linking; an application links to them at
@@ -403,7 +416,7 @@
no longer using <tt class="filename">msvcrt.dll</tt>, but another runtime
like <tt class="filename">msvcrt71.dll</tt>, and we then need that DLL. In
contrast to <tt class="filename">msvcrt.dll</tt> it may not be present on
-the target computer, so we may have to copy it along.</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="windows-build"></a>Building the Ports in
+the target computer, so we may have to copy it along.</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="windows-ports-build"></a>Building the Ports in
MS-Windows</h3></div></div></div><p>The source code of the ports is readily available on the web,
one has to check the ports sites. Each port can be built without
problems in an MS-Windows environment using Microsoft development
@@ -434,7 +447,35 @@
dependencies between the ports. If we configure libxml and libxslt to
use iconv and zlib we must build these two first and make sure their
headers and libraries can be found by the compiler and the
-linker when building libxml and libxslt.</p></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2719828"></a>The Complete Program</h2></div></div></div><p>
+linker when building libxml and libxslt.</p></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2839739"></a>zlib, iconv and All That</h2></div></div></div><p>We saw that libxml and libxslt depend on various other
+libraries, for instance zlib, iconv, and so forth. Taking a look into
+them gives us clues on the capabilities of libxml and libxslt.</p><p><a href="http://www.zlib.org" target="_top">zlib</a> is a free general
+purpose lossless data compression library. It is a venerable
+workhorse; more than <a href="http://www.gzip.org/zlib/apps.html" target="_top">500 applications</a>
+(both commercial and open source) seem to use the library. libxml uses
+zlib so that it can read from or write to compressed files
+directly. The <tt class="function">xmlParseFile</tt> function can
+transparently parse a compressed document to produce an
+<span class="structname">xmlDoc</span>. If we want to create a compressed
+document with libxml we can use an
+<span class="structname">xmlTextWriterPtr</span> (obtained through
+<tt class="function">xmlNewTextWriterDoc</tt>), or another related
+structure from <tt class="filename">libxml/xmlwriter.h</tt>, with
+compression enabled.</p><p>XML allows documents to use a variety of different character
+encodings. <a href="http://www.gnu.org/software/libiconv" target="_top">iconv</a> is a free
+library for converting between different character encodings. libxml
+provides a set of default converters for some encodings: UTF-8, UTF-16
+(little endian and big endian), ISO-8859-1, ASCII, and HTML (a
+specific handler for the conversion of UTF-8 to ASCII with HTML
+predefined entities like &copy; for the copyright sign). However,
+when compiled with iconv support, libxml and libxslt can handle the
+full range of encodings provided by iconv; these should cover most
+needs.</p><p>libxml and libxslt can be used in multi-threaded
+applications. In MS-Windows they are linked against
+<tt class="filename">MSVCRT.DLL</tt> (or one of its descendants, as we saw
+<a href="#windows-build" title="MS-Windows Compiling and
+Linking">above</a>). In *NIX the pthreads
+(POSIX threads) library is used.</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2839841"></a>The Complete Program</h2></div></div></div><p>
The complete program listing is given below. The program is also
<a href="libxslt_pipes.c" target="_top">available online</a>.
</p><p>
@@ -445,34 +486,25 @@
*
* Writen by Panos Louridas, based on libxslt_tutorial.c by John Fleck.
*
- * Copyright (c) 2004 Panagiotis Louridas
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions: </para>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Cambridge, MA 02139, USA.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
*/
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <malloc.h>
-#include <stdarg.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
Modified: packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.xml
===================================================================
--- packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.xml 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/tutorial2/libxslt_pipes.xml 2004-10-31 04:45:45 UTC (rev 312)
@@ -100,7 +100,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
- #include <malloc.h>
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
@@ -382,28 +381,52 @@
place (remember that libxml and libxslt are used by the GNOME project,
so they are present in most installations). The program can be
dynamically linked so that its footprint is minimized, or statically
-linked, so that it stands by itself, carrying all required code. For
-dynamic linking the following one liner will do:</para>
+linked, so that it stands by itself, carrying all required code.</para>
+<para>For dynamic linking the following one liner will do:</para>
+
<para>
-<userinput>gcc -o libxslt_pipes -Wall -I/usr/include/libxml2 -lxslt -lxml2 -L/usr/lib
-libxslt_pipes.c</userinput>
+<userinput>gcc -o libxslt_pipes -Wall -I/usr/include/libxml2 -lxslt
+-lxml2 -L/usr/lib libxslt_pipes.c</userinput>
</para>
<para>We assume that the necessary header files are in <filename
class="directory">/usr/include/libxml2</filename> and that the
required libraries (<filename>libxslt.so</filename>,
-<filename>libxsml2.so</filename>) are in <filename
+<filename>libxml2.so</filename>) are in <filename
class="directory">/usr/lib</filename>.</para>
-<para>For static linking we must list more libraries in the command
-line, as the libraries on which the libxsl and libxslt libraries
-depend are also needed. Still, an one-liner will do:</para>
+<para>In general, a program may need to link to additional libraries,
+depending on the processing it actually performs. A good way to start
+is to use the <command>xslt-config</command> script. The
+<option>--help</option> option displays usage
+information. Running</para>
<para>
+ <userinput>
+ xslt-config --cflags
+ </userinput>
+</para>
+
+<para>we get compile flags, while running</para>
+
+<para>
+ <userinput>
+ xslt-config --libs
+ </userinput>
+</para>
+
+<para>we get the library settings for the linker.</para>
+
+<para>For static linking we must list more libraries than we did for
+dynamic linking, as the libraries on which the libxsl and libxslt
+libraries depend are also needed. Using <command>xslt-config</command>
+on a particular installation we create the following one-liner:</para>
+
+<para>
<userinput>
gcc -o libxslt_pipes -Wall -I/usr/include/libxml2 libxslt_pipes.c
--static -lxslt -lxml2 -lpthread -lz -lm
+-static -L/usr/lib -lxslt -lxml2 -lz -lpthread -lm
</userinput>
</para>
@@ -423,7 +446,8 @@
</sect1>
-<sect1><title>MS-Windows Compiling and Linking</title>
+<sect1 id="windows-build"><title>MS-Windows Compiling and
+Linking</title>
<para>Compiling and linking in MS-Windows requires
some attention. First, the MS-Windows ports must be
@@ -473,7 +497,7 @@
likely to crash unexpectedly. Alternatively, you may wish to compile
all iconv, zlib, libxml and libxslt yourself, using the new runtime
library. This is not a tall order, and some details are given
-<link linkend="windows-build">below</link>.</para>
+<link linkend="windows-ports-build">below</link>.</para>
<para>There are three kinds of libraries in MS-Windows. Dynamically
Linked Libraries (DLLs), like <filename>msvcrt.dll</filename> we met
@@ -536,7 +560,7 @@
contrast to <filename>msvcrt.dll</filename> it may not be present on
the target computer, so we may have to copy it along.</para>
-<sect2 id="windows-build"><title>Building the Ports in
+<sect2 id="windows-ports-build"><title>Building the Ports in
MS-Windows</title>
<para>The source code of the ports is readily available on the web,
@@ -577,6 +601,47 @@
</sect1>
+<sect1><title>zlib, iconv and All That</title>
+
+<para>We saw that libxml and libxslt depend on various other
+libraries, for instance zlib, iconv, and so forth. Taking a look into
+them gives us clues on the capabilities of libxml and libxslt.</para>
+
+<para><ulink url="http://www.zlib.org">zlib</ulink> is a free general
+purpose lossless data compression library. It is a venerable
+workhorse; more than <ulink
+url="http://www.gzip.org/zlib/apps.html">500 applications</ulink>
+(both commercial and open source) seem to use the library. libxml uses
+zlib so that it can read from or write to compressed files
+directly. The <function>xmlParseFile</function> function can
+transparently parse a compressed document to produce an
+<structname>xmlDoc</structname>. If we want to create a compressed
+document with libxml we can use an
+<structname>xmlTextWriterPtr</structname> (obtained through
+<function>xmlNewTextWriterDoc</function>), or another related
+structure from <filename>libxml/xmlwriter.h</filename>, with
+compression enabled.</para>
+
+<para>XML allows documents to use a variety of different character
+encodings. <ulink
+url="http://www.gnu.org/software/libiconv">iconv</ulink> is a free
+library for converting between different character encodings. libxml
+provides a set of default converters for some encodings: UTF-8, UTF-16
+(little endian and big endian), ISO-8859-1, ASCII, and HTML (a
+specific handler for the conversion of UTF-8 to ASCII with HTML
+predefined entities like &copy; for the copyright sign). However,
+when compiled with iconv support, libxml and libxslt can handle the
+full range of encodings provided by iconv; these should cover most
+needs.</para>
+
+<para>libxml and libxslt can be used in multi-threaded
+applications. In MS-Windows they are linked against
+<filename>MSVCRT.DLL</filename> (or one of its descendants, as we saw
+<link linkend="windows-build">above</link>). In *NIX the pthreads
+(POSIX threads) library is used.</para>
+
+</sect1>
+
<sect1><title>The Complete Program</title>
<para>
Modified: packages/libxslt/trunk/doc/xslt.html
===================================================================
--- packages/libxslt/trunk/doc/xslt.html 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/xslt.html 2004-10-31 04:45:45 UTC (rev 312)
@@ -297,6 +297,19 @@
<p>Those are the public releases made:</p>
+<h3>1.1.12: Oct 29 2004</h3>
+<ul>
+ <li>build fixes: warnings removal (William).</li>
+ <li>bug fixes: attribute document pointer fix (Mark Vakoc), exslt date
+ negative periods (William Brack), generated tree structure fixes,
+ namespace lookup fix, use reentrant gmtime_r (William Brack),
+ exslt:funtion namespace fix (William), potential NULL pointer reference
+ (Dennis Dams, William), force string interning on generated
+ documents.</li>
+ <li>documentation: update of the second tutorial (Panagiotis Louridas), add
+ exslt doc in rpm packages, fix the xsltproc man page.</li>
+</ul>
+
<h3>1.1.11: Sep 29 2004</h3>
<ul>
<li>bug fixes: xsl:include problems (William Brack), UTF8 number pattern
Modified: packages/libxslt/trunk/doc/xsltproc.1
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.1 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/xsltproc.1 2004-10-31 04:45:45 UTC (rev 312)
@@ -34,7 +34,7 @@
xsltproc is a command line tool for applying XSLT stylesheets to XML documents\&. It is part of libxslt, the XSLT C library for GNOME\&. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\&.
.PP
- xsltproc is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&.
+ xsltproc is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&. It will use the standard input if a filename provided is \- \&.
.PP
If a stylesheet is included in an XML document with a Stylesheet Processing Instruction, no stylesheet need be named at the command line\&. xsltproc will automatically detect the included stylesheet and use it\&.
Modified: packages/libxslt/trunk/doc/xsltproc.xml
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.xml 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/doc/xsltproc.xml 2004-10-31 04:45:45 UTC (rev 312)
@@ -78,7 +78,8 @@
<para>
<application>xsltproc</application> is invoked from the command line with
the name of the stylesheet to be used followed by the name of the file or
- files to which the stylesheet is to be applied.
+ files to which the stylesheet is to be applied. It will use the standard
+ input if a filename provided is - .
</para>
<para>
Modified: packages/libxslt/trunk/libexslt/crypto.c
===================================================================
--- packages/libxslt/trunk/libexslt/crypto.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libexslt/crypto.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -237,7 +237,7 @@
exsltCryptoCryptoApiReportError (ctxt, __LINE__);
goto fail;
}
-// Now encrypt data.
+/* Now encrypt data. */
dwDataLen = msglen;
memcpy (dest, msg, msglen);
if (!CryptEncrypt (hKey, 0, TRUE, 0, dest, &dwDataLen, msglen)) {
@@ -288,7 +288,7 @@
exsltCryptoCryptoApiReportError (ctxt, __LINE__);
goto fail;
}
-// Now encrypt data.
+/* Now encrypt data. */
dwDataLen = msglen;
memcpy (dest, msg, msglen);
if (!CryptDecrypt (hKey, 0, TRUE, 0, dest, &dwDataLen)) {
@@ -353,7 +353,8 @@
*/
static void
exsltCryptoGcryptHash (xmlXPathParserContextPtr ctxt ATTRIBUTE_UNUSED,
- enum gcry_md_algos algorithm, const char *msg,
+/* changed the enum to int */
+ int algorithm, const char *msg,
unsigned long msglen,
char dest[HASH_DIGEST_LENGTH]) {
exsltCryptoGcryptInit ();
Modified: packages/libxslt/trunk/libexslt/date.c
===================================================================
--- packages/libxslt/trunk/libexslt/date.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libexslt/date.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -119,7 +119,8 @@
#if defined(HAVE_TIME_H) \
&& (defined(HAVE_LOCALTIME) || defined(HAVE_LOCALTIME_R)) \
- && defined(HAVE_TIME) && defined(HAVE_GMTIME)
+ && (defined(HAVE_GMTIME) || defined(HAVE_GMTIME_R)) \
+ && defined(HAVE_TIME)
#define WITH_TIME
#endif
@@ -748,6 +749,9 @@
#if HAVE_LOCALTIME_R
struct tm localTmS;
#endif
+#if HAVE_GMTIME_R
+ struct tm gmTmS;
+#endif
exsltDateValPtr ret;
ret = exsltDateCreateDate(XS_DATETIME);
@@ -775,7 +779,12 @@
ret->value.date.sec = (double) localTm->tm_sec;
/* determine the time zone offset from local to gm time */
+#if HAVE_GMTIME_R
+ gmtime_r(&secs, &gmTmS);
+ gmTm = &gmTmS;
+#else
gmTm = gmtime(&secs);
+#endif
ret->value.date.tz_flag = 0;
ret->value.date.tzo = (((ret->value.date.day * 1440) +
(ret->value.date.hour * 60) +
@@ -1651,27 +1660,22 @@
}
/**
- * _exsltDateAddDuration:
- * @x: an #exsltDateValPtr of type #XS_DURATION
- * @y: an #exsltDateValPtr of type #XS_DURATION
+ * _exsltDateAddDurCalc
+ * @ret: an exsltDateValPtr for the return value:
+ * @x: an exsltDateValPtr for the first operand
+ * @y: an exsltDateValPtr for the second operand
*
- * Compute a new duration from @x and @y.
+ * Add two durations, catering for possible negative values.
+ * The sum is placed in @ret.
*
- * Returns date/time pointer or NULL.
+ * Returns 1 for success, 0 if error detected.
*/
-static exsltDateValPtr
-_exsltDateAddDuration (exsltDateValPtr x, exsltDateValPtr y)
+static int
+_exsltDateAddDurCalc (exsltDateValPtr ret, exsltDateValPtr x,
+ exsltDateValPtr y)
{
- exsltDateValPtr ret;
long carry;
- if ((x == NULL) || (y == NULL))
- return NULL;
-
- ret = exsltDateCreateDate(XS_DURATION);
- if (ret == NULL)
- return NULL;
-
/* months */
ret->value.dur.mon = x->value.dur.mon + y->value.dur.mon;
@@ -1680,6 +1684,16 @@
carry = (long)FQUOTIENT(ret->value.dur.sec, SECS_PER_DAY);
if (ret->value.dur.sec != 0.0) {
ret->value.dur.sec = MODULO(ret->value.dur.sec, SECS_PER_DAY);
+ /*
+ * Our function MODULO always gives us a positive value, so
+ * if we end up with a "-ve" carry we need to adjust it
+ * appropriately (bug 154021)
+ */
+ if ((carry < 0) && (ret->value.dur.sec != 0)) {
+ /* change seconds to equiv negative modulus */
+ ret->value.dur.sec = ret->value.dur.sec - SECS_PER_DAY;
+ carry++;
+ }
}
/* days */
@@ -1693,11 +1707,37 @@
(ret->value.dur.mon < 0)) ||
(((ret->value.dur.day < 0) || (ret->value.dur.sec < 0)) &&
(ret->value.dur.mon > 0))) {
- exsltDateFreeDate(ret);
- return NULL;
+ return 0;
}
+ return 1;
+}
- return ret;
+/**
+ * _exsltDateAddDuration:
+ * @x: an #exsltDateValPtr of type #XS_DURATION
+ * @y: an #exsltDateValPtr of type #XS_DURATION
+ *
+ * Compute a new duration from @x and @y.
+ *
+ * Returns date/time pointer or NULL.
+ */
+static exsltDateValPtr
+_exsltDateAddDuration (exsltDateValPtr x, exsltDateValPtr y)
+{
+ exsltDateValPtr ret;
+
+ if ((x == NULL) || (y == NULL))
+ return NULL;
+
+ ret = exsltDateCreateDate(XS_DURATION);
+ if (ret == NULL)
+ return NULL;
+
+ if (_exsltDateAddDurCalc(ret, x, y))
+ return ret;
+
+ exsltDateFreeDate(ret);
+ return NULL;
}
/****************************************************************
@@ -2729,7 +2769,6 @@
xmlChar *tmp;
exsltDateValPtr x, total;
xmlChar *ret;
- long carry;
int i;
if (nargs != 1) {
@@ -2762,7 +2801,7 @@
}
for (i = 0; i < ns->nodeNr; i++) {
-
+ int result;
tmp = xmlXPathCastNodeToString (ns->nodeTab[i]);
if (tmp == NULL) {
xmlXPathFreeNodeSet (ns);
@@ -2779,22 +2818,16 @@
return;
}
- /* months */
- total->value.dur.mon += x->value.dur.mon;
+ result = _exsltDateAddDurCalc(total, total, x);
- /* seconds */
- total->value.dur.sec += x->value.dur.sec;
- carry = (long) FQUOTIENT (total->value.dur.sec, SECS_PER_DAY);
- if (total->value.dur.sec != 0.0) {
- total->value.dur.sec =
- MODULO (total->value.dur.sec, SECS_PER_DAY);
- }
-
- /* days */
- total->value.dur.day += x->value.dur.day + carry;
-
exsltDateFreeDate (x);
xmlFree (tmp);
+ if (!result) {
+ exsltDateFreeDate (total);
+ xmlXPathFreeNodeSet (ns);
+ xmlXPathReturnEmptyString (ctxt);
+ return;
+ }
}
ret = exsltDateFormatDuration (&(total->value.dur));
Modified: packages/libxslt/trunk/libexslt/exsltconfig.h
===================================================================
--- packages/libxslt/trunk/libexslt/exsltconfig.h 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libexslt/exsltconfig.h 2004-10-31 04:45:45 UTC (rev 312)
@@ -18,28 +18,28 @@
*
* the version string like "1.2.3"
*/
-#define LIBEXSLT_DOTTED_VERSION "1.1.11"
+#define LIBEXSLT_DOTTED_VERSION "1.1.12"
/**
* LIBEXSLT_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBEXSLT_VERSION 809
+#define LIBEXSLT_VERSION 810
/**
* LIBEXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBEXSLT_VERSION_STRING "809"
+#define LIBEXSLT_VERSION_STRING "810"
/**
* LIBEXSLT_VERSION_EXTRA:
*
* extra version information, used to show a CVS compilation
*/
-#define LIBEXSLT_VERSION_EXTRA "-CVS951"
+#define LIBEXSLT_VERSION_EXTRA "-CVS964"
/**
* WITH_CRYPTO:
Modified: packages/libxslt/trunk/libexslt/functions.c
===================================================================
--- packages/libxslt/trunk/libexslt/functions.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libexslt/functions.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -41,6 +41,8 @@
struct _exsltFuncResultPreComp {
xsltElemPreComp comp;
xmlXPathCompExprPtr select;
+ xmlNsPtr *nsList;
+ int nsNr;
};
/* Used for callback function in exsltInitFunc */
@@ -247,6 +249,8 @@
if (comp->select != NULL)
xmlXPathFreeCompExpr (comp->select);
+ if (comp->nsList != NULL)
+ xmlFree(comp->nsList);
xmlFree(comp);
}
@@ -451,7 +455,7 @@
exsltFuncResultComp (xsltStylesheetPtr style, xmlNodePtr inst,
xsltTransformFunction function) {
xmlNodePtr test;
- xmlChar *select;
+ xmlChar *sel;
exsltFuncResultPreComp *ret;
/*
@@ -521,12 +525,21 @@
/*
* Precompute the select attribute
*/
- select = xmlGetNsProp(inst, (const xmlChar *) "select", NULL);
- if (select != NULL) {
- ret->select = xmlXPathCompile (select);
- xmlFree(select);
+ sel = xmlGetNsProp(inst, (const xmlChar *) "select", NULL);
+ if (sel != NULL) {
+ ret->select = xmlXPathCompile (sel);
+ xmlFree(sel);
}
-
+ /*
+ * Precompute the namespace list
+ */
+ ret->nsList = xmlGetNsList(inst->doc, inst);
+ if (ret->nsList != NULL) {
+ int i = 0;
+ while (ret->nsList[i] != NULL)
+ i++;
+ ret->nsNr = i;
+ }
return ((xsltElemPreCompPtr) ret);
}
@@ -536,6 +549,8 @@
exsltFuncResultPreComp *comp) {
exsltFuncData *data;
xmlXPathObjectPtr ret;
+ xmlNsPtr *oldNsList;
+ int oldNsNr;
/* It is an error if instantiating the content of the
* func:function element results in the instantiation of more than
@@ -569,7 +584,13 @@
data->error = 1;
return;
}
+ oldNsList = ctxt->xpathCtxt->namespaces;
+ oldNsNr = ctxt->xpathCtxt->nsNr;
+ ctxt->xpathCtxt->namespaces = comp->nsList;
+ ctxt->xpathCtxt->nsNr = comp->nsNr;
ret = xmlXPathCompiledEval(comp->select, ctxt->xpathCtxt);
+ ctxt->xpathCtxt->nsNr = oldNsNr;
+ ctxt->xpathCtxt->namespaces = oldNsList;
if (ret == NULL) {
xsltGenericError(xsltGenericErrorContext,
"exsltFuncResultElem: ret == NULL\n");
Modified: packages/libxslt/trunk/libxslt/keys.c
===================================================================
--- packages/libxslt/trunk/libxslt/keys.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/keys.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -630,9 +630,9 @@
list = xsltEvalXPathKeys(ctxt, keyd->usecomp, keyd);
if (list != NULL) {
- int index = 0;
+ int ix = 0;
- str = list[index++];
+ str = list[ix++];
while (str != NULL) {
#ifdef WITH_XSLT_DEBUG_KEYS
XSLT_TRACE(ctxt,XSLT_TRACE_KEYS,xsltGenericDebug(xsltGenericDebugContext,
@@ -671,7 +671,7 @@
break;
}
xmlFree(str);
- str = list[index++];
+ str = list[ix++];
}
xmlFree(list);
#ifdef WITH_XSLT_DEBUG_KEYS
Modified: packages/libxslt/trunk/libxslt/namespaces.c
===================================================================
--- packages/libxslt/trunk/libxslt/namespaces.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/namespaces.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -437,6 +437,9 @@
* do a standard namespace search for ns in the output doc
*/
ret = xmlSearchNs(out->doc, out, ns->prefix);
+ if ((ret != NULL) && (!xmlStrEqual(ret->href, URI)))
+ ret = NULL;
+
/*
* if the search fails and it's not for the default prefix
* do a search by href
@@ -489,17 +492,19 @@
/*
* Avoid duplicating namespace declrations on the tree
*/
- if ((node != NULL) && (node->ns != NULL) &&
- (xmlStrEqual(node->ns->href, cur->href)) &&
- (xmlStrEqual(node->ns->prefix, cur->prefix))) {
- cur = cur->next;
- continue;
+ if (node != NULL) {
+ if ((node->ns != NULL) &&
+ (xmlStrEqual(node->ns->href, cur->href)) &&
+ (xmlStrEqual(node->ns->prefix, cur->prefix))) {
+ cur = cur->next;
+ continue;
+ }
+ tmp = xmlSearchNs(node->doc, node, cur->prefix);
+ if ((tmp != NULL) && (xmlStrEqual(tmp->href, cur->href))) {
+ cur = cur->next;
+ continue;
+ }
}
- tmp = xmlSearchNs(node->doc, node, cur->prefix);
- if ((tmp != NULL) && (xmlStrEqual(tmp->href, cur->href))) {
- cur = cur->next;
- continue;
- }
if (!xmlStrEqual(cur->href, XSLT_NAMESPACE)) {
/* TODO apply cascading */
Modified: packages/libxslt/trunk/libxslt/numbers.c
===================================================================
--- packages/libxslt/trunk/libxslt/numbers.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/numbers.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -318,7 +318,7 @@
xsltNumberFormatTokenize(const xmlChar *format,
xsltFormatPtr tokens)
{
- int index = 0;
+ int ix = 0;
int j;
int val;
int len;
@@ -336,19 +336,19 @@
* Insert initial non-alphanumeric token.
* There is always such a token in the list, even if NULL
*/
- while (! (IS_LETTER(val=xmlStringCurrentChar(NULL, format+index, &len)) ||
+ while (! (IS_LETTER(val=xmlStringCurrentChar(NULL, format+ix, &len)) ||
IS_DIGIT(val)) ) {
- if (format[index] == 0) /* if end of format string */
+ if (format[ix] == 0) /* if end of format string */
break; /* while */
- index += len;
+ ix += len;
}
- if (index > 0)
- tokens->start = xmlStrndup(format, index);
+ if (ix > 0)
+ tokens->start = xmlStrndup(format, ix);
for (tokens->nTokens = 0; tokens->nTokens < MAX_TOKENS;
tokens->nTokens++) {
- if (format[index] == 0)
+ if (format[ix] == 0)
break; /* for */
/*
@@ -360,27 +360,27 @@
tokens->end = NULL;
}
- val = xmlStringCurrentChar(NULL, format+index, &len);
+ val = xmlStringCurrentChar(NULL, format+ix, &len);
if (IS_DIGIT_ONE(val) ||
IS_DIGIT_ZERO(val)) {
tokens->tokens[tokens->nTokens].width = 1;
while (IS_DIGIT_ZERO(val)) {
tokens->tokens[tokens->nTokens].width++;
- index += len;
- val = xmlStringCurrentChar(NULL, format+index, &len);
+ ix += len;
+ val = xmlStringCurrentChar(NULL, format+ix, &len);
}
if (IS_DIGIT_ONE(val)) {
tokens->tokens[tokens->nTokens].token = val - 1;
- index += len;
- val = xmlStringCurrentChar(NULL, format+index, &len);
+ ix += len;
+ val = xmlStringCurrentChar(NULL, format+ix, &len);
}
} else if ( (val == (xmlChar)'A') ||
(val == (xmlChar)'a') ||
(val == (xmlChar)'I') ||
(val == (xmlChar)'i') ) {
tokens->tokens[tokens->nTokens].token = val;
- index += len;
- val = xmlStringCurrentChar(NULL, format+index, &len);
+ ix += len;
+ val = xmlStringCurrentChar(NULL, format+ix, &len);
} else {
/* XSLT section 7.7
* "Any other format token indicates a numbering sequence
@@ -401,22 +401,22 @@
* one wonders why XSLT doesn't refer to these instead).
*/
while (IS_LETTER(val) || IS_DIGIT(val)) {
- index += len;
- val = xmlStringCurrentChar(NULL, format+index, &len);
+ ix += len;
+ val = xmlStringCurrentChar(NULL, format+ix, &len);
}
/*
* Insert temporary non-alphanumeric final tooken.
*/
- j = index;
+ j = ix;
while (! (IS_LETTER(val) || IS_DIGIT(val))) {
if (val == 0)
break; /* while */
- index += len;
- val = xmlStringCurrentChar(NULL, format+index, &len);
+ ix += len;
+ val = xmlStringCurrentChar(NULL, format+ix, &len);
}
- if (index > j)
- tokens->end = xmlStrndup(&format[j], index - j);
+ if (ix > j)
+ tokens->end = xmlStrndup(&format[j], ix - j);
}
}
Modified: packages/libxslt/trunk/libxslt/pattern.c
===================================================================
--- packages/libxslt/trunk/libxslt/pattern.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/pattern.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -382,7 +382,7 @@
xmlNodePtr node, const xmlChar *mode,
const xmlChar *modeURI) {
int i;
- xsltStepOpPtr step, select = NULL;
+ xsltStepOpPtr step, sel = NULL;
if ((comp == NULL) || (node == NULL) || (ctxt == NULL)) {
xsltTransformError(ctxt, NULL, node,
@@ -411,7 +411,7 @@
for (i = 0;i < comp->nbStep;i++) {
step = &comp->steps[i];
if (step->op != XSLT_OP_PREDICATE)
- select = step;
+ sel = step;
switch (step->op) {
case XSLT_OP_END:
return(1);
@@ -618,15 +618,15 @@
if (comp->steps[i + 1].op == XSLT_OP_PREDICATE) {
xmlDocPtr prevdoc, doc;
xmlXPathObjectPtr list;
- int index, j;
+ int ix, j;
int nocache = 0;
prevdoc = (xmlDocPtr)
- XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra);
- index = (int)
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra);
+ XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra);
+ ix = (int)
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra);
list = (xmlXPathObjectPtr)
- XSLT_RUNTIME_EXTRA_LST(ctxt, select->lenExtra);
+ XSLT_RUNTIME_EXTRA_LST(ctxt, sel->lenExtra);
doc = node->doc;
if ((list == NULL) || (prevdoc != doc)) {
@@ -656,7 +656,7 @@
xmlXPathFreeObject(newlist);
return(-1);
}
- index = 0;
+ ix = 0;
if ((parent == NULL) || (node->doc == NULL))
nocache = 1;
@@ -673,13 +673,13 @@
xmlXPathFreeObject(list);
list = newlist;
- XSLT_RUNTIME_EXTRA_LST(ctxt, select->lenExtra) =
+ XSLT_RUNTIME_EXTRA_LST(ctxt, sel->lenExtra) =
(void *) list;
- XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra) =
(void *) doc;
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra) =
0;
- XSLT_RUNTIME_EXTRA_FREE(ctxt, select->lenExtra) =
+ XSLT_RUNTIME_EXTRA_FREE(ctxt, sel->lenExtra) =
(xmlFreeFunc) xmlXPathFreeObject;
} else
list = newlist;
@@ -691,7 +691,7 @@
return(0);
}
/* TODO: store the index and use it for the scan */
- if (index == 0) {
+ if (ix == 0) {
for (j = 0;j < list->nodesetval->nodeNr;j++) {
if (list->nodesetval->nodeTab[j] == node) {
if (nocache == 1)
@@ -713,18 +713,18 @@
*/
oldCS = ctxt->xpathCtxt->contextSize;
oldCP = ctxt->xpathCtxt->proximityPosition;
- if ((select != NULL) &&
- (select->op == XSLT_OP_ELEM) &&
- (select->value != NULL) &&
+ if ((sel != NULL) &&
+ (sel->op == XSLT_OP_ELEM) &&
+ (sel->value != NULL) &&
(node->type == XML_ELEMENT_NODE) &&
(node->parent != NULL)) {
xmlNodePtr previous;
- int index, nocache = 0;
+ int ix, nocache = 0;
previous = (xmlNodePtr)
- XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra);
- index = (int)
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra);
+ XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra);
+ ix = (int)
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra);
if ((previous != NULL) &&
(previous->parent == node->parent)) {
/*
@@ -741,9 +741,9 @@
(sibling->name != NULL) &&
(previous->name[0] == sibling->name[0]) &&
(xmlStrEqual(previous->name, sibling->name))) {
- if ((select->value2 == NULL) ||
+ if ((sel->value2 == NULL) ||
((sibling->ns != NULL) &&
- (xmlStrEqual(select->value2,
+ (xmlStrEqual(sel->value2,
sibling->ns->href))))
indx++;
}
@@ -756,16 +756,16 @@
while (sibling != NULL) {
if (sibling == previous)
break;
- if ((select->value2 == NULL) ||
+ if ((sel->value2 == NULL) ||
((sibling->ns != NULL) &&
- (xmlStrEqual(select->value2,
+ (xmlStrEqual(sel->value2,
sibling->ns->href))))
indx--;
sibling = sibling->next;
}
}
if (sibling != NULL) {
- pos = index + indx;
+ pos = ix + indx;
/*
* If the node is in a Value Tree we cannot
* cache it !
@@ -774,13 +774,13 @@
(node->doc->name != NULL) &&
(node->doc->name[0] != ' ')) {
len = (int)
- XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra);
+ XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra);
XSLT_RUNTIME_EXTRA(ctxt,
- select->previousExtra) = node;
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra) =
+ sel->previousExtra) = node;
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra) =
(void *) pos;
}
- index = pos;
+ ix = pos;
} else
pos = 0;
} else {
@@ -799,9 +799,9 @@
(siblings->name != NULL) &&
(node->name[0] == siblings->name[0]) &&
(xmlStrEqual(node->name, siblings->name))) {
- if ((select->value2 == NULL) ||
+ if ((sel->value2 == NULL) ||
((siblings->ns != NULL) &&
- (xmlStrEqual(select->value2,
+ (xmlStrEqual(sel->value2,
siblings->ns->href))))
len++;
}
@@ -827,23 +827,23 @@
* cache it !
*/
if ((node->doc != NULL) && (nocache == 0)) {
- XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra) =
node;
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra) =
(void *) pos;
- XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra) =
(void *) len;
}
}
- } else if ((select != NULL) && (select->op == XSLT_OP_ALL) &&
+ } else if ((sel != NULL) && (sel->op == XSLT_OP_ALL) &&
(node->type == XML_ELEMENT_NODE)) {
xmlNodePtr previous;
- int index, nocache = 0;
+ int ix, nocache = 0;
previous = (xmlNodePtr)
- XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra);
- index = (int)
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra);
+ XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra);
+ ix = (int)
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra);
if ((previous != NULL) &&
(previous->parent == node->parent)) {
/*
@@ -872,7 +872,7 @@
}
}
if (sibling != NULL) {
- pos = index + indx;
+ pos = ix + indx;
/*
* If the node is in a Value Tree we cannot
* cache it !
@@ -881,10 +881,10 @@
(node->doc->name != NULL) &&
(node->doc->name[0] != ' ')) {
len = (int)
- XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra);
+ XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra);
XSLT_RUNTIME_EXTRA(ctxt,
- select->previousExtra) = node;
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra) =
+ sel->previousExtra) = node;
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra) =
(void *) pos;
}
} else
@@ -924,11 +924,11 @@
* cache it !
*/
if ((node->doc != NULL) && (nocache == 0)) {
- XSLT_RUNTIME_EXTRA(ctxt, select->previousExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->previousExtra) =
node;
- XSLT_RUNTIME_EXTRA(ctxt, select->indexExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->indexExtra) =
(void *) pos;
- XSLT_RUNTIME_EXTRA(ctxt, select->lenExtra) =
+ XSLT_RUNTIME_EXTRA(ctxt, sel->lenExtra) =
(void *) len;
}
}
Modified: packages/libxslt/trunk/libxslt/templates.c
===================================================================
--- packages/libxslt/trunk/libxslt/templates.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/templates.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -204,8 +204,11 @@
insert = xmlNewDocNode(ctxt->output, NULL,
(const xmlChar *)"fake", NULL);
- if (insert == NULL)
+ if (insert == NULL) {
+ xsltTransformError(ctxt, NULL, node,
+ "Failed to create temporary node\n");
return(NULL);
+ }
oldInsert = ctxt->insert;
ctxt->insert = insert;
@@ -481,7 +484,6 @@
ns = xsltGetPlainNamespace(ctxt, cur->parent, cur->ns, target);
else
ns = NULL;
- /* TODO output doc->dict, use xmlNewNsPropEatName() instead */
ret = xmlNewNsProp(target, ns, cur->name, NULL);
}
if (ret != NULL) {
@@ -504,6 +506,9 @@
text->content = xmlStrdup(value);
}
}
+ } else {
+ xsltTransformError(ctxt, NULL, cur->parent,
+ "Failed to create attribute %s\n", cur->name);
}
return(ret);
}
@@ -532,7 +537,7 @@
q = xsltAttrTemplateProcess(ctxt, target, cur);
if (q != NULL) {
q->parent = target;
- q->doc = ctxt->output;
+ q->doc = target->doc;
if (ret == NULL) {
ret = q;
}
Modified: packages/libxslt/trunk/libxslt/transform.c
===================================================================
--- packages/libxslt/trunk/libxslt/transform.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/transform.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -65,8 +65,6 @@
int xsltMaxDepth = 5000;
-xmlDictPtr xmlDictCreateSub(xmlDictPtr sub);
-
/*
* Useful macros
*/
@@ -819,7 +817,7 @@
if ((node->type == XML_TEXT_NODE) ||
(node->type == XML_CDATA_SECTION_NODE))
return(xsltCopyText(ctxt, insert, node));
- copy = xmlCopyNode(node, 0);
+ copy = xmlDocCopyNode(node, insert->doc, 0);
if (copy != NULL) {
copy->doc = ctxt->output;
xmlAddChild(insert, copy);
@@ -1000,7 +998,7 @@
copy = NULL;
return(copy);
}
- copy = xmlCopyNode(node, 0);
+ copy = xmlDocCopyNode(node, insert->doc, 0);
if (copy != NULL) {
copy->doc = ctxt->output;
xmlAddChild(insert, copy);
@@ -2197,6 +2195,8 @@
}
if (res == NULL)
goto error;
+ res->dict = ctxt->dict;
+ xmlDictReference(res->dict);
} else if (xmlStrEqual(method, (const xmlChar *) "xhtml")) {
xsltTransformError(ctxt, NULL, inst,
"xsltDocumentElem: unsupported method xhtml\n",
@@ -2205,6 +2205,8 @@
res = htmlNewDocNoDtD(doctypeSystem, doctypePublic);
if (res == NULL)
goto error;
+ res->dict = ctxt->dict;
+ xmlDictReference(res->dict);
} else if (xmlStrEqual(method, (const xmlChar *) "text")) {
ctxt->type = XSLT_OUTPUT_TEXT;
res = xmlNewDoc(style->version);
@@ -2481,7 +2483,8 @@
XSLT_TRACE(ctxt,XSLT_TRACE_COPY,xsltGenericDebug(xsltGenericDebugContext,
"xsltCopy: PI %s\n", node->name));
#endif
- copy = xmlNewPI(node->name, node->content);
+ copy = xmlNewDocPI(ctxt->insert->doc, node->name,
+ node->content);
xmlAddChild(ctxt->insert, copy);
break;
case XML_COMMENT_NODE:
@@ -2786,7 +2789,7 @@
}
#endif
- pi = xmlNewPI(name, value);
+ pi = xmlNewDocPI(ctxt->insert->doc, name, value);
xmlAddChild(ctxt->insert, pi);
error:
@@ -4174,14 +4177,24 @@
XSLT_GET_IMPORT_PTR(doctypePublic, style, doctypePublic)
XSLT_GET_IMPORT_PTR(doctypeSystem, style, doctypeSystem)
if (((doctypePublic != NULL) || (doctypeSystem != NULL))) {
+ xmlNodePtr last;
/* Need a small "hack" here to assure DTD comes before
possible comment nodes */
node = res->children;
+ last = res->last;
res->children = NULL;
+ res->last = NULL;
res->intSubset = xmlCreateIntSubset(res, doctype,
doctypePublic,
doctypeSystem);
- res->children->next = node;
+ if (res->children != NULL) {
+ res->children->next = node;
+ node->prev = res->children;
+ res->last = last;
+ } else {
+ res->children = node;
+ res->last = last;
+ }
}
}
}
Modified: packages/libxslt/trunk/libxslt/variables.c
===================================================================
--- packages/libxslt/trunk/libxslt/variables.c 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/variables.c 2004-10-31 04:45:45 UTC (rev 312)
@@ -784,8 +784,8 @@
* @style: the XSLT transformation context
* @name: the variable name
* @ns_uri: the variable namespace URI
- * @select: the expression which need to be evaluated to generate a value
- * @tree: the subtree if select is NULL
+ * @sel: the expression which need to be evaluated to generate a value
+ * @tree: the subtree if sel is NULL
* @comp: the precompiled value
* @value: the string value if available
*
@@ -796,7 +796,7 @@
*/
static int
xsltRegisterGlobalVariable(xsltStylesheetPtr style, const xmlChar *name,
- const xmlChar *ns_uri, const xmlChar *select,
+ const xmlChar *ns_uri, const xmlChar *sel,
xmlNodePtr tree, xsltStylePreCompPtr comp,
const xmlChar *value) {
xsltStackElemPtr elem, tmp;
@@ -821,7 +821,7 @@
return(-1);
elem->comp = comp;
elem->name = xmlDictLookup(style->dict, name, -1);
- elem->select = xmlDictLookup(style->dict, select, -1);
+ elem->select = xmlDictLookup(style->dict, sel, -1);
if (ns_uri)
elem->nameURI = xmlDictLookup(style->dict, ns_uri, -1);
elem->tree = tree;
Modified: packages/libxslt/trunk/libxslt/xsltconfig.h
===================================================================
--- packages/libxslt/trunk/libxslt/xsltconfig.h 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/xsltconfig.h 2004-10-31 04:45:45 UTC (rev 312)
@@ -20,28 +20,28 @@
*
* the version string like "1.2.3"
*/
-#define LIBXSLT_DOTTED_VERSION "1.1.11"
+#define LIBXSLT_DOTTED_VERSION "1.1.12"
/**
* LIBXSLT_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXSLT_VERSION 10111
+#define LIBXSLT_VERSION 10112
/**
* LIBXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXSLT_VERSION_STRING "10111"
+#define LIBXSLT_VERSION_STRING "10112"
/**
* LIBXSLT_VERSION_EXTRA:
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXSLT_VERSION_EXTRA "-CVS951"
+#define LIBXSLT_VERSION_EXTRA "-CVS964"
/**
* WITH_XSLT_DEBUG:
Modified: packages/libxslt/trunk/libxslt/xsltwin32config.h
===================================================================
--- packages/libxslt/trunk/libxslt/xsltwin32config.h 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt/xsltwin32config.h 2004-10-31 04:45:45 UTC (rev 312)
@@ -23,28 +23,28 @@
*
* the version string like "1.2.3"
*/
-#define LIBXSLT_DOTTED_VERSION "1.1.11"
+#define LIBXSLT_DOTTED_VERSION "1.1.12"
/**
* LIBXSLT_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXSLT_VERSION 10111
+#define LIBXSLT_VERSION 10112
/**
* LIBXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXSLT_VERSION_STRING "10111"
+#define LIBXSLT_VERSION_STRING "10112"
/**
* LIBXSLT_VERSION_EXTRA
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXML_VERSION_EXTRA "-CVS951"
+#define LIBXML_VERSION_EXTRA "-CVS964"
/**
* WITH_XSLT_DEBUG:
Modified: packages/libxslt/trunk/libxslt.spec
===================================================================
--- packages/libxslt/trunk/libxslt.spec 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt.spec 2004-10-31 04:45:45 UTC (rev 312)
@@ -1,14 +1,14 @@
Summary: Library providing the Gnome XSLT engine
Name: libxslt
-Version: 1.1.11
+Version: 1.1.12
Release: 1
License: MIT
Group: Development/Libraries
Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://xmlsoft.org/XSLT/
-Requires: libxml2 >= 2.6.8
-BuildRequires: libxml2-devel >= 2.6.8
+Requires: libxml2 >= 2.6.15
+BuildRequires: libxml2-devel >= 2.6.15
BuildRequires: python python-devel
BuildRequires: libxml2-python
Prefix: %{_prefix}
@@ -17,7 +17,7 @@
%description
This C library allows to transform XML files into other XML files
(or HTML, text, ...) using the standard XSLT stylesheet transformation
-mechanism. To use it you need to have a version of libxml2 >= 2.6.8
+mechanism. To use it you need to have a version of libxml2 >= 2.6.15
installed. The xsltproc command is a command line interface to the XSLT engine
%package devel
@@ -29,15 +29,15 @@
%description devel
This C library allows to transform XML files into other XML files
(or HTML, text, ...) using the standard XSLT stylesheet transformation
-mechanism. To use it you need to have a version of libxml2 >= 2.6.8
+mechanism. To use it you need to have a version of libxml2 >= 2.6.15
installed.
%package python
Summary: Python bindings for the libxslt library
Group: Development/Libraries
Requires: libxslt = %{version}
-Requires: libxml2 >= 2.6.8
-Requires: libxml2-python >= 2.6.8
+Requires: libxml2 >= 2.6.15
+Requires: libxml2-python >= 2.6.15
Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`)
%description python
@@ -77,6 +77,7 @@
%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO FEATURES
%doc doc/*.html doc/html doc/tutorial doc/tutorial2 doc/*.gif
+%doc doc/EXSLT
%doc %{_mandir}/man1/xsltproc.1*
%{_libdir}/lib*.so.*
%{prefix}/bin/xsltproc
@@ -113,8 +114,8 @@
%doc python/tests/*.xsl
%changelog
-* Wed Sep 29 2004 Daniel Veillard <veillard at redhat.com>
-- upstream release 1.1.11 see http://xmlsoft.org/XSLT/news.html
+* Fri Oct 29 2004 Daniel Veillard <veillard at redhat.com>
+- upstream release 1.1.12 see http://xmlsoft.org/XSLT/news.html
* Sun Nov 2 2003 Daniel Veillard <veillard at redhat.com>
- cleanup, removal of the deprecated breakpoint library and
Modified: packages/libxslt/trunk/libxslt.spec.in
===================================================================
--- packages/libxslt/trunk/libxslt.spec.in 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/libxslt.spec.in 2004-10-31 04:45:45 UTC (rev 312)
@@ -77,6 +77,7 @@
%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO FEATURES
%doc doc/*.html doc/html doc/tutorial doc/tutorial2 doc/*.gif
+%doc doc/EXSLT
%doc %{_mandir}/man1/xsltproc.1*
%{_libdir}/lib*.so.*
%{prefix}/bin/xsltproc
Modified: packages/libxslt/trunk/ltmain.sh
===================================================================
--- packages/libxslt/trunk/ltmain.sh 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/ltmain.sh 2004-10-31 04:45:45 UTC (rev 312)
@@ -44,7 +44,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 215 $"
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $"
# Check that we have a working $echo.
@@ -1867,10 +1867,6 @@
$echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
continue
fi
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
for search_ext in .la $std_shrext .so .a; do
Modified: packages/libxslt/trunk/tests/exslt/date/sum.2.out
===================================================================
--- packages/libxslt/trunk/tests/exslt/date/sum.2.out 2004-10-31 04:31:37 UTC (rev 311)
+++ packages/libxslt/trunk/tests/exslt/date/sum.2.out 2004-10-31 04:45:45 UTC (rev 312)
@@ -2,9 +2,9 @@
sum :
result :
sum : P1M + -P1D
-result : -P1M1D
+result :
sum : P1M + -P1D + P1D
-result : P1M
+result :
sum : P1M + P1D + -P1D
result : P1M
sum :
More information about the debian-xml-sgml-commit
mailing list