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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index 03657b13bc..25dd231ca4 100644
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,110 +1,123 @@
-#include <config.h>
+/**
+ * \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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_decorationinset.h"
+#include "math_data.h"
 #include "math_support.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 
+#include "debug.h"
+
+#include "support/std_ostream.h"
+
+using std::auto_ptr;
 
-MathDecorationInset::MathDecorationInset(string const & name)
-	: MathNestInset(1), name_(name)
-{}
+
+MathDecorationInset::MathDecorationInset(latexkeys const * key)
+	: MathNestInset(1), key_(key)
+{
+//	lyxerr << " creating deco " << key->name << std::endl;
+}
 
 
-MathInset * MathDecorationInset::clone() const
+auto_ptr<InsetBase> MathDecorationInset::clone() const
 {
-	return new MathDecorationInset(*this);
+	return auto_ptr<InsetBase>(new MathDecorationInset(*this));
 }
 
 
 bool MathDecorationInset::upper() const
 {
-	return name_.substr(0, 5) != "under";
+	return key_->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";
+			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
-			name_ == "overbrace" ||
-			name_ == "underbrace" ||
-			name_ == "overleftarrow" ||
-			name_ == "overrightarrow" ||
-			name_ == "overleftrightarrow" ||
-			name_ == "underleftarrow" ||
-			name_ == "underrightarrow" ||
-			name_ == "underleftrightarrow";
+			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
-			name_ == "overline" ||
-			name_ == "underline" ||
-			name_ == "overbrace" ||
-			name_ == "underbrace" ||
-			name_ == "overleftarrow" ||
-			name_ == "overrightarrow" ||
-			name_ == "overleftrightarrow" ||
-			name_ == "widehat" ||
-			name_ == "widetilde" ||
-			name_ == "underleftarrow" ||
-			name_ == "underrightarrow" ||
-			name_ == "underleftrightarrow";
+			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(MathMetricsInfo & mi) const
+void MathDecorationInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	xcell(0).metrics(mi);
-	width_   = xcell(0).width();
-	ascent_  = xcell(0).ascent();
-	descent_ = xcell(0).descent();
+	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');
+	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_;
-		ascent_ += dh_ + 1;
+		dy_ = -dim.asc - dh_;
+		dim.asc += dh_ + 1;
 	} else {
-		dy_ = descent_ + 1;
-		descent_ += dh_ + 2;
+		dy_ = dim.des + 1;
+		dim.des += dh_ + 2;
 	}
 
-	// for the angular markers
-	descent_ += 2;
-	width_   += 2;
+	metricsMarkers(dim);
+	dim_ = dim;
 }
 
 
-void MathDecorationInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathDecorationInset::draw(PainterInfo & pi, int x, int y) const
 {
-	xcell(0).draw(pi, x + 1, y);
+	cell(0).draw(pi, x + 1, y);
 	if (wide())
-		mathed_draw_deco(pi, x + 1, y + dy_, width_, dh_, name_);
+		mathed_draw_deco(pi, x + 1, y + dy_, cell(0).width(), dh_, key_->name);
 	else
-		mathed_draw_deco(pi, x + 1 + (width_ - dw_) / 2, y + dy_, dw_, dh_, name_);
+		mathed_draw_deco(pi, x + 1 + (cell(0).width() - dw_) / 2,
+			y + dy_, dw_, dh_, key_->name);
 	drawMarkers(pi, x, y);
 }
 
@@ -113,17 +126,17 @@ void MathDecorationInset::write(WriteStream & os) const
 {
 	if (os.fragile() && protect())
 		os << "\\protect";
-	os << '\\' << name_ << '{' << cell(0) << '}';
+	os << '\\' << key_->name << '{' << cell(0) << '}';
 }
 
 
 void MathDecorationInset::normalize(NormalStream & os) const
 {
-	os << "[deco " << name_ << ' ' <<  cell(0) << ']';
+	os << "[deco " << key_->name << ' ' <<  cell(0) << ']';
 }
 
 
 void MathDecorationInset::infoize(std::ostream & os) const
 {
-	os << "Deco: " << name_;
+	os << "Deco: " << key_->name;
 }