X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathFontOld.cpp;h=c14c4e36a8c3c9e8b955572d62aec572b8112f83;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=e70b7370f594a4d33a3224914b5050daa74dfa50;hpb=6e3a75969b97a5db4c80c46be49d4deb122abfe7;p=lyx.git

diff --git a/src/mathed/InsetMathFontOld.cpp b/src/mathed/InsetMathFontOld.cpp
index e70b7370f5..c14c4e36a8 100644
--- a/src/mathed/InsetMathFontOld.cpp
+++ b/src/mathed/InsetMathFontOld.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,46 +11,60 @@
 #include <config.h>
 
 #include "InsetMathFontOld.h"
-#include "MathArray.h"
-#include "MathStream.h"
+
+#include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
-#include "support/std_ostream.h"
-
+#include "MathSupport.h"
+#include "MetricsInfo.h"
 
-namespace lyx {
+#include <ostream>
 
-using std::auto_ptr;
 
+namespace lyx {
 
-InsetMathFontOld::InsetMathFontOld(latexkeys const * key)
-	: InsetMathNest(1), key_(key)
+InsetMathFontOld::InsetMathFontOld(Buffer * buf, latexkeys const * key)
+	: InsetMathNest(buf, 1), key_(key), current_mode_(TEXT_MODE)
 {
 	//lock(true);
 }
 
 
-auto_ptr<InsetBase> InsetMathFontOld::doClone() const
+Inset * InsetMathFontOld::clone() const
 {
-	return auto_ptr<InsetBase>(new InsetMathFontOld(*this));
+	return new InsetMathFontOld(*this);
 }
 
 
-bool InsetMathFontOld::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathFontOld::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, key_->name.c_str());
+	current_mode_ = isTextFont(from_ascii(mi.base.fontname))
+				? TEXT_MODE : MATH_MODE;
+
+	docstring const font = current_mode_ == MATH_MODE
+				? "math" + key_->name : "text" + key_->name;
+
+	// When \cal is used in text mode, the font is not changed
+	bool really_change_font = font != "textcal";
+
+	FontSetChanger dummy(mi.base, font, really_change_font);
 	cell(0).metrics(mi, dim);
 	metricsMarkers(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }
 
 
 void InsetMathFontOld::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, key_->name.c_str());
+	current_mode_ = isTextFont(from_ascii(pi.base.fontname))
+				? TEXT_MODE : MATH_MODE;
+
+	docstring const font = current_mode_ == MATH_MODE
+				? "math" + key_->name : "text" + key_->name;
+
+	// When \cal is used in text mode, the font is not changed
+	bool really_change_font = font != "textcal";
+
+	FontSetChanger dummy(pi.base, font, really_change_font);
 	cell(0).draw(pi, x + 1, y);
 	drawMarkers(pi, x, y);
 }