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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index dd87a10ec5..32693a5667 100644
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,41 +1,91 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_decorationinset.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "math_parser.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "support/LOstream.h"
 
 
-using std::ostream;
+MathDecorationInset::MathDecorationInset(string const & name)
+	: MathNestInset(1), name_(name)
+{}
 
 
-MathDecorationInset::MathDecorationInset(latexkeys const * key)
-	: MathInset(1), key_(key)
+MathInset * MathDecorationInset::clone() const
 {
-	upper_ = key_->id != LM_underline && key_->id != LM_underbrace;
+	return new MathDecorationInset(*this);
 }
 
 
-MathInset * MathDecorationInset::clone() const
-{   
-	return new MathDecorationInset(*this);
+bool MathDecorationInset::upper() const
+{
+	return name_.substr(0, 5) != "under";
+}
+
+
+bool MathDecorationInset::isScriptable() const
+{
+	return
+			name_ == "overbrace" ||
+			name_ == "underbrace" ||
+			name_ == "overleftarrow" ||
+			name_ == "overrightarrow" ||
+			name_ == "overleftrightarrow" ||
+			name_ == "underleftarrow" ||
+			name_ == "underrightarrow" ||
+			name_ == "underleftrightarrow";
+}
+
+
+bool MathDecorationInset::protect() const
+{
+	return
+			name_ == "overbrace" ||
+			name_ == "underbrace" ||
+			name_ == "overleftarrow" ||
+			name_ == "overrightarrow" ||
+			name_ == "overleftrightarrow" ||
+			name_ == "underleftarrow" ||
+			name_ == "underrightarrow" ||
+			name_ == "underleftrightarrow";
 }
 
 
+bool MathDecorationInset::wide() const
+{
+	return
+			name_ == "overline" ||
+			name_ == "underline" ||
+			name_ == "overbrace" ||
+			name_ == "underbrace" ||
+			name_ == "overleftarrow" ||
+			name_ == "overrightarrow" ||
+			name_ == "overleftrightarrow" ||
+			name_ == "widehat" ||
+			name_ == "widetilde" ||
+			name_ == "underleftarrow" ||
+			name_ == "underrightarrow" ||
+			name_ == "underleftrightarrow";
+}
+
 
-void MathDecorationInset::metrics(MathStyles st)
+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_ = 5; //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_) {
+	if (upper()) {
 		dy_ = -ascent_ - dh_;
 		ascent_ += dh_ + 1;
 	} else {
@@ -43,48 +93,38 @@ void MathDecorationInset::metrics(MathStyles st)
 		descent_ += dh_ + 2;
 	}
 
-	if (key_->id == LM_not) {
-		ascent_  += dh_;
-		descent_ += dh_;
-		dh_ = height();
-		dy_ = - ascent_;
-	}
+	// for the angular markers
+	descent_ += 2;
+	width_   += 2;
 }
 
-void MathDecorationInset::draw(Painter & pain, int x, int y)
-{ 
-	xo(x);
-	yo(x);
-	xcell(0).draw(pain, x, y);
-	mathed_draw_deco(pain, x, y + dy_, width_, dh_, key_->id);
+
+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);
 }
 
 
-void MathDecorationInset::write(ostream & os, bool fragile) const
+void MathDecorationInset::write(WriteStream & os) const
 {
-	string name = key_->name;
-	if (fragile &&
-			(name == "overbrace" ||
-			 name == "underbrace" ||
-			 name == "overleftarrow" ||
-			 name == "overrightarrow"))
+	if (os.fragile() && protect())
 		os << "\\protect";
-	os << '\\' << name;
-
-	if (key_->id == LM_not)
-		os << ' ';
-	else
-		os << '{';
+	os << '\\' << name_ << '{' << cell(0) << '}';
+}
 
-	cell(0).write(os, fragile);  
 
-	if (key_->id != LM_not)
-		os << '}';
+void MathDecorationInset::normalize(NormalStream & os) const
+{
+	os << "[deco " << name_ << ' ' <<  cell(0) << ']';
 }
 
-void MathDecorationInset::writeNormal(ostream & os) const
+
+void MathDecorationInset::infoize(std::ostream & os) const
 {
-	os << "[" << key_->name << " ";
-	cell(0).writeNormal(os);
-	os << "] ";
+	os << "Deco: " << name_;
 }