X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_decorationinset.C;h=32693a56672bf09be942f1301767cb4b23a8aa33;hb=254272868f1d891b9d0a778f871afb23cce84081;hp=26193af9c5dcadbaf1ee6d63b4f9042341100672;hpb=e7689a2ed7dfbdde6f7eac23fd50c5bce83ffac3;p=lyx.git

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index 26193af9c5..32693a5667 100644
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -9,6 +9,7 @@
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "support/LOstream.h"
 
 
 MathDecorationInset::MathDecorationInset(string const & name)
@@ -17,17 +18,14 @@ MathDecorationInset::MathDecorationInset(string const & name)
 
 
 MathInset * MathDecorationInset::clone() const
-{   
+{
 	return new MathDecorationInset(*this);
 }
 
 
 bool MathDecorationInset::upper() const
 {
-	return
-			name_ != "underbar" &&
-			name_ != "underline" &&
-			name_ != "underbrace";
+	return name_.substr(0, 5) != "under";
 }
 
 
@@ -37,7 +35,11 @@ bool MathDecorationInset::isScriptable() const
 			name_ == "overbrace" ||
 			name_ == "underbrace" ||
 			name_ == "overleftarrow" ||
-			name_ == "overrightarrow";
+			name_ == "overrightarrow" ||
+			name_ == "overleftrightarrow" ||
+			name_ == "underleftarrow" ||
+			name_ == "underrightarrow" ||
+			name_ == "underleftrightarrow";
 }
 
 
@@ -47,7 +49,11 @@ bool MathDecorationInset::protect() const
 			name_ == "overbrace" ||
 			name_ == "underbrace" ||
 			name_ == "overleftarrow" ||
-			name_ == "overrightarrow";
+			name_ == "overrightarrow" ||
+			name_ == "overleftrightarrow" ||
+			name_ == "underleftarrow" ||
+			name_ == "underrightarrow" ||
+			name_ == "underleftrightarrow";
 }
 
 
@@ -60,20 +66,24 @@ bool MathDecorationInset::wide() const
 			name_ == "underbrace" ||
 			name_ == "overleftarrow" ||
 			name_ == "overrightarrow" ||
+			name_ == "overleftrightarrow" ||
 			name_ == "widehat" ||
-			name_ == "widetilde";
+			name_ == "widetilde" ||
+			name_ == "underleftarrow" ||
+			name_ == "underrightarrow" ||
+			name_ == "underleftrightarrow";
 }
 
 
-void MathDecorationInset::metrics(MathMetricsInfo const & st) const
+void MathDecorationInset::metrics(MathMetricsInfo & mi) const
 {
-	xcell(0).metrics(st);
-	size_    = st;
+	xcell(0).metrics(mi);
 	width_   = xcell(0).width();
 	ascent_  = xcell(0).ascent();
 	descent_ = xcell(0).descent();
 
-	dh_ = 6; //mathed_char_height(LM_TC_VAR, size(), 'I', ascent_, descent_);  
+	dh_ = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
+	dw_ = 6; //mathed_char_width(LM_TC_VAR, mi, 'x');
 
 	if (upper()) {
 		dy_ = -ascent_ - dh_;
@@ -82,18 +92,21 @@ void MathDecorationInset::metrics(MathMetricsInfo const & st) const
 		dy_ = descent_ + 1;
 		descent_ += dh_ + 2;
 	}
+
+	// for the angular markers
+	descent_ += 2;
+	width_   += 2;
 }
 
 
-void MathDecorationInset::draw(Painter & pain, int x, int y) const
-{ 
-	xcell(0).draw(pain, x, y);
-	if (wide()) 
-		mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
-	else {
-		int w = mathed_char_width(LM_TC_VAR, size_, 'x'); 
-		mathed_draw_deco(pain, x + (width_ - w) / 2, y + dy_, w, dh_, name_);
-	}
+void MathDecorationInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+	xcell(0).draw(pi, x + 1, y);
+	if (wide())
+		mathed_draw_deco(pi, x + 1, y + dy_, width_, dh_, name_);
+	else
+		mathed_draw_deco(pi, x + 1 + (width_ - dw_) / 2, y + dy_, dw_, dh_, name_);
+	drawMarkers(pi, x, y);
 }
 
 
@@ -109,3 +122,9 @@ void MathDecorationInset::normalize(NormalStream & os) const
 {
 	os << "[deco " << name_ << ' ' <<  cell(0) << ']';
 }
+
+
+void MathDecorationInset::infoize(std::ostream & os) const
+{
+	os << "Deco: " << name_;
+}