-/*
- * File: formulamacro.C
- * Purpose: Implementation of the formula macro LyX inset
- * Author: André Pönitz, based on ideas of Alejandro Aguilar Sierra
- * Created: March 2001
- * Description: Allows the edition of math macros inside Lyx.
+/**
+ * \file formulamacro.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
*
- * Copyright: 2001 The LyX Project
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
*
- * You are free to use and modify this code under the terms of
- * the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
*/
#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 lyx::support::bformat;
+
+using std::string;
+using std::auto_ptr;
using std::ostream;
+
extern MathCursor * mathcursor;
}
-InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
+InsetFormulaMacro::InsetFormulaMacro
+ (string const & name, int nargs, string const & type)
{
setInsetName(name);
- MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs)));
+ MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs, type)));
}
InsetFormulaMacro::InsetFormulaMacro(string const & s)
{
- std::istringstream is(STRCONV(s));
+ std::istringstream is(s);
read(is);
}
-Inset * InsetFormulaMacro::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetFormulaMacro::clone() const
{
- return new InsetFormulaMacro(*this);
+ return auto_ptr<InsetBase>(new InsetFormulaMacro(*this));
}
-// Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
-// {
-// return new InsetFormulaMacro(*this);
-// }
-
-
-void InsetFormulaMacro::write(Buffer const *, ostream & os) const
+void InsetFormulaMacro::write(Buffer const &, ostream & os) const
{
os << "FormulaMacro ";
WriteStream wi(os, false, false);
}
-int InsetFormulaMacro::latex(Buffer const *, ostream & os,
- LatexRunParams const & runparams) const
+int InsetFormulaMacro::latex(Buffer const &, ostream & os,
+ 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(Buffer const *, LyXLex & lex)
+void InsetFormulaMacro::read(Buffer const &, LyXLex & lex)
{
read(lex.getStream());
}
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());
}
-void InsetFormulaMacro::metrics(MetricsInfo & m, Dimension & dim) const
+void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
{
- MetricsInfo mi = m;
par()->metrics(mi, dim_);
dim_.asc += 5;
dim_.des += 5;
}
-Inset::Code InsetFormulaMacro::lyxCode() const
+InsetOld::Code InsetFormulaMacro::lyxCode() const
{
- return Inset::MATHMACRO_CODE;
+ return InsetOld::MATHMACRO_CODE;
}
pi.base.style = LM_ST_TEXT;
pi.base.font = font;
- Dimension dim;
- MetricsInfo mi;
- mi.base.bv = pi.base.bv;
- mi.base.font = pi.base.font;
- metrics(mi, dim);
- dim_ = dim;
- int const a = y - dim.asc + 1;
- int const w = dim.wid - 2;
- int const h = dim.height() - 2;
+ int const a = y - dim_.asc + 1;
+ int const w = dim_.wid - 2;
+ int const h = dim_.height() - 2;
// LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);