--xinclude should also force XInclude processing on the stylesheets

* xsltproc/xsltproc.c: --xinclude should also force XInclude
  processing on the stylesheets themselves, raised by Daniel Leidert
Daniel

diff --git a/ChangeLog b/ChangeLog
index e6a8e77..f2c9e0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 16 17:39:04 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+       * xsltproc/xsltproc.c: --xinclude should also force XInclude
+         processing on the stylesheets themselves, raised by Daniel Leidert
+
 Thu Aug 10 15:54:02 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net
 
        * libxslt/transform.c libxslt/variables.c

diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index 2d8a9f4..7abee40 100644 (file)
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -777,6 +777,18 @@ main(int argc, char **argv)
            style = xmlReadFile((const char *) argv[i], NULL, options);
             if (timing) 
                endTimer("Parsing stylesheet %s", argv[i]);
+            if (style != NULL) {
+               if (timing)
+                   startTimer();
+#if LIBXML_VERSION >= 20603
+               xmlXIncludeProcessFlags(style, XSLT_PARSE_OPTIONS);
+#else
+               xmlXIncludeProcess(style);
+#endif
+               if (timing) {
+                   endTimer("XInclude processing %s", argv[i]);
+               }
+           }
            if (style == NULL) {
                fprintf(stderr,  "cannot parse %s\n", argv[i]);
                cur = NULL;