make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_dotsinset.C b/src/mathed/math_dotsinset.C
index d173a3bb71e16ef4181f24f2452a97469e323901..2615aed1df585f187a82160e35373763ad2c5006 100644 (file)
--- a/src/mathed/math_dotsinset.C
+++ b/src/mathed/math_dotsinset.C
@@ -5,14 +5,13 @@
 #endif
 
 #include "math_dotsinset.h"
-#include "mathed/support.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
 
-using std::ostream;
 
-
-MathDotsInset::MathDotsInset(string const & name, int id)
-       : MathInset(0, name), code_(id)
+MathDotsInset::MathDotsInset(string const & name)
+       : name_(name)
 {}
 
 
@@ -22,37 +21,37 @@ MathInset * MathDotsInset::clone() const
 }     
 
 
-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(MathStyles st)
+void MathDotsInset::metrics(MathMetricsInfo const & mi) const
 {
-       size(st);
-       mathed_char_dim(LM_TC_VAR, size(), 'M', ascent_, descent_, width_);
-       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;
+       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(ostream & os, bool /* fragile */) const
+void MathDotsInset::write(WriteStream & os) const
 {
-       os << '\\' << name() << ' ';
+       os << '\\' << name_ << ' ';
 }
 
 
-void MathDotsInset::WriteNormal(ostream & os) const
+void MathDotsInset::normalize(NormalStream & os) const
 {
-       os << "[" << name() << "] ";
+       os << "[" << name_ << "] ";
 }