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 35a2515d6b07c57555e5b058544f684482abd497..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)
@@ -84,8 +84,6 @@ void MathDecorationInset::metrics(MathMetricsInfo const & st) const
 
 void MathDecorationInset::draw(Painter & pain, int x, int y) const
 { 
-       xo(x);
-       yo(x);
        xcell(0).draw(pain, x, y);
        if (wide()) 
                mathed_draw_deco(pain, x, y + dy_, width_, dh_, name_);
@@ -96,17 +94,15 @@ void MathDecorationInset::draw(Painter & pain, int x, int y) const
 }
 
 
-void MathDecorationInset::write(MathWriteInfo & os) const
+void MathDecorationInset::write(WriteStream & os) const
 {
-       if (os.fragile && protect())
+       if (os.fragile() && protect())
                os << "\\protect";
        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) << ']';
 }