Fix drawing of empty boxes

[lyx.git] / src / mathed / InsetMathBrace.cpp

diff --git a/src/mathed/InsetMathBrace.cpp b/src/mathed/InsetMathBrace.cpp
index c1034c9aeeb1f662e48478c7b8fb7e25493b6d2e..3a452c03862a94f8763a218421994a1953324657 100644 (file)
--- a/src/mathed/InsetMathBrace.cpp
+++ b/src/mathed/InsetMathBrace.cpp
@@ -21,6 +21,7 @@
 #include "frontends/Painter.h"
 
 #include <ostream>
+#include <algorithm>
 
 using namespace std;
 
@@ -48,17 +49,19 @@ void InsetMathBrace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        Dimension dim0;
        cell(0).metrics(mi, dim0);
-       Dimension t = theFontMetrics(mi.base.font).dimension('{');
+       FontInfo font = mi.base.font;
+       augmentFont(font, "mathnormal");
+       Dimension t = theFontMetrics(font).dimension('{');
        dim.asc = max(dim0.asc, t.asc);
        dim.des = max(dim0.des, t.des);
        dim.wid = dim0.width() + 2 * t.wid;
-       metricsMarkers(dim);
 }
 
 
 void InsetMathBrace::draw(PainterInfo & pi, int x, int y) const
 {
        FontInfo font = pi.base.font;
+       augmentFont(font, "mathnormal");
        font.setShape(UP_SHAPE);
        font.setColor(Color_latex);
        Dimension t = theFontMetrics(font).dimension('{');
@@ -66,7 +69,6 @@ void InsetMathBrace::draw(PainterInfo & pi, int x, int y) const
        cell(0).draw(pi, x + t.wid, y);
        Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        pi.pain.text(x + t.wid + dim0.width(), y, '}', font);
-       drawMarkers(pi, x, y);
 }
 
 
@@ -100,6 +102,12 @@ void InsetMathBrace::mathmlize(MathStream & os) const
 }
 
 
+void InsetMathBrace::htmlize(HtmlStream & os) const
+{
+       os << cell(0);
+}
+
+
 void InsetMathBrace::mathematica(MathematicaStream & os) const
 {
        os << cell(0);