X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathStream.cpp;h=ed23eb416040a88a6303bb721d965d33cb5b68f9;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=f4ff9349b059543097e47a2bfbf6294d3183d0c8;hpb=60da156ffda0df3c40e466630aeb6d1008bdd2ab;p=lyx.git

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index f4ff9349b0..ed23eb4160 100644
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -107,7 +107,7 @@ WriteStream & operator<<(WriteStream & ws, docstring const & s)
 	}
 	ws.os() << s.substr(first);
 	int lf = 0;
-	char_type lastchar;
+	char_type lastchar = 0;
 	docstring::const_iterator dit = s.begin() + first;
 	docstring::const_iterator end = s.end();
 	for (; dit != end; ++dit) {
@@ -442,55 +442,16 @@ HtmlStream & operator<<(HtmlStream & ms, docstring const & s)
 
 
 SetMode::SetMode(MathStream & os, bool text)
-	: os_(os), opened_(false)
-{
-	init(text, "");
-}
-
-
-SetMode::SetMode(MathStream & os, bool text, string const & attrs)
-	: os_(os), opened_(false)
-{
-	init(text, attrs);
-}
-
-
-void SetMode::init(bool text, string const & attrs)
+	: os_(os)
 {
 	was_text_ = os_.inText();
-	if (was_text_)
-		os_ << "</mtext>";
-	if (text) {
-		os_.setTextMode();
-		os_ << "<mtext";
-		if (!attrs.empty())
-			os_ << " " << from_utf8(attrs);
-		os_ << ">";
-		opened_ = true;
-	} else {
-		if (!attrs.empty()) {
-			os_ << "<mstyle " << from_utf8(attrs) << ">";
-			opened_ = true;
-		}
-		os_.setMathMode();
-	}
+	os_.setTextMode(text);
 }
 
 
 SetMode::~SetMode()
 {
-	if (opened_) {
-		if (os_.inText())
-			os_ << "</mtext>";
-		else
-			os_ << "</mstyle>";
-	}
-	if (was_text_) {
-		os_.setTextMode();
-		os_ << "<mtext>";
-	} else {
-		os_.setMathMode();
-	}
+	os_.setTextMode(was_text_);
 }
 
 
@@ -498,42 +459,16 @@ SetMode::~SetMode()
 
 
 SetHTMLMode::SetHTMLMode(HtmlStream & os, bool text)
-	: os_(os), opened_(false)
-{
-	init(text, "");
-}
-
-
-SetHTMLMode::SetHTMLMode(HtmlStream & os, bool text, string attrs)
-	: os_(os), opened_(true)
-{
-	init(text, attrs);
-}
-
-
-void SetHTMLMode::init(bool text, string const & attrs)
+	: os_(os)
 {
 	was_text_ = os_.inText();
-	if (text) {
-		os_.setTextMode();
-		if (attrs.empty())
-			os_ << MTag("span");
-		else
-			os_ << MTag("span", attrs);
-		opened_ = true;
-	} else
-		os_.setMathMode();
+	os_.setTextMode(text);
 }
 
 
 SetHTMLMode::~SetHTMLMode()
 {
-	if (opened_)
-		os_ << ETag("span");
-	if (was_text_)
-		os_.setTextMode();
-	else
-		os_.setMathMode();
+	os_.setTextMode(was_text_);
 }