patch from Mark Vadok about htmlNodeDumpOutput location. removed an

* HTMLtree.c include/libxml/HTMLtree.h: patch from Mark Vadok
  about htmlNodeDumpOutput location.
* xpath.c: removed an undefined function signature
* doc/apibuild.py doc/libxml2-api.xml: the script was exporting
  too many symbols in the API breaking the python bindings.
  Updated with the libxslt/libexslt changes.
Daniel
This commit is contained in:
Daniel Veillard 2002-12-12 00:15:55 +00:00
parent 9b4bb4d07a
commit 024b57019f
7 changed files with 74 additions and 1197 deletions

View File

@ -1,3 +1,12 @@
Thu Dec 12 01:09:34 CET 2002 Daniel Veillard <daniel@veillard.com>
* HTMLtree.c include/libxml/HTMLtree.h: patch from Mark Vadok
about htmlNodeDumpOutput location.
* xpath.c: removed an undefined function signature
* doc/apibuild.py doc/libxml2-api.xml: the script was exporting
too many symbols in the API breaking the python bindings.
Updated with the libxslt/libexslt changes.
Wed Dec 11 20:26:15 CET 2002 Daniel Veillard <daniel@veillard.com>
* configure.in: preparing release of 2.4.29

View File

@ -651,8 +651,6 @@ htmlAttrListDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur, co
}
void htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
xmlNodePtr cur, const char *encoding);
/**
* htmlNodeListDumpOutput:

View File

@ -182,9 +182,6 @@ class index:
if self.functions.has_key(id):
up = idx.functions[id]
self.functions[id].update(None, up.type, up.info, up.extra)
else:
if idx.functions[id].static == 0:
self.functions[id] = idx.functions[id]
def analyze_dict(self, type, dict):
count = 0
@ -225,6 +222,8 @@ ignored_words = {
"LIBXML_DLL_IMPORT": (0, "Special macro to flag external keywords"),
"__declspec": (3, "Windows keyword"),
"ATTRIBUTE_UNUSED": (0, "macro keyword"),
"LIBEXSLT_PUBLIC": (0, "macro keyword"),
"X_IN_Y": (5, "macro function builder"),
}
class CLexer:
@ -1342,15 +1341,20 @@ class docBuilder:
output.write(" <struct name='%s' file='%s' type='%s'" % (
name, self.modulename_file(id.module), id.info))
name = id.info[7:]
if self.idx.structs.has_key(name):
if self.idx.structs.has_key(name) and \
type(self.idx.structs[name]) == type(()):
output.write(">\n");
for field in self.idx.structs[name].info:
desc = field[2]
if desc == None:
desc = ''
else:
desc = escape(desc)
output.write(" <field name='%s' type='%s' info='%s'/>\n" % (field[1] , field[0], desc))
try:
for field in self.idx.structs[name].info:
print name, field
desc = field[2]
if desc == None:
desc = ''
else:
desc = escape(desc)
output.write(" <field name='%s' type='%s' info='%s'/>\n" % (field[1] , field[0], desc))
except:
print "Failed to serialize struct %s" % (name)
output.write(" </struct>\n")
else:
output.write("/>\n");
@ -1433,17 +1437,23 @@ def rebuild():
if glob.glob("../parser.c") != [] :
print "Rebuilding API description for libxml2"
builder = docBuilder("libxml2", ["..", "../include/libxml"],
["xmlwin32version.h", "tst.c"])
["xmlwin32version.h", "tst.c",
"schemasInternals.h", "xmlschemas" ])
elif glob.glob("../libxslt/transform.c") != [] :
print "Rebuilding API description for libxslt"
builder = docBuilder("libxslt", ["../libxslt"],
["win32config.h", "tst.c"])
["win32config.h", "libxslt.h", "tst.c"])
else:
print "rebuild() failed, unable to guess the module"
return None
builder.scan()
builder.analyze()
builder.serialize()
if glob.glob("../libexslt/exslt.c") != [] :
extra = docBuilder("libexslt", ["../libexslt"], ["libexslt.h"])
extra.scan()
extra.analyze()
extra.serialize()
return builder
#

File diff suppressed because it is too large Load Diff

View File

@ -103,6 +103,9 @@ void htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf,
int format);
int htmlIsBooleanAttr (const xmlChar *name);
void htmlNodeDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
xmlNodePtr cur, const char *encoding);

View File

@ -165,16 +165,9 @@ registerDefaultInputCallbacks()
registerDefaultOutputCallbacks()
registerHTTPPostCallbacks()
# functions from module xmlmemory.c
mallocBreakpoint()
# functions from module xmlregexp
regexpCompile()
# functions from module xmlschemastypes
schemaCleanupTypes()
schemaInitTypes()
# functions from module xmlunicode
uCSIsAlphabeticPresentationForms()
uCSIsArabic()
@ -395,9 +388,6 @@ Class xmlNode(xmlCore)
unsetNsProp()
unsetProp()
# functions from module tree.c
newReconciliedNs()
# functions from module valid
isID()
isRef()
@ -425,9 +415,6 @@ Class xmlNode(xmlCore)
xpathNextPrecedingSibling()
xpathNextSelf()
# functions from module xpointer.c
xpointerAdvanceNode()
Class xmlDoc(xmlNode)
@ -448,9 +435,6 @@ Class xmlDoc(xmlNode)
htmlSaveFileFormat()
htmlSetMetaEncoding()
# functions from module HTMLtree.c
htmlNodeDumpOutput()
# functions from module debugXML
debugDumpDocument()
debugDumpDocumentHead()
@ -466,9 +450,6 @@ Class xmlDoc(xmlNode)
encodeSpecialChars()
parameterEntity()
# functions from module parserInternals.c
upgradeOldNs()
# functions from module tree
copyDoc()
createIntSubset()
@ -636,15 +617,6 @@ Class xpathParserContext()
xpathTrueFunction()
xpathValueFlipSign()
xpatherror()
# functions from module xpointer.c
xpointerEndPointFunction()
xpointerHereFunction()
xpointerOriginFunction()
xpointerRangeFunction()
xpointerRangeInsideFunction()
xpointerStartPointFunction()
xpointerStringRangeFunction()
Class parserCtxt()
# accessors
doc()
@ -663,9 +635,6 @@ Class parserCtxt()
htmlParseDocument()
htmlParseElement()
# functions from module HTMLparser.c
htmlDecodeEntities()
# functions from module parser
clearParserCtxt()
freeParserCtxt()
@ -676,10 +645,6 @@ Class parserCtxt()
setupParserForBuffer()
stopParser()
# functions from module parser.c
parseAttValueComplex()
parseCharDataComplex()
# functions from module parserInternals
decodeEntities()
namespaceParseNCName()
@ -743,9 +708,6 @@ Class xmlDtd(xmlNode)
dtdQAttrDesc()
dtdQElementDesc()
# functions from module valid.c
scanAttributeDecl()
Class xmlNs(xmlNode)

View File

@ -59,8 +59,6 @@
/* #define DEBUG_EXPR */
/* #define DEBUG_EVAL_COUNTS */
double xmlXPathDivideBy(double f, double fzero);
static xmlNs xmlXPathXMLNamespaceStruct = {
NULL,
XML_NAMESPACE_DECL,