rename the members of Dimension

[lyx.git] / src / mathed / math_dotsinset.C

diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C
index 1391970bc0e77cc3698d3a378cd46e93b91ae718..821ad4c70c92d55ff383644b1666d06f826e5c2a 100644 (file)
--- a/src/mathed/math_dotsinset.C
+++ b/src/mathed/math_dotsinset.C
@@ -1,13 +1,11 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
-#include "math_dotsinset.h"
-#include "mathed/support.h"
-#include "mathed/math_parser.h"
-#include "support/LOstream.h"
 
-using std::ostream;
+#include "math_dotsinset.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
+#include "math_parser.h"
 
 
 MathDotsInset::MathDotsInset(latexkeys const * key)
@@ -18,40 +16,39 @@ MathDotsInset::MathDotsInset(latexkeys const * key)
 MathInset * MathDotsInset::clone() const
 {
        return new MathDotsInset(*this);
-}     
-
-
-void MathDotsInset::draw(Painter & 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)
-               ++x;
-       if (key_->id != LM_vdots)
-               --y;
-       mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, key_->id);
 }
 
 
-void MathDotsInset::metrics(MathStyles st) const
+void MathDotsInset::metrics(MetricsInfo & mi) 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;
+       mathed_char_dim(mi.base.font, 'M', dim_);
+       dh_ = 0;
+       if (key_->name == "cdots" || key_->name == "dotsb"
+                       || key_->name == "dotsm" || key_->name == "dotsi")
+               dh_ = ascent() / 2;
+       else if (key_->name == "dotsc")
+               dh_ = ascent() / 4;
+       else if (key_->name == "vdots") {
+               dim_.wid = (dim_.wid / 2) + 1;
+               dh_ = ascent();
        }
-} 
+       else if (key_->name == "ddots")
+               dh_ = ascent();
+}
 
 
-void MathDotsInset::write(ostream & os, bool /* fragile */) const
+void MathDotsInset::draw(PainterInfo & pain, int x, int y) const
 {
-       os << '\\' << key_->name << ' ';
+       mathed_draw_deco(pain, x + 2, y - dh_, width() - 2, ascent(), key_->name);
+       if (key_->name == "vdots" || key_->name == "ddots")
+               ++x;
+       if (key_->name != "vdots")
+               --y;
+       mathed_draw_deco(pain, x + 2, y - dh_, width() - 2, ascent(), key_->name);
 }
 
 
-void MathDotsInset::writeNormal(ostream & os) const
+string MathDotsInset::name() const
 {
-       os << "[" << key_->name << "] ";
+       return key_->name;
 }