X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_dotsinset.C;h=8ab3afe6feec3c4f4b2d737091087297c96cef60;hb=3e93baac3cd18e27db3eb2a1fcaf90b25e0918a6;hp=fd2585452304cfef55f29777960a16efcbc8365e;hpb=2b8ef58dc021912b2862328b9000cfe37578ea37;p=lyx.git

diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C
index fd25854523..8ab3afe6fe 100644
--- a/src/mathed/math_dotsinset.C
+++ b/src/mathed/math_dotsinset.C
@@ -1,59 +1,71 @@
-#include <config.h>
+/**
+ * \file math_dotsinset.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_dotsinset.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
 #include "math_support.h"
+#include "math_parser.h"
+
+
+using std::string;
+using std::auto_ptr;
 
 
-MathDotsInset::MathDotsInset(string const & name)
-	: name_(name)
+MathDotsInset::MathDotsInset(latexkeys const * key)
+	: key_(key)
 {}
 
 
-MathInset * MathDotsInset::clone() const
+auto_ptr<InsetBase> MathDotsInset::clone() const
 {
-	return new MathDotsInset(*this);
+	return auto_ptr<InsetBase>(new MathDotsInset(*this));
 }
 
 
-void MathDotsInset::metrics(MathMetricsInfo const & mi) const
+void MathDotsInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	LyXFont font;
-	whichFont(font, LM_TC_VAR, mi);
-	mathed_char_dim(font, 'M', ascent_, descent_, width_);
-	switch (name_[0]) {
-		case 'l': dh_ = 0; break;
-		case 'c': dh_ = ascent_ / 2; break;
-		case 'v': width_ /= 2;
-		case 'd': dh_ = ascent_; break;
+	mathed_char_dim(mi.base.font, 'M', dim);
+	dh_ = 0;
+	if (key_->name == "cdots" || key_->name == "dotsb"
+			|| key_->name == "dotsm" || key_->name == "dotsi")
+		dh_ = dim.asc / 2;
+	else if (key_->name == "dotsc")
+		dh_ = dim.asc / 4;
+	else if (key_->name == "vdots") {
+		dim.wid = (dim.wid / 2) + 1;
+		dh_ = dim.asc;
 	}
+	else if (key_->name == "ddots")
+		dh_ = dim.asc;
+	dim_ = dim;
 }
 
 
-void MathDotsInset::draw(Painter & pain, int x, int y) const
+void MathDotsInset::draw(PainterInfo & pain, int x, int y) const
 {
-	mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, name_);
-	char const c = name_[0];
-	if (c == 'v' || c == 'd')
+	mathed_draw_deco(pain, x + 2, y - dh_, dim_.width() - 2, dim_.ascent(),
+		key_->name);
+	if (key_->name == "vdots" || key_->name == "ddots")
 		++x;
-	if (c != 'v')
+	if (key_->name != "vdots")
 		--y;
-	mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, name_);
-}
-
-
-void MathDotsInset::write(WriteStream & os) const
-{
-	os << '\\' << name_ << ' ';
+	mathed_draw_deco(pain, x + 2, y - dh_, dim_.width() - 2, dim_.ascent(),
+		key_->name);
+	setPosCache(pain, x, y);
 }
 
 
-void MathDotsInset::normalize(NormalStream & os) const
+string MathDotsInset::name() const
 {
-	os << "[" << name_ << "] ";
+	return key_->name;
 }