lxml 5.3.2__cp39-cp39-macosx_10_9_universal2.whl → 6.0.0__cp39-cp39-macosx_10_9_universal2.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. lxml/__init__.py +1 -1
  2. lxml/_elementpath.cpython-39-darwin.so +0 -0
  3. lxml/_elementpath.py +3 -1
  4. lxml/apihelpers.pxi +25 -17
  5. lxml/builder.cpython-39-darwin.so +0 -0
  6. lxml/builder.py +11 -0
  7. lxml/debug.pxi +0 -54
  8. lxml/etree.cpython-39-darwin.so +0 -0
  9. lxml/etree.h +24 -28
  10. lxml/etree.pyx +154 -33
  11. lxml/etree_api.h +59 -50
  12. lxml/extensions.pxi +3 -6
  13. lxml/html/__init__.py +7 -3
  14. lxml/html/_difflib.cpython-39-darwin.so +0 -0
  15. lxml/html/_difflib.py +2106 -0
  16. lxml/html/builder.py +40 -0
  17. lxml/html/defs.py +3 -3
  18. lxml/html/diff.cpython-39-darwin.so +0 -0
  19. lxml/html/diff.py +406 -312
  20. lxml/includes/etree_defs.h +6 -6
  21. lxml/includes/libexslt/exsltconfig.h +3 -3
  22. lxml/includes/libxml/HTMLparser.h +41 -45
  23. lxml/includes/libxml/HTMLtree.h +1 -0
  24. lxml/includes/libxml/SAX.h +2 -186
  25. lxml/includes/libxml/SAX2.h +2 -3
  26. lxml/includes/libxml/c14n.h +1 -12
  27. lxml/includes/libxml/catalog.h +1 -0
  28. lxml/includes/libxml/debugXML.h +0 -138
  29. lxml/includes/libxml/encoding.h +131 -59
  30. lxml/includes/libxml/entities.h +12 -20
  31. lxml/includes/libxml/globals.h +0 -16
  32. lxml/includes/libxml/hash.h +19 -0
  33. lxml/includes/libxml/list.h +2 -2
  34. lxml/includes/libxml/nanoftp.h +3 -173
  35. lxml/includes/libxml/nanohttp.h +17 -0
  36. lxml/includes/libxml/parser.h +505 -256
  37. lxml/includes/libxml/parserInternals.h +26 -98
  38. lxml/includes/libxml/relaxng.h +7 -2
  39. lxml/includes/libxml/threads.h +0 -6
  40. lxml/includes/libxml/tree.h +61 -97
  41. lxml/includes/libxml/uri.h +11 -0
  42. lxml/includes/libxml/valid.h +49 -14
  43. lxml/includes/libxml/xinclude.h +12 -0
  44. lxml/includes/libxml/xlink.h +4 -0
  45. lxml/includes/libxml/xmlIO.h +33 -35
  46. lxml/includes/libxml/xmlautomata.h +19 -2
  47. lxml/includes/libxml/xmlerror.h +32 -18
  48. lxml/includes/libxml/xmlexports.h +61 -15
  49. lxml/includes/libxml/xmlmemory.h +27 -64
  50. lxml/includes/libxml/xmlmodule.h +4 -0
  51. lxml/includes/libxml/xmlreader.h +13 -3
  52. lxml/includes/libxml/xmlregexp.h +7 -106
  53. lxml/includes/libxml/xmlsave.h +15 -1
  54. lxml/includes/libxml/xmlschemas.h +10 -5
  55. lxml/includes/libxml/xmlunicode.h +3 -190
  56. lxml/includes/libxml/xmlversion.h +15 -194
  57. lxml/includes/libxml/xmlwriter.h +1 -0
  58. lxml/includes/libxml/xpath.h +9 -15
  59. lxml/includes/libxml/xpathInternals.h +9 -3
  60. lxml/includes/libxml/xpointer.h +1 -91
  61. lxml/includes/libxslt/xsltconfig.h +6 -6
  62. lxml/includes/lxml-version.h +1 -1
  63. lxml/includes/tree.pxd +10 -12
  64. lxml/includes/xmlparser.pxd +46 -8
  65. lxml/lxml.etree.h +24 -28
  66. lxml/lxml.etree_api.h +59 -50
  67. lxml/objectify.cpython-39-darwin.so +0 -0
  68. lxml/objectify.pyx +11 -7
  69. lxml/parser.pxi +106 -47
  70. lxml/sax.cpython-39-darwin.so +0 -0
  71. lxml/sax.py +11 -0
  72. lxml/saxparser.pxi +14 -14
  73. lxml/schematron.pxi +8 -3
  74. lxml/serializer.pxi +71 -3
  75. lxml/xslt.pxi +10 -3
  76. lxml-6.0.0.dist-info/METADATA +163 -0
  77. {lxml-5.3.2.dist-info → lxml-6.0.0.dist-info}/RECORD +81 -79
  78. {lxml-5.3.2.dist-info → lxml-6.0.0.dist-info}/WHEEL +2 -1
  79. {lxml-5.3.2.dist-info → lxml-6.0.0.dist-info}/licenses/LICENSE.txt +3 -1
  80. lxml-5.3.2.dist-info/METADATA +0 -100
  81. {lxml-5.3.2.dist-info → lxml-6.0.0.dist-info}/licenses/LICENSES.txt +0 -0
  82. {lxml-5.3.2.dist-info → lxml-6.0.0.dist-info}/top_level.txt +0 -0
@@ -159,6 +159,10 @@ static PyObject* PyBytes_FromFormat(const char* format, ...) {
159
159
  # define xmlBufUse(buf) xmlBufferLength(buf)
160
160
  #endif
161
161
 
162
+ #if LIBXML_VERSION < 21500
163
+ # define xmlCtxtIsStopped(p_ctxt) ((p_ctxt)->disableSAX != 0)
164
+ #endif
165
+
162
166
  /* libexslt 1.1.25+ support EXSLT functions in XPath */
163
167
  #if LIBXSLT_VERSION < 10125
164
168
  #define exsltDateXpathCtxtRegister(ctxt, prefix)
@@ -177,7 +181,7 @@ long _ftol2( double dblSource ) { return _ftol( dblSource ); }
177
181
 
178
182
  #ifdef __GNUC__
179
183
  /* Test for GCC > 2.95 */
180
- #if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95))
184
+ #if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95))
181
185
  #define unlikely_condition(x) __builtin_expect((x), 0)
182
186
  #else /* __GNUC__ > 2 ... */
183
187
  #define unlikely_condition(x) (x)
@@ -190,10 +194,6 @@ long _ftol2( double dblSource ) { return _ftol( dblSource ); }
190
194
  #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
191
195
  #endif
192
196
 
193
- #define PY_NEW(T) \
194
- (((PyTypeObject*)(T))->tp_new( \
195
- (PyTypeObject*)(T), __pyx_empty_tuple, NULL))
196
-
197
197
  #define _fqtypename(o) ((Py_TYPE(o))->tp_name)
198
198
 
199
199
  #define lxml_malloc(count, item_size) \
@@ -268,7 +268,7 @@ static void* lxml_unpack_xmldoc_capsule(PyObject* capsule, int* is_owned) {
268
268
  * 'inclusive' is 1). The _ELEMENT_ variants will only stop on nodes
269
269
  * that match _isElement(), the normal variant will stop on every node
270
270
  * except text nodes.
271
- *
271
+ *
272
272
  * To traverse the node and all of its children and siblings in Pyrex, call
273
273
  * cdef xmlNode* some_node
274
274
  * BEGIN_FOR_EACH_ELEMENT_FROM(some_node.parent, some_node, 1)
@@ -18,21 +18,21 @@ extern "C" {
18
18
  *
19
19
  * the version string like "1.2.3"
20
20
  */
21
- #define LIBEXSLT_DOTTED_VERSION "0.8.23"
21
+ #define LIBEXSLT_DOTTED_VERSION "0.8.24"
22
22
 
23
23
  /**
24
24
  * LIBEXSLT_VERSION:
25
25
  *
26
26
  * the version number: 1.2.3 value is 10203
27
27
  */
28
- #define LIBEXSLT_VERSION 823
28
+ #define LIBEXSLT_VERSION 824
29
29
 
30
30
  /**
31
31
  * LIBEXSLT_VERSION_STRING:
32
32
  *
33
33
  * the version number string, 1.2.3 value is "10203"
34
34
  */
35
- #define LIBEXSLT_VERSION_STRING "823"
35
+ #define LIBEXSLT_VERSION_STRING "824"
36
36
 
37
37
  /**
38
38
  * LIBEXSLT_VERSION_EXTRA:
@@ -21,6 +21,11 @@
21
21
  extern "C" {
22
22
  #endif
23
23
 
24
+ /*
25
+ * Backward compatibility
26
+ */
27
+ #define UTF8ToHtml htmlUTF8ToHtml
28
+
24
29
  /*
25
30
  * Most of the back-end structures from XML and HTML are shared.
26
31
  */
@@ -42,31 +47,22 @@ typedef struct _htmlElemDesc htmlElemDesc;
42
47
  typedef htmlElemDesc *htmlElemDescPtr;
43
48
  struct _htmlElemDesc {
44
49
  const char *name; /* The tag name */
45
- char startTag; /* Whether the start tag can be implied */
50
+ char startTag; /* unused */
46
51
  char endTag; /* Whether the end tag can be implied */
47
52
  char saveEndTag; /* Whether the end tag should be saved */
48
53
  char empty; /* Is this an empty element ? */
49
- char depr; /* Is this a deprecated element ? */
50
- char dtd; /* 1: only in Loose DTD, 2: only Frameset one */
54
+ char depr; /* unused */
55
+ char dtd; /* unused */
51
56
  char isinline; /* is this a block 0 or inline 1 element */
52
57
  const char *desc; /* the description */
53
58
 
54
- /* NRK Jan.2003
55
- * New fields encapsulating HTML structure
56
- *
57
- * Bugs:
58
- * This is a very limited representation. It fails to tell us when
59
- * an element *requires* subelements (we only have whether they're
60
- * allowed or not), and it doesn't tell us where CDATA and PCDATA
61
- * are allowed. Some element relationships are not fully represented:
62
- * these are flagged with the word MODIFIER
63
- */
64
- const char** subelts; /* allowed sub-elements of this element */
65
- const char* defaultsubelt; /* subelement for suggested auto-repair
66
- if necessary or NULL */
67
- const char** attrs_opt; /* Optional Attributes */
68
- const char** attrs_depr; /* Additional deprecated attributes */
69
- const char** attrs_req; /* Required attributes */
59
+ const char** subelts XML_DEPRECATED_MEMBER;
60
+ const char* defaultsubelt XML_DEPRECATED_MEMBER;
61
+ const char** attrs_opt XML_DEPRECATED_MEMBER;
62
+ const char** attrs_depr XML_DEPRECATED_MEMBER;
63
+ const char** attrs_req XML_DEPRECATED_MEMBER;
64
+
65
+ int dataMode;
70
66
  };
71
67
 
72
68
  /*
@@ -80,22 +76,12 @@ struct _htmlEntityDesc {
80
76
  const char *desc; /* the description */
81
77
  };
82
78
 
83
- /** DOC_DISABLE */
84
79
  #ifdef LIBXML_SAX1_ENABLED
85
- #define XML_GLOBALS_HTML \
86
- XML_OP(htmlDefaultSAXHandler, xmlSAXHandlerV1, XML_DEPRECATED)
87
- #else
88
- #define XML_GLOBALS_HTML
89
- #endif
90
80
 
91
- #define XML_OP XML_DECLARE_GLOBAL
92
- XML_GLOBALS_HTML
93
- #undef XML_OP
81
+ XML_DEPRECATED
82
+ XMLPUBVAR const xmlSAXHandlerV1 htmlDefaultSAXHandler;
94
83
 
95
- #if defined(LIBXML_THREAD_ENABLED) && !defined(XML_GLOBALS_NO_REDEFINITION)
96
- #define htmlDefaultSAXHandler XML_GLOBAL_MACRO(htmlDefaultSAXHandler)
97
- #endif
98
- /** DOC_ENABLE */
84
+ #endif /* LIBXML_SAX1_ENABLED */
99
85
 
100
86
  /*
101
87
  * There is only few public functions.
@@ -110,9 +96,11 @@ XMLPUBFUN const htmlEntityDesc *
110
96
  XMLPUBFUN const htmlEntityDesc *
111
97
  htmlEntityValueLookup(unsigned int value);
112
98
 
99
+ XML_DEPRECATED
113
100
  XMLPUBFUN int
114
101
  htmlIsAutoClosed(htmlDocPtr doc,
115
102
  htmlNodePtr elem);
103
+ XML_DEPRECATED
116
104
  XMLPUBFUN int
117
105
  htmlAutoCloseTag(htmlDocPtr doc,
118
106
  const xmlChar *name,
@@ -162,7 +150,7 @@ XMLPUBFUN htmlDocPtr
162
150
  htmlParseFile (const char *filename,
163
151
  const char *encoding);
164
152
  XMLPUBFUN int
165
- UTF8ToHtml (unsigned char *out,
153
+ htmlUTF8ToHtml (unsigned char *out,
166
154
  int *outlen,
167
155
  const unsigned char *in,
168
156
  int *inlen);
@@ -173,6 +161,7 @@ XMLPUBFUN int
173
161
  int *inlen, int quoteChar);
174
162
  XMLPUBFUN int
175
163
  htmlIsScriptAttribute(const xmlChar *name);
164
+ XML_DEPRECATED
176
165
  XMLPUBFUN int
177
166
  htmlHandleOmittedElem(int val);
178
167
 
@@ -207,20 +196,26 @@ XMLPUBFUN void
207
196
  * to the xmlReadDoc() and similar calls.
208
197
  */
209
198
  typedef enum {
210
- HTML_PARSE_RECOVER = 1<<0, /* Relaxed parsing */
199
+ HTML_PARSE_RECOVER = 1<<0, /* No effect */
211
200
  HTML_PARSE_NODEFDTD = 1<<2, /* do not default a doctype if not found */
212
201
  HTML_PARSE_NOERROR = 1<<5, /* suppress error reports */
213
202
  HTML_PARSE_NOWARNING= 1<<6, /* suppress warning reports */
214
- HTML_PARSE_PEDANTIC = 1<<7, /* pedantic error reporting */
203
+ HTML_PARSE_PEDANTIC = 1<<7, /* No effect */
215
204
  HTML_PARSE_NOBLANKS = 1<<8, /* remove blank nodes */
216
- HTML_PARSE_NONET = 1<<11,/* Forbid network access */
205
+ HTML_PARSE_NONET = 1<<11,/* No effect */
217
206
  HTML_PARSE_NOIMPLIED= 1<<13,/* Do not add implied html/body... elements */
218
207
  HTML_PARSE_COMPACT = 1<<16,/* compact small text nodes */
219
- HTML_PARSE_IGNORE_ENC=1<<21 /* ignore internal document encoding hint */
208
+ HTML_PARSE_HUGE = 1<<19,/* relax any hardcoded limit from the parser */
209
+ HTML_PARSE_IGNORE_ENC=1<<21,/* ignore internal document encoding hint */
210
+ HTML_PARSE_BIG_LINES= 1<<22,/* Store big lines numbers in text PSVI field */
211
+ HTML_PARSE_HTML5 = 1<<26 /* HTML5 support */
220
212
  } htmlParserOption;
221
213
 
222
214
  XMLPUBFUN void
223
215
  htmlCtxtReset (htmlParserCtxtPtr ctxt);
216
+ XMLPUBFUN int
217
+ htmlCtxtSetOptions (htmlParserCtxtPtr ctxt,
218
+ int options);
224
219
  XMLPUBFUN int
225
220
  htmlCtxtUseOptions (htmlParserCtxtPtr ctxt,
226
221
  int options);
@@ -251,6 +246,9 @@ XMLPUBFUN htmlDocPtr
251
246
  const char *URL,
252
247
  const char *encoding,
253
248
  int options);
249
+ XMLPUBFUN htmlDocPtr
250
+ htmlCtxtParseDocument (htmlParserCtxtPtr ctxt,
251
+ xmlParserInputPtr input);
254
252
  XMLPUBFUN htmlDocPtr
255
253
  htmlCtxtReadDoc (xmlParserCtxtPtr ctxt,
256
254
  const xmlChar *cur,
@@ -284,7 +282,7 @@ XMLPUBFUN htmlDocPtr
284
282
  const char *encoding,
285
283
  int options);
286
284
 
287
- /* NRK/Jan2003: further knowledge of HTML structure
285
+ /* deprecated content model
288
286
  */
289
287
  typedef enum {
290
288
  HTML_NA = 0 , /* something we don't check at all */
@@ -297,10 +295,14 @@ typedef enum {
297
295
  /* Using htmlElemDesc rather than name here, to emphasise the fact
298
296
  that otherwise there's a lookup overhead
299
297
  */
298
+ XML_DEPRECATED
300
299
  XMLPUBFUN htmlStatus htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int) ;
300
+ XML_DEPRECATED
301
301
  XMLPUBFUN int htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ;
302
+ XML_DEPRECATED
302
303
  XMLPUBFUN htmlStatus htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ;
303
- XMLPUBFUN htmlStatus htmlNodeStatus(const htmlNodePtr, int) ;
304
+ XML_DEPRECATED
305
+ XMLPUBFUN htmlStatus htmlNodeStatus(htmlNodePtr, int) ;
304
306
  /**
305
307
  * htmlDefaultSubelement:
306
308
  * @elt: HTML element
@@ -333,11 +335,5 @@ XMLPUBFUN htmlStatus htmlNodeStatus(const htmlNodePtr, int) ;
333
335
  }
334
336
  #endif
335
337
 
336
- #else /* LIBXML_HTML_ENABLED */
337
-
338
- /** DOC_DISABLE */
339
- #define XML_GLOBALS_HTML
340
- /** DOC_ENABLE */
341
-
342
338
  #endif /* LIBXML_HTML_ENABLED */
343
339
  #endif /* __HTML_PARSER_H__ */
@@ -133,6 +133,7 @@ XMLPUBFUN void
133
133
 
134
134
  #endif /* LIBXML_OUTPUT_ENABLED */
135
135
 
136
+ XML_DEPRECATED
136
137
  XMLPUBFUN int
137
138
  htmlIsBooleanAttr (const xmlChar *name);
138
139
 
@@ -8,195 +8,11 @@
8
8
  * Author: Daniel Veillard
9
9
  */
10
10
 
11
-
12
11
  #ifndef __XML_SAX_H__
13
12
  #define __XML_SAX_H__
14
13
 
15
- #include <libxml/xmlversion.h>
16
- #include <libxml/parser.h>
17
-
18
- #ifdef LIBXML_LEGACY_ENABLED
19
-
20
- #ifdef __cplusplus
21
- extern "C" {
14
+ #ifdef __GNUC__
15
+ #warning "libxml/SAX.h is deprecated"
22
16
  #endif
23
- XML_DEPRECATED
24
- XMLPUBFUN const xmlChar *
25
- getPublicId (void *ctx);
26
- XML_DEPRECATED
27
- XMLPUBFUN const xmlChar *
28
- getSystemId (void *ctx);
29
- XML_DEPRECATED
30
- XMLPUBFUN void
31
- setDocumentLocator (void *ctx,
32
- xmlSAXLocatorPtr loc);
33
-
34
- XML_DEPRECATED
35
- XMLPUBFUN int
36
- getLineNumber (void *ctx);
37
- XML_DEPRECATED
38
- XMLPUBFUN int
39
- getColumnNumber (void *ctx);
40
-
41
- XML_DEPRECATED
42
- XMLPUBFUN int
43
- isStandalone (void *ctx);
44
- XML_DEPRECATED
45
- XMLPUBFUN int
46
- hasInternalSubset (void *ctx);
47
- XML_DEPRECATED
48
- XMLPUBFUN int
49
- hasExternalSubset (void *ctx);
50
-
51
- XML_DEPRECATED
52
- XMLPUBFUN void
53
- internalSubset (void *ctx,
54
- const xmlChar *name,
55
- const xmlChar *ExternalID,
56
- const xmlChar *SystemID);
57
- XML_DEPRECATED
58
- XMLPUBFUN void
59
- externalSubset (void *ctx,
60
- const xmlChar *name,
61
- const xmlChar *ExternalID,
62
- const xmlChar *SystemID);
63
- XML_DEPRECATED
64
- XMLPUBFUN xmlEntityPtr
65
- getEntity (void *ctx,
66
- const xmlChar *name);
67
- XML_DEPRECATED
68
- XMLPUBFUN xmlEntityPtr
69
- getParameterEntity (void *ctx,
70
- const xmlChar *name);
71
- XML_DEPRECATED
72
- XMLPUBFUN xmlParserInputPtr
73
- resolveEntity (void *ctx,
74
- const xmlChar *publicId,
75
- const xmlChar *systemId);
76
-
77
- XML_DEPRECATED
78
- XMLPUBFUN void
79
- entityDecl (void *ctx,
80
- const xmlChar *name,
81
- int type,
82
- const xmlChar *publicId,
83
- const xmlChar *systemId,
84
- xmlChar *content);
85
- XML_DEPRECATED
86
- XMLPUBFUN void
87
- attributeDecl (void *ctx,
88
- const xmlChar *elem,
89
- const xmlChar *fullname,
90
- int type,
91
- int def,
92
- const xmlChar *defaultValue,
93
- xmlEnumerationPtr tree);
94
- XML_DEPRECATED
95
- XMLPUBFUN void
96
- elementDecl (void *ctx,
97
- const xmlChar *name,
98
- int type,
99
- xmlElementContentPtr content);
100
- XML_DEPRECATED
101
- XMLPUBFUN void
102
- notationDecl (void *ctx,
103
- const xmlChar *name,
104
- const xmlChar *publicId,
105
- const xmlChar *systemId);
106
- XML_DEPRECATED
107
- XMLPUBFUN void
108
- unparsedEntityDecl (void *ctx,
109
- const xmlChar *name,
110
- const xmlChar *publicId,
111
- const xmlChar *systemId,
112
- const xmlChar *notationName);
113
-
114
- XML_DEPRECATED
115
- XMLPUBFUN void
116
- startDocument (void *ctx);
117
- XML_DEPRECATED
118
- XMLPUBFUN void
119
- endDocument (void *ctx);
120
- XML_DEPRECATED
121
- XMLPUBFUN void
122
- attribute (void *ctx,
123
- const xmlChar *fullname,
124
- const xmlChar *value);
125
- XML_DEPRECATED
126
- XMLPUBFUN void
127
- startElement (void *ctx,
128
- const xmlChar *fullname,
129
- const xmlChar **atts);
130
- XML_DEPRECATED
131
- XMLPUBFUN void
132
- endElement (void *ctx,
133
- const xmlChar *name);
134
- XML_DEPRECATED
135
- XMLPUBFUN void
136
- reference (void *ctx,
137
- const xmlChar *name);
138
- XML_DEPRECATED
139
- XMLPUBFUN void
140
- characters (void *ctx,
141
- const xmlChar *ch,
142
- int len);
143
- XML_DEPRECATED
144
- XMLPUBFUN void
145
- ignorableWhitespace (void *ctx,
146
- const xmlChar *ch,
147
- int len);
148
- XML_DEPRECATED
149
- XMLPUBFUN void
150
- processingInstruction (void *ctx,
151
- const xmlChar *target,
152
- const xmlChar *data);
153
- XML_DEPRECATED
154
- XMLPUBFUN void
155
- globalNamespace (void *ctx,
156
- const xmlChar *href,
157
- const xmlChar *prefix);
158
- XML_DEPRECATED
159
- XMLPUBFUN void
160
- setNamespace (void *ctx,
161
- const xmlChar *name);
162
- XML_DEPRECATED
163
- XMLPUBFUN xmlNsPtr
164
- getNamespace (void *ctx);
165
- XML_DEPRECATED
166
- XMLPUBFUN int
167
- checkNamespace (void *ctx,
168
- xmlChar *nameSpace);
169
- XML_DEPRECATED
170
- XMLPUBFUN void
171
- namespaceDecl (void *ctx,
172
- const xmlChar *href,
173
- const xmlChar *prefix);
174
- XML_DEPRECATED
175
- XMLPUBFUN void
176
- comment (void *ctx,
177
- const xmlChar *value);
178
- XML_DEPRECATED
179
- XMLPUBFUN void
180
- cdataBlock (void *ctx,
181
- const xmlChar *value,
182
- int len);
183
-
184
- #ifdef LIBXML_SAX1_ENABLED
185
- XML_DEPRECATED
186
- XMLPUBFUN void
187
- initxmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr,
188
- int warning);
189
- #ifdef LIBXML_HTML_ENABLED
190
- XML_DEPRECATED
191
- XMLPUBFUN void
192
- inithtmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr);
193
- #endif
194
- #endif /* LIBXML_SAX1_ENABLED */
195
-
196
- #ifdef __cplusplus
197
- }
198
- #endif
199
-
200
- #endif /* LIBXML_LEGACY_ENABLED */
201
17
 
202
18
  #endif /* __XML_SAX_H__ */
@@ -95,16 +95,15 @@ XMLPUBFUN void
95
95
  xmlSAX2StartDocument (void *ctx);
96
96
  XMLPUBFUN void
97
97
  xmlSAX2EndDocument (void *ctx);
98
- #if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
99
- defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED)
98
+ XML_DEPRECATED
100
99
  XMLPUBFUN void
101
100
  xmlSAX2StartElement (void *ctx,
102
101
  const xmlChar *fullname,
103
102
  const xmlChar **atts);
103
+ XML_DEPRECATED
104
104
  XMLPUBFUN void
105
105
  xmlSAX2EndElement (void *ctx,
106
106
  const xmlChar *name);
107
- #endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED or LIBXML_LEGACY_ENABLED */
108
107
  XMLPUBFUN void
109
108
  xmlSAX2StartElementNs (void *ctx,
110
109
  const xmlChar *localname,
@@ -39,18 +39,7 @@ extern "C" {
39
39
  * a) default attributes (if any) are added to all nodes
40
40
  * b) all character and parsed entity references are resolved
41
41
  * In order to achieve this in libxml2 the document MUST be loaded with
42
- * following global settings:
43
- *
44
- * xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
45
- * xmlSubstituteEntitiesDefault(1);
46
- *
47
- * or corresponding parser context setting:
48
- * xmlParserCtxtPtr ctxt;
49
- *
50
- * ...
51
- * ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
52
- * ctxt->replaceEntities = 1;
53
- * ...
42
+ * following options: XML_PARSE_DTDATTR | XML_PARSE_NOENT
54
43
  */
55
44
 
56
45
  /*
@@ -161,6 +161,7 @@ XMLPUBFUN xmlChar *
161
161
  */
162
162
  XMLPUBFUN int
163
163
  xmlCatalogSetDebug (int level);
164
+ XML_DEPRECATED
164
165
  XMLPUBFUN xmlCatalogPrefer
165
166
  xmlCatalogSetDefaultPrefer(xmlCatalogPrefer prefer);
166
167
  XMLPUBFUN void
@@ -71,144 +71,6 @@ XMLPUBFUN int
71
71
  xmlDebugCheckDocument (FILE * output,
72
72
  xmlDocPtr doc);
73
73
 
74
- /****************************************************************
75
- * *
76
- * XML shell helpers *
77
- * *
78
- ****************************************************************/
79
-
80
- XMLPUBFUN void
81
- xmlLsOneNode (FILE *output, xmlNodePtr node);
82
- XMLPUBFUN int
83
- xmlLsCountNode (xmlNodePtr node);
84
-
85
- XMLPUBFUN const char *
86
- xmlBoolToText (int boolval);
87
-
88
- /****************************************************************
89
- * *
90
- * The XML shell related structures and functions *
91
- * *
92
- ****************************************************************/
93
-
94
- #ifdef LIBXML_XPATH_ENABLED
95
- /**
96
- * xmlShellReadlineFunc:
97
- * @prompt: a string prompt
98
- *
99
- * This is a generic signature for the XML shell input function.
100
- *
101
- * Returns a string which will be freed by the Shell.
102
- */
103
- typedef char * (* xmlShellReadlineFunc)(char *prompt);
104
-
105
- /**
106
- * xmlShellCtxt:
107
- *
108
- * A debugging shell context.
109
- * TODO: add the defined function tables.
110
- */
111
- typedef struct _xmlShellCtxt xmlShellCtxt;
112
- typedef xmlShellCtxt *xmlShellCtxtPtr;
113
- struct _xmlShellCtxt {
114
- char *filename;
115
- xmlDocPtr doc;
116
- xmlNodePtr node;
117
- xmlXPathContextPtr pctxt;
118
- int loaded;
119
- FILE *output;
120
- xmlShellReadlineFunc input;
121
- };
122
-
123
- /**
124
- * xmlShellCmd:
125
- * @ctxt: a shell context
126
- * @arg: a string argument
127
- * @node: a first node
128
- * @node2: a second node
129
- *
130
- * This is a generic signature for the XML shell functions.
131
- *
132
- * Returns an int, negative returns indicating errors.
133
- */
134
- typedef int (* xmlShellCmd) (xmlShellCtxtPtr ctxt,
135
- char *arg,
136
- xmlNodePtr node,
137
- xmlNodePtr node2);
138
-
139
- XMLPUBFUN void
140
- xmlShellPrintXPathError (int errorType,
141
- const char *arg);
142
- XMLPUBFUN void
143
- xmlShellPrintXPathResult(xmlXPathObjectPtr list);
144
- XMLPUBFUN int
145
- xmlShellList (xmlShellCtxtPtr ctxt,
146
- char *arg,
147
- xmlNodePtr node,
148
- xmlNodePtr node2);
149
- XMLPUBFUN int
150
- xmlShellBase (xmlShellCtxtPtr ctxt,
151
- char *arg,
152
- xmlNodePtr node,
153
- xmlNodePtr node2);
154
- XMLPUBFUN int
155
- xmlShellDir (xmlShellCtxtPtr ctxt,
156
- char *arg,
157
- xmlNodePtr node,
158
- xmlNodePtr node2);
159
- XMLPUBFUN int
160
- xmlShellLoad (xmlShellCtxtPtr ctxt,
161
- char *filename,
162
- xmlNodePtr node,
163
- xmlNodePtr node2);
164
- #ifdef LIBXML_OUTPUT_ENABLED
165
- XMLPUBFUN void
166
- xmlShellPrintNode (xmlNodePtr node);
167
- XMLPUBFUN int
168
- xmlShellCat (xmlShellCtxtPtr ctxt,
169
- char *arg,
170
- xmlNodePtr node,
171
- xmlNodePtr node2);
172
- XMLPUBFUN int
173
- xmlShellWrite (xmlShellCtxtPtr ctxt,
174
- char *filename,
175
- xmlNodePtr node,
176
- xmlNodePtr node2);
177
- XMLPUBFUN int
178
- xmlShellSave (xmlShellCtxtPtr ctxt,
179
- char *filename,
180
- xmlNodePtr node,
181
- xmlNodePtr node2);
182
- #endif /* LIBXML_OUTPUT_ENABLED */
183
- #ifdef LIBXML_VALID_ENABLED
184
- XMLPUBFUN int
185
- xmlShellValidate (xmlShellCtxtPtr ctxt,
186
- char *dtd,
187
- xmlNodePtr node,
188
- xmlNodePtr node2);
189
- #endif /* LIBXML_VALID_ENABLED */
190
- XMLPUBFUN int
191
- xmlShellDu (xmlShellCtxtPtr ctxt,
192
- char *arg,
193
- xmlNodePtr tree,
194
- xmlNodePtr node2);
195
- XMLPUBFUN int
196
- xmlShellPwd (xmlShellCtxtPtr ctxt,
197
- char *buffer,
198
- xmlNodePtr node,
199
- xmlNodePtr node2);
200
-
201
- /*
202
- * The Shell interface.
203
- */
204
- XMLPUBFUN void
205
- xmlShell (xmlDocPtr doc,
206
- char *filename,
207
- xmlShellReadlineFunc input,
208
- FILE *output);
209
-
210
- #endif /* LIBXML_XPATH_ENABLED */
211
-
212
74
  #ifdef __cplusplus
213
75
  }
214
76
  #endif