diff --git a/ChangeLog b/ChangeLog index aa910dc3..92966da9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 15 19:11:36 CEST 2002 Daniel Veillard + + * configure.in: release of 2.4.20 + * doc/*: updated and rebuilt the docs + Mon Apr 15 14:55:53 CEST 2002 Daniel Veillard * python/Makefile.am: patch from Cristian Gafton to build on diff --git a/configure.in b/configure.in index a11bcb90..e6738934 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=19 +LIBXML_MICRO_VERSION=20 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 050eb055..f3e35434 100644 --- a/doc/html/index.sgml +++ b/doc/html/index.sgml @@ -426,6 +426,10 @@ + + + + @@ -781,11 +785,11 @@ - + diff --git a/doc/html/libxml-c14n.html b/doc/html/libxml-c14n.html index 362d85c1..06b89eca 100644 --- a/doc/html/libxml-c14n.html +++ b/doc/html/libxml-c14n.html @@ -123,7 +123,7 @@ NAME="LIBXML-C14N" >

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

table : the hash table
name : the name of the userdata
name2 : a second name of the userdata
userdata : a pointer to the userdata
f : the deallocator function for replaced item (if any)
Returns :0 the addition succeeded and -1 in case of error.

xmlHashAddEntry3 ()

int         xmlHashAddEntry3                (xmlHashTablePtr table,
-                                             const xmlChar *name,
-                                             const xmlChar *name2,
-                                             const xmlChar *name3,
-                                             void *userdata);

Add the userdata to the hash table. This can later be retrieved -by using the tuple (name, name2, name3). Duplicate entries generate -errors.

table : the hash table
name : the name of the userdata
name2 : a second name of the userdata
name3 : a third name of the userdata
userdata : a pointer to the userdata
Returns :0 the addition succeeded and -1 in case of error.

xmlHashUpdateEntry3 ()

int         xmlHashUpdateEntry3             (xmlHashTablePtr table,
-                                             const xmlChar *name,
-                                             const xmlChar *name2,
-                                             const xmlChar *name3,
-                                             void *userdata,
-                                             xmlHashDeallocator f);

Add the userdata to the hash table. This can later be retrieved -by using the tuple (name, name2, name3). Existing entry for this tuple -will be removed and freed with f if found.

userdata : a pointer to the userdataf : the deallocator function for replaced item (if any)Returns :0 the addition succeeded and -1 in case of error.

xmlHashAddEntry3 ()

int         xmlHashAddEntry3                (xmlHashTablePtr table,
+                                             const xmlChar *name,
+                                             const xmlChar *name2,
+                                             const xmlChar *name3,
+                                             void *userdata);

Add the userdata to the hash table. This can later be retrieved +by using the tuple (name, name2, name3). Duplicate entries generate +errors.

table : the hash table
name : the name of the userdata
name2 : a second name of the userdata
name3 : a third name of the userdata
userdata : a pointer to the userdata
Returns :0 the addition succeeded and -1 in case of error.

xmlHashUpdateEntry3 ()

int         xmlHashUpdateEntry3             (xmlHashTablePtr table,
+                                             const xmlChar *name,
+                                             const xmlChar *name2,
+                                             const xmlChar *name3,
+                                             void *userdata,
+                                             xmlHashDeallocator f);

Add the userdata to the hash table. This can later be retrieved +by using the tuple (name, name2, name3). Existing entry for this tuple +will be removed and freed with f if found.

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

xmlChar **list, int *len, - int max);xmlValidateNameValue (const xmlChar *value); +int xmlValidateNamesValue (const xmlChar *value); +int xmlValidateNmtokenValue (const xmlChar *value); +int xmlValidateNmtokensValue (const xmlChar *value);

table : the hash table
name : the name of the userdata
name2 : a second name of the userdata
name3 :

Description

Details

xmlValidateNameValue ()

int         xmlValidateNameValue            (const xmlChar *value);

Validate that the given value match Name production

value : an Name value
Returns :1 if valid or 0 otherwise

xmlValidateNamesValue ()

int         xmlValidateNamesValue           (const xmlChar *value);

Validate that the given value match Names production

value : an Names value
Returns :1 if valid or 0 otherwise

xmlValidateNmtokenValue ()

int         xmlValidateNmtokenValue         (const xmlChar *value);

Validate that the given value match Nmtoken production

[ VC: Name Token ]

value : an Nmtoken value
Returns :1 if valid or 0 otherwise

xmlValidateNmtokensValue ()

int         xmlValidateNmtokensValue        (const xmlChar *value);

Validate that the given value match Nmtokens production

[ VC: Name Token ]

value : an Nmtokens value
Returns :1 if valid or 0 otherwise

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

*xmlInputCloseCallback) (void *context); -struct xmlParserInputBuffer; int (*xmlOutputMatchCallback*xmlOutputCloseCallback) (void *context); struct xmlParserInputBuffer; +struct xmlOutputBuffer; @@ -505,7 +505,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR" >

Description

Details

struct xmlParserInputBuffer

struct xmlParserInputBuffer {
-    void*                  context;
-    xmlInputReadCallback   readcallback;
-    xmlInputCloseCallback  closecallback;
-    
-    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
-    
-    xmlBufferPtr buffer;    /* Local buffer encoded in UTF-8 */
-    xmlBufferPtr raw;       /* if encoder != NULL buffer for raw input */
-};

struct xmlParserInputBuffer

struct xmlParserInputBuffer {
+    void*                  context;
+    xmlInputReadCallback   readcallback;
+    xmlInputCloseCallback  closecallback;
+    
+    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
+    
+    xmlBufferPtr buffer;    /* Local buffer encoded in UTF-8 */
+    xmlBufferPtr raw;       /* if encoder != NULL buffer for raw input */
+};

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

+ + + + @@ -1144,11 +1148,11 @@ - + @@ -6458,6 +6462,26 @@ + + Validate that the given value match Name production + + + + + Validate that the given value match Names production + + + + + Validate that the given value match Nmtoken production + + + + + Validate that the given value match Nmtokens production + + + Try to validate a single notation definition basically it does the following checks as described by the XML-1.0 recommendation: - it seems that no validity constraint exists on notation declarations But this function get called anyway ... diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index b61ba545..89ab4d9d 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -989,6 +989,10 @@ + + + + @@ -2260,6 +2264,10 @@ + + + + @@ -3316,6 +3324,10 @@ + + + + @@ -5646,6 +5658,10 @@ + + + + @@ -5655,11 +5671,11 @@ - + @@ -7369,8 +7385,12 @@ + + + + @@ -7382,6 +7402,10 @@ + + + + @@ -8187,6 +8211,10 @@ + + + + @@ -12635,6 +12663,10 @@ + + + + @@ -13925,35 +13957,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16377,6 +16380,10 @@ + + + + diff --git a/doc/xml.html b/doc/xml.html index bd8d2526..edcbaf40 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -556,6 +556,14 @@ you want to test those

href="http://www.w3.org/TR/xinclude">XInclude +

2.4.20: Apr 15 2002

+
    +
  • bug fixes: file descriptor leak, XPath, HTML ouput, DTD validation
    • +
  • XPath conformance testing by Richard Jinks
    • +
  • Portability fixes: Solaris, MPE/iX, Windows, OSF/1, python bindings, + libxml.m4
    • +
+

2.4.19: Mar 25 2002

  • bug fixes: half a dozen XPath bugs, Validation, ISO-Latin to UTF8 @@ -2563,6 +2571,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 1cdcd8b6..c10f9d14 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.19" +#define LIBXML_DOTTED_VERSION "2.4.20" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20419 +#define LIBXML_VERSION 20420 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20419" +#define LIBXML_VERSION_STRING "20420" /** * 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(20419); +#define LIBXML_TEST_VERSION xmlCheckVersion(20420); #if 0 /** diff --git a/libxml.spec.in b/libxml.spec.in index 5a9fa5ef..8d13a18c 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: @VERSION@ -Release: 4 +Release: 1 License: MIT Group: Development/Libraries Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz diff --git a/python/libxml2class.txt b/python/libxml2class.txt index 4b08b79c..9e55c355 100644 --- a/python/libxml2class.txt +++ b/python/libxml2class.txt @@ -144,6 +144,12 @@ createURI() normalizeURIPath() parseURI() +# functions from module valid +validateNameValue() +validateNamesValue() +validateNmtokenValue() +validateNmtokensValue() + # functions from module xmlIO cleanupInputCallbacks() cleanupOutputCallbacks() diff --git a/python/setup.py.in b/python/setup.py.in index e302d9ec..69a84180 100755 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -11,6 +11,29 @@ def missing(file): return 1 return 0 +try: + import posix + HOME = posix.environ['HOME'] +except: + HOME="C:" + +includes_dir = [ +"/usr/include", +"/usr/local/include", +"/opt/include", +HOME +]; + +xml_includes="" +for dir in includes_dir: + if not missing(dir + "/libxml2/libxml/tree.h"): + xml_includes=dir + "/libxml2" + break; + +if xml_includes == "": + print "failed to find headers for libxml2: update includes_dir" + sys.exit(1) + xml_files = ["libxml2-api.xml", "libxml2-python-api.xml", "libxml.c", "libxml.py", "libxml_wrap.h", "types.c", "xmlgenerator.py", "README", "TODO"] @@ -66,11 +89,22 @@ if missing("libxslt-py.c") or missing("libxslt.py"): else: with_xslt=1 +if with_xslt == 1: + xslt_includes="" + for dir in includes_dir: + if not missing(dir + "/libxslt/xsltconfig.h"): + xslt_includes=dir + "/libxslt" + break; + + if xslt_includes == "": + print "failed to find headers for libxslt: update includes_dir" + with_xslt = 0 + descr = "libxml2 package" modules = [ 'libxml2' ] c_files = ['libxml2-py.c', 'libxml.c', 'types.c' ] -includes= ["/usr/include/libxml2"] +includes= [xml_includes] libs = ["xml2", "m", "z"] macros = [] if with_xslt == 1: @@ -81,7 +115,7 @@ if with_xslt == 1: # c_files = c_files + ['libxslt-py.c', 'libxslt.c'] libs.insert(0, 'xslt') - includes.append("/usr/include/libxslt") + includes.append(xslt_includes) modules.append('libxslt') macros.append(('MERGED_MODULES', '1'))