From: Richard Heck <rgheck@comcast.net>
Date: Thu, 22 Jul 2010 02:20:12 +0000 (+0000)
Subject: Partially revert r34995, which broke math output. Not sure why yet....
X-Git-Tag: 2.0.0~2911
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=80aca38970cebe7cd04425b5e42139c8ee30634e;p=features.git

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
---

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index bd3d6d5d9f..4de876f01f 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -483,8 +483,7 @@ void InsetMathHull::drawT(TextPainter & pain, int x, int y) const
 }
 
 
-static docstring latexString(InsetMathHull const & inset, 
-		bool do_header = true)
+static docstring latexString(InsetMathHull const & inset)
 {
 	odocstringstream ls;
 	// 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())
 		encoding = &(inset.buffer().params().encoding());
 	WriteStream wi(ls, false, true, WriteStream::wsPreview, encoding);
-	inset.write(wi, do_header);
+	inset.write(wi);
 	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);
-	if (do_header)	
-		header_write(os);
+	header_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: {
 		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
 		// http://www.math.union.edu/~dpvc/jsMath/
 		// FIXME XHTML
diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 7e72cef637..d2ca3f6d2b 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -105,7 +105,7 @@ public:
 	bool idxLast(Cursor &) const;
 
 	///
-	void write(WriteStream & os, bool do_header = true) const;
+	void write(WriteStream & os) const;
 	///
 	void mathmlize(MathStream &) const;
 	///