Georg Baum's vspace change

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 9d17b67835ac36fdfeca2ae2a9d96357ce5d42b2..9ea39270e6d16d04a3ef8ebe3b5b243a4048d863 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -18,9 +18,9 @@
 #include "math_mathmlstream.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"
@@ -30,6 +30,7 @@
 
 using lyx::support::bformat;
 
+using std::string;
 using std::auto_ptr;
 using std::ostream;
 
@@ -74,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);
@@ -82,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);
@@ -90,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);
 }
 
 
@@ -110,9 +114,9 @@ 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();
 }