X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDecoration.cpp;h=908a887eebb5bbea01d8a944d3885293b42a2acc;hb=0cba074ecf0e25ede759ee1f817a7cfec06537d6;hp=d47c1a9c57786d0af753df1cc771b24e2d4f8b5f;hpb=38628558a6af8d8a13e55546e99365dda1dca9e5;p=lyx.git

diff --git a/src/mathed/InsetMathDecoration.cpp b/src/mathed/InsetMathDecoration.cpp
index d47c1a9c57..908a887eeb 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,7 @@ 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 = mi.base.changeEnsureMath(currentMode());
 
 	cell(0).metrics(mi, dim);
 
@@ -119,25 +119,20 @@ void InsetMathDecoration::metrics(MetricsInfo & mi, Dimension & dim) const
 		dy_ = dim.des + 1;
 		dim.des += dh_ + 2;
 	}
-
-	metricsMarkers(dim);
 }
 
 
 void InsetMathDecoration::draw(PainterInfo & pi, int x, int y) const
 {
-	FontSetChanger dummy(pi.base, currentMode() == TEXT_MODE ?
-				"textnormal" : "mathnormal");
+	Changer dummy = pi.base.changeEnsureMath(currentMode());
 
-	cell(0).draw(pi, x + 1, y);
+	cell(0).draw(pi, x, y);
 	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
 	if (wide())
 		mathed_draw_deco(pi, x + 1, y + dy_, dim0.wid, dh_, key_->name);
 	else
 		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,13 +155,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;
@@ -201,6 +196,8 @@ 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;");
@@ -212,7 +209,7 @@ namespace {
 			buildTranslationMap(t);
 		return t;
 	}
-}
+} // namespace
 
 void InsetMathDecoration::mathmlize(MathStream & os) const
 {
@@ -234,7 +231,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;
@@ -243,12 +240,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
@@ -268,25 +265,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);
 }