shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-02-12 05:57:47 +03:00
Code

add XML_SAVE_NO_EMPTY save option and use option from xmlSaveCtxtPtr

Browse Source 
* include/libxml/xmlsave.h xmlsave.c: add XML_SAVE_NO_EMPTY save option
  and use option from xmlSaveCtxtPtr rather than global during output.
* xmlsave.c: fix some output formatting for meta element under XHTML.
This commit is contained in:
Rob Richards 2005-09-12 12:16:35 +00:00
parent 602434dee5
commit 2ce51c0646
3 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Sep 12 14:14:12 CEST 2005 Rob Richards <rrichards@ctindustries.net>
* include/libxml/xmlsave.h xmlsave.c: add XML_SAVE_NO_EMPTY save option
and use option from xmlSaveCtxtPtr rather than global during output.
* xmlsave.c: fix some output formatting for meta element under XHTML.
Mon Sep 12 11:12:03 CEST 2005 Daniel Veillard <daniel@veillard.com> Mon Sep 12 11:12:03 CEST 2005 Daniel Veillard <daniel@veillard.com>
* include/libxml/parser.h parser.c xmllint.c: damn XML_FEATURE_UNICODE * include/libxml/parser.h parser.c xmllint.c: damn XML_FEATURE_UNICODE

3
include/libxml/xmlsave.h
View File

@ -28,7 +28,8 @@ extern "C" {
*/ */
typedef enum { typedef enum {
XML_SAVE_FORMAT = 1<<0, /* format save output */ XML_SAVE_FORMAT = 1<<0, /* format save output */
XML_SAVE_NO_DECL = 1<<1 /* drop the xml declaration */ XML_SAVE_NO_DECL = 1<<1, /* drop the xml declaration */
XML_SAVE_NO_EMPTY = 1<<2 /* no empty tags */
} xmlSaveOption; } xmlSaveOption;

48
xmlsave.c
View File

@ -343,6 +343,10 @@ xmlSaveCtxtInit(xmlSaveCtxtPtr ctxt)
ctxt->indent_size); ctxt->indent_size);
ctxt->indent[ctxt->indent_nr * ctxt->indent_size] = 0; ctxt->indent[ctxt->indent_nr * ctxt->indent_size] = 0;
} }
if (xmlSaveNoEmptyTags) {
ctxt->options |= XML_SAVE_NO_EMPTY;
}
} }
/** /**
@ -380,13 +384,6 @@ xmlNewSaveCtxt(const char *encoding, int options)
} }
memset(ret, 0, sizeof(xmlSaveCtxt)); memset(ret, 0, sizeof(xmlSaveCtxt));
/*
* Use the options
*/
ret->options = options;
if (options & XML_SAVE_FORMAT)
ret->format = 1;
if (encoding != NULL) { if (encoding != NULL) {
ret->handler = xmlFindCharEncodingHandler(encoding); ret->handler = xmlFindCharEncodingHandler(encoding);
if (ret->handler == NULL) { if (ret->handler == NULL) {
@ -399,6 +396,19 @@ xmlNewSaveCtxt(const char *encoding, int options)
} }
xmlSaveCtxtInit(ret); xmlSaveCtxtInit(ret);
/*
* Use the options
*/
/* Re-check this option as it may already have been set */
if ((ret->options & XML_SAVE_NO_EMPTY) && ! (options & XML_SAVE_NO_EMPTY)) {
options |= XML_SAVE_NO_EMPTY;
}
ret->options = options;
if (options & XML_SAVE_FORMAT)
ret->format = 1;
return(ret); return(ret);
} }
@ -773,7 +783,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
xmlAttrListDumpOutput(ctxt, cur->properties); xmlAttrListDumpOutput(ctxt, cur->properties);
if (((cur->type == XML_ELEMENT_NODE) || (cur->content == NULL)) && if (((cur->type == XML_ELEMENT_NODE) || (cur->content == NULL)) &&
(cur->children == NULL) && (!xmlSaveNoEmptyTags)) { (cur->children == NULL) && ((ctxt->options & XML_SAVE_NO_EMPTY) == 0)) {
xmlOutputBufferWrite(buf, 2, "/>"); xmlOutputBufferWrite(buf, 2, "/>");
ctxt->format = format; ctxt->format = format;
return; return;
@ -1245,6 +1255,13 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
} else { } else {
if (addmeta == 1) { if (addmeta == 1) {
xmlOutputBufferWrite(buf, 1, ">"); xmlOutputBufferWrite(buf, 1, ">");
if (ctxt->format) {
xmlOutputBufferWrite(buf, 1, "\n");
if (xmlIndentTreeOutput)
xmlOutputBufferWrite(buf, ctxt->indent_size *
(ctxt->level + 1 > ctxt->indent_nr ?
ctxt->indent_nr : ctxt->level + 1), ctxt->indent);
}
xmlOutputBufferWriteString(buf, xmlOutputBufferWriteString(buf,
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset="); "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
if (ctxt->encoding) { if (ctxt->encoding) {
@ -1252,12 +1269,16 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
} else { } else {
xmlOutputBufferWrite(buf, 5, "UTF-8"); xmlOutputBufferWrite(buf, 5, "UTF-8");
} }
xmlOutputBufferWrite(buf, 3, "\" /"); xmlOutputBufferWrite(buf, 4, "\" />");
if (ctxt->format)
xmlOutputBufferWrite(buf, 1, "\n");
} else {
xmlOutputBufferWrite(buf, 1, ">");
} }
/* /*
* C.3. Element Minimization and Empty Element Content * C.3. Element Minimization and Empty Element Content
*/ */
xmlOutputBufferWrite(buf, 3, "></"); xmlOutputBufferWrite(buf, 2, "</");
if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) { if ((cur->ns != NULL) && (cur->ns->prefix != NULL)) {
xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix); xmlOutputBufferWriteString(buf, (const char *)cur->ns->prefix);
xmlOutputBufferWrite(buf, 1, ":"); xmlOutputBufferWrite(buf, 1, ":");
@ -1269,6 +1290,13 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
} }
xmlOutputBufferWrite(buf, 1, ">"); xmlOutputBufferWrite(buf, 1, ">");
if (addmeta == 1) { if (addmeta == 1) {
if (ctxt->format) {
xmlOutputBufferWrite(buf, 1, "\n");
if (xmlIndentTreeOutput)
xmlOutputBufferWrite(buf, ctxt->indent_size *
(ctxt->level + 1 > ctxt->indent_nr ?
ctxt->indent_nr : ctxt->level + 1), ctxt->indent);
}
xmlOutputBufferWriteString(buf, xmlOutputBufferWriteString(buf,
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset="); "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=");
if (ctxt->encoding) { if (ctxt->encoding) {