do not package cvs versioning temp files. more cleanup, slightly improved
* Makefile.am: do not package cvs versioning temp files.
* doc/apibuild.py doc/libxml2-api.xml doc/newapi.xsl: more cleanup,
slightly improved the API xml format, fixed a lot of small
rendering problems
* doc/html/libxml*.html: rebuilt
Daniel
diff --git a/doc/apibuild.py b/doc/apibuild.py
index 57a205f..223214d 100755
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -1602,12 +1602,41 @@
if string.find(desc, "DEPRECATED") != -1:
output.write(" <deprecated/>\n")
- ids = dict.functions.keys() + dict.variables.keys() + \
- dict.macros.keys() + dict.typedefs.keys() + \
- dict.structs.keys() + dict.enums.keys()
+ ids = dict.macros.keys()
ids.sort()
for id in uniq(ids):
- output.write(" <exports symbol='%s'/>\n" % (id))
+ # Macros are sometime used to masquerade other types.
+ if dict.functions.has_key(id):
+ continue
+ if dict.variables.has_key(id):
+ continue
+ if dict.typedefs.has_key(id):
+ continue
+ if dict.structs.has_key(id):
+ continue
+ if dict.enums.has_key(id):
+ continue
+ output.write(" <exports symbol='%s' type='macro'/>\n" % (id))
+ ids = dict.enums.keys()
+ ids.sort()
+ for id in uniq(ids):
+ output.write(" <exports symbol='%s' type='enum'/>\n" % (id))
+ ids = dict.typedefs.keys()
+ ids.sort()
+ for id in uniq(ids):
+ output.write(" <exports symbol='%s' type='typedef'/>\n" % (id))
+ ids = dict.structs.keys()
+ ids.sort()
+ for id in uniq(ids):
+ output.write(" <exports symbol='%s' type='struct'/>\n" % (id))
+ ids = dict.variables.keys()
+ ids.sort()
+ for id in uniq(ids):
+ output.write(" <exports symbol='%s' type='variable'/>\n" % (id))
+ ids = dict.functions.keys()
+ ids.sort()
+ for id in uniq(ids):
+ output.write(" <exports symbol='%s' type='function'/>\n" % (id))
output.write(" </file>\n")
def serialize_xrefs_files(self, output):