-/*
- * 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>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "formulamacro.h"
-#include "commandtags.h"
#include "math_cursor.h"
-#include "math_parser.h"
-#include "math_macro.h"
#include "math_macrotable.h"
-#include "math_support.h"
+#include "math_macrotemplate.h"
#include "math_mathmlstream.h"
-#include "BufferView.h"
#include "gettext.h"
+#include "latexrunparams.h"
#include "frontends/Painter.h"
#include "frontends/font_metrics.h"
-#include "support/lyxlib.h"
-#include "support/LOstream.h"
-#include "debug.h"
+#include "support/lstrings.h"
#include "lyxlex.h"
-#include "lyxtext.h"
-#include "lyxfont.h"
+#include "support/std_sstream.h"
+
+using lyx::support::bformat;
+using std::auto_ptr;
using std::ostream;
+
extern MathCursor * mathcursor;
+
InsetFormulaMacro::InsetFormulaMacro()
{
// inset name is inherited from Inset
}
-InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
+InsetFormulaMacro::InsetFormulaMacro
+ (string const & name, int nargs, string const & type)
{
setInsetName(name);
- MathMacroTable::create(name, nargs);
+ MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs, type)));
}
InsetFormulaMacro::InsetFormulaMacro(string const & s)
{
- string name;
- mathed_parse_macro(name, s);
- setInsetName(name);
+ std::istringstream is(s);
+ read(is);
}
-Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
+auto_ptr<InsetBase> InsetFormulaMacro::clone() const
{
- return new InsetFormulaMacro(*this);
+ return auto_ptr<InsetBase>(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, bool fragile,
- bool /*free_spacing*/) const
+int InsetFormulaMacro::latex(Buffer const &, ostream & os,
+ LatexRunParams const & runparams) const
{
- WriteStream wi(os, fragile, true);
+ WriteStream wi(os, runparams.moving_arg, true);
par()->write(wi);
return 2;
}
-int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
+int InsetFormulaMacro::ascii(Buffer const &, ostream & os, int) 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) const
{
return ascii(buf, os, 0);
}
-int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
+int InsetFormulaMacro::docbook(Buffer const & buf, ostream & os, bool) const
{
return ascii(buf, os, 0);
}
-void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
+void InsetFormulaMacro::read(Buffer const &, LyXLex & lex)
{
- string name;
- mathed_parse_macro(name, lex);
- setInsetName(name);
- //lyxerr << "metrics disabled";
- metrics();
+ read(lex.getStream());
}
-string InsetFormulaMacro::prefix() const
+void InsetFormulaMacro::read(std::istream & is)
{
- return string(" ") + _("Macro: ") + getInsetName() + ": ";
+ MathMacroTemplate * p = new MathMacroTemplate(is);
+ setInsetName(p->name());
+ MathMacroTable::create(MathAtom(p));
+ //metrics();
}
-int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const
-{
- return par()->ascent() + 5;
-}
-
-
-int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
+string InsetFormulaMacro::prefix() const
{
- return par()->descent() + 5;
+ return bformat(_(" Macro: %1$s: "), getInsetName());
}
-int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
+void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
{
- metrics(bv, f);
- return 10 + font_metrics::width(prefix(), f) + par()->width();
+ par()->metrics(mi, dim_);
+ dim_.asc += 5;
+ dim_.des += 5;
+ dim_.wid += 10 + font_metrics::width(prefix(), mi.base.font);
+ dim = dim_;
}
}
-Inset::Code InsetFormulaMacro::lyxCode() const
+InsetOld::Code InsetFormulaMacro::lyxCode() const
{
- return Inset::MATHMACRO_CODE;
+ return InsetOld::MATHMACRO_CODE;
}
-MathInsetTypes InsetFormulaMacro::getType() const
+void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
{
- return LM_OT_MACRO;
-}
-
-
-void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
- int y, float & xx, bool /*cleared*/) const
-{
- Painter & pain = bv->painter();
- LyXFont font(f);
-
// label
+ LyXFont font = p.base.font;
font.setColor(LColor::math);
- int const x = int(xx);
- int const a = y - ascent(bv, font) + 1;
- int const w = width(bv, font) - 2;
- int const h = ascent(bv, font) + descent(bv, font) - 2;
+ PainterInfo pi(p.base.bv);
+ pi.base.style = LM_ST_TEXT;
+ pi.base.font = font;
+
+ 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
- pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
- pain.rectangle(x, a, w, h, LColor::mathframe);
+ pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+ pi.pain.rectangle(x, a, w, h, LColor::mathframe);
if (mathcursor &&
const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
- mathcursor->drawSelection(pain);
+ mathcursor->drawSelection(pi);
- pain.text(x + 2, y, prefix(), font);
+ pi.pain.text(x + 2, y, prefix(), font);
// formula
- par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
- xx += w + 2;
+ par()->draw(pi, x + font_metrics::width(prefix(), p.base.font) + 5, y);
xo_ = x;
yo_ = y;
-
- setCursorVisible(false);
}
projects / lyx.git / blobdiff