return to 1.1.6 behaviour for ascii export

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4110 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2002-05-02 07:30:49 +00:00
parent 0b81a7631e
commit 4d6b99e865
3 changed files with 32 additions and 12 deletions

View File

@ -294,7 +294,7 @@ int InsetFormula::latex(Buffer const *, ostream & os, bool fragile, bool) const
int InsetFormula::ascii(Buffer const *, ostream & os, int) const
{
#if 1
#if 0
TextMetricsInfo mi;
par()->metricsT(mi);
TextPainter tpain(par()->width(), par()->height());
@ -304,7 +304,7 @@ int InsetFormula::ascii(Buffer const *, ostream & os, int) const
metrics();
return tpain.textheight();
#else
WriteStream wi(os, false);
WriteStream wi(os, false, true);
par_->write(wi);
return wi.line();
#endif

View File

@ -10,6 +10,8 @@
#include "math_support.h"
#include "debug.h"
#include "Painter.h"
#include "textpainter.h"
#include "Lsstream.h"
#include "LaTeXFeatures.h"
#include "support/LAssert.h"
@ -199,21 +201,39 @@ void MathHullInset::draw(Painter & pain, int x, int y) const
}
}
/*
void MathHullInset::metricsT(TextMetricsInfo const & mi) const
void MathHullInset::metricsT(TextMetricsInfo const &) const
{
ascent_ = 1;
descent_ = 0;
width_ = normalName(objtype_).size();
#if 0
if (display()) {
MathGridInset::metricsT(mi);
} else
#endif
{
ostringstream os;
WriteStream wi(os, false, true);
write(wi);
width_ = os.str().size();
ascent_ = 1;
descent_ = 0;
}
}
void MathHullInset::drawT(TextPainter & pain, int x, int y) const
{
pain.draw(x, y, normalName(objtype_).c_str());
MathGridInset::draw(pain, x, y);
#if 0
if (display()) {
MathGridInset::drawT(pain, x, y);
} else
#endif
{
ostringstream os;
WriteStream wi(os, false, true);
write(wi);
pain.draw(x, y, os.str().c_str());
}
}
*/
string MathHullInset::label(row_type row) const

View File

@ -31,9 +31,9 @@ public:
///
void draw(Painter &, int x, int y) const;
///
//void metricsT(TextMetricsInfo const & st) const;
void metricsT(TextMetricsInfo const & st) const;
///
//void drawT(TextPainter &, int x, int y) const;
void drawT(TextPainter &, int x, int y) const;
///
string label(row_type row) const;
///