preparing release libxslt-1.0.33 updated and rebuilt the docs small fixes

* configure.in: preparing release libxslt-1.0.33
* doc/*: updated and rebuilt the docs
* doc/apibuild.py: small fixes for new tokens
Daniel

11 files changed, 118 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index b44e8078..1830a36e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 12 13:52:07 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in: preparing release libxslt-1.0.33
+	* doc/*: updated and rebuilt the docs
+	* doc/apibuild.py: small fixes for new tokens
+
 Wed Sep 10 23:32:42 PDT 2003 William Brack <wbrack@mmm.com.hk>
 
 	* transform.c: enhanced previous fix to bug #120684, using
diff --git a/NEWS b/NEWS
index 3ec3d42b..397695b0 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,20 @@ http://cvs.gnome.org/lxr/source/libxslt/ChangeLog
  file
 for a really accurate description:
 
+1.0.33: Sep 12 2003:
+   This is a bugfix only release   - error message missing argument (William Brack)
+   - mode not cascaded in template fallbacks (William Brack)
+   - catch redefinition of parameter/variables  (William Brack)
+   - multiple keys with same namespace name (William Brack)
+   - patch for compilation using MingW on Windows (Mikhail Grushinskiy)
+   - header export macros for Windows (Igor Zlatkovic)
+   - cdata-section-elements handling of namespaced names
+   - compilation without libxml2 XPointer support (Mark Vadoc)
+   - apply-templates crash (William Brack)
+   - bug with imported templates (William Brack)
+   - imported attribute-sets merging bug (DocBook) (William Brack)
+
+
 1.0.32: Aug 9 2003:
    - bugfixes: xsltSaveResultToFile() python binding (Chris Jaeger), EXSLT
     function (William Brack), RVT for globals (William Brack), EXSLT date
diff --git a/configure.in b/configure.in
index aea19a9f..651fadcb 100644
--- a/configure.in
+++ b/configure.in
@@ -6,11 +6,11 @@ dnl libexslt is an extension
 dnl
 LIBXSLT_MAJOR_VERSION=1
 LIBXSLT_MINOR_VERSION=0
-LIBXSLT_MICRO_VERSION=32
+LIBXSLT_MICRO_VERSION=33
 PACKAGE=libxslt
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=7
-LIBEXSLT_MICRO_VERSION=21
+LIBEXSLT_MICRO_VERSION=22
 LIBXML_REQUIRED_VERSION=2.5.6
 
 
diff --git a/doc/apibuild.py b/doc/apibuild.py
index 58fe3a50..cf803839 100755
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -11,6 +11,8 @@ import sys
 import string
 import glob
 
+debug=0
+
 def escape(raw):
     raw = string.replace(raw, '&', '&amp;')
     raw = string.replace(raw, '<', '&lt;')
@@ -224,6 +226,15 @@ ignored_files = {
 ignored_words = {
   "WINAPI": (0, "Windows keyword"),
   "LIBXML_DLL_IMPORT": (0, "Special macro to flag external keywords"),
+  "XMLPUBVAR": (0, "Special macro for extern vars for win32"),
+  "XSLTPUBVAR": (0, "Special macro for extern vars for win32"),
+  "EXSLTPUBVAR": (0, "Special macro for extern vars for win32"),
+  "XMLPUBFUN": (0, "Special macro for extern funcs for win32"),
+  "XSLTPUBFUN": (0, "Special macro for extern funcs for win32"),
+  "EXSLTPUBFUN": (0, "Special macro for extern funcs for win32"),
+  "XMLCALL": (0, "Special macro for win32 calls"),
+  "XSLTCALL": (0, "Special macro for win32 calls"),
+  "EXSLTCALL": (0, "Special macro for win32 calls"),
   "__declspec": (3, "Windows keyword"),
   "ATTRIBUTE_UNUSED": (0, "macro keyword"),
   "LIBEXSLT_PUBLIC": (0, "macro keyword"),
@@ -727,7 +738,8 @@ class CParser:
 		 token = self.lexer.token()
 		 continue
 	     else:
-	         #print "=> ", token
+	         if debug:
+		     print "=> ", token
 	         return token
 	 return None
 
diff --git a/doc/docbook.html b/doc/docbook.html
index 1366a616..b2925ba4 100644
--- a/doc/docbook.html
+++ b/doc/docbook.html
@@ -18,9 +18,9 @@ few pointers and informations which may be helpful:</p><ul><li>The <a href="http
     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>
-  <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
+  <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
     XML Catalogs for DocBook 4.1.2 . If it can write to the /etc/xml/
     directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on
     the resources found on the system. Otherwise it will just create
diff --git a/doc/libexslt-api.xml b/doc/libexslt-api.xml
index 6c5369b8..c85c6a58 100644
--- a/doc/libexslt-api.xml
+++ b/doc/libexslt-api.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <api name='libexslt'>
   <files>
+    <file name='exsltexports'>
+     <exports symbol='EXSLTCALL'/>
+     <exports symbol='EXSLTPUBFUN'/>
+     <exports symbol='EXSLTPUBVAR'/>
+     <exports symbol='LIBEXSLT_PUBLIC'/>
+     <exports symbol='_REENTRANT'/>
+    </file>
     <file name='exslt'>
      <exports symbol='EXSLT_COMMON_NAMESPACE'/>
      <exports symbol='EXSLT_DATE_NAMESPACE'/>
@@ -26,6 +33,12 @@
     </file>
   </files>
   <symbols>
+    <macro name='EXSLTCALL' file='exsltexports'>
+    </macro>
+    <macro name='EXSLTPUBFUN' file='exsltexports'>
+    </macro>
+    <macro name='EXSLTPUBVAR' file='exsltexports'>
+    </macro>
     <macro name='EXSLT_COMMON_NAMESPACE' file='exslt'>
       <info>Namespace for EXSLT common functions</info>
     </macro>
@@ -47,9 +60,13 @@
     <macro name='EXSLT_STRINGS_NAMESPACE' file='exslt'>
       <info>Namespace for EXSLT strings functions</info>
     </macro>
+    <macro name='LIBEXSLT_PUBLIC' file='exsltexports'>
+    </macro>
     <macro name='SAXON_NAMESPACE' file='exslt'>
       <info>Namespace for SAXON extensions functions</info>
     </macro>
+    <macro name='_REENTRANT' file='exsltexports'>
+    </macro>
     <variable name='exsltLibexsltVersion' file='exslt' type='const int'/>
     <variable name='exsltLibraryVersion' file='exslt' type='const char *'/>
     <variable name='exsltLibxmlVersion' file='exslt' type='const int'/>
diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 660dcb58..2772c5a2 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -55,6 +55,13 @@
      <exports symbol='xsltEvalXPathStringNs'/>
      <exports symbol='xsltTemplateProcess'/>
     </file>
+    <file name='xsltexports'>
+     <exports symbol='LIBXSLT_PUBLIC'/>
+     <exports symbol='XSLTCALL'/>
+     <exports symbol='XSLTPUBFUN'/>
+     <exports symbol='XSLTPUBVAR'/>
+     <exports symbol='_REENTRANT'/>
+    </file>
     <file name='xsltutils'>
      <exports symbol='IS_XSLT_ELEM'/>
      <exports symbol='IS_XSLT_NAME'/>
@@ -328,7 +335,6 @@
      <exports symbol='xsltNumberDataPtr'/>
     </file>
     <file name='xslt'>
-     <exports symbol='LIBXSLT_PUBLIC'/>
      <exports symbol='XSLT_DEFAULT_URL'/>
      <exports symbol='XSLT_DEFAULT_VENDOR'/>
      <exports symbol='XSLT_DEFAULT_VERSION'/>
@@ -372,6 +378,7 @@
      <exports symbol='xsltFreeTemplateHashes'/>
      <exports symbol='xsltGetTemplate'/>
      <exports symbol='xsltMatchPattern'/>
+     <exports symbol='xsltNormalizeCompSteps'/>
      <exports symbol='xsltTestCompMatchList'/>
     </file>
   </files>
@@ -394,8 +401,13 @@
     <macro name='IS_XSLT_REAL_NODE' file='xsltutils'>
       <info>Check that a node is a &apos;real&apos; one: document, element, text or attribute.</info>
     </macro>
-    <macro name='LIBXSLT_PUBLIC' file='xslt'>
-      <info>Macro used on Windows to tag public identifiers from shared libraries.</info>
+    <macro name='LIBXSLT_PUBLIC' file='xsltexports'>
+    </macro>
+    <macro name='XSLTCALL' file='xsltexports'>
+    </macro>
+    <macro name='XSLTPUBFUN' file='xsltexports'>
+    </macro>
+    <macro name='XSLTPUBVAR' file='xsltexports'>
     </macro>
     <macro name='XSLT_DEFAULT_URL' file='xslt'>
       <info>The XSLT &quot;vendor&quot; URL for this processor.</info>
@@ -466,6 +478,8 @@
     <macro name='XSLT_XT_NAMESPACE' file='extra'>
       <info>This is James Clark&apos;s XT processor namespace for extensions.</info>
     </macro>
+    <macro name='_REENTRANT' file='xsltexports'>
+    </macro>
     <enum name='XSLT_DEBUG_CONT' file='xsltutils' value='6' type='xsltDebugStatusCodes'/>
     <enum name='XSLT_DEBUG_INIT' file='xsltutils' value='1' type='xsltDebugStatusCodes'/>
     <enum name='XSLT_DEBUG_NEXT' file='xsltutils' value='4' type='xsltDebugStatusCodes'/>
@@ -565,7 +579,8 @@
       <field name='groupingCharacter' type='int' info=''/>
       <field name='groupingCharacterLen' type='int' info=''/>
       <field name='doc' type='xmlDocPtr' info=''/>
-      <field name='node' type='xmlNodePtr' info=''/>
+      <field name='node' type='xmlNodePtr' info='* accelerators
+*'/>
     </struct>
     <typedef name='xsltNumberDataPtr' file='numbersInternals' type='xsltNumberData *'/>
     <typedef name='xsltOutputType' file='xsltInternals' type='enum'/>
@@ -1588,6 +1603,13 @@ informations are stored'/>
       <return type='xsltStylesheetPtr' info='the next stylesheet or NULL if it was the last one'/>
       <arg name='cur' type='xsltStylesheetPtr' info='the current XSLT stylesheet'/>
     </function>
+    <function name='xsltNormalizeCompSteps' file='pattern'>
+      <info>This is a hashtable scanner function to normalize the compiled steps of an imported stylesheet.</info>
+      <return type='void'/>
+      <arg name='payload' type='void *' info='pointer to template hash table entry'/>
+      <arg name='data' type='void *' info='pointer to the stylesheet'/>
+      <arg name='name' type='const xmlChar *' info='template match name'/>
+    </function>
     <function name='xsltNumber' file='transform'>
       <info>Process the xslt number node on the source node</info>
       <return type='void'/>
diff --git a/doc/libxslt.xsa b/doc/libxslt.xsa
index 5b84b78b..f407470b 100644
--- a/doc/libxslt.xsa
+++ b/doc/libxslt.xsa
@@ -8,23 +8,9 @@
   </vendor>
   <product id="libxslt">
     <name>libxslt</name>
-    <version>1.0.32</version>
-    <last-release> Aug 9 2003</last-release>
+    <version>1.0.33</version>
+    <last-release> Sep 12 2003</last-release>
     <info-url>http://xmlsoft.org/XSLT/</info-url>
-    <changes>   - bugfixes: xsltSaveResultToFile() python binding (Chris Jaeger), EXSLT
-    function (William Brack), RVT for globals (William Brack), EXSLT date
-    (William Brack),
-    speed of large text output, xsl:copy with attributes, strip-space and
-    namespaces prefix, fix for --path xsltproc option, EXST:tokenize (Shaun
-    McCance), EXSLT:seconds (William Brack), sort with multiple keys (William
-    Brack), checking of { and } for attribute value templates (William
-    Brack)
-  
-   - Python bindings for extension elements (Sean Treadway)
-   - EXSLT:split added (Shaun McCance)
-   - portability fixes for HP-UX/Solaris/IRIX (William Brack)
-   - doc cleanup
-
-</changes>
+    <changes>   This is a bugfix only release</changes>
   </product>
 </xsa>
diff --git a/doc/news.html b/doc/news.html
index 8e6ede5f..801ec54a 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -8,7 +8,18 @@ H2 {font-family: Verdana,Arial,Helvetica}
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
 </style><title>News</title></head><body bgcolor="#8b7765" text="#000000" link="#000000" 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="100"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 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="xslt.html">flat page</a>, <a href="site.xsl">stylesheet</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></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 libxml</a></li><li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</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://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxslt">Bug Tracker</a></li><li><a href="http://xsldbg.sourceforge.net/">Xsldbg Debugger</a></li><li><a href="http://www.mod-xslt.com/mod-xslt/">Apache module</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"><h3>CVS only : check the <a href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
-for a really accurate description</h3><h3>1.0.32: Aug 9 2003</h3><ul><li>bugfixes: xsltSaveResultToFile() python binding (Chris Jaeger), EXSLT
+for a really accurate description</h3><h3>1.0.33: Sep 12 2003</h3><p>   This is a bugfix only release</p><ul><li>error message missing argument (William Brack)</li>
+  <li>mode not cascaded in template fallbacks (William Brack)</li>
+  <li>catch redefinition of parameter/variables  (William Brack)</li>
+  <li>multiple keys with same namespace name (William Brack)</li>
+  <li>patch for compilation using MingW on Windows (Mikhail Grushinskiy)</li>
+  <li>header export macros for Windows (Igor Zlatkovic)</li>
+  <li>cdata-section-elements handling of namespaced names</li>
+  <li>compilation without libxml2 XPointer support (Mark Vadoc)</li>
+  <li>apply-templates crash (William Brack)</li>
+  <li>bug with imported templates (William Brack)</li>
+  <li>imported attribute-sets merging bug (DocBook) (William Brack)</li>
+</ul><h3>1.0.32: Aug 9 2003</h3><ul><li>bugfixes: xsltSaveResultToFile() python binding (Chris Jaeger), EXSLT
     function (William Brack), RVT for globals (William Brack), EXSLT date
     (William Brack),
     <p>speed of large text output, xsl:copy with attributes, strip-space and
diff --git a/doc/xslt.html b/doc/xslt.html
index c00e8da6..db2f98cd 100644
--- a/doc/xslt.html
+++ b/doc/xslt.html
@@ -282,6 +282,23 @@ platform, get in touch with me to upload the package. I will keep them in the
 href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
 for a really accurate description</h3>
 
+<h3>1.0.33: Sep 12 2003</h3>
+
+<p>   This is a bugfix only release</p>
+<ul>
+  <li>error message missing argument (William Brack)</li>
+  <li>mode not cascaded in template fallbacks (William Brack)</li>
+  <li>catch redefinition of parameter/variables  (William Brack)</li>
+  <li>multiple keys with same namespace name (William Brack)</li>
+  <li>patch for compilation using MingW on Windows (Mikhail Grushinskiy)</li>
+  <li>header export macros for Windows (Igor Zlatkovic)</li>
+  <li>cdata-section-elements handling of namespaced names</li>
+  <li>compilation without libxml2 XPointer support (Mark Vadoc)</li>
+  <li>apply-templates crash (William Brack)</li>
+  <li>bug with imported templates (William Brack)</li>
+  <li>imported attribute-sets merging bug (DocBook) (William Brack)</li>
+</ul>
+
 <h3>1.0.32: Aug 9 2003</h3>
 <ul>
   <li>bugfixes: xsltSaveResultToFile() python binding (Chris Jaeger), EXSLT
@@ -846,8 +863,8 @@ few pointers and informations which may be helpful:</p>
   <li><a
     href="https://sourceforge.net/docman/index.php?group_id=21935">DocBook
     Open Repository</a> contains a lot of informations about DocBook</li>
-  <li> Bob Stayton provides a <a href="http://www.sagehill.net/">lot of
-    resources</a> and consulting services around DocBook.
+  <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
     XML Catalogs for DocBook 4.1.2 . If it can write to the /etc/xml/
     directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on
diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h
index 0b70288f..71e35f78 100644
--- a/libxslt/xsltwin32config.h
+++ b/libxslt/xsltwin32config.h
@@ -21,21 +21,21 @@ extern "C" {
  *
  * the version string like "1.2.3"
  */
-#define LIBXSLT_DOTTED_VERSION "1.0.32"
+#define LIBXSLT_DOTTED_VERSION "1.0.33"
 
 /**
  * LIBXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXSLT_VERSION 10032
+#define LIBXSLT_VERSION 10033
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXSLT_VERSION_STRING "10032"
+#define LIBXSLT_VERSION_STRING "10033"
 
 /**
  * WITH_XSLT_DEBUG: