X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=efd6c696a23f11ac41df323c5e8d4fa33aee023a;hpb=18a610d4d6ba137eadee1a8088a03b72e6eaeffb;p=lyx.git diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index efd6c696a2..16f8c3c58b 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -1,9 +1,9 @@ /* * File: formulamacro.C * Purpose: Implementation of the formula macro LyX inset - * Author: André Pönitz + * Author: André Pönitz, based on ideas of Alejandro Aguilar Sierra * Created: March 2001 - * Description: Allows the edition of math macros inside Lyx. + * Description: Allows the edition of math macros inside Lyx. * * Copyright: 2001 The LyX Project * @@ -22,20 +22,18 @@ #include "math_cursor.h" #include "math_parser.h" #include "math_macro.h" -#include "math_macroarg.h" #include "math_macrotable.h" -#include "math_macrotemplate.h" -#include "math_matrixinset.h" -#include "lyx_main.h" +#include "math_support.h" +#include "math_mathmlstream.h" #include "BufferView.h" #include "gettext.h" -#include "Painter.h" -#include "font.h" +#include "frontends/Painter.h" +#include "frontends/font_metrics.h" #include "support/lyxlib.h" -#include "mathed/support.h" #include "support/LOstream.h" #include "debug.h" #include "lyxlex.h" +#include "lyxtext.h" #include "lyxfont.h" using std::ostream; @@ -43,133 +41,114 @@ using std::ostream; extern MathCursor * mathcursor; InsetFormulaMacro::InsetFormulaMacro() - : tmacro_(new MathMacroTemplate("unknown", 0)) -{} +{ + // inset name is inherited from Inset + setInsetName("unknown"); +} -InsetFormulaMacro::InsetFormulaMacro(string nm, int na) - : tmacro_(new MathMacroTemplate(nm, na)) +InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs) { - MathMacroTable::insertTemplate(tmacro_); + setInsetName(name); + MathMacroTable::create(name, nargs); } -InsetFormulaMacro::~InsetFormulaMacro() +InsetFormulaMacro::InsetFormulaMacro(string const & s) { -#ifdef WITH_WARNINGS -#warning Need to unregister from MathMacroTable. -#endif - // Instead of unregister an delete leak this until it gets fixed - //delete tmacro_; + string name; + mathed_parse_macro(name, s); + setInsetName(name); } Inset * InsetFormulaMacro::clone(Buffer const &, bool) const { -#ifdef WITH_WARNINGS -#warning This should not be needed in reality... -#endif return new InsetFormulaMacro(*this); } -void InsetFormulaMacro::write(ostream & os) const +void InsetFormulaMacro::write(Buffer const *, ostream & os) const { os << "FormulaMacro "; - tmacro().write(os, false); + WriteStream wi(os, false, false); + par()->write(wi); } -int InsetFormulaMacro::latex(ostream & os, bool fragile, +int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile, bool /*free_spacing*/) const { - tmacro().write(os, fragile); + WriteStream wi(os, fragile, true); + par()->write(wi); return 2; } -int InsetFormulaMacro::ascii(ostream & os, int) const + +int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const { - tmacro().write(os, false); + WriteStream wi(os, false, true); + par()->write(wi); return 0; } -int InsetFormulaMacro::linuxdoc(ostream & os) const +int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const { - return ascii(os, 0); + return ascii(buf, os, 0); } -int InsetFormulaMacro::docBook(ostream & os) const +int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const { - return ascii(os, 0); + return ascii(buf, os, 0); } -void InsetFormulaMacro::read(LyXLex & lex) +void InsetFormulaMacro::read(Buffer const *, LyXLex & lex) { - // Awful hack... - delete tmacro_; - tmacro_ = mathed_parse_macro(lex); - MathMacroTable::insertTemplate(tmacro_); + string name; + mathed_parse_macro(name, lex); + setInsetName(name); + //lyxerr << "metrics disabled"; metrics(); } string InsetFormulaMacro::prefix() const { - return string(" ") + _("Macro: ") + tmacro().name() + ": "; + return string(" ") + _("Macro: ") + getInsetName() + ": "; } int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const { - return tmacro().ascent() + 5; + return par()->ascent() + 5; } int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const { - return tmacro().descent() + 5; + return par()->descent() + 5; } -int InsetFormulaMacro::width(BufferView *, LyXFont const & f) const +int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const { - metrics(); - return 10 + lyxfont::width(prefix(), f) + tmacro().width(); + metrics(bv, f); + return 10 + font_metrics::width(prefix(), f) + par()->width(); } - -UpdatableInset::RESULT -InsetFormulaMacro::localDispatch(BufferView * bv, - kb_action action, string const & arg) +MathAtom const & InsetFormulaMacro::par() const { - RESULT result = DISPATCHED; - switch (action) { - case LFUN_MATH_MACROARG: { - int const i = lyx::atoi(arg); - lyxerr << "inserting macro arg " << i << "\n"; - if (i > 0 && i <= tmacro().numargs()) { - mathcursor->insert(new MathMacroArgument(i)); - updateLocal(bv, true); - } else { - lyxerr << "not in range 0.." << tmacro().numargs() << "\n"; - } - break; - } - - default: - result = InsetFormulaBase::localDispatch(bv, action, arg); - } - return result; + return MathMacroTable::provide(getInsetName()); } -MathMacroTemplate const & InsetFormulaMacro::tmacro() const +MathAtom & InsetFormulaMacro::par() { - return *tmacro_; + return MathMacroTable::provide(getInsetName()); } @@ -185,45 +164,35 @@ MathInsetTypes InsetFormulaMacro::getType() const } -MathInset * InsetFormulaMacro::par() const -{ - return const_cast(tmacro_); -} - - -void InsetFormulaMacro::metrics() const -{ - par()->metrics(LM_ST_TEXT); -} - - void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, - int baseline, float & x, bool /*cleared*/) const + int y, float & xx, bool /*cleared*/) const { - Painter & pain = bv->painter(); + MathPainterInfo pain = MathPainterInfo(bv->painter()); LyXFont font(f); // label font.setColor(LColor::math); - - int const y = baseline - ascent(bv, font) + 1; + + 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; // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too - pain.fillRectangle(int(x), y , w, h, LColor::mathmacrobg); - pain.rectangle(int(x), y, w, h, LColor::mathframe); + pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg); + pain.pain.rectangle(x, a, w, h, LColor::mathframe); - if (mathcursor && mathcursor->formula() == this) + if (mathcursor && + const_cast(mathcursor->formula()) == this) mathcursor->drawSelection(pain); - pain.text(int(x + 2), baseline, prefix(), font); - x += width(bv, font); + pain.pain.text(x + 2, y, prefix(), font); // formula - float t = tmacro().width() + 5; - x -= t; - par()->draw(pain, int(x), baseline); - x += t; -} + par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y); + xx += w + 2; + xo_ = x; + yo_ = y; + setCursorVisible(false); +}