X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=39ab9325401bde56f23a94e7d151e9f8f2577d76;hb=7338f3b980d4dc5793ff80be814b7a74e1c72274;hp=3d048a5b79b9dcdb52d5bf2263f1b98ffe03bd6b;hpb=4366ef931c28ef76e01b2c0fdbb0f515f1e0cdbd;p=lyx.git diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 3d048a5b79..39ab932540 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -1,45 +1,47 @@ -/* - * 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 -#ifdef __GNUG__ -#pragma implementation -#endif - #include "formulamacro.h" -#include "commandtags.h" +#include "lfuns.h" #include "math_cursor.h" #include "math_parser.h" #include "math_macro.h" #include "math_macrotable.h" +#include "math_macrotemplate.h" +#include "metricsinfo.h" #include "math_support.h" #include "math_mathmlstream.h" #include "BufferView.h" #include "gettext.h" -#include "Painter.h" -#include "font.h" +#include "latexrunparams.h" +#include "frontends/Painter.h" +#include "frontends/font_metrics.h" #include "support/lyxlib.h" +#include "support/lstrings.h" #include "support/LOstream.h" #include "debug.h" #include "lyxlex.h" #include "lyxtext.h" -#include "lyxfont.h" +#include "Lsstream.h" + +using namespace lyx::support; using std::ostream; +using std::auto_ptr; extern MathCursor * mathcursor; + InsetFormulaMacro::InsetFormulaMacro() { // inset name is inherited from Inset @@ -47,24 +49,24 @@ InsetFormulaMacro::InsetFormulaMacro() } -InsetFormulaMacro::InsetFormulaMacro(string name, int nargs) +InsetFormulaMacro::InsetFormulaMacro + (string const & name, int nargs, string const & type) { setInsetName(name); - MathMacroTable::create(name, nargs, string()); + 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(STRCONV(s)); + read(is); } -Inset * InsetFormulaMacro::clone(Buffer const &, bool) const +auto_ptr InsetFormulaMacro::clone() const { - return new InsetFormulaMacro(*this); + return auto_ptr(new InsetFormulaMacro(*this)); } @@ -76,10 +78,10 @@ void InsetFormulaMacro::write(Buffer const *, ostream & os) const } -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; } @@ -99,7 +101,7 @@ int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const } -int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const +int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const { return ascii(buf, os, 0); } @@ -107,36 +109,32 @@ int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const 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: %s: "), getInsetName()); } -int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const +void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const { - metrics(bv, f); - return 10 + lyxfont::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_; } @@ -152,44 +150,38 @@ MathAtom & InsetFormulaMacro::par() } -Inset::Code InsetFormulaMacro::lyxCode() const -{ - return Inset::MATHMACRO_CODE; -} - - -MathInsetTypes InsetFormulaMacro::getType() const +InsetOld::Code InsetFormulaMacro::lyxCode() const { - return LM_OT_MACRO; + return InsetOld::MATHMACRO_CODE; } -void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f, - int y, float & x, bool /*cleared*/) const +void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const { - Painter & pain = bv->painter(); - LyXFont font(f); - // label + LyXFont font = p.base.font; font.setColor(LColor::math); - 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(int(x), a , w, h, LColor::mathmacrobg); - pain.rectangle(int(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(mathcursor->formula()) == this) - mathcursor->drawSelection(pain); + mathcursor->drawSelection(pi); - pain.text(int(x + 2), y, prefix(), font); - x += width(bv, font); + pi.pain.text(x + 2, y, prefix(), font); // formula - xo_ = int(x) - par()->width() - 5; + par()->draw(pi, x + font_metrics::width(prefix(), p.base.font) + 5, y); + xo_ = x; yo_ = y; - par()->draw(pain, xo_, yo_); }