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

diff --git a/src/mathed/InsetMathFontOld.cpp b/src/mathed/InsetMathFontOld.cpp
index 8483b0ef93..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.
  */
@@ -13,15 +13,18 @@
 #include "InsetMathFontOld.h"
 
 #include "MathData.h"
-#include "MathStream.h"
 #include "MathParser.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 #include "MetricsInfo.h"
 
+#include <ostream>
+
 
 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);
 }
@@ -35,7 +38,16 @@ Inset * InsetMathFontOld::clone() 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);
 }
@@ -43,7 +55,16 @@ void InsetMathFontOld::metrics(MetricsInfo & mi, Dimension & dim) const
 
 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);
 }