@img/sharp-libvips-dev 1.2.2-rc.2 → 1.2.3
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.
- package/include/expat.h +37 -24
- package/include/expat_config.h +9 -9
- package/include/expat_external.h +62 -61
- package/include/libxml2/libxml/HTMLparser.h +159 -101
- package/include/libxml2/libxml/HTMLtree.h +49 -74
- package/include/libxml2/libxml/SAX.h +8 -5
- package/include/libxml2/libxml/SAX2.h +18 -15
- package/include/libxml2/libxml/c14n.h +30 -29
- package/include/libxml2/libxml/catalog.h +47 -22
- package/include/libxml2/libxml/chvalid.h +52 -64
- package/include/libxml2/libxml/debugXML.h +18 -15
- package/include/libxml2/libxml/dict.h +22 -19
- package/include/libxml2/libxml/encoding.h +144 -111
- package/include/libxml2/libxml/entities.h +95 -75
- package/include/libxml2/libxml/globals.h +7 -4
- package/include/libxml2/libxml/hash.h +61 -64
- package/include/libxml2/libxml/list.h +59 -51
- package/include/libxml2/libxml/nanoftp.h +7 -4
- package/include/libxml2/libxml/nanohttp.h +10 -7
- package/include/libxml2/libxml/parser.h +1091 -563
- package/include/libxml2/libxml/parserInternals.h +167 -214
- package/include/libxml2/libxml/pattern.h +29 -31
- package/include/libxml2/libxml/relaxng.h +59 -58
- package/include/libxml2/libxml/schemasInternals.h +114 -268
- package/include/libxml2/libxml/schematron.h +59 -51
- package/include/libxml2/libxml/threads.h +19 -20
- package/include/libxml2/libxml/tree.h +873 -623
- package/include/libxml2/libxml/uri.h +21 -22
- package/include/libxml2/libxml/valid.h +170 -199
- package/include/libxml2/libxml/xinclude.h +24 -43
- package/include/libxml2/libxml/xlink.h +55 -51
- package/include/libxml2/libxml/xmlIO.h +133 -151
- package/include/libxml2/libxml/xmlautomata.h +66 -65
- package/include/libxml2/libxml/xmlerror.h +197 -94
- package/include/libxml2/libxml/xmlexports.h +17 -19
- package/include/libxml2/libxml/xmlmemory.h +44 -29
- package/include/libxml2/libxml/xmlmodule.h +14 -15
- package/include/libxml2/libxml/xmlreader.h +137 -131
- package/include/libxml2/libxml/xmlregexp.h +28 -31
- package/include/libxml2/libxml/xmlsave.h +81 -36
- package/include/libxml2/libxml/xmlschemas.h +61 -67
- package/include/libxml2/libxml/xmlschemastypes.h +60 -54
- package/include/libxml2/libxml/xmlstring.h +8 -9
- package/include/libxml2/libxml/xmlunicode.h +6 -3
- package/include/libxml2/libxml/xmlversion.h +44 -121
- package/include/libxml2/libxml/xmlwriter.h +97 -97
- package/include/libxml2/libxml/xpath.h +235 -232
- package/include/libxml2/libxml/xpathInternals.h +247 -277
- package/include/libxml2/libxml/xpointer.h +21 -17
- package/package.json +1 -1
- package/versions.json +2 -2
|
@@ -1,13 +1,19 @@
|
|
|
1
|
-
|
|
2
|
-
*
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* @brief HTML parser, doesn't support HTML5
|
|
5
|
+
*
|
|
6
|
+
* This module orginally implemented an HTML parser based on the
|
|
7
|
+
* (underspecified) HTML 4.0 spec. As of 2.14, the tokenizer
|
|
8
|
+
* conforms to HTML5. Tree construction still follows a custom,
|
|
9
|
+
* unspecified algorithm with many differences to HTML5.
|
|
10
|
+
*
|
|
11
|
+
* The parser defaults to ISO-8859-1, the default encoding of
|
|
12
|
+
* HTTP/1.0.
|
|
7
13
|
*
|
|
8
|
-
*
|
|
14
|
+
* @copyright See Copyright for the status of this software.
|
|
9
15
|
*
|
|
10
|
-
*
|
|
16
|
+
* @author Daniel Veillard
|
|
11
17
|
*/
|
|
12
18
|
|
|
13
19
|
#ifndef __HTML_PARSER_H__
|
|
@@ -25,20 +31,29 @@ extern "C" {
|
|
|
25
31
|
* Backward compatibility
|
|
26
32
|
*/
|
|
27
33
|
#define UTF8ToHtml htmlUTF8ToHtml
|
|
34
|
+
#define htmlDefaultSubelement(elt) elt->defaultsubelt
|
|
35
|
+
#define htmlElementAllowedHereDesc(parent,elt) \
|
|
36
|
+
htmlElementAllowedHere((parent), (elt)->name)
|
|
37
|
+
#define htmlRequiredAttrs(elt) (elt)->attrs_req
|
|
28
38
|
|
|
29
39
|
/*
|
|
30
40
|
* Most of the back-end structures from XML and HTML are shared.
|
|
31
41
|
*/
|
|
42
|
+
/** Same as xmlParserCtxt */
|
|
32
43
|
typedef xmlParserCtxt htmlParserCtxt;
|
|
33
44
|
typedef xmlParserCtxtPtr htmlParserCtxtPtr;
|
|
34
45
|
typedef xmlParserNodeInfo htmlParserNodeInfo;
|
|
46
|
+
/** Same as xmlSAXHandler */
|
|
35
47
|
typedef xmlSAXHandler htmlSAXHandler;
|
|
36
48
|
typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;
|
|
49
|
+
/** Same as xmlParserInput */
|
|
37
50
|
typedef xmlParserInput htmlParserInput;
|
|
38
51
|
typedef xmlParserInputPtr htmlParserInputPtr;
|
|
39
52
|
typedef xmlDocPtr htmlDocPtr;
|
|
40
53
|
typedef xmlNodePtr htmlNodePtr;
|
|
41
54
|
|
|
55
|
+
/** @cond ignore */
|
|
56
|
+
|
|
42
57
|
/*
|
|
43
58
|
* Internal description of an HTML element, representing HTML 4.01
|
|
44
59
|
* and XHTML 1.0 (which share the same structure).
|
|
@@ -49,7 +64,7 @@ struct _htmlElemDesc {
|
|
|
49
64
|
const char *name; /* The tag name */
|
|
50
65
|
char startTag; /* unused */
|
|
51
66
|
char endTag; /* Whether the end tag can be implied */
|
|
52
|
-
char saveEndTag; /*
|
|
67
|
+
char saveEndTag; /* unused */
|
|
53
68
|
char empty; /* Is this an empty element ? */
|
|
54
69
|
char depr; /* unused */
|
|
55
70
|
char dtd; /* unused */
|
|
@@ -77,88 +92,97 @@ struct _htmlEntityDesc {
|
|
|
77
92
|
};
|
|
78
93
|
|
|
79
94
|
#ifdef LIBXML_SAX1_ENABLED
|
|
80
|
-
|
|
95
|
+
/**
|
|
96
|
+
* @deprecated Use #xmlSAX2InitHtmlDefaultSAXHandler
|
|
97
|
+
*/
|
|
81
98
|
XML_DEPRECATED
|
|
82
99
|
XMLPUBVAR const xmlSAXHandlerV1 htmlDefaultSAXHandler;
|
|
83
|
-
|
|
84
100
|
#endif /* LIBXML_SAX1_ENABLED */
|
|
85
101
|
|
|
102
|
+
/** @endcond */
|
|
103
|
+
|
|
86
104
|
/*
|
|
87
105
|
* There is only few public functions.
|
|
88
106
|
*/
|
|
89
107
|
XML_DEPRECATED
|
|
90
108
|
XMLPUBFUN void
|
|
91
109
|
htmlInitAutoClose (void);
|
|
110
|
+
XML_DEPRECATED
|
|
92
111
|
XMLPUBFUN const htmlElemDesc *
|
|
93
112
|
htmlTagLookup (const xmlChar *tag);
|
|
113
|
+
XML_DEPRECATED
|
|
94
114
|
XMLPUBFUN const htmlEntityDesc *
|
|
95
115
|
htmlEntityLookup(const xmlChar *name);
|
|
116
|
+
XML_DEPRECATED
|
|
96
117
|
XMLPUBFUN const htmlEntityDesc *
|
|
97
118
|
htmlEntityValueLookup(unsigned int value);
|
|
98
119
|
|
|
99
120
|
XML_DEPRECATED
|
|
100
121
|
XMLPUBFUN int
|
|
101
|
-
htmlIsAutoClosed(
|
|
102
|
-
|
|
122
|
+
htmlIsAutoClosed(xmlDoc *doc,
|
|
123
|
+
xmlNode *elem);
|
|
103
124
|
XML_DEPRECATED
|
|
104
125
|
XMLPUBFUN int
|
|
105
|
-
htmlAutoCloseTag(
|
|
126
|
+
htmlAutoCloseTag(xmlDoc *doc,
|
|
106
127
|
const xmlChar *name,
|
|
107
|
-
|
|
128
|
+
xmlNode *elem);
|
|
108
129
|
XML_DEPRECATED
|
|
109
130
|
XMLPUBFUN const htmlEntityDesc *
|
|
110
|
-
htmlParseEntityRef(
|
|
131
|
+
htmlParseEntityRef(htmlParserCtxt *ctxt,
|
|
111
132
|
const xmlChar **str);
|
|
112
133
|
XML_DEPRECATED
|
|
113
134
|
XMLPUBFUN int
|
|
114
|
-
htmlParseCharRef(
|
|
135
|
+
htmlParseCharRef(htmlParserCtxt *ctxt);
|
|
115
136
|
XML_DEPRECATED
|
|
116
137
|
XMLPUBFUN void
|
|
117
|
-
htmlParseElement(
|
|
138
|
+
htmlParseElement(htmlParserCtxt *ctxt);
|
|
118
139
|
|
|
119
|
-
XMLPUBFUN
|
|
140
|
+
XMLPUBFUN htmlParserCtxt *
|
|
120
141
|
htmlNewParserCtxt(void);
|
|
121
|
-
XMLPUBFUN
|
|
142
|
+
XMLPUBFUN htmlParserCtxt *
|
|
122
143
|
htmlNewSAXParserCtxt(const htmlSAXHandler *sax,
|
|
123
144
|
void *userData);
|
|
124
145
|
|
|
125
|
-
XMLPUBFUN
|
|
146
|
+
XMLPUBFUN htmlParserCtxt *
|
|
126
147
|
htmlCreateMemoryParserCtxt(const char *buffer,
|
|
127
148
|
int size);
|
|
128
149
|
|
|
129
150
|
XMLPUBFUN int
|
|
130
|
-
htmlParseDocument(
|
|
151
|
+
htmlParseDocument(htmlParserCtxt *ctxt);
|
|
131
152
|
XML_DEPRECATED
|
|
132
|
-
XMLPUBFUN
|
|
153
|
+
XMLPUBFUN xmlDoc *
|
|
133
154
|
htmlSAXParseDoc (const xmlChar *cur,
|
|
134
155
|
const char *encoding,
|
|
135
|
-
|
|
156
|
+
htmlSAXHandler *sax,
|
|
136
157
|
void *userData);
|
|
137
|
-
XMLPUBFUN
|
|
158
|
+
XMLPUBFUN xmlDoc *
|
|
138
159
|
htmlParseDoc (const xmlChar *cur,
|
|
139
160
|
const char *encoding);
|
|
140
|
-
XMLPUBFUN
|
|
161
|
+
XMLPUBFUN htmlParserCtxt *
|
|
141
162
|
htmlCreateFileParserCtxt(const char *filename,
|
|
142
163
|
const char *encoding);
|
|
143
164
|
XML_DEPRECATED
|
|
144
|
-
XMLPUBFUN
|
|
165
|
+
XMLPUBFUN xmlDoc *
|
|
145
166
|
htmlSAXParseFile(const char *filename,
|
|
146
167
|
const char *encoding,
|
|
147
|
-
|
|
168
|
+
htmlSAXHandler *sax,
|
|
148
169
|
void *userData);
|
|
149
|
-
XMLPUBFUN
|
|
170
|
+
XMLPUBFUN xmlDoc *
|
|
150
171
|
htmlParseFile (const char *filename,
|
|
151
172
|
const char *encoding);
|
|
173
|
+
XML_DEPRECATED
|
|
152
174
|
XMLPUBFUN int
|
|
153
175
|
htmlUTF8ToHtml (unsigned char *out,
|
|
154
176
|
int *outlen,
|
|
155
177
|
const unsigned char *in,
|
|
156
178
|
int *inlen);
|
|
179
|
+
XML_DEPRECATED
|
|
157
180
|
XMLPUBFUN int
|
|
158
181
|
htmlEncodeEntities(unsigned char *out,
|
|
159
182
|
int *outlen,
|
|
160
183
|
const unsigned char *in,
|
|
161
184
|
int *inlen, int quoteChar);
|
|
185
|
+
XML_DEPRECATED
|
|
162
186
|
XMLPUBFUN int
|
|
163
187
|
htmlIsScriptAttribute(const xmlChar *name);
|
|
164
188
|
XML_DEPRECATED
|
|
@@ -166,115 +190,175 @@ XMLPUBFUN int
|
|
|
166
190
|
htmlHandleOmittedElem(int val);
|
|
167
191
|
|
|
168
192
|
#ifdef LIBXML_PUSH_ENABLED
|
|
169
|
-
|
|
193
|
+
/*
|
|
170
194
|
* Interfaces for the Push mode.
|
|
171
195
|
*/
|
|
172
|
-
XMLPUBFUN
|
|
173
|
-
htmlCreatePushParserCtxt(
|
|
196
|
+
XMLPUBFUN htmlParserCtxt *
|
|
197
|
+
htmlCreatePushParserCtxt(htmlSAXHandler *sax,
|
|
174
198
|
void *user_data,
|
|
175
199
|
const char *chunk,
|
|
176
200
|
int size,
|
|
177
201
|
const char *filename,
|
|
178
202
|
xmlCharEncoding enc);
|
|
179
203
|
XMLPUBFUN int
|
|
180
|
-
htmlParseChunk (
|
|
204
|
+
htmlParseChunk (htmlParserCtxt *ctxt,
|
|
181
205
|
const char *chunk,
|
|
182
206
|
int size,
|
|
183
207
|
int terminate);
|
|
184
208
|
#endif /* LIBXML_PUSH_ENABLED */
|
|
185
209
|
|
|
186
210
|
XMLPUBFUN void
|
|
187
|
-
htmlFreeParserCtxt (
|
|
211
|
+
htmlFreeParserCtxt (htmlParserCtxt *ctxt);
|
|
188
212
|
|
|
189
213
|
/*
|
|
190
214
|
* New set of simpler/more flexible APIs
|
|
191
215
|
*/
|
|
216
|
+
|
|
192
217
|
/**
|
|
193
|
-
*
|
|
194
|
-
*
|
|
195
|
-
* This is the set of XML parser options that can be passed down
|
|
196
|
-
* to the xmlReadDoc() and similar calls.
|
|
218
|
+
* This is the set of HTML parser options that can be passed to
|
|
219
|
+
* #htmlReadDoc, #htmlCtxtSetOptions and other functions.
|
|
197
220
|
*/
|
|
198
221
|
typedef enum {
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
222
|
+
/**
|
|
223
|
+
* No effect as of 2.14.0.
|
|
224
|
+
*/
|
|
225
|
+
HTML_PARSE_RECOVER = 1<<0,
|
|
226
|
+
/**
|
|
227
|
+
* Do not default to a doctype if none was found.
|
|
228
|
+
*/
|
|
229
|
+
HTML_PARSE_NODEFDTD = 1<<2,
|
|
230
|
+
/**
|
|
231
|
+
* Disable error and warning reports to the error handlers.
|
|
232
|
+
* Errors are still accessible with xmlCtxtGetLastError().
|
|
233
|
+
*/
|
|
234
|
+
HTML_PARSE_NOERROR = 1<<5,
|
|
235
|
+
/**
|
|
236
|
+
* Disable warning reports.
|
|
237
|
+
*/
|
|
238
|
+
HTML_PARSE_NOWARNING = 1<<6,
|
|
239
|
+
/**
|
|
240
|
+
* No effect.
|
|
241
|
+
*/
|
|
242
|
+
HTML_PARSE_PEDANTIC = 1<<7,
|
|
243
|
+
/**
|
|
244
|
+
* Remove some text nodes containing only whitespace from the
|
|
245
|
+
* result document. Which nodes are removed depends on a conservative
|
|
246
|
+
* heuristic. The reindenting feature of the serialization code relies
|
|
247
|
+
* on this option to be set when parsing. Use of this option is
|
|
248
|
+
* DISCOURAGED.
|
|
249
|
+
*/
|
|
250
|
+
HTML_PARSE_NOBLANKS = 1<<8,
|
|
251
|
+
/**
|
|
252
|
+
* No effect.
|
|
253
|
+
*/
|
|
254
|
+
HTML_PARSE_NONET = 1<<11,
|
|
255
|
+
/**
|
|
256
|
+
* Do not add implied html, head or body elements.
|
|
257
|
+
*/
|
|
258
|
+
HTML_PARSE_NOIMPLIED = 1<<13,
|
|
259
|
+
/**
|
|
260
|
+
* Store small strings directly in the node struct to save
|
|
261
|
+
* memory.
|
|
262
|
+
*/
|
|
263
|
+
HTML_PARSE_COMPACT = 1<<16,
|
|
264
|
+
/**
|
|
265
|
+
* Relax some internal limits. See XML_PARSE_HUGE in xmlParserOption.
|
|
266
|
+
*
|
|
267
|
+
* @since 2.14.0
|
|
268
|
+
*
|
|
269
|
+
* Use XML_PARSE_HUGE with older versions.
|
|
270
|
+
*/
|
|
271
|
+
HTML_PARSE_HUGE = 1<<19,
|
|
272
|
+
/**
|
|
273
|
+
* Ignore the encoding in the HTML declaration. This option is
|
|
274
|
+
* mostly unneeded these days. The only effect is to enforce
|
|
275
|
+
* ISO-8859-1 decoding of ASCII-like data.
|
|
276
|
+
*/
|
|
277
|
+
HTML_PARSE_IGNORE_ENC =1<<21,
|
|
278
|
+
/**
|
|
279
|
+
* Enable reporting of line numbers larger than 65535.
|
|
280
|
+
*
|
|
281
|
+
* @since 2.14.0
|
|
282
|
+
*
|
|
283
|
+
* Use XML_PARSE_BIG_LINES with older versions.
|
|
284
|
+
*/
|
|
285
|
+
HTML_PARSE_BIG_LINES = 1<<22,
|
|
286
|
+
/**
|
|
287
|
+
* Make the tokenizer emit a SAX callback for each token. This results
|
|
288
|
+
* in unbalanced invocations of startElement and endElement.
|
|
289
|
+
*
|
|
290
|
+
* For now, this is only usable to tokenize HTML5 with custom SAX
|
|
291
|
+
* callbacks. A tree builder isn't implemented yet.
|
|
292
|
+
*
|
|
293
|
+
* @since 2.14.0
|
|
294
|
+
*/
|
|
295
|
+
HTML_PARSE_HTML5 = 1<<26
|
|
212
296
|
} htmlParserOption;
|
|
213
297
|
|
|
214
298
|
XMLPUBFUN void
|
|
215
|
-
htmlCtxtReset (
|
|
299
|
+
htmlCtxtReset (htmlParserCtxt *ctxt);
|
|
216
300
|
XMLPUBFUN int
|
|
217
|
-
htmlCtxtSetOptions (
|
|
301
|
+
htmlCtxtSetOptions (htmlParserCtxt *ctxt,
|
|
218
302
|
int options);
|
|
219
303
|
XMLPUBFUN int
|
|
220
|
-
htmlCtxtUseOptions (
|
|
304
|
+
htmlCtxtUseOptions (htmlParserCtxt *ctxt,
|
|
221
305
|
int options);
|
|
222
|
-
XMLPUBFUN
|
|
306
|
+
XMLPUBFUN xmlDoc *
|
|
223
307
|
htmlReadDoc (const xmlChar *cur,
|
|
224
308
|
const char *URL,
|
|
225
309
|
const char *encoding,
|
|
226
310
|
int options);
|
|
227
|
-
XMLPUBFUN
|
|
311
|
+
XMLPUBFUN xmlDoc *
|
|
228
312
|
htmlReadFile (const char *URL,
|
|
229
313
|
const char *encoding,
|
|
230
314
|
int options);
|
|
231
|
-
XMLPUBFUN
|
|
315
|
+
XMLPUBFUN xmlDoc *
|
|
232
316
|
htmlReadMemory (const char *buffer,
|
|
233
317
|
int size,
|
|
234
318
|
const char *URL,
|
|
235
319
|
const char *encoding,
|
|
236
320
|
int options);
|
|
237
|
-
XMLPUBFUN
|
|
321
|
+
XMLPUBFUN xmlDoc *
|
|
238
322
|
htmlReadFd (int fd,
|
|
239
323
|
const char *URL,
|
|
240
324
|
const char *encoding,
|
|
241
325
|
int options);
|
|
242
|
-
XMLPUBFUN
|
|
326
|
+
XMLPUBFUN xmlDoc *
|
|
243
327
|
htmlReadIO (xmlInputReadCallback ioread,
|
|
244
328
|
xmlInputCloseCallback ioclose,
|
|
245
329
|
void *ioctx,
|
|
246
330
|
const char *URL,
|
|
247
331
|
const char *encoding,
|
|
248
332
|
int options);
|
|
249
|
-
XMLPUBFUN
|
|
250
|
-
htmlCtxtParseDocument (
|
|
251
|
-
|
|
252
|
-
XMLPUBFUN
|
|
253
|
-
htmlCtxtReadDoc (
|
|
333
|
+
XMLPUBFUN xmlDoc *
|
|
334
|
+
htmlCtxtParseDocument (htmlParserCtxt *ctxt,
|
|
335
|
+
xmlParserInput *input);
|
|
336
|
+
XMLPUBFUN xmlDoc *
|
|
337
|
+
htmlCtxtReadDoc (xmlParserCtxt *ctxt,
|
|
254
338
|
const xmlChar *cur,
|
|
255
339
|
const char *URL,
|
|
256
340
|
const char *encoding,
|
|
257
341
|
int options);
|
|
258
|
-
XMLPUBFUN
|
|
259
|
-
htmlCtxtReadFile (
|
|
342
|
+
XMLPUBFUN xmlDoc *
|
|
343
|
+
htmlCtxtReadFile (xmlParserCtxt *ctxt,
|
|
260
344
|
const char *filename,
|
|
261
345
|
const char *encoding,
|
|
262
346
|
int options);
|
|
263
|
-
XMLPUBFUN
|
|
264
|
-
htmlCtxtReadMemory (
|
|
347
|
+
XMLPUBFUN xmlDoc *
|
|
348
|
+
htmlCtxtReadMemory (xmlParserCtxt *ctxt,
|
|
265
349
|
const char *buffer,
|
|
266
350
|
int size,
|
|
267
351
|
const char *URL,
|
|
268
352
|
const char *encoding,
|
|
269
353
|
int options);
|
|
270
|
-
XMLPUBFUN
|
|
271
|
-
htmlCtxtReadFd (
|
|
354
|
+
XMLPUBFUN xmlDoc *
|
|
355
|
+
htmlCtxtReadFd (xmlParserCtxt *ctxt,
|
|
272
356
|
int fd,
|
|
273
357
|
const char *URL,
|
|
274
358
|
const char *encoding,
|
|
275
359
|
int options);
|
|
276
|
-
XMLPUBFUN
|
|
277
|
-
htmlCtxtReadIO (
|
|
360
|
+
XMLPUBFUN xmlDoc *
|
|
361
|
+
htmlCtxtReadIO (xmlParserCtxt *ctxt,
|
|
278
362
|
xmlInputReadCallback ioread,
|
|
279
363
|
xmlInputCloseCallback ioclose,
|
|
280
364
|
void *ioctx,
|
|
@@ -282,7 +366,8 @@ XMLPUBFUN htmlDocPtr
|
|
|
282
366
|
const char *encoding,
|
|
283
367
|
int options);
|
|
284
368
|
|
|
285
|
-
|
|
369
|
+
/**
|
|
370
|
+
* deprecated content model
|
|
286
371
|
*/
|
|
287
372
|
typedef enum {
|
|
288
373
|
HTML_NA = 0 , /* something we don't check at all */
|
|
@@ -302,34 +387,7 @@ XMLPUBFUN int htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ;
|
|
|
302
387
|
XML_DEPRECATED
|
|
303
388
|
XMLPUBFUN htmlStatus htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ;
|
|
304
389
|
XML_DEPRECATED
|
|
305
|
-
XMLPUBFUN htmlStatus htmlNodeStatus(
|
|
306
|
-
/**
|
|
307
|
-
* htmlDefaultSubelement:
|
|
308
|
-
* @elt: HTML element
|
|
309
|
-
*
|
|
310
|
-
* Returns the default subelement for this element
|
|
311
|
-
*/
|
|
312
|
-
#define htmlDefaultSubelement(elt) elt->defaultsubelt
|
|
313
|
-
/**
|
|
314
|
-
* htmlElementAllowedHereDesc:
|
|
315
|
-
* @parent: HTML parent element
|
|
316
|
-
* @elt: HTML element
|
|
317
|
-
*
|
|
318
|
-
* Checks whether an HTML element description may be a
|
|
319
|
-
* direct child of the specified element.
|
|
320
|
-
*
|
|
321
|
-
* Returns 1 if allowed; 0 otherwise.
|
|
322
|
-
*/
|
|
323
|
-
#define htmlElementAllowedHereDesc(parent,elt) \
|
|
324
|
-
htmlElementAllowedHere((parent), (elt)->name)
|
|
325
|
-
/**
|
|
326
|
-
* htmlRequiredAttrs:
|
|
327
|
-
* @elt: HTML element
|
|
328
|
-
*
|
|
329
|
-
* Returns the attributes required for the specified element.
|
|
330
|
-
*/
|
|
331
|
-
#define htmlRequiredAttrs(elt) (elt)->attrs_req
|
|
332
|
-
|
|
390
|
+
XMLPUBFUN htmlStatus htmlNodeStatus(xmlNode *, int) ;
|
|
333
391
|
|
|
334
392
|
#ifdef __cplusplus
|
|
335
393
|
}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
*
|
|
3
|
-
*
|
|
4
|
-
*
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* @brief HTML documents
|
|
5
|
+
*
|
|
6
|
+
* This modules implements functions to work with HTML documents,
|
|
7
|
+
* most of them related to serialization.
|
|
5
8
|
*
|
|
6
|
-
*
|
|
9
|
+
* @copyright See Copyright for the status of this software.
|
|
7
10
|
*
|
|
8
|
-
*
|
|
11
|
+
* @author Daniel Veillard
|
|
9
12
|
*/
|
|
10
13
|
|
|
11
14
|
#ifndef __HTML_TREE_H__
|
|
@@ -22,114 +25,86 @@
|
|
|
22
25
|
extern "C" {
|
|
23
26
|
#endif
|
|
24
27
|
|
|
25
|
-
|
|
26
|
-
/**
|
|
27
|
-
* HTML_TEXT_NODE:
|
|
28
|
-
*
|
|
29
|
-
* Macro. A text node in a HTML document is really implemented
|
|
30
|
-
* the same way as a text node in an XML document.
|
|
31
|
-
*/
|
|
28
|
+
/* Deprecated */
|
|
29
|
+
/** @cond ignore */
|
|
32
30
|
#define HTML_TEXT_NODE XML_TEXT_NODE
|
|
33
|
-
/**
|
|
34
|
-
* HTML_ENTITY_REF_NODE:
|
|
35
|
-
*
|
|
36
|
-
* Macro. An entity reference in a HTML document is really implemented
|
|
37
|
-
* the same way as an entity reference in an XML document.
|
|
38
|
-
*/
|
|
39
31
|
#define HTML_ENTITY_REF_NODE XML_ENTITY_REF_NODE
|
|
40
|
-
/**
|
|
41
|
-
* HTML_COMMENT_NODE:
|
|
42
|
-
*
|
|
43
|
-
* Macro. A comment in a HTML document is really implemented
|
|
44
|
-
* the same way as a comment in an XML document.
|
|
45
|
-
*/
|
|
46
32
|
#define HTML_COMMENT_NODE XML_COMMENT_NODE
|
|
47
|
-
/**
|
|
48
|
-
* HTML_PRESERVE_NODE:
|
|
49
|
-
*
|
|
50
|
-
* Macro. A preserved node in a HTML document is really implemented
|
|
51
|
-
* the same way as a CDATA section in an XML document.
|
|
52
|
-
*/
|
|
53
33
|
#define HTML_PRESERVE_NODE XML_CDATA_SECTION_NODE
|
|
54
|
-
/**
|
|
55
|
-
* HTML_PI_NODE:
|
|
56
|
-
*
|
|
57
|
-
* Macro. A processing instruction in a HTML document is really implemented
|
|
58
|
-
* the same way as a processing instruction in an XML document.
|
|
59
|
-
*/
|
|
60
34
|
#define HTML_PI_NODE XML_PI_NODE
|
|
35
|
+
/** @endcond */
|
|
61
36
|
|
|
62
|
-
XMLPUBFUN
|
|
37
|
+
XMLPUBFUN xmlDoc *
|
|
63
38
|
htmlNewDoc (const xmlChar *URI,
|
|
64
39
|
const xmlChar *ExternalID);
|
|
65
|
-
XMLPUBFUN
|
|
40
|
+
XMLPUBFUN xmlDoc *
|
|
66
41
|
htmlNewDocNoDtD (const xmlChar *URI,
|
|
67
42
|
const xmlChar *ExternalID);
|
|
68
43
|
XMLPUBFUN const xmlChar *
|
|
69
|
-
htmlGetMetaEncoding (
|
|
44
|
+
htmlGetMetaEncoding (xmlDoc *doc);
|
|
70
45
|
XMLPUBFUN int
|
|
71
|
-
htmlSetMetaEncoding (
|
|
46
|
+
htmlSetMetaEncoding (xmlDoc *doc,
|
|
72
47
|
const xmlChar *encoding);
|
|
73
48
|
#ifdef LIBXML_OUTPUT_ENABLED
|
|
74
49
|
XMLPUBFUN void
|
|
75
|
-
htmlDocDumpMemory (
|
|
50
|
+
htmlDocDumpMemory (xmlDoc *cur,
|
|
76
51
|
xmlChar **mem,
|
|
77
52
|
int *size);
|
|
78
53
|
XMLPUBFUN void
|
|
79
|
-
htmlDocDumpMemoryFormat (
|
|
54
|
+
htmlDocDumpMemoryFormat (xmlDoc *cur,
|
|
80
55
|
xmlChar **mem,
|
|
81
56
|
int *size,
|
|
82
57
|
int format);
|
|
83
|
-
XMLPUBFUN int
|
|
84
|
-
htmlDocDump (FILE *f,
|
|
85
|
-
xmlDocPtr cur);
|
|
86
58
|
XMLPUBFUN int
|
|
87
59
|
htmlSaveFile (const char *filename,
|
|
88
|
-
|
|
89
|
-
XMLPUBFUN int
|
|
90
|
-
htmlNodeDump (xmlBufferPtr buf,
|
|
91
|
-
xmlDocPtr doc,
|
|
92
|
-
xmlNodePtr cur);
|
|
93
|
-
XMLPUBFUN void
|
|
94
|
-
htmlNodeDumpFile (FILE *out,
|
|
95
|
-
xmlDocPtr doc,
|
|
96
|
-
xmlNodePtr cur);
|
|
97
|
-
XMLPUBFUN int
|
|
98
|
-
htmlNodeDumpFileFormat (FILE *out,
|
|
99
|
-
xmlDocPtr doc,
|
|
100
|
-
xmlNodePtr cur,
|
|
101
|
-
const char *encoding,
|
|
102
|
-
int format);
|
|
60
|
+
xmlDoc *cur);
|
|
103
61
|
XMLPUBFUN int
|
|
104
62
|
htmlSaveFileEnc (const char *filename,
|
|
105
|
-
|
|
63
|
+
xmlDoc *cur,
|
|
106
64
|
const char *encoding);
|
|
107
65
|
XMLPUBFUN int
|
|
108
66
|
htmlSaveFileFormat (const char *filename,
|
|
109
|
-
|
|
67
|
+
xmlDoc *cur,
|
|
110
68
|
const char *encoding,
|
|
111
69
|
int format);
|
|
112
|
-
|
|
70
|
+
XMLPUBFUN int
|
|
71
|
+
htmlNodeDump (xmlBuffer *buf,
|
|
72
|
+
xmlDoc *doc,
|
|
73
|
+
xmlNode *cur);
|
|
74
|
+
XMLPUBFUN int
|
|
75
|
+
htmlDocDump (FILE *f,
|
|
76
|
+
xmlDoc *cur);
|
|
113
77
|
XMLPUBFUN void
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
78
|
+
htmlNodeDumpFile (FILE *out,
|
|
79
|
+
xmlDoc *doc,
|
|
80
|
+
xmlNode *cur);
|
|
81
|
+
XMLPUBFUN int
|
|
82
|
+
htmlNodeDumpFileFormat (FILE *out,
|
|
83
|
+
xmlDoc *doc,
|
|
84
|
+
xmlNode *cur,
|
|
117
85
|
const char *encoding,
|
|
118
86
|
int format);
|
|
87
|
+
|
|
119
88
|
XMLPUBFUN void
|
|
120
|
-
|
|
121
|
-
|
|
89
|
+
htmlNodeDumpOutput (xmlOutputBuffer *buf,
|
|
90
|
+
xmlDoc *doc,
|
|
91
|
+
xmlNode *cur,
|
|
122
92
|
const char *encoding);
|
|
123
93
|
XMLPUBFUN void
|
|
124
|
-
|
|
125
|
-
|
|
94
|
+
htmlNodeDumpFormatOutput(xmlOutputBuffer *buf,
|
|
95
|
+
xmlDoc *doc,
|
|
96
|
+
xmlNode *cur,
|
|
126
97
|
const char *encoding,
|
|
127
98
|
int format);
|
|
128
99
|
XMLPUBFUN void
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
xmlNodePtr cur,
|
|
100
|
+
htmlDocContentDumpOutput(xmlOutputBuffer *buf,
|
|
101
|
+
xmlDoc *cur,
|
|
132
102
|
const char *encoding);
|
|
103
|
+
XMLPUBFUN void
|
|
104
|
+
htmlDocContentDumpFormatOutput(xmlOutputBuffer *buf,
|
|
105
|
+
xmlDoc *cur,
|
|
106
|
+
const char *encoding,
|
|
107
|
+
int format);
|
|
133
108
|
|
|
134
109
|
#endif /* LIBXML_OUTPUT_ENABLED */
|
|
135
110
|
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
*
|
|
3
|
-
*
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* @brief Old SAX version 1 handler, deprecated
|
|
5
|
+
*
|
|
6
|
+
* @deprecated set of SAX version 1 interfaces used to
|
|
4
7
|
* build the DOM tree.
|
|
5
8
|
*
|
|
6
|
-
*
|
|
9
|
+
* @copyright See Copyright for the status of this software.
|
|
7
10
|
*
|
|
8
|
-
*
|
|
11
|
+
* @author Daniel Veillard
|
|
9
12
|
*/
|
|
10
13
|
|
|
11
14
|
#ifndef __XML_SAX_H__
|