diff --git a/AUTHORS b/AUTHORS index 9f3c0e17..5d0c9b65 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,5 @@ - Daniel Veillard: - Daniel.Veillard@imag.fr + daniel@veillard.com DV on #gnome IRC channel http://veillard.com/ Used to work at W3C, now Red Hat @@ -13,3 +12,6 @@ Bjorn Reese: http://home1.stofanet.dk/breese/ Software developer at http://www.systematic.dk/ Member of the XML-MTF Mapping WG. + +William Brack + diff --git a/ChangeLog b/ChangeLog index 1fed873c..a407b221 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Jun 28 15:48:06 CEST 2001 Daniel Veillard + + * libxslt/xsltwin32config.h[.in]: added configuration/version + informations for Windows/MSC + * libxslt/libxslt.h libxslt/*.c: internal header to centralize + includes switches + * libxslt/Makefile.am: added libxslt.h and xsltwin32config.h[.in] + * libxslt/*.[ch] libxslt/*.in: quite a bit of cleanup, especially + the email addresses + * AUTHORS: added William + Tue Jun 26 18:45:38 CEST 2001 Daniel Veillard * configure.in doc/xslt.html: releasing 0.13.0 diff --git a/FEATURES b/FEATURES index 78ebf3e5..59714469 100644 --- a/FEATURES +++ b/FEATURES @@ -241,4 +241,4 @@ YES @class YES @* YES except ns for key key('a','b') -Daniel.Veillard@imag.fr +daniel@veillard.com diff --git a/configure.in b/configure.in index b81a949a..5dfeaeff 100644 --- a/configure.in +++ b/configure.in @@ -178,6 +178,7 @@ AC_OUTPUT([ Makefile libxslt/Makefile libxslt/xsltconfig.h +libxslt/xsltwin32config.h tests/Makefile tests/docs/Makefile tests/REC1/Makefile diff --git a/doc/internals.html b/doc/internals.html index c93e6645..0aa9b5df 100644 --- a/doc/internals.html +++ b/doc/internals.html @@ -500,7 +500,7 @@ xsltCompMatch).

-

Daniel Veillard

+

Daniel Veillard

$Id$

diff --git a/doc/libxslt.sgml b/doc/libxslt.sgml index ac83fd75..7d30b929 100644 --- a/doc/libxslt.sgml +++ b/doc/libxslt.sgml @@ -23,7 +23,7 @@ Veillard
- Daniel.Veillard@imag.fr + daniel@veillard.com
diff --git a/doc/xslt.html b/doc/xslt.html index 6462233f..e1ceab9a 100644 --- a/doc/xslt.html +++ b/doc/xslt.html @@ -125,7 +125,7 @@ database::

  • provide new documentations pieces (translations, examples, etc ...)
  • Check the TODO file and try to close one of the items
  • take one of the points raised in the archive or the bug database and - provide a fix. Get in touch with + provide a fix. Get in touch with me before to avoid synchronization problems and check that the suggested fix will fit in nicely :-)
    • @@ -382,7 +382,7 @@ documents.

    -

    Daniel Veillard

    +

    Daniel Veillard

    $Id$

    diff --git a/libxslt.spec.in b/libxslt.spec.in index e2835273..aca78c6d 100644 --- a/libxslt.spec.in +++ b/libxslt.spec.in @@ -35,7 +35,7 @@ installed. %changelog -* Mon Jan 22 2001 Daniel.Veillard +* Mon Jan 22 2001 Daniel.Veillard - created based on libxml2 spec file diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am index fb7d5855..c10e6a6b 100644 --- a/libxslt/Makefile.am +++ b/libxslt/Makefile.am @@ -41,7 +41,10 @@ libxslt_la_SOURCES = \ documents.c \ preproc.c \ transform.c \ - win32config.h + win32config.h \ + xsltwin32config.h \ + xsltwin32config.h.in \ + libxslt.h libxslt_la_LIBADD = $(EXTRA_LIBS) libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@ diff --git a/libxslt/attributes.c b/libxslt/attributes.c index 46cbf61f..a04156e8 100644 --- a/libxslt/attributes.c +++ b/libxslt/attributes.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/attributes.h b/libxslt/attributes.h index 687db0ce..c112a2e0 100644 --- a/libxslt/attributes.h +++ b/libxslt/attributes.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_ATTRIBUTES_H__ diff --git a/libxslt/documents.c b/libxslt/documents.c index 35c62635..7f6684b2 100644 --- a/libxslt/documents.c +++ b/libxslt/documents.c @@ -3,14 +3,13 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include -#include #include #include #include diff --git a/libxslt/documents.h b/libxslt/documents.h index 0f371fab..7c4f1a72 100644 --- a/libxslt/documents.h +++ b/libxslt/documents.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_DOCUMENTS_H__ diff --git a/libxslt/extensions.c b/libxslt/extensions.c index 6cda92e8..92a6c18d 100644 --- a/libxslt/extensions.c +++ b/libxslt/extensions.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/extensions.h b/libxslt/extensions.h index 65685848..a4f053e0 100644 --- a/libxslt/extensions.h +++ b/libxslt/extensions.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_EXTENSION_H__ diff --git a/libxslt/extra.c b/libxslt/extra.c index 0a21165c..4f1786be 100644 --- a/libxslt/extra.c +++ b/libxslt/extra.c @@ -7,10 +7,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include @@ -19,7 +19,6 @@ #include #include #include -#include #include "xslt.h" #include "xsltInternals.h" #include "xsltutils.h" diff --git a/libxslt/extra.h b/libxslt/extra.h index 72df1f13..df242284 100644 --- a/libxslt/extra.h +++ b/libxslt/extra.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_EXTRA_H__ diff --git a/libxslt/functions.c b/libxslt/functions.c index e8233bea..4b430369 100644 --- a/libxslt/functions.c +++ b/libxslt/functions.c @@ -6,11 +6,11 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com * Bjorn Reese for number formatting */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/functions.h b/libxslt/functions.h index 7a00b712..db2d24ba 100644 --- a/libxslt/functions.h +++ b/libxslt/functions.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com * Bjorn Reese for number formatting */ diff --git a/libxslt/imports.c b/libxslt/imports.c index 66766068..51ec6b2b 100644 --- a/libxslt/imports.c +++ b/libxslt/imports.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/imports.h b/libxslt/imports.h index daed14a5..7a7305ff 100644 --- a/libxslt/imports.h +++ b/libxslt/imports.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_IMPORTS_H__ diff --git a/libxslt/keys.c b/libxslt/keys.c index 16b5b17a..723b83e0 100644 --- a/libxslt/keys.c +++ b/libxslt/keys.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/keys.h b/libxslt/keys.h index 5503f5e8..72ff1317 100644 --- a/libxslt/keys.h +++ b/libxslt/keys.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_KEY_H__ diff --git a/libxslt/namespaces.c b/libxslt/namespaces.c index cbfa6e4a..b76e864b 100644 --- a/libxslt/namespaces.c +++ b/libxslt/namespaces.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/namespaces.h b/libxslt/namespaces.h index b81618df..8a5e25ae 100644 --- a/libxslt/namespaces.h +++ b/libxslt/namespaces.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_NAMESPACES_H__ diff --git a/libxslt/numbers.c b/libxslt/numbers.c index 824ac079..2c4d6242 100644 --- a/libxslt/numbers.c +++ b/libxslt/numbers.c @@ -6,11 +6,11 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com * Bjorn Reese */ -#include "xsltconfig.h" +#include "libxslt.h" #include #include diff --git a/libxslt/numbersInternals.h b/libxslt/numbersInternals.h index 54ae52ea..f6fd7aa3 100644 --- a/libxslt/numbersInternals.h +++ b/libxslt/numbersInternals.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com * Bjorn Reese */ diff --git a/libxslt/pattern.c b/libxslt/pattern.c index bc2c214e..e61fe7e0 100644 --- a/libxslt/pattern.c +++ b/libxslt/pattern.c @@ -6,7 +6,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ /* @@ -14,7 +14,7 @@ * TODO: detect [number] at compilation, optimize accordingly */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/pattern.h b/libxslt/pattern.h index 882d9258..3a382d54 100644 --- a/libxslt/pattern.h +++ b/libxslt/pattern.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_PATTERN_H__ diff --git a/libxslt/preproc.c b/libxslt/preproc.c index 0ec9d834..9168a41f 100644 --- a/libxslt/preproc.c +++ b/libxslt/preproc.c @@ -12,10 +12,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/preproc.h b/libxslt/preproc.h index 7700db6d..e3857463 100644 --- a/libxslt/preproc.h +++ b/libxslt/preproc.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_PRECOMP_H__ diff --git a/libxslt/templates.c b/libxslt/templates.c index 5770daef..e1146fbc 100644 --- a/libxslt/templates.c +++ b/libxslt/templates.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/templates.h b/libxslt/templates.h index 847e6da9..07510e26 100644 --- a/libxslt/templates.h +++ b/libxslt/templates.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_TEMPLATES_H__ diff --git a/libxslt/transform.c b/libxslt/transform.c index 95e0f29a..add7a7b4 100644 --- a/libxslt/transform.c +++ b/libxslt/transform.c @@ -13,10 +13,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/transform.h b/libxslt/transform.h index ff9a085c..995e09eb 100644 --- a/libxslt/transform.h +++ b/libxslt/transform.h @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_TRANSFORM_H__ diff --git a/libxslt/variables.c b/libxslt/variables.c index 87fcaa06..5c30eb65 100644 --- a/libxslt/variables.c +++ b/libxslt/variables.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include @@ -21,7 +21,6 @@ #include #include #include -#include #include "xslt.h" #include "xsltInternals.h" #include "xsltutils.h" diff --git a/libxslt/variables.h b/libxslt/variables.h index 6018fdc1..2cdafd05 100644 --- a/libxslt/variables.h +++ b/libxslt/variables.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_VARIABLES_H__ diff --git a/libxslt/win32config.h b/libxslt/win32config.h index 691c6fe5..5daf21bb 100644 --- a/libxslt/win32config.h +++ b/libxslt/win32config.h @@ -56,11 +56,13 @@ static int isnan (double d) { /* Microsoft's C runtime names all non-ANSI functions with a leading underscore. Since functionality is still the same, they can be used. */ #ifdef _MSC_VER -#include +#include #ifndef WITH_TRIO #define snprintf _snprintf #define vsnprintf _vsnprintf #endif /* WITH_TRIO */ +#else +#include #endif /* _MSC_VER */ diff --git a/libxslt/xslt.c b/libxslt/xslt.c index b77e5d3b..61bac098 100644 --- a/libxslt/xslt.c +++ b/libxslt/xslt.c @@ -6,10 +6,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include diff --git a/libxslt/xslt.h b/libxslt/xslt.h index 813f6a4c..d18ec5fa 100644 --- a/libxslt/xslt.h +++ b/libxslt/xslt.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_H__ diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h index 8999465b..c8fa47f2 100644 --- a/libxslt/xsltInternals.h +++ b/libxslt/xsltInternals.h @@ -4,7 +4,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ #ifndef __XML_XSLT_INTERNALS_H__ diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in index 14ebb593..a87b01c0 100644 --- a/libxslt/xsltconfig.h.in +++ b/libxslt/xsltconfig.h.in @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_XSLTCONFIG_H__ diff --git a/libxslt/xsltproc.c b/libxslt/xsltproc.c index 0d150892..e979f61e 100644 --- a/libxslt/xsltproc.c +++ b/libxslt/xsltproc.c @@ -3,11 +3,10 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include -#include +#include "libxslt.h" #ifdef HAVE_STRING_H #include #endif diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c index 9ea632de..786b3dd9 100644 --- a/libxslt/xsltutils.c +++ b/libxslt/xsltutils.c @@ -6,15 +6,14 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@imag.fr + * daniel@veillard.com */ -#include "xsltconfig.h" +#include "libxslt.h" #include #include -#include #include #include #include diff --git a/libxslt/xsltutils.h b/libxslt/xsltutils.h index a3390112..8a54d9a4 100644 --- a/libxslt/xsltutils.h +++ b/libxslt/xsltutils.h @@ -3,7 +3,7 @@ * * See Copyright for the status of this software. * - * Daniel.Veillard@w3.org + * daniel@veillard.com */ #ifndef __XML_XSLTUTILS_H__ diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h new file mode 100644 index 00000000..cc46a089 --- /dev/null +++ b/libxslt/xsltwin32config.h @@ -0,0 +1,64 @@ +/* + * xsltwin32config.h: compile-time version informations for the XSLT engine + * when compiled on windows + * + * See Copyright for the status of this software. + * + * daniel@veillard.com + */ + +#ifndef __XML_XSLTWIN32CONFIG_H__ +#define __XML_XSLTWIN32CONFIG_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * LIBXSLT_DOTTED_VERSION: + * + * the version string like "1.2.3" + */ +#define LIBXSLT_DOTTED_VERSION "0.13.0" + +/** + * LIBXSLT_VERSION: + * + * the version number: 1.2.3 value is 1002003 + */ +#define LIBXSLT_VERSION 1300 + +/** + * LIBXSLT_VERSION_STRING: + * + * the version number string, 1.2.3 value is "1002003" + */ +#define LIBXSLT_VERSION_STRING "1300" + +/** + * WITH_XSLT_DEBUG: + * + * Activate the compilation of the debug reporting. Speed penalty + * is insignifiant and being able to run xsltpoc -v is useful. On + * by default + */ +#if 1 +#define WITH_XSLT_DEBUG +#endif + +/** + * ATTRIBUTE_UNUSED: + * + * This macro is used to flag unused function parameters to GCC, useless here + */ +#ifndef ATTRIBUTE_UNUSED +#define ATTRIBUTE_UNUSED +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* __XML_XSLTWIN32CONFIG_H__ */ diff --git a/libxslt/xsltwin32config.h.in b/libxslt/xsltwin32config.h.in new file mode 100644 index 00000000..1e865786 --- /dev/null +++ b/libxslt/xsltwin32config.h.in @@ -0,0 +1,64 @@ +/* + * xsltwin32config.h: compile-time version informations for the XSLT engine + * when compiled on windows + * + * See Copyright for the status of this software. + * + * daniel@veillard.com + */ + +#ifndef __XML_XSLTWIN32CONFIG_H__ +#define __XML_XSLTWIN32CONFIG_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * LIBXSLT_DOTTED_VERSION: + * + * the version string like "1.2.3" + */ +#define LIBXSLT_DOTTED_VERSION "@VERSION@" + +/** + * LIBXSLT_VERSION: + * + * the version number: 1.2.3 value is 1002003 + */ +#define LIBXSLT_VERSION @LIBXSLT_VERSION_NUMBER@ + +/** + * LIBXSLT_VERSION_STRING: + * + * the version number string, 1.2.3 value is "1002003" + */ +#define LIBXSLT_VERSION_STRING "@LIBXSLT_VERSION_NUMBER@" + +/** + * WITH_XSLT_DEBUG: + * + * Activate the compilation of the debug reporting. Speed penalty + * is insignifiant and being able to run xsltpoc -v is useful. On + * by default + */ +#if 1 +#define WITH_XSLT_DEBUG +#endif + +/** + * ATTRIBUTE_UNUSED: + * + * This macro is used to flag unused function parameters to GCC, useless here + */ +#ifndef ATTRIBUTE_UNUSED +#define ATTRIBUTE_UNUSED +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* __XML_XSLTWIN32CONFIG_H__ */