diff --git a/ChangeLog b/ChangeLog index ff50ee25..917165b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 18 13:18:53 CEST 2002 Daniel Veillard + + * configure.in: preparing the release of 2.4.26 + * doc/*: updated and rebuilt the documentation + Wed Oct 16 20:01:46 CEST 2002 Daniel Veillard * parser.c: fixed a XML Namespace compliance bug reported by diff --git a/configure.in b/configure.in index dcfa5075..2a65e446 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=25 +LIBXML_MICRO_VERSION=26 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/doc/html/index.sgml b/doc/html/index.sgml index 9df5e7d5..9aaeb629 100644 --- a/doc/html/index.sgml +++ b/doc/html/index.sgml @@ -834,6 +834,7 @@ + diff --git a/doc/html/libxml-c14n.html b/doc/html/libxml-c14n.html index 94d448ab..22421085 100644 --- a/doc/html/libxml-c14n.html +++ b/doc/html/libxml-c14n.html @@ -121,7 +121,7 @@ NAME="LIBXML-C14N">c14n

Name

Synopsis

Description

Details

catalog

Name

Synopsis

Description

Details

debugXML

Name

Synopsis

Description

Details

Print node to stdout

Print node to the output FILE

a non-null node to print to stdout a non-null node to print to the output FILE

Prints result to stdout

Prints result to the output FILE

the output FILE* the output FILE*, defaults to stdout if NULL
DOCBparser

Name

Synopsis

Description

Details

encoding

Name

Synopsis

Description

Details

globals

Name

Synopsis

Description

Details

hash

Name

Synopsis

Description

Details

parserInternals

Name

Synopsis

Description

Details

c : an unicode character (int)
Returns :0 if not, non-zero otherwise

xmlIsPubidChar ()

int         xmlIsPubidChar                  (int c);

Check whether the character is allowed by the production -[13] PubidChar ::= x20 | xD | xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]

xmlIsLetter ()

xmlIsPubidChar ()
int         xmlIsLetter                     (int c);
int xmlIsPubidChar (int c);

Check whether the character is allowed by the production -[84] Letter ::= BaseChar | Ideographic

x20 | xD | xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]

xmlIsLetter ()

int         xmlIsLetter                     (int c);

Check whether the character is allowed by the production +[84] Letter ::= BaseChar | Ideographic

schemasInternals

Name

Synopsis

Description

Details

threads

Name

Synopsis

Description

Details

xmlautomata

Name

Synopsis

Description

Details

xmlChar *path); int xmlCheckFilename (const char *path); +int xmlFileMatch (const char *filename); @@ -565,7 +569,7 @@ HREF="libxml-xmlio.html#XMLIOFTPCLOSE" >

Description

Details

xmlCheckFilename ()

int         xmlCheckFilename                (const char *path);

function checks to see if path is a valid source +(file, socket...) for XML.

if stat is not available on the target machine, +returns 1. if stat fails, returns 0 (if calling +stat on the filename fails, it can't be right). +if stat succeeds and the file is a directory,

xmlmemory

Name

Synopsis

Description

Details

xmlregexp

Name

Synopsis

Description

Details

xmlschemas

Name

Synopsis

Description

Details

ctx : 
msg : 
... : 

xmlSchemaValidityWarningFunc ()

void        (*xmlSchemaValidityWarningFunc) (void *ctx,
-                                             const char *msg,
-                                             ...);

xmlSchemaValidityWarningFunc ()

void        (*xmlSchemaValidityWarningFunc) (void *ctx,
+                                             const char *msg,
+                                             ...);

struct xmlSchemaParserCtxt

xmlschemastypes

Name

Synopsis

Description

Details

xmlunicode

Name

Synopsis

Description

Details

+ @@ -3609,6 +3610,11 @@ + + function checks to see if path is a valid source (file, socket...) for XML. + + + Checks that the value conforms to the LanguageID production: @@ -6761,7 +6767,7 @@ - + Implements the XML shell function "base" dumps the current XML base of the node @@ -6822,9 +6828,9 @@ - Print node to stdout + Print node to the output FILE - + Print the xpath error to libxml default error channel @@ -6833,7 +6839,7 @@ - Prints result to stdout + Prints result to the output FILE diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index eab9e13d..4e4ea792 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -420,6 +420,7 @@ + @@ -1994,6 +1995,7 @@ + @@ -6546,6 +6548,7 @@ + @@ -10928,6 +10931,7 @@ + @@ -10953,6 +10957,7 @@ + @@ -11717,6 +11722,7 @@ + @@ -15249,6 +15255,7 @@ + @@ -16642,6 +16649,7 @@ + @@ -16871,6 +16879,7 @@ + @@ -16902,6 +16911,7 @@ + @@ -17072,8 +17082,7 @@ - - + diff --git a/doc/xml.html b/doc/xml.html index 0e25a933..e4113a27 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -582,6 +582,14 @@ to test those

Schemas and XInclude +

2.4.26: Oct 18 2002

+
    +
  • Patches for Windows CE port, improvements on Windows paths handling
    • +
  • Fixes to the validation code (DTD and Schemas), xmlNodeGetPath() , + HTML serialization, Namespace compliance, and a number of small + problems
    • +
+

2.4.25: Sep 26 2002

  • A number of bug fixes: XPath, validation, Python bindings, DOM and @@ -2692,6 +2700,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + }
  • And then use it to save the document: diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h index 4f2a493e..c760bfb5 100644 --- a/include/libxml/xmlwin32version.h +++ b/include/libxml/xmlwin32version.h @@ -1,5 +1,6 @@ /* - * xmlversion.h : compile-time version informations for the XML parser. + * xmlwin32version.h : compile-time version informations for the XML parser + * when compiled on the Windows platform * * See Copyright for the status of this software. * @@ -26,21 +27,21 @@ extern void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.4.25" +#define LIBXML_DOTTED_VERSION "2.4.26" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20425 +#define LIBXML_VERSION 20426 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20425" +#define LIBXML_VERSION_STRING "20426" /** * LIBXML_TEST_VERSION: @@ -48,9 +49,8 @@ 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(20425); +#define LIBXML_TEST_VERSION xmlCheckVersion(20426); -#ifndef VMS #if 0 /** * WITH_TRIO: @@ -66,9 +66,6 @@ extern void xmlCheckVersion(int version); */ #define WITHOUT_TRIO #endif -#else /* VMS */ -#define WITH_TRIO 1 -#endif /* VMS */ /** * LIBXML_THREAD_ENABLED: @@ -76,10 +73,8 @@ extern void xmlCheckVersion(int version); * Whether the thread support is configured in */ #if 0 -#if defined(_REENTRANT) || (_POSIX_C_SOURCE - 0 >= 199506L) #define LIBXML_THREAD_ENABLED #endif -#endif /** * LIBXML_FTP_ENABLED: @@ -108,15 +103,6 @@ extern void xmlCheckVersion(int version); #define LIBXML_HTML_ENABLED #endif -/** - * LIBXML_C14N_ENABLED: - * - * Whether the Canonicalization support is configured in - */ -#if 1 -#define LIBXML_C14N_ENABLED -#endif - /** * LIBXML_CATALOG_ENABLED: * @@ -153,6 +139,15 @@ extern void xmlCheckVersion(int version); #define LIBXML_XPTR_ENABLED #endif +/** + * LIBXML_C14N_ENABLED: + * + * Whether the Canonicalization support is configured in + */ +#if 0 +#define LIBXML_C14N_ENABLED +#endif + /** * LIBXML_XINCLUDE_ENABLED: * @@ -167,7 +162,7 @@ extern void xmlCheckVersion(int version); * * Whether iconv support is available */ -#if 1 +#if 0 #define LIBXML_ICONV_ENABLED #endif @@ -189,42 +184,6 @@ extern void xmlCheckVersion(int version); #define DEBUG_MEMORY_LOCATION #endif -/** - * LIBXML_UNICODE_ENABLED - * - * Whether the Unicode related interfaces are compiled in - */ -#if 1 -#define LIBXML_UNICODE_ENABLED -#endif - -/** - * LIBXML_REGEXP_ENABLED - * - * Whether the regular expressions interfaces are compiled in - */ -#if 1 -#define LIBXML_REGEXP_ENABLED -#endif - -/** - * LIBXML_AUTOMATA_ENABLED - * - * Whether the automata interfaces are compiled in - */ -#if 1 -#define LIBXML_AUTOMATA_ENABLED -#endif - -/** - * LIBXML_SCHEMAS_ENABLED - * - * Whether the Schemas validation interfaces are compiled in - */ -#if 1 -#define LIBXML_SCHEMAS_ENABLED -#endif - /** * LIBXML_DLL_IMPORT: * @@ -241,7 +200,7 @@ extern void xmlCheckVersion(int version); * code which links against libxml statically. */ #ifndef LIBXML_DLL_IMPORT -#if (defined(_MSC_VER) || defined(__CYGWIN__)) && !defined(IN_LIBXML) && !defined(LIBXML_STATIC) +#if defined(_MSC_VER) && !defined(IN_LIBXML) && !defined(LIBXML_STATIC) #define LIBXML_DLL_IMPORT __declspec(dllimport) #else #define LIBXML_DLL_IMPORT @@ -264,9 +223,19 @@ extern void xmlCheckVersion(int version); #define ATTRIBUTE_UNUSED #endif +/** + * #pragma comment(lib, "iconv.lib") + * + * pragma understood my MS compiler which enables a conditional link with + * iconv. + */ +#ifdef _MSC_VER +#if defined LIBXML_ICONV_ENABLED && !defined LIBXML2_COMPILING_MSCCDEF +#pragma comment(lib, "iconv.lib") +#endif +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ #endif - -