several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C
index 93b37336d6c3ed3ecb0c881a911564a60407881a..1d27ce03cb73fa40cfe94c542538f348a39e87a3 100644 (file)
--- a/src/mathed/math_braceinset.C
+++ b/src/mathed/math_braceinset.C
@@ -6,8 +6,9 @@
 
 #include "math_braceinset.h"
 #include "math_parser.h"
-#include "mathed/support.h"
-#include "support/LOstream.h"
+#include "math_support.h"
+#include "math_mathmlstream.h"
+
 
 using std::max;
 
@@ -18,39 +19,39 @@ MathBraceInset::MathBraceInset()
 
 
 MathInset * MathBraceInset::clone() const
-{   
+{
        return new MathBraceInset(*this);
 }
 
 
-void MathBraceInset::write(MathWriteInfo & os) const
+void MathBraceInset::metrics(MathMetricsInfo & mi) const
 {
-       os << '{' << cell(0) << '}';
+       xcell(0).metrics(mi);
+       int a, d;
+       mathed_char_dim(mi.base.font, '{', a, d, wid_);
+       ascent_  = max(xcell(0).ascent(), a);
+       descent_ = max(xcell(0).descent(), a);
+       width_   = xcell(0).width() + 2 * wid_;
 }
 
 
-void MathBraceInset::writeNormal(std::ostream & os) const
+void MathBraceInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       os << "[block ";
-       cell(0).writeNormal(os);
-       os << "]";
+       LyXFont font = pi.base.font;
+       font.setColor(LColor::latex);
+       drawChar(pi, font, x, y, '{');
+       xcell(0).draw(pi, x + wid_, y);
+       drawChar(pi, font, x + width_ - wid_, y, '}');
 }
 
 
-void MathBraceInset::metrics(MathMetricsInfo const & mi) const
+void MathBraceInset::write(WriteStream & os) const
 {
-       xcell(0).metrics(mi);
-       int a, d;
-       mathed_char_dim(LM_TC_TEX, mi, '{', a, d, wid_);
-       ascent_  = std::max(xcell(0).ascent(), a);
-       descent_ = std::max(xcell(0).descent(), a);
-       width_   = xcell(0).width() + 2 * wid_;
+       os << '{' << cell(0) << '}';
 }
 
 
-void MathBraceInset::draw(Painter & pain, int x, int y) const
-{ 
-       drawChar(pain, LM_TC_TEX, mi_, x, y, '{');
-       xcell(0).draw(pain, x + wid_, y);
-       drawChar(pain, LM_TC_TEX, mi_, x + width_ - wid_, y, '}');
+void MathBraceInset::normalize(NormalStream & os) const
+{
+       os << "[block " << cell(0) << ']';
 }