X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBrace.cpp;h=8b06f6d546d06c9095814b75dd12c8209b764d61;hb=c9d9309c1ecffa218dee04ce4f7991ed4fc0c9bb;hp=e096c7a3ce3bf6fff03e084d72b147a55fc72617;hpb=31059d1741933d95403e7f07ed033cae482f778b;p=lyx.git

diff --git a/src/mathed/InsetMathBrace.cpp b/src/mathed/InsetMathBrace.cpp
index e096c7a3ce..8b06f6d546 100644
--- a/src/mathed/InsetMathBrace.cpp
+++ b/src/mathed/InsetMathBrace.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,63 +11,65 @@
 #include <config.h>
 
 #include "InsetMathBrace.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "LColor.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/std_ostream.h"
-
-namespace lyx {
+#include <ostream>
+#include <algorithm>
 
-using std::max;
-using std::auto_ptr;
+using namespace std;
 
+namespace lyx {
 
-InsetMathBrace::InsetMathBrace()
-	: InsetMathNest(1)
+InsetMathBrace::InsetMathBrace(Buffer * buf)
+	: InsetMathNest(buf, 1)
 {}
 
 
 InsetMathBrace::InsetMathBrace(MathData const & ar)
-	: InsetMathNest(1)
+	: InsetMathNest(const_cast<Buffer *>(ar.buffer()), 1)
 {
 	cell(0) = ar;
 }
 
 
-auto_ptr<InsetBase> InsetMathBrace::doClone() const
+Inset * InsetMathBrace::clone() const
 {
-	return auto_ptr<InsetBase>(new InsetMathBrace(*this));
+	return new InsetMathBrace(*this);
 }
 
 
-bool InsetMathBrace::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathBrace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	cell(0).metrics(mi);
-	Dimension t = theFontMetrics(mi.base.font).dimension('{');
-	dim.asc = max(cell(0).ascent(), t.asc);
-	dim.des = max(cell(0).descent(), t.des);
-	dim.wid = cell(0).width() + 2 * t.wid;
+	Dimension dim0;
+	cell(0).metrics(mi, dim0);
+	FontInfo font = mi.base.font;
+	augmentFont(font, from_ascii("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);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }
 
 
 void InsetMathBrace::draw(PainterInfo & pi, int x, int y) const
 {
-	LyXFont font = pi.base.font;
-	font.setColor(LColor::latex);
+	FontInfo font = pi.base.font;
+	augmentFont(font, from_ascii("mathnormal"));
+	font.setShape(UP_SHAPE);
+	font.setColor(Color_latex);
 	Dimension t = theFontMetrics(font).dimension('{');
 	pi.pain.text(x, y, '{', font);
 	cell(0).draw(pi, x + t.wid, y);
-	pi.pain.text(x + t.wid + cell(0).width(), y, '}', font);
+	Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
+	pi.pain.text(x + t.wid + dim0.width(), y, '}', font);
 	drawMarkers(pi, x, y);
 }
 
@@ -102,6 +104,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);