diff --git a/stepmania/src/CatalogXml.cpp b/stepmania/src/CatalogXml.cpp index b5b13488a6..abd37578a4 100644 --- a/stepmania/src/CatalogXml.cpp +++ b/stepmania/src/CatalogXml.cpp @@ -254,6 +254,7 @@ void SaveCatalogXml() DISP_OPT opts = optDefault; opts.stylesheet = CATALOG_XSL; + opts.write_tabs = false; xml.SaveToFile(fn, &opts); LOG->Trace( "Done." ); diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 1516e25101..57f1c00a5a 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -670,6 +670,7 @@ bool Profile::SaveAllToDir( CString sDir, bool bSignData ) const DISP_OPT opts = optDefault; opts.stylesheet = STATS_XSL; + opts.write_tabs = false; bool bSaved = xml.SaveToFile(fn, &opts); // Update file cache, or else IsAFile in CryptManager won't see this new file. diff --git a/stepmania/src/XmlFile.cpp b/stepmania/src/XmlFile.cpp index d63db1ad4f..2668736987 100644 --- a/stepmania/src/XmlFile.cpp +++ b/stepmania/src/XmlFile.cpp @@ -511,9 +511,10 @@ bool XNode::GetXML( RageFile &f, DISP_OPT *opt /*= &optDefault*/ ) if( opt && opt->newline ) if( f.Write("\r\n") == -1 ) return false; - for( int i = 0 ; i < opt->tab_base ; i++) - if( f.Write("\t") == -1 ) - return false; + if( opt->write_tabs ) + for( int i = 0 ; i < opt->tab_base ; i++) + if( f.Write("\t") == -1 ) + return false; } // newline ) if( f.Write("\r\n") == -1 ) return false; - for( int i = 0 ; i < opt->tab_base ; i++) - if( f.Write("\t") == -1 ) - return false; + if( opt->write_tabs ) + for( int i = 0 ; i < opt->tab_base ; i++) + if( f.Write("\t") == -1 ) + return false; } if( f.Write((opt->reference_value&&opt->entitys?opt->entitys->Entity2Ref(value):value)) == -1 ) return false; @@ -570,9 +572,10 @@ bool XNode::GetXML( RageFile &f, DISP_OPT *opt /*= &optDefault*/ ) { if( f.Write("\r\n") == -1 ) return false; - for( int i = 0 ; i < opt->tab_base-1 ; i++) - if( f.Write("\t") == -1 ) - return false; + if( opt->write_tabs ) + for( int i = 0 ; i < opt->tab_base-1 ; i++) + if( f.Write("\t") == -1 ) + return false; } if( f.Write("") == -1 ) return false; diff --git a/stepmania/src/XmlFile.h b/stepmania/src/XmlFile.h index c631027425..11dc464883 100644 --- a/stepmania/src/XmlFile.h +++ b/stepmania/src/XmlFile.h @@ -87,10 +87,19 @@ struct DISP_OPT bool newline; // newline when new tag bool reference_value; // do convert from entity to reference ( < -> < ) XENTITYS *entitys; // entity table for entity encode - CString stylesheet; // empty string = none + CString stylesheet; // empty string = no stylesheet + bool write_tabs; // if false, don't write tab indent characters int tab_base; // internal usage - DISP_OPT() { newline = true; reference_value = true; entitys = &entityDefault; tab_base = 0; } + DISP_OPT() + { + newline = true; + reference_value = true; + entitys = &entityDefault; + stylesheet = ""; + write_tabs = true; + tab_base = 0; + } }; extern DISP_OPT optDefault;