X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_dotsinset.C;h=b6c460acb1352e3fc82b10c0fa2b703363580e6d;hb=d359dd8fca52c4f0100f7cf4bf636113c5c4e49f;hp=2fad8b4082e2c822c828ed399438346cf5ef0291;hpb=1b787e207d68610c6c8a1b3e21fce15891e38bef;p=lyx.git

diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C
index 2fad8b4082..b6c460acb1 100644
--- a/src/mathed/math_dotsinset.C
+++ b/src/mathed/math_dotsinset.C
@@ -1,9 +1,12 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_dotsinset.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "math_support.h"
 
 
@@ -15,40 +18,44 @@ MathDotsInset::MathDotsInset(string const & name)
 MathInset * MathDotsInset::clone() const
 {
 	return new MathDotsInset(*this);
-}     
+}
 
 
-void MathDotsInset::draw(Painter & pain, int x, int y) const
+void MathDotsInset::metrics(MathMetricsInfo & mi) const
+{
+	mathed_char_dim(mi.base.font, 'M', ascent_, descent_, width_);
+	if (name_ == "ldots" || name_ == "dotsm") 
+		dh_ = 0;
+	else if (name_ == "cdots" || name_ == "dotsb"
+			|| name_ == "dotsm" || name_ == "dotsi")
+		dh_ = ascent_ / 2;
+	else if (name_ == "dotsc")
+		dh_ = ascent_ / 4;
+	else if (name_ == "vdots")
+		width_ /= 2;
+	else if (name_ == "ddots")
+		dh_ = ascent_;
+}
+
+
+void MathDotsInset::draw(MathPainterInfo & 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')
+	if (name_ == "vdots" || name_ == "ddots")
 		++x;
-	if (c != 'v')
+	if (name_ != "vdots")
 		--y;
 	mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, name_);
 }
 
 
-void MathDotsInset::metrics(MathMetricsInfo const & mi) const
-{
-	mathed_char_dim(LM_TC_VAR, mi, '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;
-	}
-} 
-
-
-void MathDotsInset::write(MathWriteInfo & os) const
+void MathDotsInset::write(WriteStream & os) const
 {
-	os << '\\' << name_.c_str() << ' ';
+	os << '\\' << name_ << ' ';
 }
 
 
-void MathDotsInset::writeNormal(NormalStream & os) const
+void MathDotsInset::normalize(NormalStream & os) const
 {
-	os << "[" << name_.c_str() << "] ";
+	os << "[" << name_ << "] ";
 }