diff --git a/ChangeLog b/ChangeLog
index 43d32617..4da7f324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
Mon Mar 18 19:18:13 CET 2002 Daniel Veillard
+ * configure.in: preparing 2.4.18
+ * doc/*: updated and rebuilt the web site
+ * *.c libxml.h: implement the new IN_LIBXML scheme discussed with
+ the Windows and Cygwin maintainers.
* parser.c: humm, changed the way the SAX parser work when
xmlSubstituteEntitiesDefault(1) is set, it will then
do the entity registration and loading by itself in case the
diff --git a/DOCBparser.c b/DOCBparser.c
index 0b4012a6..3670c5af 100644
--- a/DOCBparser.c
+++ b/DOCBparser.c
@@ -10,6 +10,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_DOCB_ENABLED
diff --git a/HTMLparser.c b/HTMLparser.c
index 24394ead..4c819d1b 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -6,6 +6,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_HTML_ENABLED
diff --git a/HTMLtree.c b/HTMLtree.c
index 7868d644..e02465dd 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -7,6 +7,7 @@
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_HTML_ENABLED
diff --git a/SAX.c b/SAX.c
index 9baeab54..5fc34635 100644
--- a/SAX.c
+++ b/SAX.c
@@ -7,6 +7,7 @@
*/
+#define IN_LIBXML
#include "libxml.h"
#include
#include
diff --git a/c14n.c b/c14n.c
index 25d9b9cf..83eee102 100644
--- a/c14n.c
+++ b/c14n.c
@@ -9,6 +9,7 @@
*
* Author: Aleksey Sanin
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_C14N_ENABLED
diff --git a/catalog.c b/catalog.c
index 29c473e5..1fc419d7 100644
--- a/catalog.c
+++ b/catalog.c
@@ -12,6 +12,7 @@
* Daniel.Veillard@imag.fr
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_CATALOG_ENABLED
diff --git a/configure.in b/configure.in
index 5a697ad4..e4f0c114 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=4
-LIBXML_MICRO_VERSION=17
+LIBXML_MICRO_VERSION=18
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/debugXML.c b/debugXML.c
index df50f66c..fcfa57fe 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -7,6 +7,7 @@
* Daniel Veillard
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_DEBUG_ENABLED
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html
new file mode 100644
index 00000000..5fa64c65
--- /dev/null
+++ b/doc/APIchunk22.html
@@ -0,0 +1,773 @@
+
+
+
+
+
+API Alphabetic Index x-x for libxml2
+
+
+
+
+ 
+ |
+
+The XML C library for Gnome
+API Alphabetic Index x-x for libxml2
+ |
|
|
+
+
+
+
diff --git a/doc/news.html b/doc/news.html
index d4d925ac..12ae020b 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -90,6 +90,15 @@ for a really accurate description
you want to test those
+2.4.18: Mar 18 2002
+
+- bug fixes: tree, SAX, canonicalization, validation, portability,
+ xpath
+- removed the --with-buffer option it was becoming unmaintainable
+- serious cleanup of the Python makefiles
+- speedup patch to XPath very effective for DocBook stylesheets
+- Fixes for Windows build, cleanup of the documentation
+
2.4.17: Mar 8 2002
- a lot of bug fixes, including "namespace nodes have no parents in
diff --git a/doc/xml.html b/doc/xml.html
index b38ccdbc..45a78724 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -556,6 +556,16 @@ you want to test those
href="http://www.w3.org/TR/xinclude">XInclude
+2.4.18: Mar 18 2002
+
+ - bug fixes: tree, SAX, canonicalization, validation, portability,
+ xpath
+ - removed the --with-buffer option it was becoming unmaintainable
+ - serious cleanup of the Python makefiles
+ - speedup patch to XPath very effective for DocBook stylesheets
+ - Fixes for Windows build, cleanup of the documentation
+
+
2.4.17: Mar 8 2002
- a lot of bug fixes, including "namespace nodes have no parents in
@@ -2528,6 +2538,8 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) {
}
return(ret);
+
+
}
- And then use it to save the document:
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 168b1a6b..28549776 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -221,6 +221,8 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) {
}
return(ret);
+
+
}
- And then use it to save the document:
diff --git a/encoding.c b/encoding.c
index 06ebd2a3..df8714be 100644
--- a/encoding.c
+++ b/encoding.c
@@ -23,6 +23,7 @@
* Original code for IsoLatin1 and UTF-16 by "Martin J. Duerst"
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/entities.c b/entities.c
index 4f6f52a6..efc7b9fd 100644
--- a/entities.c
+++ b/entities.c
@@ -6,6 +6,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/error.c b/error.c
index f27494e4..14d91f31 100644
--- a/error.c
+++ b/error.c
@@ -6,6 +6,7 @@
* Daniel Veillard
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/globals.c b/globals.c
index ff0e3b76..cce70fbf 100644
--- a/globals.c
+++ b/globals.c
@@ -11,6 +11,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef HAVE_STDLIB_H
diff --git a/hash.c b/hash.c
index 33fdec8f..f01e6b90 100644
--- a/hash.c
+++ b/hash.c
@@ -17,6 +17,7 @@
* Author: breese@users.sourceforge.net
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index d80540ad..4ec99648 100644
--- a/include/libxml/xmlwin32version.h
+++ b/include/libxml/xmlwin32version.h
@@ -27,21 +27,21 @@ extern void xmlCheckVersion(int version);
*
* the version string like "1.2.3"
*/
-#define LIBXML_DOTTED_VERSION "2.4.17"
+#define LIBXML_DOTTED_VERSION "2.4.18"
/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXML_VERSION 20417
+#define LIBXML_VERSION 20418
/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXML_VERSION_STRING "20417"
+#define LIBXML_VERSION_STRING "20418"
/**
* LIBXML_TEST_VERSION:
@@ -49,7 +49,7 @@ extern void xmlCheckVersion(int version);
* Macro to check that the libxml version in use is compatible with
* the version the software has been compiled against
*/
-#define LIBXML_TEST_VERSION xmlCheckVersion(20417);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20418);
#if 0
/**
diff --git a/libxml.h b/libxml.h
index d229ba39..6b7476f5 100644
--- a/libxml.h
+++ b/libxml.h
@@ -9,9 +9,6 @@
#ifndef __XML_LIBXML_H__
#define __XML_LIBXML_H__
-#ifndef IN_LIBXML
-#define IN_LIBXML
-#endif
#if defined(WIN32) && !defined(__CYGWIN__)
#include "win32config.h"
#elif defined(macintosh)
diff --git a/list.c b/list.c
index 5abe2eee..756912a2 100644
--- a/list.c
+++ b/list.c
@@ -15,6 +15,7 @@
* Author: Gary.Pennington@uk.sun.com
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/nanoftp.c b/nanoftp.c
index 875e54a7..03d68884 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -16,6 +16,7 @@
#define NEED_SOCKETS
#endif /* TESTING */
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_FTP_ENABLED
diff --git a/nanohttp.c b/nanohttp.c
index 01e4353a..b843370e 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -15,6 +15,7 @@
fly with ZLIB if found at compile-time */
#define NEED_SOCKETS
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_HTTP_ENABLED
diff --git a/parser.c b/parser.c
index d2fd6905..a14cdbda 100644
--- a/parser.c
+++ b/parser.c
@@ -30,6 +30,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#if defined(WIN32) && !defined (__CYGWIN__)
diff --git a/parserInternals.c b/parserInternals.c
index c539714d..68ac5382 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -7,6 +7,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#if defined(WIN32) && !defined (__CYGWIN__)
diff --git a/threads.c b/threads.c
index 37c7d9c8..b790d055 100644
--- a/threads.c
+++ b/threads.c
@@ -7,6 +7,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/tree.c b/tree.c
index 900f2219..84620c71 100644
--- a/tree.c
+++ b/tree.c
@@ -11,6 +11,7 @@
*
*/
+#define IN_LIBXML
#include "libxml.h"
#include /* for memset() only ! */
diff --git a/uri.c b/uri.c
index c68a01c0..6e43fc9c 100644
--- a/uri.c
+++ b/uri.c
@@ -8,6 +8,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/valid.c b/valid.c
index f285c19e..9133a305 100644
--- a/valid.c
+++ b/valid.c
@@ -7,6 +7,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/xinclude.c b/xinclude.c
index dfd90abd..7fbcaca7 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -14,6 +14,7 @@
* TODO: add an node intermediate API and handle recursion at this level
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/xlink.c b/xlink.c
index d0d8ea0a..17ec77f6 100644
--- a/xlink.c
+++ b/xlink.c
@@ -8,6 +8,7 @@
*/
+#define IN_LIBXML
#include "libxml.h"
#include /* for memset() only */
diff --git a/xmlIO.c b/xmlIO.c
index edb2389a..e3c16fb1 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -8,6 +8,7 @@
* 14 Nov 2000 ht - for VMS, truncated name of long functions to under 32 char
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/xmlcatalog.c b/xmlcatalog.c
index 37969f01..78781f07 100644
--- a/xmlcatalog.c
+++ b/xmlcatalog.c
@@ -6,6 +6,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/xmlmemory.c b/xmlmemory.c
index 1c1ed361..890ab7b0 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -4,6 +4,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
#include
diff --git a/xpath.c b/xpath.c
index 032c9b18..24d8dc01 100644
--- a/xpath.c
+++ b/xpath.c
@@ -16,6 +16,7 @@
* for VMS
*/
+#define IN_LIBXML
#include "libxml.h"
#ifdef LIBXML_XPATH_ENABLED
diff --git a/xpointer.c b/xpointer.c
index 8ffb975f..b49073a7 100644
--- a/xpointer.c
+++ b/xpointer.c
@@ -9,6 +9,7 @@
* daniel@veillard.com
*/
+#define IN_LIBXML
#include "libxml.h"
/*