X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_decorationinset.C;h=25dd231ca4ab8fe5679d1dd8f2c111c24e9ba69e;hb=edbef46cd7865dab72ab6b503d62e2492479d297;hp=45bea19ae6331d70e32d966d786b7c08ca86bcf9;hpb=655e17854904a7b82a31fe545edd001fdf37009b;p=lyx.git

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index 45bea19ae6..25dd231ca4 100644
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,74 +1,142 @@
+/**
+ * \file math_decorationinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "math_decorationinset.h"
-#include "math_iter.h"
-#include "mathed/support.h"
+#include "math_data.h"
+#include "math_support.h"
 #include "math_parser.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+
+#include "debug.h"
 
-using std::ostream;
+#include "support/std_ostream.h"
 
+using std::auto_ptr;
 
-MathDecorationInset::MathDecorationInset(int d, short st)
-	: MathParInset(st, "", LM_OT_DECO), deco_(d)
+
+MathDecorationInset::MathDecorationInset(latexkeys const * key)
+	: MathNestInset(1), key_(key)
 {
-	upper_ = (deco_ != LM_underline && deco_ != LM_underbrace);
+//	lyxerr << " creating deco " << key->name << std::endl;
 }
 
 
-bool MathDecorationInset::GetLimits() const
-{ 
-	return deco_ == LM_underbrace || deco_ == LM_overbrace;
-}    
+auto_ptr<InsetBase> MathDecorationInset::clone() const
+{
+	return auto_ptr<InsetBase>(new MathDecorationInset(*this));
+}
 
 
-MathedInset * MathDecorationInset::Clone()
-{   
-	return new MathDecorationInset(*this);
+bool MathDecorationInset::upper() const
+{
+	return key_->name.substr(0, 5) != "under";
 }
 
 
-void
-MathDecorationInset::draw(Painter & pain, int x, int y)
-{ 
-	MathParInset::draw(pain, x + (width - dw_) / 2, y);
-	mathed_draw_deco(pain, x, y + dy_, width, dh_, deco_);
+bool MathDecorationInset::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";
+}
+
+
+bool MathDecorationInset::protect() 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";
+}
+
+
+bool MathDecorationInset::wide() const
+{
+	return
+			key_->name == "overline" ||
+			key_->name == "underline" ||
+			key_->name == "overbrace" ||
+			key_->name == "underbrace" ||
+			key_->name == "overleftarrow" ||
+			key_->name == "overrightarrow" ||
+			key_->name == "overleftrightarrow" ||
+			key_->name == "widehat" ||
+			key_->name == "widetilde" ||
+			key_->name == "underleftarrow" ||
+			key_->name == "underrightarrow" ||
+			key_->name == "underleftrightarrow";
 }
 
 
-void
-MathDecorationInset::Metrics()
+void MathDecorationInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	int h = 2 * mathed_char_height(LM_TC_VAR, size(), 'I',
-				       ascent, descent);  
-	MathParInset::Metrics();
-	int w = Width() + 4;
-	if (w < 16) w = 16;
-	dh_ = w / 5;
-	if (dh_ > h) dh_ = h;
-	
-	if (upper_) {
-		ascent += dh_ + 2;
-		dy_ = -ascent;
+	cell(0).metrics(mi, dim);
+
+	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_ = -dim.asc - dh_;
+		dim.asc += dh_ + 1;
 	} else {
-		dy_ = descent + 2;
-		descent += dh_ + 4;
+		dy_ = dim.des + 1;
+		dim.des += dh_ + 2;
 	}
-	dw_ = width;
-	width = w;
+
+	metricsMarkers(dim);
+	dim_ = dim;
+}
+
+
+void MathDecorationInset::draw(PainterInfo & pi, int x, int y) const
+{
+	cell(0).draw(pi, x + 1, y);
+	if (wide())
+		mathed_draw_deco(pi, x + 1, y + dy_, cell(0).width(), dh_, key_->name);
+	else
+		mathed_draw_deco(pi, x + 1 + (cell(0).width() - dw_) / 2,
+			y + dy_, dw_, dh_, key_->name);
+	drawMarkers(pi, x, y);
 }
 
 
-void MathDecorationInset::Write(ostream & os, bool fragile)
+void MathDecorationInset::write(WriteStream & os) const
 {
-	latexkeys const * l = lm_get_key_by_id(deco_, LM_TK_WIDE);
-	if (fragile &&
-	    (strcmp(l->name, "overbrace") == 0 ||
-	     strcmp(l->name, "underbrace") == 0 ||
-	     strcmp(l->name, "overleftarrow") == 0 ||
-	     strcmp(l->name, "overrightarrow") == 0))
+	if (os.fragile() && protect())
 		os << "\\protect";
-	os << '\\' << l->name << '{';
-	MathParInset::Write(os, fragile);  
-	os << '}';
+	os << '\\' << key_->name << '{' << cell(0) << '}';
+}
+
+
+void MathDecorationInset::normalize(NormalStream & os) const
+{
+	os << "[deco " << key_->name << ' ' <<  cell(0) << ']';
+}
+
+
+void MathDecorationInset::infoize(std::ostream & os) const
+{
+	os << "Deco: " << key_->name;
 }