X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.C;h=16f8c3c58b0448fc457991ed66dd19c1cc7231ee;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=d8b620d87d9eb0c75520380924ac2f957f9c0a89;hpb=6317b96d19a8af67fb145cd66c08b06299488cee;p=lyx.git

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index d8b620d87d..16f8c3c58b 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
  *
@@ -22,17 +22,14 @@
 #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 "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"
@@ -50,18 +47,18 @@ 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(name, nargs);
 }
 
 
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
-	string name = mathed_parse_macro(s);
+	string name;
+	mathed_parse_macro(name, s);
 	setInsetName(name);
-	metrics();
 }
 
 
@@ -74,20 +71,24 @@ Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
 void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 {
 	os << "FormulaMacro ";
-	par()->write(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
 {
-	par()->write(os, fragile);
+	WriteStream wi(os, fragile, true);
+	par()->write(wi);
 	return 2;
 }
 
+
 int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
 {
-	par()->write(os, false);
+	WriteStream wi(os, false, true);
+	par()->write(wi);
 	return 0;
 }
 
@@ -98,7 +99,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);
 }
@@ -106,8 +107,10 @@ int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
 
 void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
 {
-	string name = mathed_parse_macro(lex);
+	string name;
+	mathed_parse_macro(name, lex);
 	setInsetName(name);
+	//lyxerr << "metrics disabled";
 	metrics();
 }
 
@@ -130,42 +133,10 @@ int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
 }
 
 
-int InsetFormulaMacro::width(BufferView *, LyXFont const & f) const
+int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
 {
-	metrics();
-	return 10 + lyxfont::width(prefix(), f) + par()->width();
-}
-
-
-
-UpdatableInset::RESULT
-InsetFormulaMacro::localDispatch(BufferView * bv,
-				 kb_action action, string const & arg)
-{
-	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;
+	metrics(bv, f);
+	return 10 + font_metrics::width(prefix(), f) + par()->width();
 }
 
 
@@ -193,39 +164,35 @@ MathInsetTypes InsetFormulaMacro::getType() const
 }
 
 
-void InsetFormulaMacro::metrics() const
-{
-	par()->metrics(LM_ST_TEXT);
-}
-
-
 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);
 
 	// label
 	font.setColor(LColor::math);
-	
-	int const y = baseline - ascent(bv, font) + 1;
+
+	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.fillRectangle(int(x), y , w, h, LColor::mathmacrobg);
-	pain.rectangle(int(x), y, w, h, LColor::mathframe);
+	pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+	pain.pain.rectangle(x, a, w, h, LColor::mathframe);
 
-	if (mathcursor && mathcursor->formula() == this)
+	if (mathcursor &&
+			const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
 		mathcursor->drawSelection(pain);
 
-	pain.text(int(x + 2), baseline, prefix(), font);
-	x += width(bv, font);
+	pain.pain.text(x + 2, y, prefix(), font);
 
 	// formula
-	float t = par()->width() + 5;
-	x -= t;
-	par()->draw(pain, int(x), baseline);
-	x += t;
-}
+	par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
+	xx += w + 2;
+	xo_ = x;
+	yo_ = y;
 
+	setCursorVisible(false);
+}