lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

doc: Misc fixes to parser docs

Browse Source
This commit is contained in:
Nick Wellnhofer
2025-05-04 02:15:25 +02:00
parent b7274fb02f
commit 1bf44f09ba
4 changed files with 358 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
include/libxml/parser.h
View File

@@ -1,9 +1,9 @@
/** /**
* @file * @file
* *
* @brief the core parser module * @brief Validating XML 1.0 parser
* *
* Interfaces, constants and types related to the XML parser * Interfaces, constants and types related to the XML parser.
* *
* @copyright See Copyright for the status of this software. * @copyright See Copyright for the status of this software.
* *
@@ -92,12 +92,7 @@ typedef enum {
typedef void (* xmlParserInputDeallocate)(xmlChar *str); typedef void (* xmlParserInputDeallocate)(xmlChar *str);
/** /**
* An xmlParserInput is an input flow for the XML processor. * Parser input
* Each entity parsed is associated an xmlParserInput (except the
* few predefined ones). This is the case both for internal entities
* - in which case the flow is already completely in memory - or
* external entities - in which case we use the buf structure for
* progressive reading and I18N conversions to the internal UTF-8 format.
*/ */
struct _xmlParserInput { struct _xmlParserInput {
/* Input buffer */ /* Input buffer */
@@ -187,14 +182,12 @@ typedef enum {
XML_PARSER_XML_DECL /* before XML decl (but after BOM) */ XML_PARSER_XML_DECL /* before XML decl (but after BOM) */
} xmlParserInputState; } xmlParserInputState;
/** @cond IGNORE */
/* /*
* Internal bits in the 'loadsubset' context member * Internal bits in the 'loadsubset' context member
*/ */
#define XML_DETECT_IDS 2 #define XML_DETECT_IDS 2
#define XML_COMPLETE_ATTRS 4 #define XML_COMPLETE_ATTRS 4
#define XML_SKIP_IDS 8 #define XML_SKIP_IDS 8
/** @endcond */
/* /*
* Internal type. Only XML_PARSE_READER is used. * Internal type. Only XML_PARSE_READER is used.
@@ -234,8 +227,8 @@ typedef xmlParserErrors
xmlResourceType type, xmlParserInputFlags flags, xmlResourceType type, xmlParserInputFlags flags,
xmlParserInputPtr *out); xmlParserInputPtr *out);
/* /**
* The parser context. * Parser context
*/ */
struct _xmlParserCtxt { struct _xmlParserCtxt {
/* The SAX handler */ /* The SAX handler */
@@ -846,28 +839,50 @@ typedef void (*endElementNsSAX2Func) (void *ctx,
const xmlChar *prefix, const xmlChar *prefix,
const xmlChar *URI); const xmlChar *URI);
/**
* Callbacks for SAX parser
*
* For DTD-related handlers, it's recommended to either use the
* original libxml2 handler or set them to NULL if DTDs can be
* ignored.
*/
struct _xmlSAXHandler { struct _xmlSAXHandler {
/* /** @brief DTD */
* For DTD-related handlers, it's recommended to either use the internalSubsetSAXFunc internalSubset;
* original libxml2 handler or set them to NULL if DTDs can be /** @brief unused */
* ignored. isStandaloneSAXFunc isStandalone;
/** @brief DTD */
hasInternalSubsetSAXFunc hasInternalSubset;
/** @brief DTD */
hasExternalSubsetSAXFunc hasExternalSubset;
/** @brief DTD */
resolveEntitySAXFunc resolveEntity;
/** @brief DTD */
getEntitySAXFunc getEntity;
/** @brief DTD */
entityDeclSAXFunc entityDecl;
/** @brief DTD */
notationDeclSAXFunc notationDecl;
/** @brief DTD */
attributeDeclSAXFunc attributeDecl;
/** @brief DTD */
elementDeclSAXFunc elementDecl;
/** @brief DTD */
unparsedEntityDeclSAXFunc unparsedEntityDecl;
/** @brief useless */
setDocumentLocatorSAXFunc setDocumentLocator;
/**
* @brief Called at the start of a document
*
* Use xmlCtxtGetVersion(), xmlCtxtGetDeclaredEncoding() and
* xmlCtxtGetStandalone() to get data from the XML declaration.
*/ */
internalSubsetSAXFunc internalSubset; /* DTD */
isStandaloneSAXFunc isStandalone; /* unused */
hasInternalSubsetSAXFunc hasInternalSubset; /* DTD */
hasExternalSubsetSAXFunc hasExternalSubset; /* DTD */
resolveEntitySAXFunc resolveEntity; /* DTD */
getEntitySAXFunc getEntity; /* DTD */
entityDeclSAXFunc entityDecl; /* DTD */
notationDeclSAXFunc notationDecl; /* DTD */
attributeDeclSAXFunc attributeDecl; /* DTD */
elementDeclSAXFunc elementDecl; /* DTD */
unparsedEntityDeclSAXFunc unparsedEntityDecl; /* DTD */
setDocumentLocatorSAXFunc setDocumentLocator; /* deprecated */
startDocumentSAXFunc startDocument; startDocumentSAXFunc startDocument;
/** @brief End of document */
endDocumentSAXFunc endDocument; endDocumentSAXFunc endDocument;
/* /**
* @brief Legacy start tag handler
*
* `startElement` and `endElement` are only used by the legacy SAX1 * `startElement` and `endElement` are only used by the legacy SAX1
* interface and should not be used in new software. If you really * interface and should not be used in new software. If you really
* have to enable SAX1, the preferred way is set the `initialized` * have to enable SAX1, the preferred way is set the `initialized`
@@ -881,37 +896,53 @@ struct _xmlSAXHandler {
* together with custom SAX callbacks. * together with custom SAX callbacks.
*/ */
startElementSAXFunc startElement; startElementSAXFunc startElement;
/** @brief See _xmlSAXHandler.startElement */
endElementSAXFunc endElement; endElementSAXFunc endElement;
/** @brief Entity reference */
referenceSAXFunc reference; referenceSAXFunc reference;
/** @brief Text */
charactersSAXFunc characters; charactersSAXFunc characters;
/* /**
* @brief Ignorable whitespace
*
* `ignorableWhitespace` should always be set to the same value * `ignorableWhitespace` should always be set to the same value
* as `characters`. Otherwise, the parser will try to detect * as `characters`. Otherwise, the parser will try to detect
* whitespace which is unreliable. * whitespace which is unreliable.
*/ */
ignorableWhitespaceSAXFunc ignorableWhitespace; ignorableWhitespaceSAXFunc ignorableWhitespace;
/** @brief Processing instruction */
processingInstructionSAXFunc processingInstruction; processingInstructionSAXFunc processingInstruction;
/** @brief Comment */
commentSAXFunc comment; commentSAXFunc comment;
/** @brief Warning message */
warningSAXFunc warning; warningSAXFunc warning;
/** @brief Error message */
errorSAXFunc error; errorSAXFunc error;
fatalErrorSAXFunc fatalError; /* unused, `error` gets all the errors */ /** @brief Unused, all errors go to `error`. */
getParameterEntitySAXFunc getParameterEntity; /* DTD */ fatalErrorSAXFunc fatalError;
/** @brief DTD */
getParameterEntitySAXFunc getParameterEntity;
cdataBlockSAXFunc cdataBlock; cdataBlockSAXFunc cdataBlock;
externalSubsetSAXFunc externalSubset; /* DTD */ /** @brief DTD */
/* externalSubsetSAXFunc externalSubset;
* `initialized` should always be set to XML_SAX2_MAGIC to enable the /**
* modern SAX2 interface. * @brief Legacy magic value
*
* `initialized` should always be set to XML_SAX2_MAGIC to
* enable the modern SAX2 interface.
*/ */
unsigned int initialized; unsigned int initialized;
/* /** @brief Application data */
* The following members are only used by the SAX2 interface.
*/
void *_private; void *_private;
/** @brief Start tag */
startElementNsSAX2Func startElementNs; startElementNsSAX2Func startElementNs;
/** @brief End tag */
endElementNsSAX2Func endElementNs; endElementNsSAX2Func endElementNs;
/* /**
* @brief Structured error handler.
*
* Takes precedence over `error` or `warning`, but modern code * Takes precedence over `error` or `warning`, but modern code
* should use xmlCtxtSetErrorHandler. * should use xmlCtxtSetErrorHandler().
*/ */
xmlStructuredErrorFunc serror; xmlStructuredErrorFunc serror;
}; };
@@ -972,7 +1003,6 @@ typedef xmlParserInputPtr (*xmlExternalEntityLoader) (const char *URL,
XMLPUBVAR const char *const xmlParserVersion; XMLPUBVAR const char *const xmlParserVersion;
/** @cond IGNORE */
XML_DEPRECATED XML_DEPRECATED
XMLPUBVAR const xmlSAXLocator xmlDefaultSAXLocator; XMLPUBVAR const xmlSAXLocator xmlDefaultSAXLocator;
#ifdef LIBXML_SAX1_ENABLED #ifdef LIBXML_SAX1_ENABLED
@@ -1005,25 +1035,85 @@ XMLPUBFUN int *__xmlSaveNoEmptyTags(void);
#endif #endif
#ifndef XML_GLOBALS_NO_REDEFINITION #ifndef XML_GLOBALS_NO_REDEFINITION
/**
* Thread-local setting to enable validation. Defaults to 0.
*
* @deprecated Use the parser option XML_PARSE_DTDVALID.
*/
#define xmlDoValidityCheckingDefaultValue \ #define xmlDoValidityCheckingDefaultValue \
(*__xmlDoValidityCheckingDefaultValue()) (*__xmlDoValidityCheckingDefaultValue())
/**
* Thread-local setting to disable warnings. Defaults to 1.
*
* @deprecated Use the parser option XML_PARSE_NOWARNING.
*/
#define xmlGetWarningsDefaultValue \ #define xmlGetWarningsDefaultValue \
(*__xmlGetWarningsDefaultValue()) (*__xmlGetWarningsDefaultValue())
/**
* Thread-local setting to ignore some whitespace. Defaults
* to 1.
*
* @deprecated Use the parser option XML_PARSE_NOBLANKS.
*/
#define xmlKeepBlanksDefaultValue (*__xmlKeepBlanksDefaultValue()) #define xmlKeepBlanksDefaultValue (*__xmlKeepBlanksDefaultValue())
/**
* Thread-local setting to store line numbers. Defaults
* to 0, but is always enabled after setting parser options.
*
* @deprecated Shouldn't be needed when using parser options.
*/
#define xmlLineNumbersDefaultValue \ #define xmlLineNumbersDefaultValue \
(*__xmlLineNumbersDefaultValue()) (*__xmlLineNumbersDefaultValue())
/**
* Thread-local setting to enable loading of external DTDs.
* Defaults to 0.
*
* @deprecated Use the parser option XML_PARSE_DTDLOAD.
*/
#define xmlLoadExtDtdDefaultValue (*__xmlLoadExtDtdDefaultValue()) #define xmlLoadExtDtdDefaultValue (*__xmlLoadExtDtdDefaultValue())
/**
* Thread-local setting to enable pedantic warnings.
* Defaults to 0.
*
* @deprecated Use the parser option XML_PARSE_PEDANTIC.
*/
#define xmlPedanticParserDefaultValue \ #define xmlPedanticParserDefaultValue \
(*__xmlPedanticParserDefaultValue()) (*__xmlPedanticParserDefaultValue())
/**
* Thread-local setting to enable entity substitution.
* Defaults to 0.
*
* @deprecated Use the parser option XML_PARSE_NOENT.
*/
#define xmlSubstituteEntitiesDefaultValue \ #define xmlSubstituteEntitiesDefaultValue \
(*__xmlSubstituteEntitiesDefaultValue()) (*__xmlSubstituteEntitiesDefaultValue())
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
/**
* Thread-local setting to disable indenting when
* formatting output. Defaults to 1.
*
* @deprecated Use the xmlsave.h API with option
* XML_SAVE_NO_INDENT.
*/
#define xmlIndentTreeOutput (*__xmlIndentTreeOutput()) #define xmlIndentTreeOutput (*__xmlIndentTreeOutput())
/**
* Thread-local setting to change the indent string.
* Defaults to two spaces.
*
* @deprecated Use the xmlsave.h API and
* xmlSaveSetIndentString().
*/
#define xmlTreeIndentString (*__xmlTreeIndentString()) #define xmlTreeIndentString (*__xmlTreeIndentString())
/**
* Thread-local setting to disable empty tags when
* serializing. Defaults to 0.
*
* @deprecated Use the xmlsave.h API with option
* XML_SAVE_NO_EMPTY.
*/
#define xmlSaveNoEmptyTags (*__xmlSaveNoEmptyTags()) #define xmlSaveNoEmptyTags (*__xmlSaveNoEmptyTags())
#endif #endif
#endif #endif
/** @endcond */
/* /*
* Init/Cleanup * Init/Cleanup
@@ -1666,7 +1756,7 @@ XMLPUBFUN xmlDocPtr
const char *encoding, const char *encoding,
int options); int options);
/** /*
* New input API * New input API
*/ */

70
include/libxml/parserInternals.h
View File

@@ -1,11 +1,10 @@
/** /**
* @file * @file
* *
* @brief internals routines and limits exported by the parser. * @brief Internals routines and limits exported by the parser.
* *
* this module exports a number of internal parsing routines * Except for some I/O-related functions, most of these macros and
* they are not really all intended for applications but * functions are deprecated.
* can prove useful doing low level processing.
* *
* @copyright See Copyright for the status of this software. * @copyright See Copyright for the status of this software.
* *
@@ -87,7 +86,8 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* [2] Char ::= \#x9 | \#xA | \#xD | [\#x20...] * [2] Char ::= #x9 | #xA | #xD | [#x20...]
*
* any byte character in the accepted range * any byte character in the accepted range
*/ */
#define IS_BYTE_CHAR(c) xmlIsChar_ch(c) #define IS_BYTE_CHAR(c) xmlIsChar_ch(c)
@@ -97,8 +97,9 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* [2] Char ::= \#x9 | \#xA | \#xD | [\#x20-\#xD7FF] | [\#xE000-\#xFFFD] * [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
* | [\#x10000-\#x10FFFF] * | [#x10000-#x10FFFF]
*
* any Unicode character, excluding the surrogate blocks, FFFE, and FFFF. * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
*/ */
#define IS_CHAR(c) xmlIsCharQ(c) #define IS_CHAR(c) xmlIsCharQ(c)
@@ -115,7 +116,7 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* [3] S ::= (\#x20 | \#x9 | \#xD | \#xA)+ * [3] S ::= (#x20 | #x9 | #xD | #xA)+
*/ */
#define IS_BLANK(c) xmlIsBlankQ(c) #define IS_BLANK(c) xmlIsBlankQ(c)
@@ -131,7 +132,7 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* [85] BaseChar ::= ... long list see REC ... * [85] BaseChar ::= ... long list see REC ...
*/ */
#define IS_BASECHAR(c) xmlIsBaseCharQ(c) #define IS_BASECHAR(c) xmlIsBaseCharQ(c)
@@ -140,7 +141,7 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* [88] Digit ::= ... long list see REC ... * [88] Digit ::= ... long list see REC ...
*/ */
#define IS_DIGIT(c) xmlIsDigitQ(c) #define IS_DIGIT(c) xmlIsDigitQ(c)
@@ -156,7 +157,7 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* [87] CombiningChar ::= ... long list see REC ... * [87] CombiningChar ::= ... long list see REC ...
*/ */
#define IS_COMBINING(c) xmlIsCombiningQ(c) #define IS_COMBINING(c) xmlIsCombiningQ(c)
@@ -172,10 +173,9 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* * [89] Extender ::= #x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 |
* [89] Extender ::= \#x00B7 | \#x02D0 | \#x02D1 | \#x0387 | \#x0640 | * #x0E46 | #x0EC6 | #x3005 | [#x3031-#x3035] |
* \#x0E46 | \#x0EC6 | \#x3005 | [\#x3031-\#x3035] | * [#x309D-#x309E] | [#x30FC-#x30FE]
* [\#x309D-\#x309E] | [\#x30FC-\#x30FE]
*/ */
#define IS_EXTENDER(c) xmlIsExtenderQ(c) #define IS_EXTENDER(c) xmlIsExtenderQ(c)
@@ -191,8 +191,7 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* * [86] Ideographic ::= [#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029]
* [86] Ideographic ::= [\#x4E00-\#x9FA5] | \#x3007 | [\#x3021-\#x3029]
*/ */
#define IS_IDEOGRAPHIC(c) xmlIsIdeographicQ(c) #define IS_IDEOGRAPHIC(c) xmlIsIdeographicQ(c)
@@ -201,8 +200,7 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* * [84] Letter ::= BaseChar | Ideographic
* [84] Letter ::= BaseChar | Ideographic
*/ */
#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c)) #define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))
@@ -236,8 +234,8 @@ extern "C" {
* *
* Macro to check the following production in the XML spec: * Macro to check the following production in the XML spec:
* *
* * [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] |
* [13] PubidChar ::= \#x20 | \#xD | \#xA | [a-zA-Z0-9] | [-'()+,./:=?;!*\#@$_%] * [-'()+,./:=?;!*#@$_%]
*/ */
#define IS_PUBIDCHAR(c) xmlIsPubidCharQ(c) #define IS_PUBIDCHAR(c) xmlIsPubidCharQ(c)
@@ -248,7 +246,7 @@ extern "C" {
*/ */
#define IS_PUBIDCHAR_CH(c) xmlIsPubidChar_ch(c) #define IS_PUBIDCHAR_CH(c) xmlIsPubidChar_ch(c)
/** /*
* Global variables used for predefined strings. * Global variables used for predefined strings.
*/ */
XMLPUBVAR const xmlChar xmlStringText[]; XMLPUBVAR const xmlChar xmlStringText[];
@@ -259,7 +257,7 @@ XMLPUBVAR const xmlChar xmlStringComment[];
XML_DEPRECATED XML_DEPRECATED
XMLPUBFUN int xmlIsLetter (int c); XMLPUBFUN int xmlIsLetter (int c);
/** /*
* Parser context. * Parser context.
*/ */
XMLPUBFUN xmlParserCtxtPtr XMLPUBFUN xmlParserCtxtPtr
@@ -292,7 +290,7 @@ XMLPUBFUN int
xmlParserInputPtr input, xmlParserInputPtr input,
xmlCharEncodingHandlerPtr handler); xmlCharEncodingHandlerPtr handler);
/** /*
* Input Streams. * Input Streams.
*/ */
XMLPUBFUN xmlParserInputPtr XMLPUBFUN xmlParserInputPtr
@@ -322,7 +320,7 @@ XMLPUBFUN xmlParserInputPtr
XMLPUBFUN xmlParserInputPtr XMLPUBFUN xmlParserInputPtr
xmlNewInputStream (xmlParserCtxtPtr ctxt); xmlNewInputStream (xmlParserCtxtPtr ctxt);
/** /*
* Namespaces. * Namespaces.
*/ */
XMLPUBFUN xmlChar * XMLPUBFUN xmlChar *
@@ -330,7 +328,7 @@ XMLPUBFUN xmlChar *
const xmlChar *name, const xmlChar *name,
xmlChar **prefix); xmlChar **prefix);
/** /*
* Generic production rules. * Generic production rules.
*/ */
XML_DEPRECATED XML_DEPRECATED
@@ -482,23 +480,11 @@ XMLPUBFUN void
xmlParseExternalSubset (xmlParserCtxtPtr ctxt, xmlParseExternalSubset (xmlParserCtxtPtr ctxt,
const xmlChar *ExternalID, const xmlChar *ExternalID,
const xmlChar *SystemID); const xmlChar *SystemID);
/**
* If no entities need to be substituted.
*/
#define XML_SUBSTITUTE_NONE 0
/**
* Whether general entities need to be substituted.
*/
#define XML_SUBSTITUTE_REF 1
/**
* Whether parameter entities need to be substituted.
*/
#define XML_SUBSTITUTE_PEREF 2
/**
* Both general and parameter entities need to be substituted.
*/
#define XML_SUBSTITUTE_BOTH 3
#define XML_SUBSTITUTE_NONE 0
#define XML_SUBSTITUTE_REF 1
#define XML_SUBSTITUTE_PEREF 2
#define XML_SUBSTITUTE_BOTH 3
XML_DEPRECATED XML_DEPRECATED
XMLPUBFUN xmlChar * XMLPUBFUN xmlChar *
xmlStringDecodeEntities (xmlParserCtxtPtr ctxt, xmlStringDecodeEntities (xmlParserCtxtPtr ctxt,

358
parser.c
View File

@@ -1217,50 +1217,51 @@ xmlCleanSpecialAttr(xmlParserCtxtPtr ctxt)
* Checks that the value conforms to the LanguageID production: * Checks that the value conforms to the LanguageID production:
* *
* NOTE: this is somewhat deprecated, those productions were removed from * NOTE: this is somewhat deprecated, those productions were removed from
* the XML Second edition. * the XML Second edition.
* *
* [33] LanguageID ::= Langcode ('-' Subcode)* * [33] LanguageID ::= Langcode ('-' Subcode)*
* [34] Langcode ::= ISO639Code | IanaCode | UserCode * [34] Langcode ::= ISO639Code | IanaCode | UserCode
* [35] ISO639Code ::= ([a-z] | [A-Z]) ([a-z] | [A-Z]) * [35] ISO639Code ::= ([a-z] | [A-Z]) ([a-z] | [A-Z])
* [36] IanaCode ::= ('i' | 'I') '-' ([a-z] | [A-Z])+ * [36] IanaCode ::= ('i' | 'I') '-' ([a-z] | [A-Z])+
* [37] UserCode ::= ('x' | 'X') '-' ([a-z] | [A-Z])+ * [37] UserCode ::= ('x' | 'X') '-' ([a-z] | [A-Z])+
* [38] Subcode ::= ([a-z] | [A-Z])+ * [38] Subcode ::= ([a-z] | [A-Z])+
* *
* The current REC reference the successors of RFC 1766, currently 5646 * The current REC reference the successors of RFC 1766, currently 5646
* *
* http://www.rfc-editor.org/rfc/rfc5646.txt * http://www.rfc-editor.org/rfc/rfc5646.txt
* langtag = language
* ["-" script]
* ["-" region]
* *("-" variant)
* *("-" extension)
* ["-" privateuse]
* language = 2*3ALPHA ; shortest ISO 639 code
* ["-" extlang] ; sometimes followed by
* ; extended language subtags
* / 4ALPHA ; or reserved for future use
* / 5*8ALPHA ; or registered language subtag
* *
* extlang = 3ALPHA ; selected ISO 639 codes * langtag = language
* *2("-" 3ALPHA) ; permanently reserved * ["-" script]
* ["-" region]
* *("-" variant)
* *("-" extension)
* ["-" privateuse]
* language = 2*3ALPHA ; shortest ISO 639 code
* ["-" extlang] ; sometimes followed by
* ; extended language subtags
* / 4ALPHA ; or reserved for future use
* / 5*8ALPHA ; or registered language subtag
* *
* script = 4ALPHA ; ISO 15924 code * extlang = 3ALPHA ; selected ISO 639 codes
* *2("-" 3ALPHA) ; permanently reserved
* *
* region = 2ALPHA ; ISO 3166-1 code * script = 4ALPHA ; ISO 15924 code
* / 3DIGIT ; UN M.49 code
* *
* variant = 5*8alphanum ; registered variants * region = 2ALPHA ; ISO 3166-1 code
* / (DIGIT 3alphanum) * / 3DIGIT ; UN M.49 code
* *
* extension = singleton 1*("-" (2*8alphanum)) * variant = 5*8alphanum ; registered variants
* / (DIGIT 3alphanum)
* *
* ; Single alphanumerics * extension = singleton 1*("-" (2*8alphanum))
* ; "x" reserved for private use *
* singleton = DIGIT ; 0 - 9 * ; Single alphanumerics
* / %x41-57 ; A - W * ; "x" reserved for private use
* / %x59-5A ; Y - Z * singleton = DIGIT ; 0 - 9
* / %x61-77 ; a - w * / %x41-57 ; A - W
* / %x79-7A ; y - z * / %x59-5A ; Y - Z
* / %x61-77 ; a - w
* / %x79-7A ; y - z
* *
* it sounds right to still allow Irregular i-xxx IANA and user codes too * it sounds right to still allow Irregular i-xxx IANA and user codes too
* The parser below doesn't try to cope with extension or privateuse * The parser below doesn't try to cope with extension or privateuse
@@ -2539,8 +2540,8 @@ xmlPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) {
* *
* Parse a numeric character reference. Always consumes '&'. * Parse a numeric character reference. Always consumes '&'.
* *
* [66] CharRef ::= '&\#' [0-9]+ ';' | * [66] CharRef ::= '&#' [0-9]+ ';' |
* '&\#x' [0-9a-fA-F]+ ';' * '&#x' [0-9a-fA-F]+ ';'
* *
* [ WFC: Legal Character ] * [ WFC: Legal Character ]
* Characters referred to using character references must match the * Characters referred to using character references must match the
@@ -2645,8 +2646,8 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
* parse Reference declarations, variant parsing from a string rather * parse Reference declarations, variant parsing from a string rather
* than an an input flow. * than an an input flow.
* *
* [66] CharRef ::= '&\#' [0-9]+ ';' | * [66] CharRef ::= '&#' [0-9]+ ';' |
* '&\#x' [0-9a-fA-F]+ ';' * '&#x' [0-9a-fA-F]+ ';'
* *
* [ WFC: Legal Character ] * [ WFC: Legal Character ]
* Characters referred to using character references must match the * Characters referred to using character references must match the
@@ -2736,7 +2737,7 @@ xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) {
* *
* @deprecated Internal function, do not use. * @deprecated Internal function, do not use.
* *
* [69] PEReference ::= '%' Name ';' * [69] PEReference ::= '%' Name ';'
* *
* [ WFC: No Recursion ] * [ WFC: No Recursion ]
* A parsed entity must not contain a recursive * A parsed entity must not contain a recursive
@@ -2759,7 +2760,7 @@ xmlParseStringCharRef(xmlParserCtxtPtr ctxt, const xmlChar **str) {
* *
* A PEReference may have been detected in the current input stream * A PEReference may have been detected in the current input stream
* the handling is done accordingly to * the handling is done accordingly to
* http://www.w3.org/TR/REC-xml\#entproc * http://www.w3.org/TR/REC-xml#entproc
* i.e. * i.e.
* - Included in literal in entity values * - Included in literal in entity values
* - Included as Parameter Entity reference within DTDs * - Included as Parameter Entity reference within DTDs
@@ -2925,11 +2926,11 @@ static int areBlanks(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
* *
* parse an UTF8 encoded XML qualified name string * parse an UTF8 encoded XML qualified name string
* *
* [NS 5] QName ::= (Prefix ':')? LocalPart * [NS 5] QName ::= (Prefix ':')? LocalPart
* *
* [NS 6] Prefix ::= NCName * [NS 6] Prefix ::= NCName
* *
* [NS 7] LocalPart ::= NCName * [NS 7] LocalPart ::= NCName
* *
* @returns the local part, and prefix is updated * @returns the local part, and prefix is updated
* to get the Prefix if any. * to get the Prefix if any.
@@ -3321,12 +3322,12 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) {
* *
* parse an XML name. * parse an XML name.
* *
* [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | * [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |
* CombiningChar | Extender * CombiningChar | Extender
* *
* [5] Name ::= (Letter | '_' | ':') (NameChar)* * [5] Name ::= (Letter | '_' | ':') (NameChar)*
* *
* [6] Names ::= Name (\#x20 Name)* * [6] Names ::= Name (#x20 Name)*
* *
* @returns the Name parsed or NULL * @returns the Name parsed or NULL
*/ */
@@ -3419,10 +3420,10 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
* *
* parse an XML name. * parse an XML name.
* *
* [4NS] NCNameChar ::= Letter | Digit | '.' | '-' | '_' | * [4NS] NCNameChar ::= Letter | Digit | '.' | '-' | '_' |
* CombiningChar | Extender * CombiningChar | Extender
* *
* [5NS] NCName ::= (Letter | '_') (NCNameChar)* * [5NS] NCName ::= (Letter | '_') (NCNameChar)*
* *
* @returns the Name parsed or NULL * @returns the Name parsed or NULL
*/ */
@@ -3519,12 +3520,12 @@ xmlParseNameAndCompare(xmlParserCtxtPtr ctxt, xmlChar const *other) {
* *
* parse an XML name. * parse an XML name.
* *
* [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | * [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |
* CombiningChar | Extender * CombiningChar | Extender
* *
* [5] Name ::= (Letter | '_' | ':') (NameChar)* * [5] Name ::= (Letter | '_' | ':') (NameChar)*
* *
* [6] Names ::= Name (\#x20 Name)* * [6] Names ::= Name (#x20 Name)*
* *
* @returns the Name parsed or NULL. The `str` pointer * @returns the Name parsed or NULL. The `str` pointer
* is updated to the current location in the string. * is updated to the current location in the string.
@@ -3614,9 +3615,9 @@ xmlParseStringName(xmlParserCtxtPtr ctxt, const xmlChar** str) {
* *
* parse an XML Nmtoken. * parse an XML Nmtoken.
* *
* [7] Nmtoken ::= (NameChar)+ * [7] Nmtoken ::= (NameChar)+
* *
* [8] Nmtokens ::= Nmtoken (\#x20 Nmtoken)* * [8] Nmtokens ::= Nmtoken (#x20 Nmtoken)*
* *
* @returns the Nmtoken parsed or NULL * @returns the Nmtoken parsed or NULL
*/ */
@@ -3847,8 +3848,8 @@ xmlExpandPEsInEntityValue(xmlParserCtxtPtr ctxt, xmlSBuf *buf,
* *
* parse a value for ENTITY declarations * parse a value for ENTITY declarations
* *
* [9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' | * [9] EntityValue ::= '"' ([^%&"] | PEReference | Reference)* '"' |
* "'" ([^%&'] | PEReference | Reference)* "'" * "'" ([^%&'] | PEReference | Reference)* "'"
* *
* @returns the EntityValue parsed with reference substituted or NULL * @returns the EntityValue parsed with reference substituted or NULL
*/ */
@@ -4228,21 +4229,25 @@ xmlExpandEntitiesInAttValue(xmlParserCtxtPtr ctxt, const xmlChar *str,
* @param isNamespace whether this is a namespace declaration * @param isNamespace whether this is a namespace declaration
* *
* parse a value for an attribute. * parse a value for an attribute.
*
* NOTE: if no normalization is needed, the routine will return pointers * NOTE: if no normalization is needed, the routine will return pointers
* directly from the data buffer. * directly from the data buffer.
* *
* 3.3.3 Attribute-Value Normalization: * 3.3.3 Attribute-Value Normalization:
*
* Before the value of an attribute is passed to the application or * Before the value of an attribute is passed to the application or
* checked for validity, the XML processor must normalize it as follows: * checked for validity, the XML processor must normalize it as follows:
*
* - a character reference is processed by appending the referenced * - a character reference is processed by appending the referenced
* character to the attribute value * character to the attribute value
* - an entity reference is processed by recursively processing the * - an entity reference is processed by recursively processing the
* replacement text of the entity * replacement text of the entity
* - a whitespace character (\#x20, \#xD, \#xA, \#x9) is processed by * - a whitespace character (\#x20, \#xD, \#xA, \#x9) is processed by
* appending \#x20 to the normalized value, except that only a single * appending \#x20 to the normalized value, except that only a single
* \#x20 is appended for a "\#xD\#xA" sequence that is part of an external * \#x20 is appended for a "#xD#xA" sequence that is part of an external
* parsed entity or the literal entity value of an internal parsed entity * parsed entity or the literal entity value of an internal parsed entity
* - other characters are processed by appending them to the normalized value * - other characters are processed by appending them to the normalized value
*
* If the declared value is not CDATA, then the XML processor must further * If the declared value is not CDATA, then the XML processor must further
* process the normalized attribute value by discarding any leading and * process the normalized attribute value by discarding any leading and
* trailing space (\#x20) characters, and by replacing sequences of space * trailing space (\#x20) characters, and by replacing sequences of space
@@ -4493,21 +4498,24 @@ error:
* Note: the parser won't do substitution of entities here, this * Note: the parser won't do substitution of entities here, this
* will be handled later in xmlStringGetNodeList() * will be handled later in xmlStringGetNodeList()
* *
* [10] AttValue ::= '"' ([^<&"] | Reference)* '"' | * [10] AttValue ::= '"' ([^<&"] | Reference)* '"' |
* "'" ([^<&'] | Reference)* "'" * "'" ([^<&'] | Reference)* "'"
* *
* 3.3.3 Attribute-Value Normalization: * 3.3.3 Attribute-Value Normalization:
*
* Before the value of an attribute is passed to the application or * Before the value of an attribute is passed to the application or
* checked for validity, the XML processor must normalize it as follows: * checked for validity, the XML processor must normalize it as follows:
*
* - a character reference is processed by appending the referenced * - a character reference is processed by appending the referenced
* character to the attribute value * character to the attribute value
* - an entity reference is processed by recursively processing the * - an entity reference is processed by recursively processing the
* replacement text of the entity * replacement text of the entity
* - a whitespace character (\#x20, \#xD, \#xA, \#x9) is processed by * - a whitespace character (\#x20, \#xD, \#xA, \#x9) is processed by
* appending \#x20 to the normalized value, except that only a single * appending \#x20 to the normalized value, except that only a single
* \#x20 is appended for a "\#xD\#xA" sequence that is part of an external * \#x20 is appended for a "#xD#xA" sequence that is part of an external
* parsed entity or the literal entity value of an internal parsed entity * parsed entity or the literal entity value of an internal parsed entity
* - other characters are processed by appending them to the normalized value * - other characters are processed by appending them to the normalized value
*
* If the declared value is not CDATA, then the XML processor must further * If the declared value is not CDATA, then the XML processor must further
* process the normalized attribute value by discarding any leading and * process the normalized attribute value by discarding any leading and
* trailing space (\#x20) characters, and by replacing sequences of space * trailing space (\#x20) characters, and by replacing sequences of space
@@ -4515,10 +4523,9 @@ error:
* All attributes for which no declaration has been read should be treated * All attributes for which no declaration has been read should be treated
* by a non-validating parser as if declared CDATA. * by a non-validating parser as if declared CDATA.
* *
* @returns the AttValue parsed or NULL. The value has to be freed by the caller. * @returns the AttValue parsed or NULL. The value has to be freed by the
* caller.
*/ */
xmlChar * xmlChar *
xmlParseAttValue(xmlParserCtxtPtr ctxt) { xmlParseAttValue(xmlParserCtxtPtr ctxt) {
if ((ctxt == NULL) || (ctxt->input == NULL)) return(NULL); if ((ctxt == NULL) || (ctxt->input == NULL)) return(NULL);
@@ -4532,7 +4539,7 @@ xmlParseAttValue(xmlParserCtxtPtr ctxt) {
* *
* parse an XML Literal * parse an XML Literal
* *
* [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'") * [11] SystemLiteral ::= ('"' [^"]* '"') | ("'" [^']* "'")
* *
* @returns the SystemLiteral parsed or NULL * @returns the SystemLiteral parsed or NULL
*/ */
@@ -4605,7 +4612,7 @@ xmlParseSystemLiteral(xmlParserCtxtPtr ctxt) {
* *
* parse an XML public literal * parse an XML public literal
* *
* [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'" * [12] PubidLiteral ::= '"' PubidChar* '"' | "'" (PubidChar - "'")* "'"
* *
* @returns the PubidLiteral parsed or NULL. * @returns the PubidLiteral parsed or NULL.
*/ */
@@ -4757,7 +4764,7 @@ xmlCharacters(xmlParserCtxtPtr ctxt, const xmlChar *buf, int size,
* reference when it appears in the string "]]>" in content, when that * reference when it appears in the string "]]>" in content, when that
* string is not marking the end of a CDATA section. * string is not marking the end of a CDATA section.
* *
* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) * [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*)
*/ */
static void static void
xmlParseCharDataInternal(xmlParserCtxtPtr ctxt, int partial) { xmlParseCharDataInternal(xmlParserCtxtPtr ctxt, int partial) {
@@ -4947,12 +4954,12 @@ xmlParseCharData(xmlParserCtxtPtr ctxt, ATTRIBUTE_UNUSED int cdata) {
* Parse an External ID or a Public ID * Parse an External ID or a Public ID
* *
* NOTE: Productions [75] and [83] interact badly since [75] can generate * NOTE: Productions [75] and [83] interact badly since [75] can generate
* 'PUBLIC' S PubidLiteral S SystemLiteral * `'PUBLIC' S PubidLiteral S SystemLiteral`
* *
* [75] ExternalID ::= 'SYSTEM' S SystemLiteral * [75] ExternalID ::= 'SYSTEM' S SystemLiteral
* | 'PUBLIC' S PubidLiteral S SystemLiteral * | 'PUBLIC' S PubidLiteral S SystemLiteral
* *
* [83] PublicID ::= 'PUBLIC' S PubidLiteral * [83] PublicID ::= 'PUBLIC' S PubidLiteral
* *
* @returns the function returns SystemLiteral and in the second * @returns the function returns SystemLiteral and in the second
* case publicID receives PubidLiteral, is strict is off * case publicID receives PubidLiteral, is strict is off
@@ -5021,7 +5028,7 @@ xmlParseExternalID(xmlParserCtxtPtr ctxt, xmlChar **publicID, int strict) {
* must not occur within comments. " * must not occur within comments. "
* This is the slow routine in case the accelerator for ascii didn't work * This is the slow routine in case the accelerator for ascii didn't work
* *
* [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->' * [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
*/ */
static void static void
xmlParseCommentComplex(xmlParserCtxtPtr ctxt, xmlChar *buf, xmlParseCommentComplex(xmlParserCtxtPtr ctxt, xmlChar *buf,
@@ -5136,7 +5143,7 @@ not_terminated:
* The spec says that "For compatibility, the string "--" (double-hyphen) * The spec says that "For compatibility, the string "--" (double-hyphen)
* must not occur within comments. " * must not occur within comments. "
* *
* [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->' * [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
*/ */
void void
xmlParseComment(xmlParserCtxtPtr ctxt) { xmlParseComment(xmlParserCtxtPtr ctxt) {
@@ -5286,7 +5293,7 @@ get_more:
* *
* parse the name of a PI * parse the name of a PI
* *
* [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l')) * [17] PITarget ::= Name - (('X' | 'x') ('M' | 'm') ('L' | 'l'))
* *
* @returns the PITarget name or NULL * @returns the PITarget name or NULL
*/ */
@@ -5400,7 +5407,7 @@ error:
* *
* parse an XML Processing Instruction. * parse an XML Processing Instruction.
* *
* [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>' * [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>'
* *
* The processing is transferred to SAX once parsed. * The processing is transferred to SAX once parsed.
*/ */
@@ -5517,12 +5524,14 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
* *
* Parse a notation declaration. Always consumes '<!'. * Parse a notation declaration. Always consumes '<!'.
* *
* [82] NotationDecl ::= '<!NOTATION' S Name S (ExternalID | PublicID) S? '>' * [82] NotationDecl ::= '<!NOTATION' S Name S (ExternalID | PublicID)
* S? '>'
* *
* Hence there is actually 3 choices: * Hence there is actually 3 choices:
*
* 'PUBLIC' S PubidLiteral * 'PUBLIC' S PubidLiteral
* 'PUBLIC' S PubidLiteral S SystemLiteral * 'PUBLIC' S PubidLiteral S SystemLiteral
* and 'SYSTEM' S SystemLiteral * 'SYSTEM' S SystemLiteral
* *
* See the NOTE on xmlParseExternalID(). * See the NOTE on xmlParseExternalID().
*/ */
@@ -5593,17 +5602,17 @@ xmlParseNotationDecl(xmlParserCtxtPtr ctxt) {
* *
* Parse an entity declaration. Always consumes '<!'. * Parse an entity declaration. Always consumes '<!'.
* *
* [70] EntityDecl ::= GEDecl | PEDecl * [70] EntityDecl ::= GEDecl | PEDecl
* *
* [71] GEDecl ::= '<!ENTITY' S Name S EntityDef S? '>' * [71] GEDecl ::= '<!ENTITY' S Name S EntityDef S? '>'
* *
* [72] PEDecl ::= '<!ENTITY' S '%' S Name S PEDef S? '>' * [72] PEDecl ::= '<!ENTITY' S '%' S Name S PEDef S? '>'
* *
* [73] EntityDef ::= EntityValue | (ExternalID NDataDecl?) * [73] EntityDef ::= EntityValue | (ExternalID NDataDecl?)
* *
* [74] PEDef ::= EntityValue | ExternalID * [74] PEDef ::= EntityValue | ExternalID
* *
* [76] NDataDecl ::= S 'NDATA' S Name * [76] NDataDecl ::= S 'NDATA' S Name
* *
* [ VC: Notation Declared ] * [ VC: Notation Declared ]
* The Name must match the declared name of a notation. * The Name must match the declared name of a notation.
@@ -5835,7 +5844,7 @@ done:
* *
* Parse an attribute default declaration * Parse an attribute default declaration
* *
* [60] DefaultDecl ::= '\#REQUIRED' | '\#IMPLIED' | (('\#FIXED' S)? AttValue) * [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue)
* *
* [ VC: Required Attribute ] * [ VC: Required Attribute ]
* if the default declaration is the keyword \#REQUIRED, then the * if the default declaration is the keyword \#REQUIRED, then the
@@ -5898,7 +5907,7 @@ xmlParseDefaultDecl(xmlParserCtxtPtr ctxt, xmlChar **value) {
* *
* Note: the leading 'NOTATION' S part has already being parsed... * Note: the leading 'NOTATION' S part has already being parsed...
* *
* [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')' * [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')'
* *
* [ VC: Notation Attributes ] * [ VC: Notation Attributes ]
* Values of this type must match one of the notation names included * Values of this type must match one of the notation names included
@@ -5969,7 +5978,7 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
* *
* parse an Enumeration attribute type. * parse an Enumeration attribute type.
* *
* [59] Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')' * [59] Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')'
* *
* [ VC: Enumeration ] * [ VC: Enumeration ]
* Values of this type must match one of the Nmtoken tokens in * Values of this type must match one of the Nmtoken tokens in
@@ -6040,10 +6049,9 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
* *
* parse an Enumerated attribute type. * parse an Enumerated attribute type.
* *
* [57] EnumeratedType ::= NotationType | Enumeration * [57] EnumeratedType ::= NotationType | Enumeration
*
* [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')'
* *
* [58] NotationType ::= 'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')'
* *
* @returns XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION * @returns XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION
*/ */
@@ -6074,12 +6082,12 @@ xmlParseEnumeratedType(xmlParserCtxtPtr ctxt, xmlEnumerationPtr *tree) {
* *
* parse the Attribute list def for an element * parse the Attribute list def for an element
* *
* [54] AttType ::= StringType | TokenizedType | EnumeratedType * [54] AttType ::= StringType | TokenizedType | EnumeratedType
* *
* [55] StringType ::= 'CDATA' * [55] StringType ::= 'CDATA'
* *
* [56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS' | 'ENTITY' | * [56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS' | 'ENTITY' |
* 'ENTITIES' | 'NMTOKEN' | 'NMTOKENS' * 'ENTITIES' | 'NMTOKEN' | 'NMTOKENS'
* *
* Validity constraints for attribute values syntax are checked in * Validity constraints for attribute values syntax are checked in
* xmlValidateAttributeValue() * xmlValidateAttributeValue()
@@ -6149,10 +6157,9 @@ xmlParseAttributeType(xmlParserCtxtPtr ctxt, xmlEnumerationPtr *tree) {
* *
* Parse an attribute list declaration for an element. Always consumes '<!'. * Parse an attribute list declaration for an element. Always consumes '<!'.
* *
* [52] AttlistDecl ::= '<!ATTLIST' S Name AttDef* S? '>' * [52] AttlistDecl ::= '<!ATTLIST' S Name AttDef* S? '>'
*
* [53] AttDef ::= S Name S AttType S DefaultDecl
* *
* [53] AttDef ::= S Name S AttType S DefaultDecl
*/ */
void void
xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt) { xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt) {
@@ -6276,8 +6283,8 @@ xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt) {
* parse the declaration for a Mixed Element content * parse the declaration for a Mixed Element content
* The leading '(' and spaces have been skipped in xmlParseElementContentDecl() * The leading '(' and spaces have been skipped in xmlParseElementContentDecl()
* *
* [51] Mixed ::= '(' S? '\#PCDATA' (S? '|' S? Name)* S? ')*' | * [51] Mixed ::= '(' S? '#PCDATA' (S? '|' S? Name)* S? ')*' |
* '(' S? '\#PCDATA' S? ')' * '(' S? '#PCDATA' S? ')'
* *
* [ VC: Proper Group/PE Nesting ] applies to [51] too (see [49]) * [ VC: Proper Group/PE Nesting ] applies to [51] too (see [49])
* *
@@ -6388,14 +6395,13 @@ mem_error:
* parse the declaration for a Mixed Element content * parse the declaration for a Mixed Element content
* The leading '(' and spaces have been skipped in xmlParseElementContentDecl() * The leading '(' and spaces have been skipped in xmlParseElementContentDecl()
* *
* [47] children ::= (choice | seq) ('?' | '*' | '+')?
* *
* [47] children ::= (choice | seq) ('?' | '*' | '+')? * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
* *
* [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
* *
* [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
*
* [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
* *
* [ VC: Proper Group/PE Nesting ] applies to [49] and [50] * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
* TODO Parameter-entity replacement text must be properly nested * TODO Parameter-entity replacement text must be properly nested
@@ -6695,13 +6701,13 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
* parse the declaration for a Mixed Element content * parse the declaration for a Mixed Element content
* The leading '(' and spaces have been skipped in xmlParseElementContentDecl() * The leading '(' and spaces have been skipped in xmlParseElementContentDecl()
* *
* [47] children ::= (choice | seq) ('?' | '*' | '+')? * [47] children ::= (choice | seq) ('?' | '*' | '+')?
* *
* [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?
* *
* [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'
* *
* [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'
* *
* [ VC: Proper Group/PE Nesting ] applies to [49] and [50] * [ VC: Proper Group/PE Nesting ] applies to [49] and [50]
* TODO Parameter-entity replacement text must be properly nested * TODO Parameter-entity replacement text must be properly nested
@@ -6733,7 +6739,7 @@ xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) {
* parse the declaration for an Element content either Mixed or Children, * parse the declaration for an Element content either Mixed or Children,
* the cases EMPTY and ANY are handled directly in xmlParseElementDecl() * the cases EMPTY and ANY are handled directly in xmlParseElementDecl()
* *
* [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children * [46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children
* *
* @returns the type of element content XML_ELEMENT_TYPE_xxx * @returns the type of element content XML_ELEMENT_TYPE_xxx
*/ */
@@ -6775,7 +6781,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name,
* *
* Parse an element declaration. Always consumes '<!'. * Parse an element declaration. Always consumes '<!'.
* *
* [45] elementdecl ::= '<!ELEMENT' S Name S contentspec S? '>' * [45] elementdecl ::= '<!ELEMENT' S Name S contentspec S? '>'
* *
* [ VC: Unique Element Type Declaration ] * [ VC: Unique Element Type Declaration ]
* No element type may be declared more than once * No element type may be declared more than once
@@ -6879,11 +6885,12 @@ xmlParseElementDecl(xmlParserCtxtPtr ctxt) {
* *
* Parse a conditional section. Always consumes '<!['. * Parse a conditional section. Always consumes '<!['.
* *
* [61] conditionalSect ::= includeSect | ignoreSect * [61] conditionalSect ::= includeSect | ignoreSect
* [62] includeSect ::= '<![' S? 'INCLUDE' S? '[' extSubsetDecl ']]>' * [62] includeSect ::= '<![' S? 'INCLUDE' S? '[' extSubsetDecl ']]>'
* [63] ignoreSect ::= '<![' S? 'IGNORE' S? '[' ignoreSectContents* ']]>' * [63] ignoreSect ::= '<![' S? 'IGNORE' S? '[' ignoreSectContents* ']]>'
* [64] ignoreSectContents ::= Ignore ('<![' ignoreSectContents ']]>' Ignore)* * [64] ignoreSectContents ::= Ignore ('<![' ignoreSectContents ']]>'
* [65] Ignore ::= Char* - (Char* ('<![' | ']]>') Char*) * Ignore)*
* [65] Ignore ::= Char* - (Char* ('<![' | ']]>') Char*)
*/ */
static void static void
@@ -7023,8 +7030,8 @@ error:
* *
* Parse markup declarations. Always consumes '<!' or '<?'. * Parse markup declarations. Always consumes '<!' or '<?'.
* *
* [29] markupdecl ::= elementdecl | AttlistDecl | EntityDecl | * [29] markupdecl ::= elementdecl | AttlistDecl | EntityDecl |
* NotationDecl | PI | Comment * NotationDecl | PI | Comment
* *
* [ VC: Proper Declaration/PE Nesting ] * [ VC: Proper Declaration/PE Nesting ]
* Parameter-entity replacement text must be properly nested with * Parameter-entity replacement text must be properly nested with
@@ -7084,7 +7091,7 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) {
* *
* parse an XML declaration header for external entities * parse an XML declaration header for external entities
* *
* [77] TextDecl ::= '<?xml' VersionInfo? EncodingDecl S? '?>' * [77] TextDecl ::= '<?xml' VersionInfo? EncodingDecl S? '?>'
*/ */
void void
@@ -7157,9 +7164,10 @@ xmlParseTextDecl(xmlParserCtxtPtr ctxt) {
* *
* parse Markup declarations from an external subset * parse Markup declarations from an external subset
* *
* [30] extSubset ::= textDecl? extSubsetDecl * [30] extSubset ::= textDecl? extSubsetDecl
* *
* [31] extSubsetDecl ::= (markupdecl | conditionalSect | PEReference | S) * * [31] extSubsetDecl ::= (markupdecl | conditionalSect |
* PEReference | S) *
*/ */
void void
xmlParseExternalSubset(xmlParserCtxtPtr ctxt, const xmlChar *ExternalID, xmlParseExternalSubset(xmlParserCtxtPtr ctxt, const xmlChar *ExternalID,
@@ -7224,7 +7232,7 @@ xmlParseExternalSubset(xmlParserCtxtPtr ctxt, const xmlChar *ExternalID,
* *
* Always consumes '&'. * Always consumes '&'.
* *
* [67] Reference ::= EntityRef | CharRef * [67] Reference ::= EntityRef | CharRef
*/ */
void void
xmlParseReference(xmlParserCtxtPtr ctxt) { xmlParseReference(xmlParserCtxtPtr ctxt) {
@@ -7586,7 +7594,7 @@ xmlLookupGeneralEntity(xmlParserCtxtPtr ctxt, const xmlChar *name, int inAttr) {
* *
* Parse an entity reference. Always consumes '&'. * Parse an entity reference. Always consumes '&'.
* *
* [68] EntityRef ::= '&' Name ';' * [68] EntityRef ::= '&' Name ';'
* *
* @returns the name, or NULL in case of error. * @returns the name, or NULL in case of error.
*/ */
@@ -7642,7 +7650,7 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
* parse ENTITY references declarations, but this version parses it from * parse ENTITY references declarations, but this version parses it from
* a string value. * a string value.
* *
* [68] EntityRef ::= '&' Name ';' * [68] EntityRef ::= '&' Name ';'
* *
* [ WFC: Entity Declared ] * [ WFC: Entity Declared ]
* In a document without any DTD, a document with only an internal DTD * In a document without any DTD, a document with only an internal DTD
@@ -7708,7 +7716,7 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) {
* The entity content is handled directly by pushing it's content as * The entity content is handled directly by pushing it's content as
* a new input stream. * a new input stream.
* *
* [69] PEReference ::= '%' Name ';' * [69] PEReference ::= '%' Name ';'
* *
* [ WFC: No Recursion ] * [ WFC: No Recursion ]
* A parsed entity must not contain a recursive * A parsed entity must not contain a recursive
@@ -7956,7 +7964,7 @@ error:
* *
* parse PEReference declarations * parse PEReference declarations
* *
* [69] PEReference ::= '%' Name ';' * [69] PEReference ::= '%' Name ';'
* *
* [ WFC: No Recursion ] * [ WFC: No Recursion ]
* A parsed entity must not contain a recursive * A parsed entity must not contain a recursive
@@ -8045,8 +8053,8 @@ xmlParseStringPEReference(xmlParserCtxtPtr ctxt, const xmlChar **str) {
* *
* parse a DOCTYPE declaration * parse a DOCTYPE declaration
* *
* [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? * [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S?
* ('[' (markupdecl | PEReference | S)* ']' S?)? '>' * ('[' (markupdecl | PEReference | S)* ']' S?)? '>'
* *
* [ VC: Root Element Type ] * [ VC: Root Element Type ]
* The Name in the document type declaration must match the element * The Name in the document type declaration must match the element
@@ -8111,7 +8119,7 @@ xmlParseDocTypeDecl(xmlParserCtxtPtr ctxt) {
* *
* parse the internal subset declaration * parse the internal subset declaration
* *
* [28 end] ('[' (markupdecl | PEReference | S)* ']' S?)? '>' * [28 end] ('[' (markupdecl | PEReference | S)* ']' S?)? '>'
*/ */
static void static void
@@ -8180,7 +8188,7 @@ xmlParseInternalSubset(xmlParserCtxtPtr ctxt) {
* *
* parse an attribute * parse an attribute
* *
* [41] Attribute ::= Name Eq AttValue * [41] Attribute ::= Name Eq AttValue
* *
* [ WFC: No External Entity References ] * [ WFC: No External Entity References ]
* Attribute values cannot contain direct or indirect entity references * Attribute values cannot contain direct or indirect entity references
@@ -8194,11 +8202,11 @@ xmlParseInternalSubset(xmlParserCtxtPtr ctxt) {
* The attribute must have been declared; the value must be of the type * The attribute must have been declared; the value must be of the type
* declared for it. * declared for it.
* *
* [25] Eq ::= S? '=' S? * [25] Eq ::= S? '=' S?
* *
* With namespace: * With namespace:
* *
* [NS 11] Attribute ::= QName Eq AttValue * [NS 11] Attribute ::= QName Eq AttValue
* *
* Also the case QName == xmlns:??? is handled independently as a namespace * Also the case QName == xmlns:??? is handled independently as a namespace
* definition. * definition.
@@ -8273,13 +8281,13 @@ xmlParseAttribute(xmlParserCtxtPtr ctxt, xmlChar **value) {
* *
* Parse a start tag. Always consumes '<'. * Parse a start tag. Always consumes '<'.
* *
* [40] STag ::= '<' Name (S Attribute)* S? '>' * [40] STag ::= '<' Name (S Attribute)* S? '>'
* *
* [ WFC: Unique Att Spec ] * [ WFC: Unique Att Spec ]
* No attribute name may appear more than once in the same start-tag or * No attribute name may appear more than once in the same start-tag or
* empty-element tag. * empty-element tag.
* *
* [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>' * [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>'
* *
* [ WFC: Unique Att Spec ] * [ WFC: Unique Att Spec ]
* No attribute name may appear more than once in the same start-tag or * No attribute name may appear more than once in the same start-tag or
@@ -8287,9 +8295,9 @@ xmlParseAttribute(xmlParserCtxtPtr ctxt, xmlChar **value) {
* *
* With namespace: * With namespace:
* *
* [NS 8] STag ::= '<' QName (S Attribute)* S? '>' * [NS 8] STag ::= '<' QName (S Attribute)* S? '>'
* *
* [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>' * [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'
* *
* @returns the element name parsed * @returns the element name parsed
*/ */
@@ -8418,11 +8426,11 @@ failed:
* *
* Parse an end tag. Always consumes '</'. * Parse an end tag. Always consumes '</'.
* *
* [42] ETag ::= '</' Name S? '>' * [42] ETag ::= '</' Name S? '>'
* *
* With namespace * With namespace
* *
* [NS 9] ETag ::= '</' QName S? '>' * [NS 9] ETag ::= '</' QName S? '>'
*/ */
static void static void
@@ -8480,11 +8488,11 @@ xmlParseEndTag1(xmlParserCtxtPtr ctxt, int line) {
* *
* parse an end of tag * parse an end of tag
* *
* [42] ETag ::= '</' Name S? '>' * [42] ETag ::= '</' Name S? '>'
* *
* With namespace * With namespace
* *
* [NS 9] ETag ::= '</' QName S? '>' * [NS 9] ETag ::= '</' QName S? '>'
*/ */
void void
@@ -8505,9 +8513,9 @@ xmlParseEndTag(xmlParserCtxtPtr ctxt) {
* *
* parse an XML Namespace QName * parse an XML Namespace QName
* *
* [6] QName ::= (Prefix ':')? LocalPart * [6] QName ::= (Prefix ':')? LocalPart
* [7] Prefix ::= NCName * [7] Prefix ::= NCName
* [8] LocalPart ::= NCName * [8] LocalPart ::= NCName
* *
* @returns the Name parsed or NULL * @returns the Name parsed or NULL
*/ */
@@ -8562,9 +8570,9 @@ xmlParseQNameHashed(xmlParserCtxtPtr ctxt, xmlHashedString *prefix) {
* *
* parse an XML Namespace QName * parse an XML Namespace QName
* *
* [6] QName ::= (Prefix ':')? LocalPart * [6] QName ::= (Prefix ':')? LocalPart
* [7] Prefix ::= NCName * [7] Prefix ::= NCName
* [8] LocalPart ::= NCName * [8] LocalPart ::= NCName
* *
* @returns the Name parsed or NULL * @returns the Name parsed or NULL
*/ */
@@ -8841,13 +8849,13 @@ xmlAttrHashInsertQName(xmlParserCtxtPtr ctxt, unsigned size,
* *
* This routine is called when running SAX2 parsing * This routine is called when running SAX2 parsing
* *
* [40] STag ::= '<' Name (S Attribute)* S? '>' * [40] STag ::= '<' Name (S Attribute)* S? '>'
* *
* [ WFC: Unique Att Spec ] * [ WFC: Unique Att Spec ]
* No attribute name may appear more than once in the same start-tag or * No attribute name may appear more than once in the same start-tag or
* empty-element tag. * empty-element tag.
* *
* [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>' * [44] EmptyElemTag ::= '<' Name (S Attribute)* S? '/>'
* *
* [ WFC: Unique Att Spec ] * [ WFC: Unique Att Spec ]
* No attribute name may appear more than once in the same start-tag or * No attribute name may appear more than once in the same start-tag or
@@ -8855,9 +8863,9 @@ xmlAttrHashInsertQName(xmlParserCtxtPtr ctxt, unsigned size,
* *
* With namespace: * With namespace:
* *
* [NS 8] STag ::= '<' QName (S Attribute)* S? '>' * [NS 8] STag ::= '<' QName (S Attribute)* S? '>'
* *
* [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>' * [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'
* *
* @returns the element name parsed * @returns the element name parsed
*/ */
@@ -9474,11 +9482,11 @@ done:
* *
* Parse an end tag. Always consumes '</'. * Parse an end tag. Always consumes '</'.
* *
* [42] ETag ::= '</' Name S? '>' * [42] ETag ::= '</' Name S? '>'
* *
* With namespace * With namespace
* *
* [NS 9] ETag ::= '</' QName S? '>' * [NS 9] ETag ::= '</' QName S? '>'
*/ */
static void static void
@@ -9540,13 +9548,13 @@ xmlParseEndTag2(xmlParserCtxtPtr ctxt, const xmlStartTag *tag) {
* *
* Parse escaped pure raw content. Always consumes '<!['. * Parse escaped pure raw content. Always consumes '<!['.
* *
* [18] CDSect ::= CDStart CData CDEnd * [18] CDSect ::= CDStart CData CDEnd
* *
* [19] CDStart ::= '<![CDATA[' * [19] CDStart ::= '<![CDATA['
* *
* [20] Data ::= (Char* - (Char* ']]>' Char*)) * [20] Data ::= (Char* - (Char* ']]>' Char*))
* *
* [21] CDEnd ::= ']]>' * [21] CDEnd ::= ']]>'
*/ */
void void
xmlParseCDSect(xmlParserCtxtPtr ctxt) { xmlParseCDSect(xmlParserCtxtPtr ctxt) {
@@ -9769,7 +9777,7 @@ xmlParseContent(xmlParserCtxtPtr ctxt) {
* *
* parse an XML element * parse an XML element
* *
* [39] element ::= EmptyElemTag | STag content ETag * [39] element ::= EmptyElemTag | STag content ETag
* *
* [ WFC: Element Type Match ] * [ WFC: Element Type Match ]
* The Name in an element's end-tag must match the element type in the * The Name in an element's end-tag must match the element type in the
@@ -9971,7 +9979,7 @@ xmlParseElementEnd(xmlParserCtxtPtr ctxt) {
* *
* parse the XML version value. * parse the XML version value.
* *
* [26] VersionNum ::= '1.' [0-9]+ * [26] VersionNum ::= '1.' [0-9]+
* *
* In practice allow [0-9].[0-9]+ at that level * In practice allow [0-9].[0-9]+ at that level
* *
@@ -10042,9 +10050,9 @@ xmlParseVersionNum(xmlParserCtxtPtr ctxt) {
* *
* parse the XML version. * parse the XML version.
* *
* [24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ") * [24] VersionInfo ::= S 'version' Eq (' VersionNum ' | " VersionNum ")
* *
* [25] Eq ::= S? '=' S? * [25] Eq ::= S? '=' S?
* *
* @returns the version string, e.g. "1.0" * @returns the version string, e.g. "1.0"
*/ */
@@ -10090,7 +10098,7 @@ xmlParseVersionInfo(xmlParserCtxtPtr ctxt) {
* *
* parse the XML encoding name * parse the XML encoding name
* *
* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* * [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')*
* *
* @returns the encoding name value or NULL * @returns the encoding name value or NULL
*/ */
@@ -10158,7 +10166,8 @@ xmlParseEncName(xmlParserCtxtPtr ctxt) {
* *
* parse the XML encoding declaration * parse the XML encoding declaration
* *
* [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'") * [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' |
* "'" EncName "'")
* *
* this setups the conversion filters. * this setups the conversion filters.
* *
@@ -10218,8 +10227,8 @@ xmlParseEncodingDecl(xmlParserCtxtPtr ctxt) {
* *
* parse the XML standalone declaration * parse the XML standalone declaration
* *
* [32] SDDecl ::= S 'standalone' Eq * [32] SDDecl ::= S 'standalone' Eq
* (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"')) * (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"'))
* *
* [ VC: Standalone Document Declaration ] * [ VC: Standalone Document Declaration ]
* TODO The standalone document declaration must have the value "no" * TODO The standalone document declaration must have the value "no"
@@ -10303,7 +10312,7 @@ xmlParseSDDecl(xmlParserCtxtPtr ctxt) {
* *
* parse an XML declaration header * parse an XML declaration header
* *
* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' * [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>'
*/ */
void void
@@ -10449,7 +10458,7 @@ xmlCtxtGetStandalone(xmlParserCtxtPtr ctxt) {
* *
* parse an XML Misc* optional field. * parse an XML Misc* optional field.
* *
* [27] Misc ::= Comment | PI | S * [27] Misc ::= Comment | PI | S
*/ */
void void
@@ -10630,7 +10639,7 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
* An external general parsed entity is well-formed if it matches the * An external general parsed entity is well-formed if it matches the
* production labeled extParsedEnt. * production labeled extParsedEnt.
* *
* [78] extParsedEnt ::= TextDecl? content * [78] extParsedEnt ::= TextDecl? content
* *
* @returns 0, -1 in case of error. the parser context is augmented * @returns 0, -1 in case of error. the parser context is augmented
* as a result of the parsing. * as a result of the parsing.
@@ -12006,7 +12015,7 @@ error:
* An external general parsed entity is well-formed if it matches the * An external general parsed entity is well-formed if it matches the
* production labeled extParsedEnt. * production labeled extParsedEnt.
* *
* [78] extParsedEnt ::= TextDecl? content * [78] extParsedEnt ::= TextDecl? content
* *
* @returns 0 if the entity is well formed, -1 in case of args problem and * @returns 0 if the entity is well formed, -1 in case of args problem and
* the parser error code otherwise * the parser error code otherwise
@@ -12057,7 +12066,7 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctxt, const xmlChar *URL,
* An external general parsed entity is well-formed if it matches the * An external general parsed entity is well-formed if it matches the
* production labeled extParsedEnt. * production labeled extParsedEnt.
* *
* [78] extParsedEnt ::= TextDecl? content * [78] extParsedEnt ::= TextDecl? content
* *
* @returns 0 if the entity is well formed, -1 in case of args problem and * @returns 0 if the entity is well formed, -1 in case of args problem and
* the parser error code otherwise * the parser error code otherwise
@@ -12100,7 +12109,8 @@ xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data,
* The allowed sequence for the Well Balanced Chunk is the one defined by * The allowed sequence for the Well Balanced Chunk is the one defined by
* the content production in the XML grammar: * the content production in the XML grammar:
* *
* [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)* * [43] content ::= (element | CharData | Reference | CDSect | PI |
* Comment)*
* *
* @returns 0 if the chunk is well balanced, -1 in case of args problem and * @returns 0 if the chunk is well balanced, -1 in case of args problem and
* the parser error code otherwise * the parser error code otherwise
@@ -12270,7 +12280,8 @@ exit:
* The allowed sequence for the data is a Well Balanced Chunk defined by * The allowed sequence for the data is a Well Balanced Chunk defined by
* the content production in the XML grammar: * the content production in the XML grammar:
* *
* [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)* * [43] content ::= (element | CharData | Reference | CDSect | PI |
* Comment)*
* *
* This function assumes the encoding of `node`'s document which is * This function assumes the encoding of `node`'s document which is
* typically not what you want. A better alternative is * typically not what you want. A better alternative is
@@ -12351,7 +12362,8 @@ xmlParseInNodeContext(xmlNodePtr node, const char *data, int datalen,
* The allowed sequence for the Well Balanced Chunk is the one defined by * The allowed sequence for the Well Balanced Chunk is the one defined by
* the content production in the XML grammar: * the content production in the XML grammar:
* *
* [43] content ::= (element | CharData | Reference | CDSect | PI | Comment)* * [43] content ::= (element | CharData | Reference | CDSect | PI |
* Comment)*
* *
* @returns 0 if the chunk is well balanced, or thehe parser error code * @returns 0 if the chunk is well balanced, or thehe parser error code
* otherwise. * otherwise.
@@ -12421,7 +12433,7 @@ error:
* It use the given SAX function block to handle the parsing callback. * It use the given SAX function block to handle the parsing callback.
* If sax is NULL, fallback to the default DOM tree building routines. * If sax is NULL, fallback to the default DOM tree building routines.
* *
* [78] extParsedEnt ::= TextDecl? content * [78] extParsedEnt ::= TextDecl? content
* *
* This correspond to a "Well Balanced" chunk * This correspond to a "Well Balanced" chunk
* *
@@ -12466,7 +12478,7 @@ xmlSAXParseEntity(xmlSAXHandlerPtr sax, const char *filename) {
* *
* parse an XML external entity out of context and build a tree. * parse an XML external entity out of context and build a tree.
* *
* [78] extParsedEnt ::= TextDecl? content * [78] extParsedEnt ::= TextDecl? content
* *
* This correspond to a "Well Balanced" chunk * This correspond to a "Well Balanced" chunk
* *

16
parserInternals.c
View File

@@ -486,7 +486,10 @@ xmlFatalErr(xmlParserCtxtPtr ctxt, xmlParserErrors code, const char *info)
* @deprecated Internal function, don't use. * @deprecated Internal function, don't use.
* *
* Check whether the character is allowed by the production * Check whether the character is allowed by the production
*
* ```
* [84] Letter ::= BaseChar | Ideographic * [84] Letter ::= BaseChar | Ideographic
* ```
* *
* @returns 0 if not, non-zero otherwise * @returns 0 if not, non-zero otherwise
*/ */
@@ -844,10 +847,12 @@ encoding_error:
* *
* The current char value, if using UTF-8 this may actually span multiple * The current char value, if using UTF-8 this may actually span multiple
* bytes in the input buffer. Implement the end of line normalization: * bytes in the input buffer. Implement the end of line normalization:
*
* 2.11 End-of-Line Handling * 2.11 End-of-Line Handling
*
* Wherever an external parsed entity or the literal entity value * Wherever an external parsed entity or the literal entity value
* of an internal parsed entity contains either the literal two-character * of an internal parsed entity contains either the literal two-character
* sequence "\#xD\#xA" or a standalone literal \#xD, an XML processor * sequence "#xD#xA" or a standalone literal \#xD, an XML processor
* must pass to the application the single character \#xA. * must pass to the application the single character \#xA.
* This behavior can conveniently be produced by normalizing all * This behavior can conveniently be produced by normalizing all
* line breaks to \#xA on input, before parsing.) * line breaks to \#xA on input, before parsing.)
@@ -3244,7 +3249,7 @@ xmlParserFindNodeInfo(xmlParserCtxtPtr ctx, xmlNodePtr node)
* *
* @deprecated Don't use. * @deprecated Don't use.
* *
* -- Initialize (set to initial state) node info sequence * Initialize (set to initial state) node info sequence
*/ */
void void
xmlInitNodeInfoSeq(xmlParserNodeInfoSeqPtr seq) xmlInitNodeInfoSeq(xmlParserNodeInfoSeqPtr seq)
@@ -3261,8 +3266,7 @@ xmlInitNodeInfoSeq(xmlParserNodeInfoSeqPtr seq)
* *
* @deprecated Don't use. * @deprecated Don't use.
* *
* -- Clear (release memory and reinitialize) node * Clear (release memory and reinitialize) node info sequence
* info sequence
*/ */
void void
xmlClearNodeInfoSeq(xmlParserNodeInfoSeqPtr seq) xmlClearNodeInfoSeq(xmlParserNodeInfoSeqPtr seq)
@@ -3280,8 +3284,8 @@ xmlClearNodeInfoSeq(xmlParserNodeInfoSeqPtr seq)
* *
* @deprecated Don't use. * @deprecated Don't use.
* *
* xmlParserFindNodeInfoIndex() : Find the index that the info record for * Find the index that the info record for the given node is or
* the given node is or should be at in a sorted sequence * should be at in a sorted sequence.
* *
* @returns a long indicating the position of the record * @returns a long indicating the position of the record
*/ */