Wed Jun 13 20:01:57 UTC 2007

Author: glandium
Date: Wed Jun 13 20:01:57 2007
New Revision: 822

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=822
Log:
 r1276 at namakemono:  mh | 2007-06-13 21:40:51 +0200
 Load /tmp/libxslt-1.1.21 into
 libxslt/branches/upstream/current.

Removed:
    packages/libxslt/branches/upstream/current/examples/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/common/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/doc/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/doc/common/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/doc/fo/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/doc/html/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/doc/lib/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/3.1.7/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/3.1.7/ent/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/4.0/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/4.0/ent/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/4.1.2/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/4.1.2/ent/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/simple/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/simple/3.1.7.1/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/simple/3.1.7.1/ent/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/dtd/simple/4.1.2.4/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/fo/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/html/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/htmlhelp/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/htmlhelp/doc/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/images/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/images/callouts/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/lib/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/result/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/result/fo/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/result/html/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/result/xhtml/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/result/xtchunk/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/result/xtchunk/html/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/template/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/test/.svn/
    packages/libxslt/branches/upstream/current/tests/docbook/xhtml/.svn/
    packages/libxslt/branches/upstream/current/vms/.svn/
    packages/libxslt/branches/upstream/current/win32/.svn/
    packages/libxslt/branches/upstream/current/win32/libxslt/.svn/
Modified:
    packages/libxslt/   (props changed)
    packages/libxslt/branches/upstream/current/ChangeLog
    packages/libxslt/branches/upstream/current/Makefile.am
    packages/libxslt/branches/upstream/current/Makefile.in
    packages/libxslt/branches/upstream/current/NEWS
    packages/libxslt/branches/upstream/current/configure
    packages/libxslt/branches/upstream/current/configure.in
    packages/libxslt/branches/upstream/current/doc/API.html
    packages/libxslt/branches/upstream/current/doc/bugs.html
    packages/libxslt/branches/upstream/current/doc/docbook.html
    packages/libxslt/branches/upstream/current/doc/downloads.html
    packages/libxslt/branches/upstream/current/doc/extensions.html
    packages/libxslt/branches/upstream/current/doc/internals.html
    packages/libxslt/branches/upstream/current/doc/libxslt.xsa
    packages/libxslt/branches/upstream/current/doc/news.html
    packages/libxslt/branches/upstream/current/doc/python.html
    packages/libxslt/branches/upstream/current/doc/xslt.html
    packages/libxslt/branches/upstream/current/doc/xsltproc2.html
    packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h
    packages/libxslt/branches/upstream/current/libexslt/math.c
    packages/libxslt/branches/upstream/current/libxslt.spec
    packages/libxslt/branches/upstream/current/libxslt/namespaces.c
    packages/libxslt/branches/upstream/current/libxslt/pattern.c
    packages/libxslt/branches/upstream/current/libxslt/transform.c
    packages/libxslt/branches/upstream/current/libxslt/xslt.c
    packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h
    packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h.in
    packages/libxslt/branches/upstream/current/libxslt/xsltutils.c
    packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h
    packages/libxslt/branches/upstream/current/python/libxsl.py
    packages/libxslt/branches/upstream/current/tests/docbook/Makefile.am
    packages/libxslt/branches/upstream/current/tests/docbook/Makefile.in

Propchange: packages/libxslt/
------------------------------------------------------------------------------

--- svk:merge (original)
+++ svk:merge Wed Jun 13 20:01:57 2007
@@ -1,2 +1,2 @@
 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
-a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1254
+a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1276

Modified: packages/libxslt/branches/upstream/current/ChangeLog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/ChangeLog?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/ChangeLog (original)
+++ packages/libxslt/branches/upstream/current/ChangeLog Wed Jun 13 20:01:57 2007
@@ -1,3 +1,72 @@
+Tue Jun 12 18:43:05 CEST 2007 Daniel Veillard <daniel at veillard.com>
+
+	* NEWS configure.in doc/*: preparing release of 1.1.20
+
+Thu May 31 12:38:08 PDT 2007 WIlliam Brack <wbrack at mmm.com.hk>
+
+	* libxslt/xslt.c: fixed obscure namespace problem related to
+	  exclude-result-prefix
+
+Mon May  7 00:14:28 HKT 2007 William Brack <wbrack at mmm.com.hk>
+
+	* libxslt/transform.c: fixed minor compilation warning; no change
+	  to logic.
+
+Sun May  6 23:42:38 HKT 2007 William Brack <wbrack at mmm.com.hk>
+
+	* libexslt/math.c: fixed two memory leaks, one in exsltMathConstant
+	  and one in exsltMathConstantFunction (bug #436324)
+
+Fri May  4 15:51:58 HKT 2007 William Brack <wbrack at mmm.com.hk>
+
+	* libxslt/transform.c: fixed xpath context housekeeping problem
+	  on processing "choose" (bug 435479).
+
+Thu Apr 26 11:10:18 HKT 2007 William Brack <wbrack at mmm.com.hk>
+
+	* libxslt/transform.c: fixed (another) problem with cached
+	  RVT's (from re-opened #378766).
+
+Tue Mar 27 16:50:52 CEST 2007 Daniel Veillard <daniel at veillard.com>
+
+	* libxslt/xsltutils.c: apply patch fron Shaun McCance to hook
+	  xsl:message construct to the new per-xsltTransformCtxt error
+	  callback if set up.
+	* Makefile.am: do not package svn files in releases
+
+Fri Mar  2 18:45:48 HKT 2007 William Brack <wbrack at mmm.com.hk>
+
+	* libxslt/xsltconfig.h.in: added setting of TRIO_REPLACE_STDIO
+	  when TRIO routines are required.
+	* libxslt/namespaces.c, libxslt/xsltutils.c: enhanced handling
+	  of stdio.h vs. trio.h when trio routines are required (now
+	  use XSLT_NEED_TRIO) (bug #412787)
+
+Sun Feb 18 09:00:08 PST 2007 William Brack <wbrack at mmm.com.hk>
+
+	* python/libxsl.py: fixed tab/space inconsistency with patch
+	  provided by Andreas Hanke (bug #409193)
+
+Thu Feb 15 14:03:18 PST 2007 William Brack <wbrack at mmm.com.hk>
+
+	* doc/xslt.html: Changed all
+	  references to CVS to be SVN; changed corresponding links.
+	* doc/*html: regenerated the documentation for above
+
+Wed Feb 14 01:21:38 PST 2007 William Brack <wbrack at mmm.com.hk>
+
+	* libxslt/pattern.c: Fixed problem with namespace on compound
+	  predicate (bug #407731)
+
+Wed Jan 24 11:05:28 PST 2007 William Brack <wbrack at mmm.com.hk>
+
+	* libxslt/pattern.c: added check for memory allocation error
+	  (bug #400242); fixed "type-punned pointer" warnings.
+	* libxslt/xsltutils.c: added checks for memory allocation error
+	  (bug #400242)
+	* restored NEWS, doc/EXSLT/downloads.html which mysteriously
+	  disappeared from svn
+	
 Wed Jan 17 14:20:18 CET 2007 Daniel Veillard <daniel at veillard.com>
 
 	* configure.in doc/*: preparing release of 1.1.20

Modified: packages/libxslt/branches/upstream/current/Makefile.am
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/Makefile.am?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/Makefile.am (original)
+++ packages/libxslt/branches/upstream/current/Makefile.am Wed Jun 13 20:01:57 2007
@@ -14,7 +14,7 @@
 bin_SCRIPTS = xslt-config
 
 dist-hook: cleanup libxslt.spec
-	(cd $(srcdir) ; tar -cf - --exclude CVS win32 vms examples) | (cd $(distdir); tar xf -)
+	(cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn win32 vms examples) | (cd $(distdir); tar xf -)
 
 CVS_EXTRA_DIST =
 

Modified: packages/libxslt/branches/upstream/current/Makefile.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/Makefile.in?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/Makefile.in (original)
+++ packages/libxslt/branches/upstream/current/Makefile.in Wed Jun 13 20:01:57 2007
@@ -799,7 +799,7 @@
 
 
 dist-hook: cleanup libxslt.spec
-	(cd $(srcdir) ; tar -cf - --exclude CVS win32 vms examples) | (cd $(distdir); tar xf -)
+	(cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn win32 vms examples) | (cd $(distdir); tar xf -)
 
 xsltConf.sh: xsltConf.sh.in Makefile
 	sed -e 's?\@XSLT_LIBDIR\@?$(XSLT_LIBDIR)?g' \

Modified: packages/libxslt/branches/upstream/current/NEWS
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/NEWS?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/NEWS (original)
+++ packages/libxslt/branches/upstream/current/NEWS Wed Jun 13 20:01:57 2007
@@ -7,9 +7,35 @@
 The change log at 
 ChangeLog.html
  describes the recents commits
-to the CVS at 
-http://cvs.gnome.org/viewcvs/libxslt/
+to the SVN at 
+http://svn.gnome.org/viewcvs/libxslt/trunk/
  code base.Those are the public releases made:
+1.1.21: Jun 12 2007:
+   - Bug fixes: out of memory allocation errors (William Brack), 
+      namespace problem on compound predicates (William Brack),
+      python space/tab inconsistencies (Andreas Hanke), hook xsl:message
+      to per transformation error callbacks (Shaun McCance),
+      cached RVT problem (William Brack), XPath context maintainance
+      on choose (William Brack), memory leaks in the math module (William
+      Brack), exclude-result-prefix induced namespace problem (William
+      Brack)
+   - Build: configure setup for TRIO_REPLACE_STDIO (William Brack)
+  
+   - Documentation: updated after change from CVs to SVN (William Brack)
+
+
+1.1.20: Jan 17 2007:
+   - Portability fixes: strict aliasing fix (Marcus Meissner), BSD portability
+      patches (Roland Illig)
+   - Bug fixes: Result Value Tree handling fix (William Brack), function
+      parameters fix (William), uninitialized variable (Kjartan Maraas),
+      empty text node handling (William), plugin support and test fixes (William),
+      fragment support fixes (William)
+   - Improvements: python stylesheet compare and transform context
+      access (Nic Ferrier), EXSLT string replace support (Joel Reed),
+      xsltproc better low level error handling (Mike Hommey and William)
+
+
 1.1.19: Nov 29 2006:
    - Bug fixes: entities within attributes (William Brack), Python detection
       problem (Joseph Sacco), in-scope namespace bug (Mike Hommey), Result
@@ -506,7 +532,7 @@
    - patches for Windows and update of Windows Makefiles by Igor
    - OpenVMS port instructions from John A Fotheringham
    - fixed some Makefiles annoyance and libraries prelinking
-  informations
+  information
 
 
 1.0.7: Nov 10 2001:

Modified: packages/libxslt/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/configure?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/configure (original)
+++ packages/libxslt/branches/upstream/current/configure Wed Jun 13 20:01:57 2007
@@ -1589,7 +1589,7 @@
 
 LIBXSLT_MAJOR_VERSION=1
 LIBXSLT_MINOR_VERSION=1
-LIBXSLT_MICRO_VERSION=20
+LIBXSLT_MICRO_VERSION=21
 PACKAGE=libxslt
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=8

Modified: packages/libxslt/branches/upstream/current/configure.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/configure.in?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/configure.in (original)
+++ packages/libxslt/branches/upstream/current/configure.in Wed Jun 13 20:01:57 2007
@@ -10,7 +10,7 @@
 dnl
 LIBXSLT_MAJOR_VERSION=1
 LIBXSLT_MINOR_VERSION=1
-LIBXSLT_MICRO_VERSION=20
+LIBXSLT_MICRO_VERSION=21
 PACKAGE=libxslt
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=8

Modified: packages/libxslt/branches/upstream/current/doc/API.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/API.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/API.html (original)
+++ packages/libxslt/branches/upstream/current/doc/API.html Wed Jun 13 20:01:57 2007
@@ -10,7 +10,7 @@
     </style><title>The programming API</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>The programming API</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.explain.com.au/oss/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>Okay this section is clearly incomplete. But integrating libxslt into your
 application should be relatively easy. First check the few steps described
-below, then for more detailed informations, look at the<a href="html/libxslt-lib.html"> generated pages</a> for the API and the source
+below, then for more detailed information, look at the<a href="html/libxslt-lib.html"> generated pages</a> for the API and the source
 of libxslt/xsltproc.c  and the  <a href="tutorial/libxslttutorial.html">tutorial</a>.</p><p>Basically doing an XSLT transformation can be done in a few steps:</p><ol><li>configure the parser for XSLT:
     <p>xmlSubstituteEntitiesDefault(1);</p>
     <p>xmlLoadExtDtdDefaultValue = 1;</p>

Modified: packages/libxslt/branches/upstream/current/doc/bugs.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/bugs.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/bugs.html (original)
+++ packages/libxslt/branches/upstream/current/doc/bugs.html Wed Jun 13 20:01:57 2007
@@ -33,7 +33,7 @@
 there regularly and it's good to have a reminder when a bug is still open. Be
 sure to specify that the bug is for the package libxslt.</p><p>For small problems you can try to get help on IRC, the #xml channel on
 irc.gnome.org (port 6667) usually have a few person subscribed which may help
-(but there is no garantee and if a real issue is raised it should go on the
+(but there is no guarantee and if a real issue is raised it should go on the
 mailing-list for archival).</p><p>There is also a mailing-list <a href="mailto:xslt at gnome.org">xslt at gnome.org</a> for libxslt, with an <a href="http://mail.gnome.org/archives/xslt/">on-line archive</a>. To subscribe
 to this list, please visit the <a href="http://mail.gnome.org/mailman/listinfo/xslt">associated Web</a> page
 and follow the instructions.</p><p>Alternatively, you can just send the bug to the <a href="mailto:xslt at gnome.org">xslt at gnome.org</a> list, if it's really libxslt
@@ -47,14 +47,14 @@
 anymore. If your mail to the list bounced waiting for administrator approval,
 it is LOST ! Repost it and fix the problem triggering the error. Also please
 note that <span style="color: #FF0000; background-color: #FFFFFF">emails with
-a legal warning asking to not copy or redistribute freely the informations
+a legal warning asking to not copy or redistribute freely the information
 they contain</span> are <strong>NOT</strong> acceptable for the mailing-list,
 such mail will as much as possible be discarded automatically, and are less
 likely to be answered if they made it to the list, <strong>DO NOT</strong>
 post to the list from an email address where such legal requirements are
 automatically added, get private paying support if you can't share
-informations.</p><p>Check the following too <span style="color: #E50000">before
-posting</span>:</p><ul><li><a href="search.php">use the search engine</a> to get informations
+information.</p><p>Check the following too <span style="color: #E50000">before
+posting</span>:</p><ul><li><a href="search.php">use the search engine</a> to get information
     related to your problem.</li>
   <li>make sure you are <a href="ftp://xmlsoft.org/libxslt/">using a recent
     version</a>, and that the problem still shows up in those</li>
@@ -68,7 +68,7 @@
     logs just preceding the possible problem</li>
   <li>Please send the command showing the error as well as the input and
     stylesheet (as an attachment)</li>
-</ul><p>Then send the bug with associated informations to reproduce it to the <a href="mailto:xslt at gnome.org">xslt at gnome.org</a> list; if it's really libxslt
+</ul><p>Then send the bug with associated information to reproduce it to the <a href="mailto:xslt at gnome.org">xslt at gnome.org</a> list; if it's really libxslt
 related I will approve it. Please do not send mail to me directly, it makes
 things really hard to track and in some cases I am not the best person to
 answer a given question, ask on the list.</p><p>To <span style="color: #E50000">be really clear about support</span>:</p><ul><li>Support or help <span style="color: #E50000">request MUST be sent to
@@ -78,10 +78,10 @@
     others" and is not welcome. I will automatically Carbon-Copy the
     xslt at gnome.org mailing list for any technical reply made about libxml2 or
     libxslt.</li>
-  <li>There is <span style="color: #E50000">no garantee for support</span>,
+  <li>There is <span style="color: #E50000">no guarantee for support</span>,
     if your question remains unanswered after a week, repost it, making sure
-    you gave all the detail needed and the informations requested.</li>
-  <li>Failing to provide informations as requested or double checking first
+    you gave all the detail needed and the information requested.</li>
+  <li>Failing to provide information as requested or double checking first
     for prior feedback also carries the implicit message "the time of the
     library maintainers is less valuable than my time" and might not be
     welcome.</li>

Modified: packages/libxslt/branches/upstream/current/doc/docbook.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/docbook.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/docbook.html (original)
+++ packages/libxslt/branches/upstream/current/doc/docbook.html Wed Jun 13 20:01:57 2007
@@ -12,13 +12,13 @@
 XML/SGML vocabulary particularly well suited to books and papers about
 computer hardware and software.</p><p>xsltproc and libxslt are not specifically dependant on DocBook, but since
 a lot of people use xsltproc and libxml2 for DocBook formatting, here are a
-few pointers and informations which may be helpful:</p><ul><li>The <a href="http://www.oasis-open.org/committees/docbook/">DocBook
+few pointers and information which may be helpful:</p><ul><li>The <a href="http://www.oasis-open.org/committees/docbook/">DocBook
     homepage at Oasis</a> you should find pointers there on all the lastest
     versions of the DTDs and XSLT stylesheets</li>
   <li><a href="http://www.docbook.org/">DocBook: The Definitive Guide</a> is
     the official reference documentation for DocBook.</li>
   <li><a href="https://sourceforge.net/docman/index.php?group_id=21935">DocBook
-    Open Repository</a> contains a lot of informations about DocBook</li>
+    Open Repository</a> contains a lot of information about DocBook</li>
   <li>Bob Stayton provides a <a href="http://www.sagehill.net/">lot of
     resources</a> and consulting services around DocBook.</li>
   <li>Here is a <a href="/buildDocBookCatalog">shell script</a> to generate

Modified: packages/libxslt/branches/upstream/current/doc/downloads.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/downloads.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/downloads.html (original)
+++ packages/libxslt/branches/upstream/current/doc/downloads.html Wed Jun 13 20:01:57 2007
@@ -21,10 +21,10 @@
 <a href="mailto:Steve.Ball at explain.com.au">Steve Ball</a> provides <a href="http://www.explain.com.au/oss/libxml2xslt.html">Mac Os X
 binaries</a>.</p><p><a name="Contribs" id="Contribs">Contribs:</a></p><p>I do accept external contributions, especially if compiling on another
 platform, get in touch with me to upload the package. I will keep them in the
-<a href="ftp://xmlsoft.org/libxml2/contribs/">contrib directory</a></p><p>Libxslt is also available from CVS:</p><ul><li><p>The <a href="http://cvs.gnome.org/viewcvs/libxslt/">GNOME CVS
-    base</a>. Check the <a href="http://developer.gnome.org/tools/cvs.html">GNOME CVS Tools</a>
-    page; the CVS module is <b>libxslt</b>.</p>
+<a href="ftp://xmlsoft.org/libxml2/contribs/">contrib directory</a></p><p>Libxslt is also available from SVN:</p><ul><li><p>The <a href="http://svn.gnome.org/viewcvs/libxslt/trunk/">GNOME SVN
+    base</a>. Check the <a href="http://developer.gnome.org/tools/svn.html">GNOME SVN Tools</a>
+    page; the SVN module is <b>libxslt</b>.</p>
   </li>
   <li><a href="ftp://xmlsoft.org/libxml2/libxslt-cvs-snapshot.tar.gz">snapshots from
-    CVS</a> updated every hour are also provided</li>
+    SVN</a> updated every hour are also provided</li>
 </ul><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>

Modified: packages/libxslt/branches/upstream/current/doc/extensions.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/extensions.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/extensions.html (original)
+++ packages/libxslt/branches/upstream/current/doc/extensions.html Wed Jun 13 20:01:57 2007
@@ -218,7 +218,7 @@
  * @ctxt:  an XSLT processing context
  * @node:  The current node
  * @inst:  the instruction in the stylesheet
- * @comp:  precomputed informations
+ * @comp:  precomputed information
  *
  * Process a libxslt:test node
  */

Modified: packages/libxslt/branches/upstream/current/doc/internals.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/internals.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/internals.html (original)
+++ packages/libxslt/branches/upstream/current/doc/internals.html Wed Jun 13 20:01:57 2007
@@ -62,7 +62,7 @@
   <li>text nodes</li>
 </ul><p>For the XSLT processing, entity nodes should not be generated (i.e. they
 should be replaced by their content). Most nodes also contains the following
-"navigation" informations:</p><ul><li>the containing <strong>doc</strong>ument</li>
+"navigation" information:</p><ul><li>the containing <strong>doc</strong>ument</li>
   <li>the <strong>parent</strong> node</li>
   <li>the first <strong>children</strong> node</li>
   <li>the <strong>last</strong> children node</li>

Modified: packages/libxslt/branches/upstream/current/doc/libxslt.xsa
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/libxslt.xsa?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/libxslt.xsa (original)
+++ packages/libxslt/branches/upstream/current/doc/libxslt.xsa Wed Jun 13 20:01:57 2007
@@ -8,12 +8,18 @@
   </vendor>
   <product id="libxslt">
     <name>libxslt</name>
-    <version>1.1.19</version>
-    <last-release> Nov 29 2006</last-release>
+    <version>1.1.20</version>
+    <last-release> Jan 17 2007</last-release>
     <info-url>http://xmlsoft.org/XSLT/</info-url>
-    <changes>   - Bug fixes: entities within attributes (William Brack), Python detection
-      problem (Joseph Sacco), in-scope namespace bug (Mike Hommey), Result
-      value tree caching bug (William Brack)
+    <changes>   - Portability fixes: strict aliasing fix (Marcus Meissner), BSD portability
+      patches (Roland Illig)
+   - Bug fixes: Result Value Tree handling fix (William Brack), function
+      parameters fix (William), uninitialized variable (Kjartan Maraas),
+      empty text node handling (William), plugin support and test fixes (William),
+      fragment support fixes (William)
+   - Improvements: python stylesheet compare and transform context
+      access (Nic Ferrier), EXSLT string replace support (Joel Reed),
+      xsltproc better low level error handling (Mike Hommey and William)
 
 </changes>
   </product>

Modified: packages/libxslt/branches/upstream/current/doc/news.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/news.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/news.html (original)
+++ packages/libxslt/branches/upstream/current/doc/news.html Wed Jun 13 20:01:57 2007
@@ -9,7 +9,17 @@
 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.explain.com.au/oss/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.20: Jan 17 2007</h3><ul><li>Portability fixes: strict aliasing fix (Marcus Meissner), BSD portability
+to the <a href="http://svn.gnome.org/viewcvs/libxslt/trunk/">SVN</a> code base.</p><p>Those are the public releases made:</p><h3>1.1.21: Jun 12 2007</h3><ul><li>Bug fixes: out of memory allocation errors (William Brack), 
+      namespace problem on compound predicates (William Brack),
+      python space/tab inconsistencies (Andreas Hanke), hook xsl:message
+      to per transformation error callbacks (Shaun McCance),
+      cached RVT problem (William Brack), XPath context maintainance
+      on choose (William Brack), memory leaks in the math module (William
+      Brack), exclude-result-prefix induced namespace problem (William
+      Brack)</li>
+  <li>Build: configure setup for TRIO_REPLACE_STDIO (William Brack)
+  </li><li>Documentation: updated after change from CVs to SVN (William Brack)</li>
+</ul><h3>1.1.20: Jan 17 2007</h3><ul><li>Portability fixes: strict aliasing fix (Marcus Meissner), BSD portability
       patches (Roland Illig)</li>
   <li>Bug fixes: Result Value Tree handling fix (William Brack), function
       parameters fix (William), uninitialized variable (Kjartan Maraas),
@@ -376,7 +386,7 @@
   <li>patches for Windows and update of Windows Makefiles by Igor</li>
   <li>OpenVMS port instructions from John A Fotheringham</li>
   <li>fixed some Makefiles annoyance and libraries prelinking
-  informations</li>
+  information</li>
 </ul><h3>1.0.7: Nov 10 2001</h3><ul><li>remove a compilation problem with LIBXSLT_PUBLIC</li>
   <li>Finishing the integration steps for Keith Isdale debugger</li>
   <li>fixes the handling of indent="no" on HTML output</li>

Modified: packages/libxslt/branches/upstream/current/doc/python.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/python.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/python.html (original)
+++ packages/libxslt/branches/upstream/current/doc/python.html Wed Jun 13 20:01:57 2007
@@ -38,7 +38,7 @@
     provides <a href="http://www.satimage.fr/software/en/downloads_osaxen.html">XMLLib
     osax</a>. This is an osax for Mac OS X with a set of commands to
     implement in AppleScript the XML DOM, XPATH and XSLT.</li>
-</ul><p>The libxslt Python module depends on the <a href="http://xmlsoft.org/python.html">libxml2 Python</a> module.</p><p>The distribution includes a set of Python bindings, which are garanteed to
+</ul><p>The libxslt Python module depends on the <a href="http://xmlsoft.org/python.html">libxml2 Python</a> module.</p><p>The distribution includes a set of Python bindings, which are guaranteed to
 be maintained as part of the library in the future, though the Python
 interface have not yet reached the completeness of the C API.</p><p><a href="mailto:stephane.bidoul at softwareag.com">Stéphane Bidoul</a>
 maintains <a href="http://users.skynet.be/sbi/libxml-python/">a Windows port
@@ -80,7 +80,7 @@
     HTML tree are suitable for XSLT processing in libxslt. This is actually
     how this page is generated !</li>
   <li><code>result</code> : this is a document generated by applying the
-    stylesheet to the document. Note that some of the stylesheet informations
+    stylesheet to the document. Note that some of the stylesheet information
     may be related to the serialization of that document and as in this
     example a specific saveResultToFilename() method of the stylesheet should
     be used to save it to a file (in that case to "foo").</li>
@@ -117,7 +117,7 @@
 information from the current XSLT processing environement, in that case it
 looks for the current insertion node in the resulting output (either the
 resulting document or the Result Value Tree being generated), and saves it to
-a global variable for checking that the access actually worked.</p><p>For more informations on the xpathParserContext and transformContext
+a global variable for checking that the access actually worked.</p><p>For more information on the xpathParserContext and transformContext
 objects check the <a href="internals.html">libray internals description</a>.
 The pctxt is actually an object from a class derived from the
 libxml2.xpathParserContext() with just a couple more properties including the

Modified: packages/libxslt/branches/upstream/current/doc/xslt.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/xslt.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/xslt.html (original)
+++ packages/libxslt/branches/upstream/current/doc/xslt.html Wed Jun 13 20:01:57 2007
@@ -110,7 +110,7 @@
 
 <p>For small problems you can try to get help on IRC, the #xml channel on
 irc.gnome.org (port 6667) usually have a few person subscribed which may help
-(but there is no garantee and if a real issue is raised it should go on the
+(but there is no guarantee and if a real issue is raised it should go on the
 mailing-list for archival).</p>
 
 <p>There is also a mailing-list <a
@@ -134,18 +134,18 @@
 anymore. If your mail to the list bounced waiting for administrator approval,
 it is LOST ! Repost it and fix the problem triggering the error. Also please
 note that <span style="color: #FF0000; background-color: #FFFFFF">emails with
-a legal warning asking to not copy or redistribute freely the informations
+a legal warning asking to not copy or redistribute freely the information
 they contain</span> are <strong>NOT</strong> acceptable for the mailing-list,
 such mail will as much as possible be discarded automatically, and are less
 likely to be answered if they made it to the list, <strong>DO NOT</strong>
 post to the list from an email address where such legal requirements are
 automatically added, get private paying support if you can't share
-informations.</p>
+information.</p>
 
 <p>Check the following too <span style="color: #E50000">before
 posting</span>:</p>
 <ul>
-  <li><a href="search.php">use the search engine</a> to get informations
+  <li><a href="search.php">use the search engine</a> to get information
     related to your problem.</li>
   <li>make sure you are <a href="ftp://xmlsoft.org/libxslt/">using a recent
     version</a>, and that the problem still shows up in those</li>
@@ -162,7 +162,7 @@
     stylesheet (as an attachment)</li>
 </ul>
 
-<p>Then send the bug with associated informations to reproduce it to the <a
+<p>Then send the bug with associated information to reproduce it to the <a
 href="mailto:xslt at gnome.org">xslt at gnome.org</a> list; if it's really libxslt
 related I will approve it. Please do not send mail to me directly, it makes
 things really hard to track and in some cases I am not the best person to
@@ -177,10 +177,10 @@
     others" and is not welcome. I will automatically Carbon-Copy the
     xslt at gnome.org mailing list for any technical reply made about libxml2 or
     libxslt.</li>
-  <li>There is <span style="color: #E50000">no garantee for support</span>,
+  <li>There is <span style="color: #E50000">no guarantee for support</span>,
     if your question remains unanswered after a week, repost it, making sure
-    you gave all the detail needed and the informations requested.</li>
-  <li>Failing to provide informations as requested or double checking first
+    you gave all the detail needed and the information requested.</li>
+  <li>Failing to provide information as requested or double checking first
     for prior feedback also carries the implicit message "the time of the
     library maintainers is less valuable than my time" and might not be
     welcome.</li>
@@ -248,15 +248,15 @@
 platform, get in touch with me to upload the package. I will keep them in the
 <a href="ftp://xmlsoft.org/libxml2/contribs/">contrib directory</a></p>
 
-<p>Libxslt is also available from CVS:</p>
-<ul>
-  <li><p>The <a href="http://cvs.gnome.org/viewcvs/libxslt/">GNOME CVS
+<p>Libxslt is also available from SVN:</p>
+<ul>
+  <li><p>The <a href="http://svn.gnome.org/viewcvs/libxslt/trunk/">GNOME SVN
     base</a>. Check the <a
-    href="http://developer.gnome.org/tools/cvs.html">GNOME CVS Tools</a>
-    page; the CVS module is <b>libxslt</b>.</p>
+    href="http://developer.gnome.org/tools/svn.html">GNOME SVN Tools</a>
+    page; the SVN module is <b>libxslt</b>.</p>
   </li>
   <li><a href="ftp://xmlsoft.org/libxml2/libxslt-cvs-snapshot.tar.gz">snapshots from
-    CVS</a> updated every hour are also provided</li>
+    SVN</a> updated every hour are also provided</li>
 </ul>
 
 <h2><a name="FAQ">FAQ</a></h2>
@@ -300,10 +300,23 @@
 <h2><a name="News">News</a></h2>
 
 <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>
+to the <a href="http://svn.gnome.org/viewcvs/libxslt/trunk/">SVN</a> code base.</p>
 
 <p>Those are the public releases made:</p>
 
+<h3>1.1.21: Jun 12 2007</h3>
+<ul>
+  <li>Bug fixes: out of memory allocation errors (William Brack), 
+      namespace problem on compound predicates (William Brack),
+      python space/tab inconsistencies (Andreas Hanke), hook xsl:message
+      to per transformation error callbacks (Shaun McCance),
+      cached RVT problem (William Brack), XPath context maintainance
+      on choose (William Brack), memory leaks in the math module (William
+      Brack), exclude-result-prefix induced namespace problem (William
+      Brack)</li>
+  <li>Build: configure setup for TRIO_REPLACE_STDIO (William Brack)
+  <li>Documentation: updated after change from CVs to SVN (William Brack)</li>
+</ul>
 <h3>1.1.20: Jan 17 2007</h3>
 <ul>
   <li>Portability fixes: strict aliasing fix (Marcus Meissner), BSD portability
@@ -857,7 +870,7 @@
   <li>patches for Windows and update of Windows Makefiles by Igor</li>
   <li>OpenVMS port instructions from John A Fotheringham</li>
   <li>fixed some Makefiles annoyance and libraries prelinking
-  informations</li>
+  information</li>
 </ul>
 
 <h3>1.0.7: Nov 10 2001</h3>
@@ -1134,7 +1147,7 @@
       --warnnet warn against fetching over the network
       --catalogs : use the catalogs from $SGML_CATALOG_FILES
       --xinclude : do XInclude processing on document input
-      --profile or --norman : dump profiling informations 
+      --profile or --norman : dump profiling information 
 orchis:~ -&gt;</pre>
 
 <h2><a name="DocBook">DocBook</a></h2>
@@ -1147,7 +1160,7 @@
 
 <p>xsltproc and libxslt are not specifically dependant on DocBook, but since
 a lot of people use xsltproc and libxml2 for DocBook formatting, here are a
-few pointers and informations which may be helpful:</p>
+few pointers and information which may be helpful:</p>
 <ul>
   <li>The <a href="http://www.oasis-open.org/committees/docbook/">DocBook
     homepage at Oasis</a> you should find pointers there on all the lastest
@@ -1156,7 +1169,7 @@
     the official reference documentation for DocBook.</li>
   <li><a
     href="https://sourceforge.net/docman/index.php?group_id=21935">DocBook
-    Open Repository</a> contains a lot of informations about DocBook</li>
+    Open Repository</a> contains a lot of information about DocBook</li>
   <li>Bob Stayton provides a <a href="http://www.sagehill.net/">lot of
     resources</a> and consulting services around DocBook.</li>
   <li>Here is a <a href="/buildDocBookCatalog">shell script</a> to generate
@@ -1215,7 +1228,7 @@
 
 <p>Okay this section is clearly incomplete. But integrating libxslt into your
 application should be relatively easy. First check the few steps described
-below, then for more detailed informations, look at the<a
+below, then for more detailed information, look at the<a
 href="html/libxslt-lib.html"> generated pages</a> for the API and the source
 of libxslt/xsltproc.c  and the  <a
 href="tutorial/libxslttutorial.html">tutorial</a>.</p>
@@ -1288,7 +1301,7 @@
 <p>The libxslt Python module depends on the <a
 href="http://xmlsoft.org/python.html">libxml2 Python</a> module.</p>
 
-<p>The distribution includes a set of Python bindings, which are garanteed to
+<p>The distribution includes a set of Python bindings, which are guaranteed to
 be maintained as part of the library in the future, though the Python
 interface have not yet reached the completeness of the C API.</p>
 
@@ -1351,7 +1364,7 @@
     HTML tree are suitable for XSLT processing in libxslt. This is actually
     how this page is generated !</li>
   <li><code>result</code> : this is a document generated by applying the
-    stylesheet to the document. Note that some of the stylesheet informations
+    stylesheet to the document. Note that some of the stylesheet information
     may be related to the serialization of that document and as in this
     example a specific saveResultToFilename() method of the stylesheet should
     be used to save it to a file (in that case to "foo").</li>
@@ -1399,7 +1412,7 @@
 resulting document or the Result Value Tree being generated), and saves it to
 a global variable for checking that the access actually worked.</p>
 
-<p>For more informations on the xpathParserContext and transformContext
+<p>For more information on the xpathParserContext and transformContext
 objects check the <a href="internals.html">libray internals description</a>.
 The pctxt is actually an object from a class derived from the
 libxml2.xpathParserContext() with just a couple more properties including the
@@ -1570,7 +1583,7 @@
 
 <p>For the XSLT processing, entity nodes should not be generated (i.e. they
 should be replaced by their content). Most nodes also contains the following
-"navigation" informations:</p>
+"navigation" information:</p>
 <ul>
   <li>the containing <strong>doc</strong>ument</li>
   <li>the <strong>parent</strong> node</li>
@@ -2300,7 +2313,7 @@
  * @ctxt:  an XSLT processing context
  * @node:  The current node
  * @inst:  the instruction in the stylesheet
- * @comp:  precomputed informations
+ * @comp:  precomputed information
  *
  * Process a libxslt:test node
  */

Modified: packages/libxslt/branches/upstream/current/doc/xsltproc2.html
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/doc/xsltproc2.html?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/doc/xsltproc2.html (original)
+++ packages/libxslt/branches/upstream/current/doc/xsltproc2.html Wed Jun 13 20:01:57 2007
@@ -31,5 +31,5 @@
       --warnnet warn against fetching over the network
       --catalogs : use the catalogs from $SGML_CATALOG_FILES
       --xinclude : do XInclude processing on document input
-      --profile or --norman : dump profiling informations 
+      --profile or --norman : dump profiling information 
 orchis:~ -&gt;</pre><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>

Modified: packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h (original)
+++ packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h Wed Jun 13 20:01:57 2007
@@ -18,7 +18,7 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBEXSLT_DOTTED_VERSION "1.1.20"
+#define LIBEXSLT_DOTTED_VERSION "1.1.21"
 
 /**
  * LIBEXSLT_VERSION:
@@ -39,7 +39,7 @@
  *
  * extra version information, used to show a CVS compilation
  */
-#define	LIBEXSLT_VERSION_EXTRA ""
+#define	LIBEXSLT_VERSION_EXTRA "-CVS1070"
 
 /**
  * WITH_CRYPTO:

Modified: packages/libxslt/branches/upstream/current/libexslt/math.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libexslt/math.c?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libexslt/math.c (original)
+++ packages/libxslt/branches/upstream/current/libexslt/math.c Wed Jun 13 20:01:57 2007
@@ -357,6 +357,7 @@
 static double
 exsltMathConstant (xmlChar *name, double precision) {
     xmlChar *str;
+    double ret;
 
     if ((name == NULL) || (xmlXPathIsNaN(precision)) || (precision < 1.0)) {
         return xmlXPathNAN;
@@ -369,10 +370,6 @@
             len = (int)precision;
         
         str = xmlStrsub(EXSLT_PI, 0, len);
-        if (str == NULL)
-            return xmlXPathNAN;
-
-        return xmlXPathCastStringToNumber(str);
 
     } else if (xmlStrEqual(name, BAD_CAST "E")) {
         int len = xmlStrlen(EXSLT_E);
@@ -381,10 +378,6 @@
             len = (int)precision;
         
         str = xmlStrsub(EXSLT_E, 0, len);
-        if (str == NULL)
-            return xmlXPathNAN;
-
-        return xmlXPathCastStringToNumber(str);
 
     } else if (xmlStrEqual(name, BAD_CAST "SQRRT2")) {
         int len = xmlStrlen(EXSLT_SQRRT2);
@@ -393,10 +386,6 @@
             len = (int)precision;
         
         str = xmlStrsub(EXSLT_SQRRT2, 0, len);
-        if (str == NULL)
-            return xmlXPathNAN;
-
-        return xmlXPathCastStringToNumber(str);
 
     } else if (xmlStrEqual(name, BAD_CAST "LN2")) {
         int len = xmlStrlen(EXSLT_LN2);
@@ -405,10 +394,6 @@
             len = (int)precision;
         
         str = xmlStrsub(EXSLT_LN2, 0, len);
-        if (str == NULL)
-            return xmlXPathNAN;
-
-        return xmlXPathCastStringToNumber(str);
 
     } else if (xmlStrEqual(name, BAD_CAST "LN10")) {
         int len = xmlStrlen(EXSLT_LN10);
@@ -417,10 +402,6 @@
             len = (int)precision;
         
         str = xmlStrsub(EXSLT_LN10, 0, len);
-        if (str == NULL)
-            return xmlXPathNAN;
-
-        return xmlXPathCastStringToNumber(str);
 
     } else if (xmlStrEqual(name, BAD_CAST "LOG2E")) {
         int len = xmlStrlen(EXSLT_LOG2E);
@@ -429,10 +410,6 @@
             len = (int)precision;
         
         str = xmlStrsub(EXSLT_LOG2E, 0, len);
-        if (str == NULL)
-            return xmlXPathNAN;
-
-        return xmlXPathCastStringToNumber(str);
 
     } else if (xmlStrEqual(name, BAD_CAST "SQRT1_2")) {
         int len = xmlStrlen(EXSLT_SQRT1_2);
@@ -441,14 +418,15 @@
             len = (int)precision;
         
         str = xmlStrsub(EXSLT_SQRT1_2, 0, len);
-        if (str == NULL)
-            return xmlXPathNAN;
-
-        return xmlXPathCastStringToNumber(str);
 
     } else {
+	str = NULL;
+    }
+    if (str == NULL)
         return xmlXPathNAN;
-    } 
+    ret = xmlXPathCastStringToNumber(str);
+    xmlFree(str);
+    return ret;
 }
 
 /**
@@ -476,6 +454,8 @@
 	return;
 
     ret = exsltMathConstant(name, ret);
+    if (name != NULL)
+	xmlFree(name);
 
     xmlXPathReturnNumber(ctxt, ret);
 }

Modified: packages/libxslt/branches/upstream/current/libxslt.spec
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt.spec?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt.spec (original)
+++ packages/libxslt/branches/upstream/current/libxslt.spec Wed Jun 13 20:01:57 2007
@@ -1,6 +1,6 @@
 Summary: Library providing the GNOME XSLT engine
 Name: libxslt
-Version: 1.1.20
+Version: 1.1.21
 Release: 1
 License: MIT
 Group: Development/Libraries
@@ -121,5 +121,5 @@
 %doc python/tests/*.xsl
 
 %changelog
-* Wed Jan 17 2007 Daniel Veillard <veillard at redhat.com>
-- upstream release 1.1.20 see http://xmlsoft.org/XSLT/news.html
+* Tue Jun 12 2007 Daniel Veillard <veillard at redhat.com>
+- upstream release 1.1.21 see http://xmlsoft.org/XSLT/news.html

Modified: packages/libxslt/branches/upstream/current/libxslt/namespaces.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/namespaces.c?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/namespaces.c (original)
+++ packages/libxslt/branches/upstream/current/libxslt/namespaces.c Wed Jun 13 20:01:57 2007
@@ -31,6 +31,11 @@
 #endif
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
+#endif
+#ifndef	XSLT_NEED_TRIO
+#include <stdio.h>
+#else
+#include <trio.h>
 #endif
 
 #include <libxml/xmlmemory.h>

Modified: packages/libxslt/branches/upstream/current/libxslt/pattern.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/pattern.c?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/pattern.c (original)
+++ packages/libxslt/branches/upstream/current/libxslt/pattern.c Wed Jun 13 20:01:57 2007
@@ -142,7 +142,7 @@
     cur = (xsltCompMatchPtr) xmlMalloc(sizeof(xsltCompMatch));
     if (cur == NULL) {
 	xsltTransformError(NULL, NULL, NULL,
-		"xsltNewCompMatch : malloc failed\n");
+		"xsltNewCompMatch : out of memory error\n");
 	return(NULL);
     }
     memset(cur, 0, sizeof(xsltCompMatch));
@@ -449,6 +449,8 @@
  * @ctxt:  a XSLT process context
  * @comp: the precompiled pattern
  * @node: a node
+ * @nsList: the namespaces in scope
+ * @nsNr: the number of namespaces in scope
  *
  * Test whether the node matches the pattern, do a direct evalutation
  * and not a step by step evaluation.
@@ -457,7 +459,7 @@
  */
 static int
 xsltTestCompMatchDirect(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
-	                xmlNodePtr node) {
+	                xmlNodePtr node, xmlNsPtr *nsList, int nsNr) {
     xsltStepOpPtr sel = NULL;
     xmlDocPtr prevdoc;
     xmlDocPtr doc;
@@ -484,14 +486,22 @@
 	xmlNodePtr parent = node->parent;
 	xmlDocPtr olddoc;
 	xmlNodePtr oldnode;
+	int oldNsNr;
+	xmlNsPtr *oldNamespaces;
 
 	oldnode = ctxt->xpathCtxt->node;
 	olddoc = ctxt->xpathCtxt->doc;
+	oldNsNr = ctxt->xpathCtxt->nsNr;
+	oldNamespaces = ctxt->xpathCtxt->namespaces;
 	ctxt->xpathCtxt->node = node;
 	ctxt->xpathCtxt->doc = doc;
+	ctxt->xpathCtxt->namespaces = nsList;
+	ctxt->xpathCtxt->nsNr = nsNr;
 	newlist = xmlXPathEval(comp->pattern, ctxt->xpathCtxt);
 	ctxt->xpathCtxt->node = oldnode;
 	ctxt->xpathCtxt->doc = olddoc;
+	ctxt->xpathCtxt->namespaces = oldNamespaces;
+	ctxt->xpathCtxt->nsNr = oldNsNr;
 	if (newlist == NULL)
 	    return(-1);
 	if (newlist->type != XPATH_NODESET) {
@@ -818,7 +828,8 @@
 			/* Free the rollback states */
 			xmlFree(states.states);
 		    }
-		    return(xsltTestCompMatchDirect(ctxt, comp, node));
+		    return(xsltTestCompMatchDirect(ctxt, comp, node,
+		    				   comp->nsList, comp->nsNr));
 		}
 
 		doc = node->doc;
@@ -2066,7 +2077,12 @@
 int
 xsltAddTemplate(xsltStylesheetPtr style, xsltTemplatePtr cur,
 	        const xmlChar *mode, const xmlChar *modeURI) {
-    xsltCompMatchPtr pat, list, *top = NULL, next;
+    xsltCompMatchPtr pat, list, next;
+    /*
+     * 'top' will point to style->xxxMatch ptr - declaring as 'void'
+     *  avoids gcc 'type-punned pointer' warning.
+     */
+    void **top = NULL;
     const xmlChar *name = NULL;
     float priority;              /* the priority */
 
@@ -2076,6 +2092,8 @@
     priority = cur->priority;
     pat = xsltCompilePatternInternal(cur->match, style->doc, cur->elem,
 		    style, NULL, 1);
+    if (pat == NULL)
+    	return(-1);
     while (pat) {
 	next = pat->next;
 	pat->next = NULL;
@@ -2097,24 +2115,24 @@
 	    if (pat->steps[0].value != NULL)
 		name = pat->steps[0].value;
 	    else
-		top = (xsltCompMatchPtr *) &(style->attrMatch);
+		top = &(style->attrMatch);
 	    break;
         case XSLT_OP_CHILD:
         case XSLT_OP_PARENT:
         case XSLT_OP_ANCESTOR:
-	    top = (xsltCompMatchPtr *) &(style->elemMatch);
+	    top = &(style->elemMatch);
 	    break;
         case XSLT_OP_ROOT:
-	    top = (xsltCompMatchPtr *) &(style->rootMatch);
+	    top = &(style->rootMatch);
 	    break;
         case XSLT_OP_KEY:
-	    top = (xsltCompMatchPtr *) &(style->keyMatch);
+	    top = &(style->keyMatch);
 	    break;
         case XSLT_OP_ID:
 	    /* TODO optimize ID !!! */
         case XSLT_OP_NS:
         case XSLT_OP_ALL:
-	    top = (xsltCompMatchPtr *) &(style->elemMatch);
+	    top = &(style->elemMatch);
 	    break;
         case XSLT_OP_END:
 	case XSLT_OP_PREDICATE:
@@ -2130,20 +2148,20 @@
 	    if (pat->steps[0].value != NULL)
 		name = pat->steps[0].value;
 	    else
-		top = (xsltCompMatchPtr *) &(style->piMatch);
+		top = &(style->piMatch);
 	    break;
 	case XSLT_OP_COMMENT:
-	    top = (xsltCompMatchPtr *) &(style->commentMatch);
+	    top = &(style->commentMatch);
 	    break;
 	case XSLT_OP_TEXT:
-	    top = (xsltCompMatchPtr *) &(style->textMatch);
+	    top = &(style->textMatch);
 	    break;
         case XSLT_OP_ELEM:
 	case XSLT_OP_NODE:
 	    if (pat->steps[0].value != NULL)
 		name = pat->steps[0].value;
 	    else
-		top = (xsltCompMatchPtr *) &(style->elemMatch);
+		top = &(style->elemMatch);
 	    break;
 	}
 	if (name != NULL) {

Modified: packages/libxslt/branches/upstream/current/libxslt/transform.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/transform.c?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/transform.c (original)
+++ packages/libxslt/branches/upstream/current/libxslt/transform.c Wed Jun 13 20:01:57 2007
@@ -2576,9 +2576,12 @@
 		oldCurInst = ctxt->inst;
 		ctxt->inst = cur;
                 ctxt->insert = insert;
+		oldLocalFragmentBase = ctxt->localRVTBase;
+		ctxt->localRVTBase = NULL;
 
                 info->func(ctxt, contextNode, cur, (xsltElemPreCompPtr) info);
 
+		ctxt->localRVTBase = oldLocalFragmentBase;
 		/*
 		* Cleanup temporary tree fragments.
 		*/
@@ -5082,6 +5085,8 @@
 	xmlDocPtr oldXPContextDoc = xpctxt->doc;
 	int oldXPProximityPosition = xpctxt->proximityPosition;
 	int oldXPContextSize = xpctxt->contextSize;
+	xmlNsPtr *oldXPNamespaces = xpctxt->namespaces;
+	int oldXPNsNr = xpctxt->nsNr;
 	
 #ifdef XSLT_REFACTORED
 	xsltStyleItemWhenPtr wcomp = NULL;
@@ -5201,6 +5206,8 @@
 	xpctxt->doc = oldXPContextDoc;
 	xpctxt->proximityPosition = oldXPProximityPosition;
 	xpctxt->contextSize = oldXPContextSize;
+	xpctxt->namespaces = oldXPNamespaces;
+	xpctxt->nsNr = oldXPNsNr;
 	goto exit;
 
 test_is_true:
@@ -5209,6 +5216,8 @@
 	xpctxt->doc = oldXPContextDoc;
 	xpctxt->proximityPosition = oldXPProximityPosition;
 	xpctxt->contextSize = oldXPContextSize;
+	xpctxt->namespaces = oldXPNamespaces;
+	xpctxt->nsNr = oldXPNsNr;
 	goto process_sequence;
     }
 

Modified: packages/libxslt/branches/upstream/current/libxslt/xslt.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/xslt.c?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xslt.c (original)
+++ packages/libxslt/branches/upstream/current/libxslt/xslt.c Wed Jun 13 20:01:57 2007
@@ -3469,7 +3469,7 @@
 	    }
 	    	     
 	    if ((cur->nsDef != NULL) && (style->exclPrefixNr > 0)) {
-		xmlNsPtr ns = cur->nsDef, prev = NULL, next;
+		xmlNsPtr ns = cur->nsDef, prev = NULL, next, rns;
 		xmlNodePtr root = NULL;
 		int i, moved;
 
@@ -3482,18 +3482,27 @@
 			    if ((ns->prefix != NULL) && 
 			        (xmlStrEqual(ns->href,
 					     style->exclPrefixTab[i]))) {
-				/*
-				 * Move the namespace definition on the root
-				 * element to avoid duplicating it without
-				 * loosing it.
-				 */
+				/* Remove the namespace from this node */
 				if (prev == NULL) {
 				    cur->nsDef = ns->next;
 				} else {
 				    prev->next = ns->next;
 				}
-				ns->next = root->nsDef;
-				root->nsDef = ns;
+				/*
+				 * If this prefix is not already present,
+				 * move the namespace definition on the root
+				 * element to avoid duplicating it without
+				 * loosing it.
+				 */
+				for (rns = root->nsDef; rns != NULL; rns = rns->next)
+				    if (xmlStrEqual(ns->prefix, rns->prefix))
+					break;
+				if (rns == NULL) {
+				    ns->next = root->nsDef;
+				    root->nsDef = ns;
+				}
+				else
+				    xmlFreeNs(ns);
 				moved = 1;
 				break;
 			    }

Modified: packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h (original)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h Wed Jun 13 20:01:57 2007
@@ -20,28 +20,28 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXSLT_DOTTED_VERSION "1.1.20"
+#define LIBXSLT_DOTTED_VERSION "1.1.21"
 
 /**
  * LIBXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXSLT_VERSION 10120
+#define LIBXSLT_VERSION 10121
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXSLT_VERSION_STRING "10120"
+#define LIBXSLT_VERSION_STRING "10121"
 
 /**
  * LIBXSLT_VERSION_EXTRA:
  *
  * extra version information, used to show a CVS compilation
  */
-#define	LIBXSLT_VERSION_EXTRA "-SVN1417"
+#define	LIBXSLT_VERSION_EXTRA "-CVS1070"
 
 /**
  * WITH_XSLT_DEBUG:
@@ -77,7 +77,7 @@
 /**
  * XSLT_NEED_TRIO:
  *
- * should be activated in the existing libc library lacks some of the
+ * should be activated if the existing libc library lacks some of the
  * string formatting function, in that case reuse the Trio ones already
  * compiled in the libxml2 library.
  */
@@ -91,6 +91,10 @@
 #ifndef XSLT_NEED_TRIO
 #define XSLT_NEED_TRIO
 #endif
+#endif
+
+#ifdef	XSLT_NEED_TRIO
+#define	TRIO_REPLACE_STDIO
 #endif
 
 /**

Modified: packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h.in?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h.in (original)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h.in Wed Jun 13 20:01:57 2007
@@ -77,7 +77,7 @@
 /**
  * XSLT_NEED_TRIO:
  *
- * should be activated in the existing libc library lacks some of the
+ * should be activated if the existing libc library lacks some of the
  * string formatting function, in that case reuse the Trio ones already
  * compiled in the libxml2 library.
  */
@@ -91,6 +91,10 @@
 #ifndef XSLT_NEED_TRIO
 #define XSLT_NEED_TRIO
 #endif
+#endif
+
+#ifdef	XSLT_NEED_TRIO
+#define	TRIO_REPLACE_STDIO
 #endif
 
 /**

Modified: packages/libxslt/branches/upstream/current/libxslt/xsltutils.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/xsltutils.c?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltutils.c (original)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltutils.c Wed Jun 13 20:01:57 2007
@@ -12,7 +12,12 @@
 #define IN_LIBXSLT
 #include "libxslt.h"
 
+#ifndef	XSLT_NEED_TRIO
 #include <stdio.h>
+#else
+#include <trio.h>
+#endif
+
 #include <string.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -46,11 +51,6 @@
 #define XSLT_WIN32_PERFORMANCE_COUNTER
 #endif /* _MS_VER */
 #endif /* WIN32 */
-
-#ifdef XSLT_NEED_TRIO
-#include "trio.h"
-#define vsnprintf trio_vsnprintf
-#endif
 
 /************************************************************************
  * 									*
@@ -425,11 +425,18 @@
  */
 void
 xsltMessage(xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr inst) {
+    xmlGenericErrorFunc error = xsltGenericError;
+    void *errctx = xsltGenericErrorContext;
     xmlChar *prop, *message;
     int terminate = 0;
 
     if ((ctxt == NULL) || (inst == NULL))
 	return;
+
+    if (ctxt->error != NULL) {
+	error = ctxt->error;
+	errctx = ctxt->errctx;
+    }
 
     prop = xmlGetNsProp(inst, (const xmlChar *)"terminate", NULL);
     if (prop != NULL) {
@@ -438,7 +445,7 @@
 	} else if (xmlStrEqual(prop, (const xmlChar *)"no")) {
 	    terminate = 0;
 	} else {
-	    xsltGenericError(xsltGenericErrorContext,
+	    error(errctx,
 		"xsl:message : terminate expecting 'yes' or 'no'\n");
 	    ctxt->state = XSLT_STATE_ERROR;
 	}
@@ -448,10 +455,9 @@
     if (message != NULL) {
 	int len = xmlStrlen(message);
 
-	xsltGenericError(xsltGenericErrorContext, "%s",
-		         (const char *)message);
+	error(errctx, "%s", (const char *)message);
 	if ((len > 0) && (message[len - 1] != '\n'))
-	    xsltGenericError(xsltGenericErrorContext, "\n");
+	    error(errctx, "\n");
 	xmlFree(message);
     }
     if (terminate)
@@ -2098,13 +2104,17 @@
 	    xpathCtxt = XSLT_CCTXT(style)->xpathCtxt;
 	    xpathCtxt->doc = style->doc;
 	} else
-	    xpathCtxt = xmlXPathNewContext(style->doc);	
+	    xpathCtxt = xmlXPathNewContext(style->doc);
 #else
 	xpathCtxt = xmlXPathNewContext(style->doc);
 #endif
+	if (xpathCtxt == NULL)
+	    return NULL;
 	xpathCtxt->dict = style->dict;
     } else {
 	xpathCtxt = xmlXPathNewContext(NULL);
+	if (xpathCtxt == NULL)
+	    return NULL;
     }
     /*
     * Compile the expression.

Modified: packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h (original)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h Wed Jun 13 20:01:57 2007
@@ -23,21 +23,21 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXSLT_DOTTED_VERSION "1.1.20"
+#define LIBXSLT_DOTTED_VERSION "1.1.21"
 
 /**
  * LIBXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXSLT_VERSION 10120
+#define LIBXSLT_VERSION 10121
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXSLT_VERSION_STRING "10120"
+#define LIBXSLT_VERSION_STRING "10121"
 
 /**
  * LIBXSLT_VERSION_EXTRA:

Modified: packages/libxslt/branches/upstream/current/python/libxsl.py
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/python/libxsl.py?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/python/libxsl.py (original)
+++ packages/libxslt/branches/upstream/current/python/libxsl.py Wed Jun 13 20:01:57 2007
@@ -20,9 +20,9 @@
             if osname == 'Linux' or osname == 'SunOS':
                 RTLD_GLOBAL = 0x00100
                 RTLD_NOW = 0x00002
-	    elif osname == 'Darwin':
-	        RTLD_GLOBAL = 0x8
-		RTLD_NOW = 0x2
+            elif osname == 'Darwin':
+                RTLD_GLOBAL = 0x8
+                RTLD_NOW = 0x2
             #
             # is there a better method ?
             #
@@ -30,12 +30,12 @@
 #                print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
 #                      "on this platform: %s" % (osname)
         except:
-	     pass
+             pass
 #            print "libxslt could not guess RTLD_GLOBAL and RTLD_NOW " + \
 #                  "on this platform: %s" % (osname)
     except:
-	 RTLD_GLOBAL = -1
-	 RTLD_NOW = -1
+        RTLD_GLOBAL = -1
+        RTLD_NOW = -1
 
     if RTLD_GLOBAL != -1 and RTLD_NOW != -1:
         try:
@@ -102,21 +102,21 @@
 
     def styleInit(self, style, URI):
         """Callback function when used in a newly compiled stylesheet,
-	   the return value is passed in subsequent calls"""
-	pass
+           the return value is passed in subsequent calls"""
+        pass
 
     def styleShutdown(self, style, URI, data):
         """Callback function when a stylesheet using it is destroyed"""
-	pass
+        pass
 
     def ctxtInit(self, ctxt, URI):
         """Callback function when used in a new transformation process,
-	   the return value is passed in subsequent calls"""
-	pass
+           the return value is passed in subsequent calls"""
+        pass
 
     def ctxtShutdown(self, ctxt, URI, data):
         """Callback function when a transformation using it finishes"""
-	pass
+        pass
 
 def cleanup():
     """Cleanup all libxslt and libxml2 memory allocated"""

Modified: packages/libxslt/branches/upstream/current/tests/docbook/Makefile.am
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/tests/docbook/Makefile.am?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/tests/docbook/Makefile.am (original)
+++ packages/libxslt/branches/upstream/current/tests/docbook/Makefile.am Wed Jun 13 20:01:57 2007
@@ -186,4 +186,4 @@
 	  rm -f $$out ; done )
 
 dist-hook:
-	@(cd $(srcdir) ; tar -cf - --exclude CVS common html dtd lib xhtml fo doc images template htmlhelp result test) | (cd $(distdir); tar xf -)
+	@(cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn common html dtd lib xhtml fo doc images template htmlhelp result test) | (cd $(distdir); tar xf -)

Modified: packages/libxslt/branches/upstream/current/tests/docbook/Makefile.in
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxslt/branches/upstream/current/tests/docbook/Makefile.in?rev=822&op=diff
==============================================================================
--- packages/libxslt/branches/upstream/current/tests/docbook/Makefile.in (original)
+++ packages/libxslt/branches/upstream/current/tests/docbook/Makefile.in Wed Jun 13 20:01:57 2007
@@ -555,7 +555,7 @@
 	  rm -f $$out ; done )
 
 dist-hook:
-	@(cd $(srcdir) ; tar -cf - --exclude CVS common html dtd lib xhtml fo doc images template htmlhelp result test) | (cd $(distdir); tar xf -)
+	@(cd $(srcdir) ; tar -cf - --exclude CVS --exclude .svn common html dtd lib xhtml fo doc images template htmlhelp result test) | (cd $(distdir); tar xf -)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


