diff --git a/ChangeLog b/ChangeLog index 750b1033..0d10b333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ Thu Dec 12 10:59:11 CET 2002 Daniel Veillard + * configure.in: preparing release of 2.4.30 * doc/apibuild.py doc/libxml2-api.xml: fixups to the api builder, - gives enum values, fix functype return type + gives enum values, fix functype return type, put back fields in + structs + * doc/*: updated the docs rebuilt Thu Dec 12 01:09:34 CET 2002 Daniel Veillard diff --git a/configure.in b/configure.in index 9652debe..9700f53f 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=29 +LIBXML_MICRO_VERSION=30 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/apibuild.py b/doc/apibuild.py index 3e94e931..7f3158e1 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -182,6 +182,10 @@ class index: if self.functions.has_key(id): up = idx.functions[id] self.functions[id].update(None, up.type, up.info, up.extra) + # else: + # print "Function %s from %s is not declared in headers" % ( + # id, idx.functions[id].module) + # TODO: do the same for variables. def analyze_dict(self, type, dict): count = 0 @@ -1348,12 +1352,12 @@ class docBuilder: output.write(" \n"); try: for field in self.idx.structs[name].info: - print name, field desc = field[2] if desc == None: desc = '' @@ -1369,6 +1373,15 @@ class docBuilder: output.write(" \n" % ( name, self.modulename_file(id.module), id.info)) + def serialize_variable(self, output, name): + id = self.idx.variables[name] + if id.info != None: + output.write(" \n" % ( + name, self.modulename_file(id.module), id.info)) + else: + output.write(" \n" % ( + name, self.modulename_file(id.module))) + def serialize_function(self, output, name): id = self.idx.functions[name] output.write(" <%s name='%s' file='%s'>\n" % (id.type, name, @@ -1430,6 +1443,10 @@ class docBuilder: typedefs.sort() for typedef in typedefs: self.serialize_typedef(output, typedef) + variables = self.idx.variables.keys() + variables.sort() + for variable in variables: + self.serialize_variable(output, variable) functions = self.idx.functions.keys() functions.sort() for function in functions: diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 9cefcb1f..0028b5c8 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -2402,9 +2402,23 @@ - + + + + + + + + + + + - + + + + + @@ -2416,15 +2430,48 @@ - + + + + + - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + @@ -2434,7 +2481,12 @@ - + + + + + + @@ -2443,14 +2495,83 @@ - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2461,16 +2582,67 @@ - + + + + + + + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -2478,38 +2650,172 @@ - + + + + + - + + + + + + + + + + + + + + + - + + + + + - + + + + + - + + + + + + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + + + + - + + + + + @@ -2517,38 +2823,208 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Take a block of UTF-8 chars in and try to convert it to an ASCII plus HTML entities block of chars out. diff --git a/doc/news.html b/doc/news.html index 44976a2a..ec056397 100644 --- a/doc/news.html +++ b/doc/news.html @@ -102,6 +102,12 @@ to test those

Schemas and XInclude +

2.4.30: Dec 12 2002

+
    +
  • 2.4.29 broke the python bindings, rereleasing
    • +
  • Improvement/fixes of the XML API generator, and couple of minor code + fixes.
    • +

2.4.29: Dec 11 2002

  • Windows fixes (Igor): Windows CE port, pthread linking, python bindings diff --git a/doc/xml.html b/doc/xml.html index c088ca32..86b82809 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -589,6 +589,13 @@ to test those

    Schemas and XInclude
+

2.4.30: Dec 12 2002

+
    +
  • 2.4.29 broke the python bindings, rereleasing
    • +
  • Improvement/fixes of the XML API generator, and couple of minor code + fixes.
    • +
+

2.4.29: Dec 11 2002

  • Windows fixes (Igor): Windows CE port, pthread linking, python bindings @@ -2751,6 +2758,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + } diff --git a/doc/xmlio.html b/doc/xmlio.html index 3a2bb835..7010213c 100644 --- a/doc/xmlio.html +++ b/doc/xmlio.html @@ -251,6 +251,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + } diff --git a/python/libxml2class.txt b/python/libxml2class.txt index f72e7533..e15f5999 100644 --- a/python/libxml2class.txt +++ b/python/libxml2class.txt @@ -430,6 +430,7 @@ Class xmlDoc(xmlNode) htmlNodeDumpFile() htmlNodeDumpFileFormat() htmlNodeDumpFormatOutput() + htmlNodeDumpOutput() htmlSaveFile() htmlSaveFileEnc() htmlSaveFileFormat()