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

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

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index 0213ad027f65bd47b2e31ed4f1c582903443ff4d..b447e594b701227d4f0e7ccc8375ed23f2a93241 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -1,14 +1,14 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_decorationinset.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "math_parser.h"
-#include "support/LOstream.h"
-
-
-using std::ostream;
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
 
 
 MathDecorationInset::MathDecorationInset(string const & name)
@@ -48,7 +48,21 @@ bool MathDecorationInset::protect() const
 }
 
 
-void MathDecorationInset::metrics(MathStyles st) const
+bool MathDecorationInset::wide() const
+{
+       return
+                       name_ == "overline" ||
+                       name_ == "underline" ||
+                       name_ == "overbrace" ||
+                       name_ == "underbrace" ||
+                       name_ == "overleftarrow" ||
+                       name_ == "overrightarrow" ||
+                       name_ == "widehat" ||
+                       name_ == "widetilde";
+}
+
+
+void MathDecorationInset::metrics(MathMetricsInfo const & st) const
 {
        xcell(0).metrics(st);
        size_    = st;
@@ -70,26 +84,25 @@ void MathDecorationInset::metrics(MathStyles st) const
 
 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_, name_);
+       if (wide()) 
+               mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
+       else {
+               int w = 2 + mathed_char_width(LM_TC_VAR, size_, 'x'); 
+               mathed_draw_deco(pain, x + (width_ - w) / 2, y + dy_, w, dh_, name_);
+       }
 }
 
 
-void MathDecorationInset::write(ostream & os, bool fragile) const
+void MathDecorationInset::write(WriteStream & os) const
 {
-       if (fragile && protect())
+       if (os.fragile() && protect())
                os << "\\protect";
-       os << '\\' << name_ << '{';
-       cell(0).write(os, fragile);  
-       os << '}';
+       os << '\\' << name_ << '{' << cell(0) << '}';
 }
 
 
-void MathDecorationInset::writeNormal(ostream & os) const
+void MathDecorationInset::normalize(NormalStream & os) const
 {
-       os << "[" << name_ << " ";
-       cell(0).writeNormal(os);
-       os << "] ";
+       os << "[deco " << name_ << ' ' <<  cell(0) << ']';
 }