X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=da8943bacf13f298adc8d319b81fd0868df95099;hb=92d522b7f1be6046adcac062c558bbf0bf021612;hp=cd2b108c242169cb4050dd2b4b2b6721db03b516;hpb=1b787e207d68610c6c8a1b3e21fce15891e38bef;p=lyx.git

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index cd2b108c24..da8943bacf 100644
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -1,9 +1,9 @@
 /*
  *  File:        formulamacro.C
  *  Purpose:     Implementation of the formula macro LyX inset
- *  Author:      André Pönitz
+ *  Author:      André Pönitz, based on ideas of Alejandro Aguilar Sierra
  *  Created:     March 2001
- *  Description: Allows the edition of math macros inside Lyx. 
+ *  Description: Allows the edition of math macros inside Lyx.
  *
  *  Copyright: 2001  The LyX Project
  *
@@ -13,37 +13,36 @@
 
 #include <config.h>
 
-#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 "math_matrixinset.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/math_support.h"
+#include "support/lstrings.h"
 #include "support/LOstream.h"
 #include "debug.h"
 #include "lyxlex.h"
 #include "lyxtext.h"
-#include "lyxfont.h"
-#include "math_mathmlstream.h"
+#include "Lsstream.h"
+
+using namespace lyx::support;
 
 using std::ostream;
 
 extern MathCursor * mathcursor;
 
+
 InsetFormulaMacro::InsetFormulaMacro()
 {
 	// inset name is inherited from Inset
@@ -51,50 +50,46 @@ InsetFormulaMacro::InsetFormulaMacro()
 }
 
 
-InsetFormulaMacro::InsetFormulaMacro(string nm, int na)
+InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
 {
-	setInsetName(nm);
-	MathMacroTable::create(nm, na, string());
+	setInsetName(name);
+	MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs)));
 }
 
 
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
-	string name = mathed_parse_macro(s);
-	setInsetName(name);
-#ifdef WITH_WARNINGS
-#warning "metrics disabled"
-#endif
-	//metrics();
+	std::istringstream is(STRCONV(s));
+	read(is);
 }
 
 
-Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
+Inset * InsetFormulaMacro::clone() const
 {
 	return new InsetFormulaMacro(*this);
 }
 
 
-void InsetFormulaMacro::write(Buffer const * buf, ostream & os) const
+void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 {
 	os << "FormulaMacro ";
-	MathWriteInfo wi(buf, os, false);
+	WriteStream wi(os, false, false);
 	par()->write(wi);
 }
 
 
-int InsetFormulaMacro::latex(Buffer const * buf, ostream & os, bool fragile, 
-			     bool /*free_spacing*/) const
+int InsetFormulaMacro::latex(Buffer const *, ostream & os,
+			     LatexRunParams const & runparams) const
 {
-	MathWriteInfo wi(buf, os, fragile);
+	WriteStream wi(os, runparams.moving_arg, true);
 	par()->write(wi);
 	return 2;
 }
 
 
-int InsetFormulaMacro::ascii(Buffer const * buf, ostream & os, int) const
+int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
 {
-	MathWriteInfo wi(buf, os, false);
+	WriteStream wi(os, false, true);
 	par()->write(wi);
 	return 0;
 }
@@ -106,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);
 }
@@ -114,67 +109,32 @@ int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
 
 void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
 {
-	string name = mathed_parse_macro(lex);
-	setInsetName(name);
-	//lyxerr << "metrics disabled";
-	metrics();
+	read(lex.getStream());
 }
 
 
-string InsetFormulaMacro::prefix() const
+void InsetFormulaMacro::read(std::istream & is)
 {
-	return string(" ") + _("Macro: ") + getInsetName() + ": ";
-}
-
-
-int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const
-{
-	return par()->ascent() + 5;
-}
-
-
-int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
-{
-	return par()->descent() + 5;
+	MathMacroTemplate * p = new MathMacroTemplate(is);
+	setInsetName(p->name());
+	MathMacroTable::create(MathAtom(p));
+	//metrics();
 }
 
 
-int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
+string InsetFormulaMacro::prefix() const
 {
-	metrics(bv, f);
-	return 10 + lyxfont::width(prefix(), f) + par()->width();
+	return bformat(_(" Macro: %s: "), getInsetName());
 }
 
 
-
-UpdatableInset::RESULT
-InsetFormulaMacro::localDispatch(BufferView * bv,
-				 kb_action action, string const & arg)
+void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) 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 <= par()->numargs()) {
-				mathcursor->insert(MathAtom(new MathMacroArgument(i)));
-				updateLocal(bv, true);
-			//} else {
-			//	lyxerr << "not in range 0.." << par()->numargs() << "\n";
-			//}
-			break;
-		}
-		
-		default: {
-			result = InsetFormulaBase::localDispatch(bv, action, arg);
-			// force redraw if anything happened
-			if (result != UNDISPATCHED) {
-				bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
-				bv->updateInset(this, false);
-			}
-		}
-	}
-	return result;
+	par()->metrics(mi, dim_);
+	dim_.asc += 5;
+	dim_.des += 5;
+	dim_.wid += 10 + font_metrics::width(prefix(), mi.base.font);
+	dim = dim_;
 }
 
 
@@ -196,38 +156,32 @@ Inset::Code InsetFormulaMacro::lyxCode() const
 }
 
 
-MathInsetTypes InsetFormulaMacro::getType() const
-{
-	return LM_OT_MACRO;
-}
-
-
-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 && mathcursor->formula() == this)
-		mathcursor->drawSelection(pain);
+	if (mathcursor &&
+			const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
+		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_);
 }
-