Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index aec0bb25f22efbebbe6c8880b0f52f8634c28f2f..2701258775b3c71d29a21c40fb6676513c4b1fde 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,90 +1,122 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
+
 
 #include "math_decorationinset.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "math_parser.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "support/LOstream.h"
 
 
-using std::ostream;
-
-
 MathDecorationInset::MathDecorationInset(latexkeys const * key)
        : MathNestInset(1), key_(key)
-{
-       upper_ = key_->id != LM_underline && key_->id != LM_underbrace;
-}
+{}
 
 
 MathInset * MathDecorationInset::clone() const
-{   
+{
        return new MathDecorationInset(*this);
 }
 
 
+bool MathDecorationInset::upper() const
+{
+       return key_->name.substr(0, 5) != "under";
+}
+
+
+bool MathDecorationInset::isScriptable() const
+{
+       return
+                       key_->name == "overbrace" ||
+                       key_->name == "underbrace" ||
+                       key_->name == "overleftarrow" ||
+                       key_->name == "overrightarrow" ||
+                       key_->name == "overleftrightarrow" ||
+                       key_->name == "underleftarrow" ||
+                       key_->name == "underrightarrow" ||
+                       key_->name == "underleftrightarrow";
+}
+
+
+bool MathDecorationInset::protect() const
+{
+       return
+                       key_->name == "overbrace" ||
+                       key_->name == "underbrace" ||
+                       key_->name == "overleftarrow" ||
+                       key_->name == "overrightarrow" ||
+                       key_->name == "overleftrightarrow" ||
+                       key_->name == "underleftarrow" ||
+                       key_->name == "underrightarrow" ||
+                       key_->name == "underleftrightarrow";
+}
 
-void MathDecorationInset::metrics(MathStyles st) const
+
+bool MathDecorationInset::wide() const
 {
-       xcell(0).metrics(st);
-       size_    = st;
-       width_   = xcell(0).width();
-       ascent_  = xcell(0).ascent();
-       descent_ = xcell(0).descent();
+       return
+                       key_->name == "overline" ||
+                       key_->name == "underline" ||
+                       key_->name == "overbrace" ||
+                       key_->name == "underbrace" ||
+                       key_->name == "overleftarrow" ||
+                       key_->name == "overrightarrow" ||
+                       key_->name == "overleftrightarrow" ||
+                       key_->name == "widehat" ||
+                       key_->name == "widetilde" ||
+                       key_->name == "underleftarrow" ||
+                       key_->name == "underrightarrow" ||
+                       key_->name == "underleftrightarrow";
+}
 
-       dh_ = 5; //mathed_char_height(LM_TC_VAR, size(), 'I', ascent_, descent_);  
 
-       if (upper_) {
-               dy_ = -ascent_ - dh_;
-               ascent_ += dh_ + 1;
+void MathDecorationInset::metrics(MathMetricsInfo & mi) const
+{
+       cell(0).metrics(mi);
+       dim_ = cell(0).dim();
+       dh_  = 6; //mathed_char_height(LM_TC_VAR, mi, 'I', ascent_, descent_);
+       dw_  = 6; //mathed_char_width(LM_TC_VAR, mi, 'x');
+
+       if (upper()) {
+               dy_ = -dim_.a - dh_;
+               dim_.a += dh_ + 1;
        } else {
-               dy_ = descent_ + 1;
-               descent_ += dh_ + 2;
+               dy_ = dim_.d + 1;
+               dim_.d += dh_ + 2;
        }
 
-       if (key_->id == LM_not) {
-               ascent_  += dh_;
-               descent_ += dh_;
-               dh_ = height();
-               dy_ = - ascent_;
-       }
+       metricsMarkers();
 }
 
-void MathDecorationInset::draw(Painter & pain, int x, int y) const
-{ 
-       xo(x);
-       yo(x);
-       xcell(0).draw(pain, x, y);
-       mathed_draw_deco(pain, x, y + dy_, width_, dh_, key_->id);
+
+void MathDecorationInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+       cell(0).draw(pi, x + 1, y);
+       if (wide())
+               mathed_draw_deco(pi, x + 1, y + dy_, width(), dh_, key_->name);
+       else
+               mathed_draw_deco(pi, x + 1 + (width() - dw_) / 2, y + dy_, dw_, dh_, key_->name);
+       drawMarkers(pi, x, y);
 }
 
 
-void MathDecorationInset::write(ostream & os, bool fragile) const
+void MathDecorationInset::write(WriteStream & os) const
 {
-       string name = key_->name;
-       if (fragile &&
-                       (name == "overbrace" ||
-                        name == "underbrace" ||
-                        name == "overleftarrow" ||
-                        name == "overrightarrow"))
+       if (os.fragile() && protect())
                os << "\\protect";
-       os << '\\' << name;
-
-       if (key_->id == LM_not)
-               os << ' ';
-       else
-               os << '{';
+       os << '\\' << key_->name << '{' << cell(0) << '}';
+}
 
-       cell(0).write(os, fragile);  
 
-       if (key_->id != LM_not)
-               os << '}';
+void MathDecorationInset::normalize(NormalStream & os) const
+{
+       os << "[deco " << key_->name << ' ' <<  cell(0) << ']';
 }
 
-void MathDecorationInset::writeNormal(ostream & os) const
+
+void MathDecorationInset::infoize(std::ostream & os) const
 {
-       os << "[" << key_->name << " ";
-       cell(0).writeNormal(os);
-       os << "] ";
+       os << "Deco: " << key_->name;
 }