From f2a941fc1e287a89d2ec7e4ded60516c58a18525 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sun, 7 Sep 2003 20:54:29 +0000 Subject: [PATCH] 2.6.0beta1 changes Fixing attribute normalization, might not be totally * configure.in doc/* : 2.6.0beta1 changes * SAX2.c hash.c parser.c parserInternals.c: Fixing attribute normalization, might not be totally fixed but this should make sure SAX event provide the right strings for attributes except entities for which libxml2 is different by default This should fix #109564 * result/attrib.xml.sax result/ent3.sax result/p3p.sax: minor changes in attribute callback values * result/c14n/with-comments/example-4 result/c14n/without-comments/example-4: this also fixes a subtle bug in the canonicalization tests. Daniel --- python/libxml2class.txt | 384 ++++++++++++++++++++-------------------- 1 file changed, 193 insertions(+), 191 deletions(-) diff --git a/python/libxml2class.txt b/python/libxml2class.txt index dd11b542..6a77cd19 100644 --- a/python/libxml2class.txt +++ b/python/libxml2class.txt @@ -18,6 +18,7 @@ htmlNewDoc() htmlNewDocNoDtD() # functions from module SAX2 +SAXDefaultVersion() defaultSAXHandlerInit() docbDefaultSAXHandlerInit() htmlDefaultSAXHandlerInit() @@ -572,53 +573,41 @@ Class xmlDoc(xmlNode) # functions from module xpointer xpointerNewContext() +Class xpathContext() + # accessors + contextDoc() + contextNode() + contextPosition() + contextSize() + function() + functionURI() + setContextDoc() + setContextNode() + + # functions from module python + registerXPathFunction() + + # functions from module xpath + xpathEval() + xpathEvalExpression() + xpathFreeContext() + + # functions from module xpathInternals + xpathNewParserContext() + xpathNsLookup() + xpathRegisterAllFunctions() + xpathRegisterNs() + xpathRegisteredFuncsCleanup() + xpathRegisteredNsCleanup() + xpathRegisteredVariablesCleanup() + xpathVariableLookup() + xpathVariableLookupNS() + + # functions from module xpointer + xpointerEval() Class xmlAttribute(xmlNode) -Class xmlTextReaderLocator() - - # functions from module xmlreader - BaseURI() - LineNumber() - - -Class xmlNs(xmlNode) - - # functions from module tree - copyNamespace() - copyNamespaceList() - freeNs() - freeNsList() - newChild() - newDocNode() - newDocNodeEatName() - newDocRawNode() - newNodeEatName() - newNsProp() - newNsPropEatName() - newTextChild() - setNs() - setNsProp() - unsetNsProp() - - # functions from module xpathInternals - xpathNodeSetFreeNs() - - -Class xmlDtd(xmlNode) - - # functions from module debugXML - debugDumpDTD() - - # functions from module tree - copyDtd() - freeDtd() - - # functions from module valid - dtdAttrDesc() - dtdElementDesc() - dtdQAttrDesc() - dtdQElementDesc() Class catalog() # functions from module catalog @@ -632,6 +621,106 @@ Class catalog() resolvePublic() resolveSystem() resolveURI() + + +Class xmlElement(xmlNode) + + +Class xmlAttr(xmlNode) + + # functions from module debugXML + debugDumpAttr() + debugDumpAttrList() + + # functions from module tree + copyProp() + copyPropList() + freeProp() + freePropList() + removeProp() + + # functions from module valid + removeID() + removeRef() + + +Class xmlTextReader(xmlTextReaderCore) + + # functions from module xmlreader + AttributeCount() + BaseUri() + Close() + CurrentDoc() + CurrentNode() + Depth() + Expand() + GetAttribute() + GetAttributeNo() + GetAttributeNs() + GetParserProp() + GetRemainder() + HasAttributes() + HasValue() + IsDefault() + IsEmptyElement() + IsValid() + LocalName() + LookupNamespace() + MoveToAttribute() + MoveToAttributeNo() + MoveToAttributeNs() + MoveToElement() + MoveToFirstAttribute() + MoveToNextAttribute() + Name() + NamespaceUri() + Next() + NodeType() + Normalization() + Prefix() + QuoteChar() + Read() + ReadAttributeValue() + ReadInnerXml() + ReadOuterXml() + ReadState() + ReadString() + RelaxNGSetSchema() + RelaxNGValidate() + SetParserProp() + Value() + XmlLang() +Class xmlReg() + + # functions from module xmlregexp + regexpExec() + regexpFreeRegexp() + regexpIsDeterminist() + regexpPrint() + + +Class xmlEntity(xmlNode) + + # functions from module parserInternals + handleEntity() +Class relaxNgSchema() + + # functions from module relaxng + relaxNGDump() + relaxNGDumpTree() + relaxNGFree() + relaxNGNewValidCtxt() + + # functions from module xmlreader + RelaxNGSetSchema() +Class relaxNgValidCtxt() + + # functions from module relaxng + relaxNGValidateDoc() + relaxNGValidateFullElement() + relaxNGValidatePopElement() + relaxNGValidatePushCData() + relaxNGValidatePushElement() Class xpathParserContext() # accessors context() @@ -774,6 +863,63 @@ Class parserCtxt(parserCtxtCore) scanName() skipBlankChars() stringDecodeEntities() + stringLenDecodeEntities() + + +Class xmlDtd(xmlNode) + + # functions from module debugXML + debugDumpDTD() + + # functions from module tree + copyDtd() + freeDtd() + + # functions from module valid + dtdAttrDesc() + dtdElementDesc() + dtdQAttrDesc() + dtdQElementDesc() + + +Class xmlNs(xmlNode) + + # functions from module tree + copyNamespace() + copyNamespaceList() + freeNs() + freeNsList() + newChild() + newDocNode() + newDocNodeEatName() + newDocRawNode() + newNodeEatName() + newNsProp() + newNsPropEatName() + newTextChild() + setNs() + setNsProp() + unsetNsProp() + + # functions from module xpathInternals + xpathNodeSetFreeNs() + + +Class inputBuffer(ioReadWrapper) + + # functions from module xmlIO + freeParserInputBuffer() + grow() + push() + read() + + # functions from module xmlreader + newTextReader() +Class relaxNgParserCtxt() + + # functions from module relaxng + relaxNGFreeParserCtxt() + relaxNGParse() Class outputBuffer(ioWriteWrapper) @@ -794,98 +940,11 @@ Class outputBuffer(ioWriteWrapper) flush() write() writeString() - - -Class xmlElement(xmlNode) -Class relaxNgSchema() - - # functions from module relaxng - relaxNGDump() - relaxNGDumpTree() - relaxNGFree() - relaxNGNewValidCtxt() +Class xmlTextReaderLocator() # functions from module xmlreader - RelaxNGSetSchema() - - -Class xmlEntity(xmlNode) - - # functions from module parserInternals - handleEntity() - - -Class xmlTextReader(xmlTextReaderCore) - - # functions from module xmlreader - AttributeCount() - BaseUri() - Close() - CurrentDoc() - CurrentNode() - Depth() - Expand() - GetAttribute() - GetAttributeNo() - GetAttributeNs() - GetParserProp() - GetRemainder() - HasAttributes() - HasValue() - IsDefault() - IsEmptyElement() - IsValid() - LocalName() - LookupNamespace() - MoveToAttribute() - MoveToAttributeNo() - MoveToAttributeNs() - MoveToElement() - MoveToFirstAttribute() - MoveToNextAttribute() - Name() - NamespaceUri() - Next() - NodeType() - Normalization() - Prefix() - QuoteChar() - Read() - ReadAttributeValue() - ReadInnerXml() - ReadOuterXml() - ReadState() - ReadString() - RelaxNGSetSchema() - RelaxNGValidate() - SetParserProp() - Value() - XmlLang() - - -Class xmlAttr(xmlNode) - - # functions from module debugXML - debugDumpAttr() - debugDumpAttrList() - - # functions from module tree - copyProp() - copyPropList() - freeProp() - freePropList() - removeProp() - - # functions from module valid - removeID() - removeRef() -Class xmlReg() - - # functions from module xmlregexp - regexpExec() - regexpFreeRegexp() - regexpIsDeterminist() - regexpPrint() + BaseURI() + LineNumber() Class URI() # accessors authority() @@ -912,60 +971,3 @@ Class URI() parseURIReference() printURI() saveUri() -Class relaxNgParserCtxt() - - # functions from module relaxng - relaxNGFreeParserCtxt() - relaxNGParse() -Class xpathContext() - # accessors - contextDoc() - contextNode() - contextPosition() - contextSize() - function() - functionURI() - setContextDoc() - setContextNode() - - # functions from module python - registerXPathFunction() - - # functions from module xpath - xpathEval() - xpathEvalExpression() - xpathFreeContext() - - # functions from module xpathInternals - xpathNewParserContext() - xpathNsLookup() - xpathRegisterAllFunctions() - xpathRegisterNs() - xpathRegisteredFuncsCleanup() - xpathRegisteredNsCleanup() - xpathRegisteredVariablesCleanup() - xpathVariableLookup() - xpathVariableLookupNS() - - # functions from module xpointer - xpointerEval() - - -Class inputBuffer(ioReadWrapper) - - # functions from module xmlIO - freeParserInputBuffer() - grow() - push() - read() - - # functions from module xmlreader - newTextReader() -Class relaxNgValidCtxt() - - # functions from module relaxng - relaxNGValidateDoc() - relaxNGValidateFullElement() - relaxNGValidatePopElement() - relaxNGValidatePushCData() - relaxNGValidatePushElement()