X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_dotsinset.C;h=b6c460acb1352e3fc82b10c0fa2b703363580e6d;hb=e093e5e80c334995a77445c8e66a9f3c9594dda1;hp=1391970bc0e77cc3698d3a378cd46e93b91ae718;hpb=8b7b3a589507e2bed9777f2854ea731c454492e4;p=lyx.git

diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C
index 1391970bc0..b6c460acb1 100644
--- a/src/mathed/math_dotsinset.C
+++ b/src/mathed/math_dotsinset.C
@@ -1,57 +1,61 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_dotsinset.h"
-#include "mathed/support.h"
-#include "mathed/math_parser.h"
-#include "support/LOstream.h"
-
-using std::ostream;
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
 
 
-MathDotsInset::MathDotsInset(latexkeys const * key)
-	: key_(key)
+MathDotsInset::MathDotsInset(string const & name)
+	: name_(name)
 {}
 
 
 MathInset * MathDotsInset::clone() const
 {
 	return new MathDotsInset(*this);
-}     
+}
+
 
+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(Painter & pain, int x, int y) const
+
+void MathDotsInset::draw(MathPainterInfo & pain, int x, int y) const
 {
-	mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, key_->id);
-	if (key_->id == LM_vdots || key_->id == LM_ddots)
+	mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, name_);
+	if (name_ == "vdots" || name_ == "ddots")
 		++x;
-	if (key_->id != LM_vdots)
+	if (name_ != "vdots")
 		--y;
-	mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, key_->id);
+	mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, name_);
 }
 
 
-void MathDotsInset::metrics(MathStyles st) const
-{
-	size(st);
-	mathed_char_dim(LM_TC_VAR, size(), 'M', ascent_, descent_, width_);
-	switch (key_->id) {
-		case LM_ldots: dh_ = 0; break;
-		case LM_cdots: dh_ = ascent_ / 2; break;
-		case LM_vdots: width_ /= 2;
-		case LM_ddots: dh_ = ascent_; break;
-	}
-} 
-
-
-void MathDotsInset::write(ostream & os, bool /* fragile */) const
+void MathDotsInset::write(WriteStream & os) const
 {
-	os << '\\' << key_->name << ' ';
+	os << '\\' << name_ << ' ';
 }
 
 
-void MathDotsInset::writeNormal(ostream & os) const
+void MathDotsInset::normalize(NormalStream & os) const
 {
-	os << "[" << key_->name << "] ";
+	os << "[" << name_ << "] ";
 }