X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Ftextwriter.cpp;h=65f4870ea6e466816ee25d9dd40dbc550d00faa8;hp=08909a1c6ed952b190754063d628f4e0e3dbe3dc;hb=19179a622c1de88de5ed7047643eec79f285bf2a;hpb=a582163d380833b1370ba067a1fd0ad5c2984723

diff --git a/source/textwriter.cpp b/source/textwriter.cpp
index 08909a1..65f4870 100644
--- a/source/textwriter.cpp
+++ b/source/textwriter.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2007-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "statement.h"
@@ -16,9 +9,15 @@ namespace Msp {
 namespace DataFile {
 
 TextWriter::TextWriter(IO::Base &o):
-	WriterMode(o)
+	WriterMode(o),
+	float_format("%#.7g")
 { }
 
+void TextWriter::set_float_precision(unsigned fp)
+{
+	float_format = format("%%#.%dg", fp/4-1);
+}
+
 void TextWriter::write(const Statement &st)
 {
 	write_(st, 0);
@@ -39,9 +38,15 @@ void TextWriter::write_(const Statement &st, unsigned level)
 		else if(i->get_signature()==IntType::signature)
 			out.write(lexical_cast(i->get<IntType::Store>()));
 		else if(i->get_signature()==FloatType::signature)
-			out.write(format("%15g", (i->get<FloatType::Store>())));
+			out.write(format(float_format, i->get<FloatType::Store>()));
 		else if(i->get_signature()==SymbolType::signature)
-			out.write(i->get<SymbolType::Store>().name);
+		{
+			string name = i->get<SymbolType::Store>().name;
+			if(isdigit(name[0]))
+				out.write("\\"+name);
+			else
+				out.write(name);
+		}
 	}
 	if(!st.sub.empty())
 	{