X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathFontOld.cpp;h=11ba283fdf9efc51ed1ff593f82b4441cff257bd;hb=3e79e0f5f00add2c735d372f4734cf31f64b7e5f;hp=c46defe89729d6388d2dac2e05372d55c624ba7b;hpb=9daf07588f49b52eb5e2fd5e8e8a58705e2e447e;p=lyx.git

diff --git a/src/mathed/InsetMathFontOld.cpp b/src/mathed/InsetMathFontOld.cpp
index c46defe897..11ba283fdf 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,22 +13,35 @@
 #include "InsetMathFontOld.h"
 
 #include "MathData.h"
-#include "MathStream.h"
 #include "MathParser.h"
+#include "MathStream.h"
+#include "MathSupport.h"
 #include "MetricsInfo.h"
 
+#include "support/gettext.h"
+#include "support/lassert.h"
+#include "support/lstrings.h"
+
 #include <ostream>
 
+using namespace lyx::support;
 
 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);
 }
 
 
+std::string InsetMathFontOld::font() const
+{
+	LASSERT(isAscii(key_->name), return "mathnormal");
+	return to_ascii(key_->name);
+}
+
+
 Inset * InsetMathFontOld::clone() const
 {
 	return new InsetMathFontOld(*this);
@@ -37,17 +50,35 @@ Inset * InsetMathFontOld::clone() const
 
 void InsetMathFontOld::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, key_->name.c_str());
+	current_mode_ = isTextFont(mi.base.fontname)
+				? TEXT_MODE : MATH_MODE;
+
+	std::string const fontname = current_mode_ == MATH_MODE
+		? "math" + font() : "text" + font();// I doubt that this still works
+
+	// When \cal is used in text mode, the font is not changed
+	bool really_change_font = fontname != "textcal";
+
+	Changer dummy = really_change_font ? mi.base.changeFontSet(fontname)
+		: Changer();
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
-	// Cache the inset dimension. 
-	setDimCache(mi, dim);
+	metricsMarkers(mi, dim);
 }
 
 
 void InsetMathFontOld::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, key_->name.c_str());
+	current_mode_ = isTextFont(pi.base.fontname)
+				? TEXT_MODE : MATH_MODE;
+
+	std::string const fontname = current_mode_ == MATH_MODE
+		? "math" + font() : "text" + font();// I doubt that this still works
+
+	// When \cal is used in text mode, the font is not changed
+	bool really_change_font = fontname != "textcal";
+
+	Changer dummy = really_change_font ? pi.base.changeFontSet(fontname)
+		: Changer();
 	cell(0).draw(pi, x + 1, y);
 	drawMarkers(pi, x, y);
 }
@@ -79,7 +110,7 @@ void InsetMathFontOld::normalize(NormalStream & os) const
 
 void InsetMathFontOld::infoize(odocstream & os) const
 {
-	os << "Font: " << key_->name;
+	os << bformat(_("Font: %1$s"), key_->name);
 }