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

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index be28d0765e..f7fd6ea2aa 100644
--- a/src/mathed/InsetMathDecoration.cpp
+++ b/src/mathed/InsetMathDecoration.cpp
@@ -22,17 +22,22 @@
 #include "LaTeXFeatures.h"
 
 #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;
 }
@@ -46,7 +51,7 @@ Inset * InsetMathDecoration::clone() const
 
 bool InsetMathDecoration::upper() const
 {
-	return key_->name.substr(0, 5) != "under";
+	return key_->name.substr(0, 5) != "under" && key_->name != "utilde";
 }
 
 
@@ -54,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";
 }
 
 
@@ -92,7 +91,9 @@ bool InsetMathDecoration::wide() const
 			key_->name == "widetilde" ||
 			key_->name == "underleftarrow" ||
 			key_->name == "underrightarrow" ||
-			key_->name == "underleftrightarrow";
+			key_->name == "underleftrightarrow" ||
+			key_->name == "undertilde" ||
+			key_->name == "utilde";
 }
 
 
@@ -104,8 +105,10 @@ InsetMath::mode_type InsetMathDecoration::currentMode() const
 
 void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	FontSetChanger dummy(mi.base, currentMode() == TEXT_MODE ?
-				"textnormal" : "mathnormal");
+	Changer dummy =
+		(currentMode() == MATH_MODE) ? mi.base.changeEnsureMath() :
+		(isMathFont(mi.base.fontname)) ? mi.base.changeFontSet("textnormal")
+		: Changer();
 
 	cell(0).metrics(mi, dim);
 
@@ -120,14 +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
 {
-	FontSetChanger dummy(pi.base, currentMode() == TEXT_MODE ?
-				"textnormal" : "mathnormal");
+	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);
@@ -137,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);
 }
 
 
@@ -160,22 +164,22 @@ 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;
 		string tag;
 	};
 
-	typedef map<string, Attributes> Translator;
+	typedef map<string, Attributes> TranslationMap;
 
-	void buildTranslator(Translator & t) {
+	void buildTranslationMap(TranslationMap & t) {
 		// the decorations we need to support are listed in lib/symbols
 		t["acute"] = Attributes(true, "&acute;");
 		t["bar"]   = Attributes(true, "&OverBar;");
@@ -201,23 +205,25 @@ namespace {
 		// this is the macron, again, but it works
 		t["underline"] = Attributes(false, "&macr;");
 		t["underrightarrow"] = Attributes(false, "&xrarr;");
+		t["undertilde"] = Attributes(false, "&Tilde;");
+		t["utilde"] = Attributes(false, "&Tilde;");
 		t["vec"] = Attributes(true, "&rarr;");
 		t["widehat"] = Attributes(true, "&Hat;");
 		t["widetilde"] = Attributes(true, "&Tilde;");
 	}
 
-	Translator const & translator() {
-		static Translator t;
+	TranslationMap const & translationMap() {
+		static TranslationMap t;
 		if (t.empty())
-			buildTranslator(t);
+			buildTranslationMap(t);
 		return t;
 	}
 }
 
 void InsetMathDecoration::mathmlize(MathStream & os) const
 {
-	Translator const & t = translator();
-	Translator::const_iterator cur = t.find(to_utf8(key_->name));
+	TranslationMap const & t = translationMap();
+	TranslationMap::const_iterator cur = t.find(to_utf8(key_->name));
 	LASSERT(cur != t.end(), return);
 	char const * const outag = cur->second.over ? "mover" : "munder";
 	os << MTag(outag)
@@ -234,21 +240,21 @@ 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;
 	}
 
-	Translator const & t = translator();
-	Translator::const_iterator cur = t.find(name);
+	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
@@ -268,25 +274,20 @@ void InsetMathDecoration::validate(LaTeXFeatures & features) const
 	if (features.runparams().math_flavor == OutputParams::MathAsHTML) {
 		string const name = to_utf8(key_->name);
 		if (name == "bar") {
-			features.addPreambleSnippet("<style type=\"text/css\">\n"
-				"span.overbar{border-top: thin black solid;}\n"
-				"</style>");
+			features.addCSSSnippet("span.overbar{border-top: thin black solid;}");
 		} else if (name == "underbar" || name == "underline") {
-			features.addPreambleSnippet("<style type=\"text/css\">\n"
-				"span.underbar{border-bottom: thin black solid;}\n"
-				"</style>");
+			features.addCSSSnippet("span.underbar{border-bottom: thin black solid;}");
 		} else {
-			features.addPreambleSnippet("<style type=\"text/css\">\n"
+			features.addCSSSnippet(
 				"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.symbol{height: 0.5ex;}\n"
-				"</style>");
+				"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);
 }