X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_fracinset.C;h=b694d72fe117a26e798080362cc9a36b8555597a;hb=b447408de232872fef1537fca542abc23702d572;hp=c1f8f23ff4bfa78e7a965a23028803eee7206da4;hpb=aed2b1804c474ad4927a681c708b45bee6c4a36f;p=lyx.git

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index c1f8f23ff4..b694d72fe1 100644
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -1,11 +1,27 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_fracinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
 
 #include "math_fracinset.h"
-#include "math_support.h"
-#include "Painter.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "textpainter.h"
+#include "LColor.h"
+#include "frontends/Painter.h"
+
+
+using std::string;
+using std::max;
+using std::auto_ptr;
 
 
 MathFracInset::MathFracInset(bool atop)
@@ -13,9 +29,9 @@ MathFracInset::MathFracInset(bool atop)
 {}
 
 
-MathInset * MathFracInset::clone() const
-{   
-	return new MathFracInset(*this);
+auto_ptr<InsetBase> MathFracInset::clone() const
+{
+	return auto_ptr<InsetBase>(new MathFracInset(*this));
 }
 
 
@@ -25,25 +41,56 @@ MathFracInset * MathFracInset::asFracInset()
 }
 
 
-void MathFracInset::metrics(MathMetricsInfo const & mi) const
+MathFracInset const * MathFracInset::asFracInset() const
+{
+	return atop_ ? 0 : this;
+}
+
+
+void MathFracInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	MathMetricsInfo m = mi;
-	smallerStyleFrac(m);
-	xcell(0).metrics(m);
-	xcell(1).metrics(m);
-	width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
-	ascent_  = xcell(0).height() + 4 + 5;
-	descent_ = xcell(1).height() + 4 - 5; 
+	FracChanger dummy(mi.base);
+	cell(0).metrics(mi);
+	cell(1).metrics(mi);
+	dim.wid = max(cell(0).width(), cell(1).width()) + 2;
+	dim.asc = cell(0).height() + 2 + 5;
+	dim.des = cell(1).height() + 2 - 5;
+	metricsMarkers(dim);
+	dim_ = dim;
 }
 
 
-void MathFracInset::draw(Painter & pain, int x, int y) const
+void MathFracInset::draw(PainterInfo & pi, int x, int y) const
 {
-	int m = x + width() / 2;
-	xcell(0).draw(pain, m - xcell(0).width() / 2, y - xcell(0).descent() - 3 - 5);
-	xcell(1).draw(pain, m - xcell(1).width() / 2, y + xcell(1).ascent()  + 3 - 5);
+	setPosCache(pi, x, y);
+	int m = x + dim_.wid / 2;
+	FracChanger dummy(pi.base);
+	cell(0).draw(pi, m - cell(0).width() / 2, y - cell(0).descent() - 2 - 5);
+	cell(1).draw(pi, m - cell(1).width() / 2, y + cell(1).ascent()  + 2 - 5);
 	if (!atop_)
-		pain.line(x + 2, y - 5, x + width() - 4, y - 5, LColor::math);
+		pi.pain.line(x + 1, y - 5, x + dim_.wid - 2, y - 5, LColor::math);
+	drawMarkers(pi, x, y);
+}
+
+
+void MathFracInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
+{
+	cell(0).metricsT(mi, dim);
+	cell(1).metricsT(mi, dim);
+	dim.wid = max(cell(0).width(), cell(1).width());
+	dim.asc = cell(0).height() + 1;
+	dim.des = cell(1).height();
+	//dim = dim_;
+}
+
+
+void MathFracInset::drawT(TextPainter & pain, int x, int y) const
+{
+	int m = x + dim_.width() / 2;
+	cell(0).drawT(pain, m - cell(0).width() / 2, y - cell(0).descent() - 1);
+	cell(1).drawT(pain, m - cell(1).width() / 2, y + cell(1).ascent());
+	if (!atop_)
+		pain.horizontalLine(x, y, dim_.width());
 }
 
 
@@ -51,22 +98,30 @@ void MathFracInset::write(WriteStream & os) const
 {
 	if (atop_)
 		os << '{' << cell(0) << "\\atop " << cell(1) << '}';
-	else
-		os << "\\frac{" << cell(0) << "}{" << cell(1) << '}';
+	else // it's \\frac
+		MathNestInset::write(os);
+}
+
+
+string MathFracInset::name() const
+{
+	return atop_ ? "atop" : "frac";
 }
 
 
-void MathFracInset::normalize(NormalStream & os) const
+void MathFracInset::maple(MapleStream & os) const
 {
-	if (atop_) 
-		os << "[atop ";
-	else
-		os << "[frac ";
-	os << cell(0) << ' ' << cell(1) << ']';
+	os << '(' << cell(0) << ")/(" << cell(1) << ')';
+}
+
+
+void MathFracInset::mathematica(MathematicaStream & os) const
+{
+	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-void MathFracInset::maplize(MapleStream & os) const
+void MathFracInset::octave(OctaveStream & os) const
 {
 	os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }