#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;
InsetFormulaMacro::InsetFormulaMacro(string const & s)
{
- std::istringstream is(STRCONV(s));
+ std::istringstream is(s);
read(is);
}
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);
}
-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);
}
-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);
}
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());
}