X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=fec9ff2dc61f66ead136364f349f773954acef12;hpb=9f42114d4d865aac377bee09389e4c88fe701cc3;p=lyx.git diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index fec9ff2dc6..16f8c3c58b 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -1,13 +1,11 @@ /* - * File: formula.h - * Purpose: Implementation of formula inset - * Author: Alejandro Aguilar Sierra - * Created: January 1996 - * Description: Allows the edition of math paragraphs inside Lyx. + * 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. * - * Copyright: 1996, 1997 Alejandro Aguilar Sierra - * - * Version: 0.4, Lyx project. + * Copyright: 2001 The LyX Project * * You are free to use and modify this code under the terms of * the GNU General Public Licence version 2 or later. @@ -24,178 +22,177 @@ #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; extern MathCursor * mathcursor; InsetFormulaMacro::InsetFormulaMacro() - : InsetFormulaBase(new MathMacroTemplate("unknown", 0)) -{} +{ + // inset name is inherited from Inset + setInsetName("unknown"); +} + + +InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs) +{ + setInsetName(name); + MathMacroTable::create(name, nargs); +} -InsetFormulaMacro::InsetFormulaMacro(string nm, int na) - : InsetFormulaBase(new MathMacroTemplate(nm, na)) +InsetFormulaMacro::InsetFormulaMacro(string const & s) { - MathMacroTable::insertTemplate(tmacro()); + string name; + mathed_parse_macro(name, s); + setInsetName(name); } -Inset * InsetFormulaMacro::Clone(Buffer const &) const +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 "; - tmacro()->Write(os, false); + WriteStream wi(os, false, false); + par()->write(wi); } -int InsetFormulaMacro::Latex(Buffer const *, 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(Buffer const *, 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(Buffer const * buf, ostream & os) const +int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const { - return Ascii(buf, os, 0); + 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); + return ascii(buf, os, 0); } -void InsetFormulaMacro::Read(Buffer const *, LyXLex & lex) +void InsetFormulaMacro::read(Buffer const *, LyXLex & lex) { - // Awful hack... - par_ = mathed_parse(lex); - MathMacroTable::insertTemplate(tmacro()); - par_->Metrics(LM_ST_TEXT); + 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 { - tmacro()->Metrics(LM_ST_TEXT); - return 10 + lyxfont::width(prefix(), f) + tmacro()->width(); + metrics(bv, f); + return 10 + font_metrics::width(prefix(), f) + par()->width(); } -void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, - int baseline, float & x, bool /*cleared*/) const +MathAtom const & InsetFormulaMacro::par() const { - Painter & pain = bv->painter(); - LyXFont font(f); - - // label - font.setColor(LColor::math); - - int const y = baseline - ascent(bv, font) + 1; - int const w = width(bv, font) - 2; - int const h = ascent(bv, font) + descent(bv, font) - 2; - - pain.fillRectangle(int(x), y , w, h, LColor::mathbg); - pain.rectangle(int(x), y, w, h, LColor::mathframe); - - if (mathcursor && mathcursor->formula() == this && mathcursor->Selection()) { - int xp[10]; - int yp[10]; - int n; - mathcursor->SelGetArea(xp, yp, n); - pain.fillPolygon(xp, yp, n, LColor::selection); - } + return MathMacroTable::provide(getInsetName()); +} - pain.text(int(x + 2), baseline, prefix(), font); - x += width(bv, font); - // formula - float t = tmacro()->width() + 5; - x -= t; - tmacro()->draw(pain, int(x), baseline); - x += t; +MathAtom & InsetFormulaMacro::par() +{ + return MathMacroTable::provide(getInsetName()); } -UpdatableInset::RESULT -InsetFormulaMacro::LocalDispatch(BufferView * bv, - kb_action action, string const & arg) +Inset::Code InsetFormulaMacro::lyxCode() 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()->nargs()) { - mathcursor->insert(new MathMacroArgument(i)); - UpdateLocal(bv); - } else { - lyxerr << "not in range 0.." << tmacro()->nargs() << "\n"; - } - break; - } - - default: - result = InsetFormulaBase::LocalDispatch(bv, action, arg); - } - return result; + return Inset::MATHMACRO_CODE; } -MathMacroTemplate * InsetFormulaMacro::tmacro() const +MathInsetTypes InsetFormulaMacro::getType() const { - return static_cast(par_); + return LM_OT_MACRO; } -Inset::Code InsetFormulaMacro::LyxCode() const +void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, + int y, float & xx, bool /*cleared*/) const { - return Inset::MATHMACRO_CODE; -} + MathPainterInfo pain = MathPainterInfo(bv->painter()); + LyXFont font(f); + + // label + 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; + + // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too + pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg); + pain.pain.rectangle(x, a, w, h, LColor::mathframe); + + if (mathcursor && + const_cast(mathcursor->formula()) == this) + mathcursor->drawSelection(pain); + + pain.pain.text(x + 2, y, prefix(), font); + + // formula + par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y); + xx += w + 2; + xo_ = x; + yo_ = y; + + setCursorVisible(false); +}