X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=39ab9325401bde56f23a94e7d151e9f8f2577d76;hb=7338f3b980d4dc5793ff80be814b7a74e1c72274;hp=6469b547bdfb6e398adebb4c5002428015676818;hpb=6b954412883ed962cee39e5cdfc5d9962e893142;p=lyx.git diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index 6469b547bd..39ab932540 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -1,193 +1,187 @@ -/* - * 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 + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * Copyright: 1996, 1997 Alejandro Aguilar Sierra + * \author Alejandro Aguilar Sierra + * \author André Pönitz * - * Version: 0.4, Lyx project. - * - * 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_macroarg.h" #include "math_macrotable.h" #include "math_macrotemplate.h" -#include "lyx_main.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 "mathed/support.h" +#include "support/lstrings.h" #include "support/LOstream.h" #include "debug.h" +#include "lyxlex.h" +#include "lyxtext.h" +#include "Lsstream.h" + +using namespace lyx::support; using std::ostream; -using std::istream; +using std::auto_ptr; + +extern MathCursor * mathcursor; -extern MathedCursor * mathcursor; InsetFormulaMacro::InsetFormulaMacro() - : InsetFormula(true) { - par = &MathMacroTable::provideTemplate("unknown", 0); + // inset name is inherited from Inset + setInsetName("unknown"); +} + + +InsetFormulaMacro::InsetFormulaMacro + (string const & name, int nargs, string const & type) +{ + setInsetName(name); + MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs, type))); } -InsetFormulaMacro::InsetFormulaMacro(string nm, int na) - : InsetFormula(true) +InsetFormulaMacro::InsetFormulaMacro(string const & s) { - par = &MathMacroTable::provideTemplate(nm, na); + std::istringstream is(STRCONV(s)); + read(is); } -Inset * InsetFormulaMacro::Clone(Buffer const &) const +auto_ptr InsetFormulaMacro::clone() const { - return new InsetFormulaMacro(*this); + return auto_ptr(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*/, - bool /*free_spacing*/) const +int InsetFormulaMacro::latex(Buffer const *, ostream & os, + LatexRunParams const & runparams) const { - tmacro()->WriteDef(os, true); // or false? + WriteStream wi(os, runparams.moving_arg, true); + par()->write(wi); return 2; } -int InsetFormulaMacro::Linuxdoc(Buffer const * buf, ostream & os) const +int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const { - return Ascii(buf, os, 0); + WriteStream wi(os, false, true); + par()->write(wi); + return 0; } -int InsetFormulaMacro::DocBook(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); } -void InsetFormulaMacro::Read(Buffer const *, LyXLex & lex) +int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const { - istream & is = lex.getStream(); - mathed_parser_file(is, lex.GetLineNo()); - - MathParInset * tmp = new MathParInset; - MathedArray ar; - mathed_parse(ar, tmp, 0); - par = &MathMacroTable::provideTemplate(tmp->GetName(), tmp->xo()); - par->setData(ar); - //cerr << "## InsetFormulaMacro::Read name: " << tmp->GetName() << endl; - //cerr << "## InsetFormulaMacro::Read nargs: " << tmp->xo() << endl; - //cerr << "## InsetFormulaMacro::Read 1: " << ar << endl; - - // Update line number - lex.setLineNo(mathed_parser_lineno()); - - // reading of end_inset in the inset!!! - while (lex.IsOK()) { - lex.nextToken(); - if (lex.GetString() == "\\end_inset") - break; - } + return ascii(buf, os, 0); } -int InsetFormulaMacro::ascent(BufferView * pain, LyXFont const & f) const + +void InsetFormulaMacro::read(Buffer const *, LyXLex & lex) { - return InsetFormula::ascent(pain, f); + read(lex.getStream()); } -int InsetFormulaMacro::descent(BufferView * pain, LyXFont const & f) const +void InsetFormulaMacro::read(std::istream & is) { - return InsetFormula::descent(pain, f); + MathMacroTemplate * p = new MathMacroTemplate(is); + setInsetName(p->name()); + MathMacroTable::create(MathAtom(p)); + //metrics(); } string InsetFormulaMacro::prefix() const { - return string(" ") + _("Macro: ") + par->GetName() + ": "; + return bformat(_(" Macro: %s: "), getInsetName()); } -int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const + +void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const { - return 10 + lyxfont::width(prefix(), f) + InsetFormula::width(bv, f); + par()->metrics(mi, dim_); + dim_.asc += 5; + dim_.des += 5; + dim_.wid += 10 + font_metrics::width(prefix(), mi.base.font); + dim = dim_; } -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); - - pain.text(int(x + 2), baseline, prefix(), font); - x += width(bv, font); - - // formula - float t = InsetFormula::width(bv, f) + 5; - x -= t; - InsetFormula::draw(bv, font, baseline, x, cleared); - x += t; + return MathMacroTable::provide(getInsetName()); } -string const InsetFormulaMacro::EditMessage() const +MathAtom & InsetFormulaMacro::par() { - return _("Math macro editor mode"); + return MathMacroTable::provide(getInsetName()); } -UpdatableInset::RESULT -InsetFormulaMacro::LocalDispatch(BufferView * bv, - kb_action action, string const & arg) +InsetOld::Code InsetFormulaMacro::lyxCode() const { - if (action == LFUN_MATH_MACROARG) { - int const i = lyx::atoi(arg); - if (i > 0 && i <= tmacro()->nargs()) { - mathcursor->insertInset(new MathMacroArgument(i), LM_TC_INSET); - InsetFormula::UpdateLocal(bv); - } - - return DISPATCHED; - } - par->Metrics(); - return InsetFormula::LocalDispatch(bv, action, arg); + return InsetOld::MATHMACRO_CODE; } -MathMacroTemplate * InsetFormulaMacro::tmacro() const + +void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const { - return static_cast(par); + // label + LyXFont font = p.base.font; + font.setColor(LColor::math); + + 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 + 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(pi); + + pi.pain.text(x + 2, y, prefix(), font); + + // formula + par()->draw(pi, x + font_metrics::width(prefix(), p.base.font) + 5, y); + xo_ = x; + yo_ = y; }