Partially revert r34995, which broke math output. Not sure why yet....

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35001 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-07-22 02:20:12 +00:00
parent 06445c964e
commit 80aca38970
2 changed files with 7 additions and 10 deletions

View File

@ -483,8 +483,7 @@ void InsetMathHull::drawT(TextPainter & pain, int x, int y) const
} }
static docstring latexString(InsetMathHull const & inset, static docstring latexString(InsetMathHull const & inset)
bool do_header = true)
{ {
odocstringstream ls; odocstringstream ls;
// This has to be static, because a preview snippet or a math // This has to be static, because a preview snippet or a math
@ -496,7 +495,7 @@ static docstring latexString(InsetMathHull const & inset,
if (inset.isBufferValid()) if (inset.isBufferValid())
encoding = &(inset.buffer().params().encoding()); encoding = &(inset.buffer().params().encoding());
WriteStream wi(ls, false, true, WriteStream::wsPreview, encoding); WriteStream wi(ls, false, true, WriteStream::wsPreview, encoding);
inset.write(wi, do_header); inset.write(wi);
return ls.str(); return ls.str();
} }
@ -1128,14 +1127,12 @@ docstring InsetMathHull::eolString(row_type row, bool fragile, bool last_eoln) c
} }
void InsetMathHull::write(WriteStream & os, bool do_header) const void InsetMathHull::write(WriteStream & os) const
{ {
ModeSpecifier specifier(os, MATH_MODE); ModeSpecifier specifier(os, MATH_MODE);
if (do_header) header_write(os);
header_write(os);
InsetMathGrid::write(os); InsetMathGrid::write(os);
if (do_header) footer_write(os);
footer_write(os);
} }
@ -1892,7 +1889,7 @@ docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
} }
case BufferParams::LaTeX: { case BufferParams::LaTeX: {
string const tag = (getType() == hullSimple) ? "span" : "div"; string const tag = (getType() == hullSimple) ? "span" : "div";
docstring const latex = latexString(*this, false); docstring const latex = latexString(*this);
// class='math' allows for use of jsMath // class='math' allows for use of jsMath
// http://www.math.union.edu/~dpvc/jsMath/ // http://www.math.union.edu/~dpvc/jsMath/
// FIXME XHTML // FIXME XHTML

View File

@ -105,7 +105,7 @@ public:
bool idxLast(Cursor &) const; bool idxLast(Cursor &) const;
/// ///
void write(WriteStream & os, bool do_header = true) const; void write(WriteStream & os) const;
/// ///
void mathmlize(MathStream &) const; void mathmlize(MathStream &) const;
/// ///