AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #125 from PKEuS/master 

Added depth as constructor argument to XMLPrinter
This commit is contained in:
Lee Thomason 2013-08-05 13:04:27 -07:00
parent db304256bb 1bfb95488f
commit 03238517b3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tinyxml2.cpp
View File

@ -1729,11 +1729,11 @@ void XMLDocument::PrintError() const
} }
XMLPrinter::XMLPrinter( FILE* file, bool compact ) : XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
_elementJustOpened( false ), _elementJustOpened( false ),
_firstElement( true ), _firstElement( true ),
_fp( file ), _fp( file ),
_depth( 0 ), _depth( depth ),
_textDepth( -1 ), _textDepth( -1 ),
_processEntities( true ), _processEntities( true ),
_compactMode( compact ) _compactMode( compact )
@ -1840,7 +1840,7 @@ void XMLPrinter::PrintString( const char* p, bool restricted )
void XMLPrinter::PushHeader( bool writeBOM, bool writeDec ) void XMLPrinter::PushHeader( bool writeBOM, bool writeDec )
{ {
if ( writeBOM ) { if ( writeBOM ) {
static const unsigned char bom[] = { TIXML_UTF_LEAD_0, TIXML_UTF_LEAD_1, TIXML_UTF_LEAD_2, 0 }; static const unsigned char bom[] = { TIXML_UTF_LEAD_0, TIXML_UTF_LEAD_1, TIXML_UTF_LEAD_2, 0 };
Print( "%s", bom ); Print( "%s", bom );
} }
if ( writeDec ) { if ( writeDec ) {
@ -1858,6 +1858,8 @@ void XMLPrinter::OpenElement( const char* name )
if ( _textDepth < 0 && !_firstElement && !_compactMode ) { if ( _textDepth < 0 && !_firstElement && !_compactMode ) {
Print( "\n" ); Print( "\n" );
}
if ( !_compactMode ) {
PrintSpace( _depth ); PrintSpace( _depth );
} }

4
tinyxml2.h
View File

@ -126,11 +126,9 @@ class XMLDocument;
class XMLElement; class XMLElement;
class XMLAttribute; class XMLAttribute;
class XMLComment; class XMLComment;
class XMLNode;
class XMLText; class XMLText;
class XMLDeclaration; class XMLDeclaration;
class XMLUnknown; class XMLUnknown;
class XMLPrinter; class XMLPrinter;
/* /*
@ -1885,7 +1883,7 @@ public:
If 'compact' is set to true, then output is created If 'compact' is set to true, then output is created
with only required whitespace and newlines. with only required whitespace and newlines.
*/ */
XMLPrinter( FILE* file=0, bool compact = false ); XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 );
~XMLPrinter() {} ~XMLPrinter() {}
/** If streaming, write the BOM and declaration. */ /** If streaming, write the BOM and declaration. */