X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDecoration.cpp;h=f7fd6ea2aa20300162d2e8da059131322b378705;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=b9202f5d6394bbf5cc0e1d7623916d60f023c65b;hpb=38b9a4530e8eb870e60cf8a15c208010fb292054;p=lyx.git

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index b9202f5d63..f7fd6ea2aa 100644
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -23,17 +23,21 @@
 
 #include "support/debug.h"
 #include "support/docstring.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/lstrings.h"
 
 #include <ostream>
 
+using namespace lyx::support;
+
 using namespace std;
 
 namespace lyx {
 
 
 InsetMathDecoration::InsetMathDecoration(Buffer * buf, latexkeys const * key)
-	: InsetMathNest(buf, 1), key_(key)
+	: InsetMathNest(buf, 1), key_(key), dh_(0), dy_(0), dw_(0)
 {
 //	lyxerr << " creating deco " << key->name << endl;
 }
@@ -55,13 +59,7 @@ bool InsetMathDecoration::isScriptable() const
 {
 	return
 			key_->name == "overbrace" ||
-			key_->name == "underbrace" ||
-			key_->name == "overleftarrow" ||
-			key_->name == "overrightarrow" ||
-			key_->name == "overleftrightarrow" ||
-			key_->name == "underleftarrow" ||
-			key_->name == "underrightarrow" ||
-			key_->name == "underleftrightarrow";
+			key_->name == "underbrace";
 }
 
 
@@ -107,9 +105,10 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	bool really_change_font = currentMode() == TEXT_MODE
-				&& isMathFont(from_ascii(mi.base.fontname));
-	FontSetChanger dummy(mi.base, "textnormal", really_change_font);
+	Changer dummy =
+		(currentMode() == MATH_MODE) ? mi.base.changeEnsureMath() :
+		(isMathFont(mi.base.fontname)) ? mi.base.changeFontSet("textnormal")
+		: Changer();
 
 	cell(0).metrics(mi, dim);
 
@@ -124,15 +123,16 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 		dim.des += dh_ + 2;
 	}
 
-	metricsMarkers(dim);
+	metricsMarkers(mi, dim);
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
-	bool really_change_font = currentMode() == TEXT_MODE
-				&& isMathFont(from_ascii(pi.base.fontname));
-	FontSetChanger dummy(pi.base, "textnormal", really_change_font);
+	Changer dummy =
+		(currentMode() == MATH_MODE) ? pi.base.changeEnsureMath() :
+		(isMathFont(pi.base.fontname)) ? pi.base.changeFontSet("textnormal")
+		: Changer();
 
 	cell(0).draw(pi, x + 1, y);
 	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
@@ -142,7 +142,6 @@ void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 		mathed_draw_deco(pi, x + 1 + (dim0.wid - dw_) / 2,
 			y + dy_, dw_, dh_, key_->name);
 	drawMarkers(pi, x, y);
-	setPosCache(pi, x, y);
 }
 
 
@@ -165,13 +164,13 @@ void InsetMathDecoration::normalize(NormalStream & os) const
 
 void InsetMathDecoration::infoize(odocstream & os) const
 {
-	os << "Deco: " << key_->name;
+	os << bformat(_("Decoration: %1$s"), key_->name);
 }
 
 
 namespace {
 	struct Attributes {
-		Attributes() {}
+		Attributes() : over(false) {}
 		Attributes(bool o, string t)
 			: over(o), tag(t) {}
 		bool over;
@@ -241,7 +240,7 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
 		os << MTag("span", "class='overbar'") << cell(0) << ETag("span");
 		return;
 	}
-	
+
 	if (name == "underbar" || name == "underline") {
 		os << MTag("span", "class='underbar'") << cell(0) << ETag("span");
 		return;
@@ -250,12 +249,12 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
 	TranslationMap const & t = translationMap();
 	TranslationMap::const_iterator cur = t.find(name);
 	LASSERT(cur != t.end(), return);
-	
+
 	bool symontop = cur->second.over;
 	string const symclass = symontop ? "symontop" : "symonbot";
 	os << MTag("span", "class='symbolpair " + symclass + "'")
 	   << '\n';
-	
+
 	if (symontop)
 		os << MTag("span", "class='symbol'") << from_ascii(cur->second.tag);
 	else
@@ -283,12 +282,12 @@ void InsetMathDecoration::validate(LaTeXFeatures & features) const
 				"span.symbolpair{display: inline-block; text-align:center;}\n"
 				"span.symontop{vertical-align: top;}\n"
 				"span.symonbot{vertical-align: bottom;}\n"
-				"span.symbolpair span{display: block;}\n"			
+				"span.symbolpair span{display: block;}\n"
 				"span.symbol{height: 0.5ex;}");
 		}
 	} else {
 		if (!key_->requires.empty())
-			features.require(to_utf8(key_->requires));
+			features.require(key_->requires);
 	}
 	InsetMathNest::validate(features);
 }