remove symbol_def.h

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

diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C
index 9d2e777d52148f568989f8b6a59b3409e1b7fea0..f7b6238dc0f704bc9daa0bba8219e0a595812fd8 100644 (file)
--- a/src/mathed/math_dotsinset.C
+++ b/src/mathed/math_dotsinset.C
@@ -1,5 +1,3 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -11,47 +9,49 @@
 using std::ostream;
 
 
-MathDotsInset::MathDotsInset(string const & nam, int id, short st)
-       : MathedInset(nam, LM_OT_DOTS, st), code_(id) {}
+MathDotsInset::MathDotsInset(string const & name)
+       : name_(name)
+{}
 
 
-MathedInset * MathDotsInset::Clone()
+MathInset * MathDotsInset::clone() const
 {
-       return new MathDotsInset(name, code_, GetStyle());
+       return new MathDotsInset(*this);
 }     
 
 
-void MathDotsInset::draw(Painter & pain, int x, int y)
+void MathDotsInset::draw(Painter & pain, int x, int y) const
 {
-       mathed_draw_deco(pain, x + 2, y - dh_, width - 2, ascent, code_);
-       if (code_ == LM_vdots || code_ == LM_ddots)
+       mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, name_);
+       char const c = name_[0];
+       if (c == 'v' || c == 'd')
                ++x;
-       if (code_ != LM_vdots)
+       if (c != 'v')
                --y;
-       mathed_draw_deco(pain, x + 2, y - dh_, width - 2, ascent, code_);
+       mathed_draw_deco(pain, x + 2, y - dh_, width_ - 2, ascent_, name_);
 }
 
 
-void MathDotsInset::Metrics()
+void MathDotsInset::metrics(MathStyles st) const
 {
-       mathed_char_height(LM_TC_VAR, size(), 'M', ascent, descent);
-       width = mathed_char_width(LM_TC_VAR, size(), 'M');   
-       switch (code_) {
-               case LM_ldots: dh_ = 0; break;
-               case LM_cdots: dh_ = ascent/2; break;
-               case LM_vdots: width /= 2;
-               case LM_ddots: dh_ = ascent; break;
+       size(st);
+       mathed_char_dim(LM_TC_VAR, size(), '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(ostream & os, bool /* fragile */)
+void MathDotsInset::write(ostream & os, bool /* fragile */) const
 {
-       os << '\\' << name << ' ';
+       os << '\\' << name_ << ' ';
 }
 
 
-void MathDotsInset::WriteNormal(ostream & os)
+void MathDotsInset::writeNormal(ostream & os) const
 {
-       os << "[" << name << "] ";
+       os << "[" << name_ << "] ";
 }