Rename ascii to plaintext and LatexRunParams to OutputParams.

[lyx.git] / src / mathed / formulamacro.C

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 6e0bc6b8ef6377e8eee364cb2f185202add1475b..9ea39270e6d16d04a3ef8ebe3b5b243a4048d863 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -12,32 +12,28 @@
 #include <config.h>
 
 #include "formulamacro.h"
-#include "lfuns.h"
 #include "math_cursor.h"
-#include "math_parser.h"
-#include "math_macro.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
-#include "metricsinfo.h"
-#include "math_support.h"
 #include "math_mathmlstream.h"
-#include "BufferView.h"
+
 #include "gettext.h"
-#include "latexrunparams.h"
+#include "LColor.h"
+#include "lyxlex.h"
+#include "outputparams.h"
+
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
-#include "support/lyxlib.h"
+
 #include "support/lstrings.h"
-#include "support/LOstream.h"
-#include "debug.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
 
-using std::ostream;
+using std::string;
 using std::auto_ptr;
+using std::ostream;
+
 
 extern MathCursor * mathcursor;
 
@@ -59,7 +55,7 @@ InsetFormulaMacro::InsetFormulaMacro
 
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
-       std::istringstream is(STRCONV(s));
+       std::istringstream is(s);
        read(is);
 }
 
@@ -79,7 +75,7 @@ void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 
 
 int InsetFormulaMacro::latex(Buffer const &, ostream & os,
-                            LatexRunParams const & runparams) const
+                            OutputParams const & runparams) const
 {
        WriteStream wi(os, runparams.moving_arg, true);
        par()->write(wi);
@@ -87,7 +83,8 @@ int InsetFormulaMacro::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetFormulaMacro::ascii(Buffer const &, ostream & os, int) const
+int InsetFormulaMacro::plaintext(Buffer const &, ostream & os,
+                            OutputParams const &) const
 {
        WriteStream wi(os, false, true);
        par()->write(wi);
@@ -95,15 +92,17 @@ int InsetFormulaMacro::ascii(Buffer const &, ostream & os, int) const
 }
 
 
-int InsetFormulaMacro::linuxdoc(Buffer const & buf, ostream & os) const
+int InsetFormulaMacro::linuxdoc(Buffer const & buf, ostream & os,
+                               OutputParams const & runparams) const
 {
-       return ascii(buf, os, 0);
+       return plaintext(buf, os, runparams);
 }
 
 
-int InsetFormulaMacro::docbook(Buffer const & buf, ostream & os, bool) const
+int InsetFormulaMacro::docbook(Buffer const & buf, ostream & os,
+                              OutputParams const & runparams) const
 {
-       return ascii(buf, os, 0);
+       return plaintext(buf, os, runparams);
 }
 
 
@@ -115,16 +114,16 @@ void InsetFormulaMacro::read(Buffer const &, LyXLex & lex)
 
 void InsetFormulaMacro::read(std::istream & is)
 {
-       MathMacroTemplate * p = new MathMacroTemplate(is);
+       auto_ptr<MathMacroTemplate> p(new MathMacroTemplate(is));
        setInsetName(p->name());
-       MathMacroTable::create(MathAtom(p));
+       MathMacroTable::create(MathAtom(p.release()));
        //metrics();
 }
 
 
 string InsetFormulaMacro::prefix() const
 {
-       return bformat(_(" Macro: %s: "), getInsetName());
+       return bformat(_(" Macro: %1$s: "), getInsetName());
 }