X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=90576cbdd9a06f7bcf7217818550893851a5bc5f;hpb=cfdd73ea94c3cc0058459d67b1c62fabd31fbeb1;p=lyx.git diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 90576cbdd9..16f8c3c58b 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -1,23 +1,20 @@ /* - * 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: (c) 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. */ #include -#include #ifdef __GNUG__ -#pragma implementation "formulamacro.h" +#pragma implementation #endif #include "formulamacro.h" @@ -25,254 +22,177 @@ #include "math_cursor.h" #include "math_parser.h" #include "math_macro.h" -#include "lyx_main.h" -#include "lyx_cb.h" +#include "math_macrotable.h" +#include "math_support.h" +#include "math_mathmlstream.h" #include "BufferView.h" -#include "lyxscreen.h" -#include "lyxdraw.h" #include "gettext.h" -#include "Painter.h" +#include "frontends/Painter.h" +#include "frontends/font_metrics.h" +#include "support/lyxlib.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() - : InsetFormula(true) { - tmacro = 0; - opened = false; + // inset name is inherited from Inset + setInsetName("unknown"); } -InsetFormulaMacro::InsetFormulaMacro(string nm, int na, bool /*e*/) - : InsetFormula(true), name(nm) +InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs) { - tmacro = MathMacroTable::mathMTable.getTemplate(name.c_str()); - if (!tmacro) { - tmacro = new MathMacroTemplate(name.c_str(), 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() const +Inset * InsetFormulaMacro::clone(Buffer const &, bool) const { - return new InsetFormulaMacro(name); + return new InsetFormulaMacro(*this); } -void InsetFormulaMacro::Write(ostream & os) +void InsetFormulaMacro::write(Buffer const *, ostream & os) const { os << "FormulaMacro "; - Latex(os, 0); + WriteStream wi(os, false, false); + par()->write(wi); } -int InsetFormulaMacro::Latex(ostream & os, signed char /*fragile*/) +int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile, + bool /*free_spacing*/) const { - int ret = 1; - tmacro->WriteDef(os); - return ret; + WriteStream wi(os, fragile, true); + par()->write(wi); + return 2; } -int InsetFormulaMacro::Latex(string &file, signed char /*fragile*/) +int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const { - int ret = 1; - tmacro->WriteDef(file); - return ret; + WriteStream wi(os, false, true); + par()->write(wi); + return 0; } -int InsetFormulaMacro::Linuxdoc(string &/*file*/) +int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const { - return 0; + return ascii(buf, os, 0); } -int InsetFormulaMacro::DocBook(string &/*file*/) +int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const { - return 0; + return ascii(buf, os, 0); } -void InsetFormulaMacro::Read(LyXLex & lex) +void InsetFormulaMacro::read(Buffer const *, LyXLex & lex) { - istream & is = lex.getStream(); - mathed_parser_file(is, lex.GetLineNo()); - mathed_parse(0, 0, reinterpret_cast(&tmacro)); - - // 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(); } -#ifdef USE_PAINTER -int InsetFormulaMacro::ascent(Painter & pain, LyXFont const & f) const -{ - if (opened) { - tmacro->update(); - return InsetFormula::ascent(pain, f); - } - return f.maxAscent()+3; -} -#else -int InsetFormulaMacro::Ascent(LyXFont const & f) const +string InsetFormulaMacro::prefix() const { - if (opened) { - tmacro->update(); - return InsetFormula::Ascent(f); - } - return f.maxAscent()+3; + return string(" ") + _("Macro: ") + getInsetName() + ": "; } -#endif -#ifdef USE_PAINTER -int InsetFormulaMacro::descent(Painter & pain, LyXFont const & f) const -{ - if (opened) { - tmacro->update(); - return InsetFormula::descent(pain, f); - } - return f.maxDescent()+1; -} -#else -int InsetFormulaMacro::Descent(LyXFont const & f) const +int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const { - if (opened) { - tmacro->update(); - return InsetFormula::Descent(f); - } - return f.maxDescent()+1; + return par()->ascent() + 5; } -#endif -#ifdef USE_PAINTER -int InsetFormulaMacro::width(Painter & pain, LyXFont const & f) const +int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const { - if (opened) { - tmacro->update(); - return InsetFormula::width(pain, f); - } - string ilabel(_("Macro: ")); - ilabel += name; - return 6 + f.stringWidth(ilabel); + return par()->descent() + 5; } -#else -int InsetFormulaMacro::Width(LyXFont const & f) const + + +int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const { - if (opened) { - tmacro->update(); - return InsetFormula::Width(f); - } - string ilabel(_("Macro: ")); - ilabel += name; - return 6 + f.stringWidth(ilabel); + metrics(bv, f); + return 10 + font_metrics::width(prefix(), f) + par()->width(); } -#endif -#ifdef USE_PAINTER -void InsetFormulaMacro::draw(Painter & pain, LyXFont const & f, - int baseline, float & x) const +MathAtom const & InsetFormulaMacro::par() const { - LyXFont font(f); - tmacro->update(); - if (opened) { - tmacro->setEditMode(true); - InsetFormula::draw(pain, font, baseline, x); - tmacro->setEditMode(false); - } else { - font.setColor(LColor::math); - - int y = baseline - ascent(pain, font) + 1; - int w = width(pain, font) - 2; - int h = (ascent(pain, font) + descent(pain, 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(pain, font) - 1; - } + return MathMacroTable::provide(getInsetName()); } -#else -void InsetFormulaMacro::Draw(LyXFont font, LyXScreen & scr, - int baseline, float & x) + + +MathAtom & InsetFormulaMacro::par() { - tmacro->update(); - if (opened) { - tmacro->setEditMode(true); - InsetFormula::Draw(font, scr, baseline, x); - tmacro->setEditMode(false); - } else { - font.setColor(LyXFont::MATH); - - int y = baseline - Ascent(font) + 1; - int w = Width(font) - 2, h = (Ascent(font) + Descent(font) - 2); - - - scr.fillRectangle(gc_lighted, int(x), y, w, h); - scr.drawFrame(FL_UP_FRAME, int(x), y, w, h, FL_BLACK, -1); - - string s(_("Macro: ")); - s += name; - scr.drawString(font, s, baseline, int(x +2)); - x += Width(font) - 1; - } + return MathMacroTable::provide(getInsetName()); } -#endif -void InsetFormulaMacro::Edit(int x, int y) +Inset::Code InsetFormulaMacro::lyxCode() const { - opened = true; - par = static_cast(tmacro->Clone()); - InsetFormula::Edit(x, y); + return Inset::MATHMACRO_CODE; } - -void InsetFormulaMacro::InsetUnlock() + +MathInsetTypes InsetFormulaMacro::getType() const { - opened = false; - LyxArrayBase * tarray = tmacro->GetData(); - MathedIter it(tarray); - it.Clear(); - tmacro->SetData(par->GetData()); - tmacro->setEditMode(false); - InsetFormula::InsetUnlock(); + return LM_OT_MACRO; } -bool InsetFormulaMacro::LocalDispatch(int action, char const * arg) +void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, + int y, float & xx, bool /*cleared*/) const { - if (action == LFUN_MATH_MACROARG) { - int i = atoi(arg) - 1; - if (i >= 0 && i < tmacro->getNoArgs()) { - mathcursor->Insert(tmacro->getMacroPar(i), LM_TC_INSET); - InsetFormula::UpdateLocal(); - } - - return true; - } - tmacro->setEditMode(true); - tmacro->Metrics(); - bool result = InsetFormula::LocalDispatch(action, arg); - tmacro->setEditMode(false); - - return result; + 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); }