Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index f46065ade0236be17690aa250762b799e84a18c3..2b6f667fd4a8d82b1bb688d644f2e422bf11a829 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,70 +1,55 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_sizeinset.h"
+#include "math_parser.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
 #include "support/LOstream.h"
 
+using std::atoi;
 
-MathSizeInset::MathSizeInset(MathStyles st)
-       : MathInset("", LM_OT_SIMPLE, 1), style_(st)
-{
-       name_ = verbose();
-}
+MathSizeInset::MathSizeInset(latexkeys const * l)
+       : MathNestInset(1), key_(l), style_(MathStyles(atoi(l->extra.c_str())))
+{}
 
 
-char const * MathSizeInset::verbose() const
+MathInset * MathSizeInset::clone() const
 {
-       switch (style_) {
-               case LM_ST_DISPLAY:
-                       return "displaystyle";
-               case LM_ST_TEXT:
-                       return "textstyle";
-               case LM_ST_SCRIPT:
-                       return "scriptstyle";
-               case LM_ST_SCRIPTSCRIPT:
-                       return "scriptscriptstyle";
-       }
-       return "unknownstyle";
+       return new MathSizeInset(*this);
 }
 
 
-MathInset * MathSizeInset::Clone() const
+void MathSizeInset::metrics(MathMetricsInfo & mi) const
 {
-       return new MathSizeInset(*this);
+       MathStyleChanger dummy(mi.base, style_);
+       dim_ = cell(0).metrics(mi);
+       metricsMarkers2();
 }
 
 
-void MathSizeInset::draw(Painter & pain, int x, int y)
+void MathSizeInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       xo(x);
-       yo(y);
-       xcell(0).draw(pain, x, y);
+       MathStyleChanger dummy(pi.base, style_);
+       cell(0).draw(pi, x + 1, y);
+       drawMarkers2(pi, x, y);
 }
 
 
-void MathSizeInset::Metrics(MathStyles /* st */)
+void MathSizeInset::write(WriteStream & os) const
 {
-       xcell(0).Metrics(style_);
-       ascent_   = xcell(0).ascent_;
-       descent_  = xcell(0).descent_;
-       width_    = xcell(0).width_;
+       os << "{\\" << key_->name << ' ' << cell(0) << '}';
 }
 
 
-void MathSizeInset::Write(std::ostream & os, bool fragile) const
+void MathSizeInset::normalize(NormalStream & os) const
 {
-       os << "{\\" << name() << " ";
-       cell(0).Write(os, fragile);
-       os << "}";
+       os << '[' << key_->name << ' ' << cell(0) << ']';
 }
 
 
-void MathSizeInset::WriteNormal(std::ostream & os) const
+void MathSizeInset::infoize(std::ostream & os) const
 {
-       os << "[" << name() << " ";
-       cell(0).WriteNormal(os);
-       os << "]";
+       os << "Size: " << key_->name;
 }