3party/pugixml
0
0
Fork 0
mirror of https://github.com/zeux/pugixml.git synced 2024-12-28 06:10:55 +08:00
Code Issues Projects Releases Wiki Activity

add align each attribute on new line support with format_indent_attribute

Browse Source
This commit is contained in:
halex2005 2015-04-14 00:56:23 +05:00
parent 9539c488c2
commit 6766f35338
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/pugixml.cpp
View File

@ -3480,13 +3480,26 @@ PUGI__NS_BEGIN
} }
} }
PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) PUGI__FN void node_output_attributes(xml_buffered_writer &writer, xml_node_struct *node, const char_t *indent, size_t indent_length, unsigned int flags, unsigned int depth)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
bool eachAttributeOnNewLine = PUGI__NODETYPE(node) != node_declaration
&& (flags & format_indent)
&& (flags & format_each_attribute_on_new_line)
&& (flags & format_raw) == 0;
for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute) for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
{ {
writer.write(' '); if (eachAttributeOnNewLine)
{
writer.write('\n');
text_output_indent(writer, indent, indent_length, depth + 1);
}
else
{
writer.write(' ');
}
writer.write_string(a->name ? a->name : default_name); writer.write_string(a->name ? a->name : default_name);
writer.write('=', '"'); writer.write('=', '"');
@ -3497,7 +3510,7 @@ PUGI__NS_BEGIN
} }
} }
PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) PUGI__FN bool node_output_start(xml_buffered_writer &writer, xml_node_struct *node, const char_t *indent, size_t indent_length, unsigned int flags, unsigned int depth)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
const char_t* name = node->name ? node->name : default_name; const char_t* name = node->name ? node->name : default_name;
@ -3506,18 +3519,16 @@ PUGI__NS_BEGIN
writer.write_string(name); writer.write_string(name);
if (node->first_attribute) if (node->first_attribute)
node_output_attributes(writer, node, flags); node_output_attributes(writer, node, indent, indent_length, flags, depth);
if (!node->first_child) if (!node->first_child)
{ {
writer.write(' ', '/', '>'); writer.write(' ', '/', '>');
return false; return false;
} }
else else
{ {
writer.write('>'); writer.write('>');
return true; return true;
} }
} }
@ -3532,7 +3543,7 @@ PUGI__NS_BEGIN
writer.write('>'); writer.write('>');
} }
PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags) PUGI__FN void node_output_simple(xml_buffered_writer &writer, xml_node_struct *node, const char_t *indent, size_t indent_length, unsigned int flags, unsigned int depth)
{ {
const char_t* default_name = PUGIXML_TEXT(":anonymous"); const char_t* default_name = PUGIXML_TEXT(":anonymous");
@ -3566,7 +3577,7 @@ PUGI__NS_BEGIN
case node_declaration: case node_declaration:
writer.write('<', '?'); writer.write('<', '?');
writer.write_string(node->name ? node->name : default_name); writer.write_string(node->name ? node->name : default_name);
node_output_attributes(writer, node, flags); node_output_attributes(writer, node, indent, indent_length, flags, depth);
writer.write('?', '>'); writer.write('?', '>');
break; break;
@ -3608,7 +3619,7 @@ PUGI__NS_BEGIN
// begin writing current node // begin writing current node
if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata) if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata)
{ {
node_output_simple(writer, node, flags); node_output_simple(writer, node, indent, indent_length, flags, depth);
indent_flags = 0; indent_flags = 0;
} }
@ -3624,7 +3635,7 @@ PUGI__NS_BEGIN
{ {
indent_flags = indent_newline | indent_indent; indent_flags = indent_newline | indent_indent;
if (node_output_start(writer, node, flags)) if (node_output_start(writer, node, indent, indent_length, flags, depth))
{ {
node = node->first_child; node = node->first_child;
depth++; depth++;
@ -3643,7 +3654,7 @@ PUGI__NS_BEGIN
} }
else else
{ {
node_output_simple(writer, node, flags); node_output_simple(writer, node, indent, indent_length, flags, depth);
indent_flags = indent_newline | indent_indent; indent_flags = indent_newline | indent_indent;
} }

3
src/pugixml.hpp
View File

@ -203,9 +203,12 @@ namespace pugi
// Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default. // Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default.
const unsigned int format_save_file_text = 0x20; const unsigned int format_save_file_text = 0x20;
// Set each attribute to new line
const unsigned int format_each_attribute_on_new_line = 0x40;
// The default set of formatting flags. // The default set of formatting flags.
// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none. // Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
const unsigned int format_default = format_indent; const unsigned int format_default = format_indent;
const unsigned int format_indent_attributes = format_indent | format_each_attribute_on_new_line;
// Forward declarations // Forward declarations
struct xml_attribute_struct; struct xml_attribute_struct;