X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=344457c48f84072d66c1203a50a8eaba25abd9d4;hpb=bb2aa47875a71c75ddf6dc8a231b2e4ed78ba0c7;p=lyx.git diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 344457c48f..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. @@ -25,203 +23,176 @@ #include "math_parser.h" #include "math_macro.h" #include "math_macrotable.h" -#include "math_macrotemplate.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; -using std::istream; + +extern MathCursor * mathcursor; InsetFormulaMacro::InsetFormulaMacro() - : InsetFormula(true) { - tmacro_ = 0; - opened_ = false; + // inset name is inherited from Inset + setInsetName("unknown"); } -InsetFormulaMacro::InsetFormulaMacro(string nm, int na) - : InsetFormula(true), name_(nm) +InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs) { - tmacro_ = MathMacroTable::mathMTable.getTemplate(name_); - if (!tmacro_) { - tmacro_ = new MathMacroTemplate(name_, na); - MathMacroTable::mathMTable.addTemplate(tmacro_); - } - opened_ = false; + setInsetName(name); + MathMacroTable::create(name, nargs); } -InsetFormulaMacro::~InsetFormulaMacro() +InsetFormulaMacro::InsetFormulaMacro(string const & s) { - par = 0; + 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(name_); + return new InsetFormulaMacro(*this); } -void InsetFormulaMacro::Write(Buffer const *, ostream & os) const +void InsetFormulaMacro::write(Buffer const *, ostream & os) const { os << "FormulaMacro "; - tmacro_->WriteDef(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_->WriteDef(os, true); // or false? + WriteStream wi(os, fragile, true); + par()->write(wi); return 2; } -int InsetFormulaMacro::Linuxdoc(Buffer const * buf, ostream & os) const +int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const +{ + WriteStream wi(os, false, true); + par()->write(wi); + return 0; +} + + +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) { - istream & is = lex.getStream(); - mathed_parser_file(is, lex.GetLineNo()); - MathedArray ar; - - mathed_parse(ar, 0, reinterpret_cast(&tmacro_)); - // since tmacro_ == 0 when mathed_parse is called we need to sett - // its contents explicitly afterwards (Lgb) - tmacro_->setData(ar); - - // Update line number - lex.setLineNo(mathed_parser_lineno()); - - MathMacroTable::mathMTable.addTemplate(tmacro_); - name_ = tmacro_->GetName(); - par = tmacro_; + string name; + mathed_parse_macro(name, lex); + setInsetName(name); + //lyxerr << "metrics disabled"; + metrics(); +} + - // reading of end_inset in the inset!!! - while (lex.IsOK()) { - lex.nextToken(); - if (lex.GetString() == "\\end_inset") - break; - } +string InsetFormulaMacro::prefix() const +{ + return string(" ") + _("Macro: ") + getInsetName() + ": "; } -int InsetFormulaMacro::ascent(BufferView * pain, LyXFont const & f) const +int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const { - if (opened_) { - return InsetFormula::ascent(pain, f); - } - return lyxfont::maxAscent(f) + 3; + return par()->ascent() + 5; } -int InsetFormulaMacro::descent(BufferView * pain, LyXFont const & f) const +int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const { - if (opened_) { - return InsetFormula::descent(pain, f); - } - return lyxfont::maxDescent(f) + 1; + return par()->descent() + 5; } int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const { - if (opened_) { - return InsetFormula::width(bv, f); - } - string ilabel(_("Macro: ")); - ilabel += name_; - return 6 + lyxfont::width(ilabel, f); + metrics(bv, f); + return 10 + font_metrics::width(prefix(), f) + par()->width(); +} + + +MathAtom const & InsetFormulaMacro::par() const +{ + return MathMacroTable::provide(getInsetName()); +} + + +MathAtom & InsetFormulaMacro::par() +{ + return MathMacroTable::provide(getInsetName()); +} + + +Inset::Code InsetFormulaMacro::lyxCode() const +{ + return Inset::MATHMACRO_CODE; +} + + +MathInsetTypes InsetFormulaMacro::getType() const +{ + return LM_OT_MACRO; } 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); - if (opened_) { - tmacro_->setEditMode(true); - InsetFormula::draw(bv, font, baseline, x, cleared); - tmacro_->setEditMode(false); - } else { - 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); - - string s(_("Macro: ")); - s += name_; - pain.text(int(x + 2), baseline, s, font); - x += width(bv, font) - 1; - } -} - - -string const InsetFormulaMacro::EditMessage() const -{ - return _("Math macro editor mode"); -} - - -void InsetFormulaMacro::Edit(BufferView * bv, int x, int y,unsigned int button) -{ - opened_ = true; - par = static_cast(tmacro_->Clone()); - InsetFormula::Edit(bv, x, y, button); -} - - -void InsetFormulaMacro::InsetUnlock(BufferView * bv) -{ - opened_ = false; - tmacro_->setData(par->GetData()); - tmacro_->setEditMode(false); - InsetFormula::InsetUnlock(bv); -} - - -UpdatableInset::RESULT -InsetFormulaMacro::LocalDispatch(BufferView * bv, - kb_action action, string const & arg) -{ - if (action == LFUN_MATH_MACROARG) { - int const i = lyx::atoi(arg) - 1; - if (i >= 0 && i < tmacro_->getNoArgs()) { - mathcursor->insertInset(tmacro_->getMacroPar(i), - LM_TC_INSET); - InsetFormula::UpdateLocal(bv); - } - - return DISPATCHED; - } - tmacro_->setEditMode(true); - tmacro_->Metrics(); - RESULT result = InsetFormula::LocalDispatch(bv, action, arg); - tmacro_->setEditMode(false); - - return result; + + // 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); }