bump the libxml2 require to 2.6.0 which should ship for good real soon...

* configure.in: bump the libxml2 require to 2.6.0 which
  should ship for good real soon...
* doc/Makefile.am: fix installation of HTML pages
* doc/libxslt-api.xml: rebuilt
* libxslt/xsltexports.h: cleanup
* python/generator.py: ATTRIBUTE_UNUSED is after the parameter
* xsltproc/xsltproc.c: applied Crutcher Dunnavant --load-trace patch 2
Daniel

7 files changed, 62 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index bd531b79..d6fa4be2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Oct 19 23:32:23 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in: bump the libxml2 require to 2.6.0 which
+	  should ship for good real soon...
+	* doc/Makefile.am: fix installation of HTML pages
+	* doc/libxslt-api.xml: rebuilt
+	* libxslt/xsltexports.h: cleanup
+	* python/generator.py: ATTRIBUTE_UNUSED is after the parameter
+	* xsltproc/xsltproc.c: applied Crutcher Dunnavant --load-trace patch 2
+
 Fri Oct 17 18:25:42 HKT 2003 William Brack <wbrack@mmm.com.hk>
 
 	* libxslt/attributes.c: fixed bug 123822
diff --git a/configure.in b/configure.in
index 7885c158..982fb715 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ PACKAGE=libxslt
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=7
 LIBEXSLT_MICRO_VERSION=22
-LIBXML_REQUIRED_VERSION=2.5.6
+LIBXML_REQUIRED_VERSION=2.6.0
 
 
 LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a0351d55..4994b9f9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -105,8 +105,10 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
 	-@INSTALL@ -m 0644 $(srcdir)/*.html $(DESTDIR)$(TARGET_DIR)
 	-@INSTALL@ -m 0644 $(srcdir)/*.gif $(DESTDIR)$(TARGET_DIR)
-	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
-	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
+	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/html
+	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)/html
+	-@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(TARGET_DIR)/html
+	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)/html
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
 	-@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial
 	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxslt --html-dir=$(HTML_DIR))
diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 2772c5a2..f5b23c37 100644
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -406,6 +406,7 @@
     <macro name='XSLTCALL' file='xsltexports'>
     </macro>
     <macro name='XSLTPUBFUN' file='xsltexports'>
+      <info>XSLTPUBFUN, XSLTPUBVAR, XSLTCALL  Macros which declare an exportable function, an exportable variable and the calling convention used for functions.  Please use an extra block for every platform/compiler combination when modifying this, rather than overlong #ifdef lines. This helps readability as well as the fact that different compilers on the same platform might need different definitions. Windows platform with MS compiler Windows platform with Borland compiler Windows platform with GNU compiler (Mingw) Cygwin platform, GNU compiler</info>
     </macro>
     <macro name='XSLTPUBVAR' file='xsltexports'>
     </macro>
diff --git a/libxslt/xsltexports.h b/libxslt/xsltexports.h
index d27ef629..aab58025 100644
--- a/libxslt/xsltexports.h
+++ b/libxslt/xsltexports.h
@@ -10,6 +10,7 @@
 #define __XSLT_EXPORTS_H__
 
 /**
+ * XSLTPUBFUN:
  * XSLTPUBFUN, XSLTPUBVAR, XSLTCALL
  *
  * Macros which declare an exportable function, an exportable variable and
diff --git a/python/generator.py b/python/generator.py
index 87216016..454b3552 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -406,10 +406,11 @@ def print_function_wrapper(name, output, export, include):
         return 1
 
     output.write("PyObject *\n")
-    output.write("libxslt_%s(ATTRIBUTE_UNUSED PyObject *self," % (name))
+    output.write("libxslt_%s(PyObject *self ATTRIBUTE_UNUSED," % (name))
+    output.write(" PyObject *args")
     if format == "":
-	output.write("ATTRIBUTE_UNUSED ")
-    output.write(" PyObject *args) {\n")
+	output.write(" ATTRIBUTE_UNUSED")
+    output.write(") {\n")
     if ret[0] != 'void':
         output.write("    PyObject *py_retval;\n")
     if c_return != "":
diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index a82af9ae..ea937b74 100644
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -94,6 +94,7 @@ static int noout = 0;
 #ifdef LIBXML_HTML_ENABLED
 static int html = 0;
 #endif
+static int load_trace = 0;
 #ifdef LIBXML_XINCLUDE_ENABLED
 static int xinclude = 0;
 #endif
@@ -171,6 +172,13 @@ xsltprocExternalEntityLoader(const char *URL, const char *ID,
 	if (ret != NULL) {
 	    if (warning != NULL)
 		ctxt->sax->warning = warning;
+	    if (load_trace) {
+		fprintf \
+			(stderr,
+			 "Loaded URL=\"%s\" ID=\"%s\"\n",
+			 URL ? URL : "(null)",
+			 ID ? ID : "(null)");
+	    }
 	    return(ret);
 	}
     }
@@ -182,12 +190,20 @@ xsltprocExternalEntityLoader(const char *URL, const char *ID,
 	newURL = xmlStrcat(newURL, (const xmlChar *) lastsegment);
 	if (newURL != NULL) {
 	    ret = defaultEntityLoader((const char *)newURL, ID, ctxt);
-	    xmlFree(newURL);
 	    if (ret != NULL) {
 		if (warning != NULL)
 		    ctxt->sax->warning = warning;
+		if (load_trace) {
+		    fprintf \
+		    	(stderr,
+		    	 "Loaded URL=\"%s\" ID=\"%s\"\n",
+			 newURL,
+		    	 ID ? ID : "(null)");
+		}
+		xmlFree(newURL);
 		return(ret);
 	    }
+	    xmlFree(newURL);
 	}
     }
     if (warning != NULL) {
@@ -476,6 +492,9 @@ static void usage(const char *name) {
     printf("\t--novalid skip the Dtd loading phase\n");
     printf("\t--noout: do not dump the result\n");
     printf("\t--maxdepth val : increase the maximum depth\n");
+#if LIBXML_VERSION >= 20600
+    printf("\t--maxparserdepth val : increase the maximum parser depth\n");
+#endif
 #ifdef LIBXML_HTML_ENABLED
     printf("\t--html: the input document is(are) an HTML file(s)\n");
 #endif
@@ -497,6 +516,7 @@ static void usage(const char *name) {
 #ifdef LIBXML_XINCLUDE_ENABLED
     printf("\t--xinclude : do XInclude processing on document intput\n");
 #endif
+    printf("\t--load-trace : print trace of all external entites loaded\n");
     printf("\t--profile or --norman : dump profiling informations \n");
     printf("\nProject libxslt home page: http://xmlsoft.org/XSLT/\n");
     printf("To report bugs and get help: http://xmlsoft.org/XSLT/bugs.html\n");
@@ -630,6 +650,9 @@ main(int argc, char **argv)
             xinclude++;
             xsltSetXIncludeDefault(1);
 #endif
+        } else if ((!strcmp(argv[i], "-load-trace")) ||
+                   (!strcmp(argv[i], "--load-trace"))) {
+            load_trace++;
         } else if ((!strcmp(argv[i], "-param")) ||
                    (!strcmp(argv[i], "--param"))) {
             i++;
@@ -677,6 +700,17 @@ main(int argc, char **argv)
                 if (value > 0)
                     xsltMaxDepth = value;
             }
+#if LIBXML_VERSION >= 20600
+        } else if ((!strcmp(argv[i], "-maxparserdepth")) ||
+                   (!strcmp(argv[i], "--maxparserdepth"))) {
+            int value;
+
+            i++;
+            if (sscanf(argv[i], "%d", &value) == 1) {
+                if (value > 0)
+                    xmlParserMaxDepth = value;
+            }
+#endif
         } else if ((!strcmp(argv[i],"-dumpextensions"))||
 			(!strcmp(argv[i],"--dumpextensions"))) {
 		dumpextensions++;
@@ -714,6 +748,12 @@ main(int argc, char **argv)
             (!strcmp(argv[i], "--maxdepth"))) {
             i++;
             continue;
+#if LIBXML_VERSION >= 20600
+        } else if ((!strcmp(argv[i], "-maxparserdepth")) ||
+            (!strcmp(argv[i], "--maxparserdepth"))) {
+            i++;
+            continue;
+#endif
         } else if ((!strcmp(argv[i], "-o")) ||
                    (!strcmp(argv[i], "-output")) ||
                    (!strcmp(argv[i], "--output"))) {