X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.cpp;h=e960e2c5d53ea0f8ba846e612b5c6dcd60cd26b0;hb=7855c0c1fc98b154768d3014883873387bd64c95;hp=959262d9cd469c595c08b6eb12be502902a5c66d;hpb=b6aed54c45cf4a479cfd11e3e6851194f5a05947;p=lyx.git

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 959262d9cd..e960e2c5d5 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -85,53 +85,10 @@ docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e)
 }
 
 
-string escapeChar(char c, XHTMLStream::EscapeSettings e)
+docstring escapeChar(char c, XHTMLStream::EscapeSettings e)
 {
-	string str;
-	switch (e) {
-	case XHTMLStream::ESCAPE_NONE:
-		str += c;
-		break;
-	case XHTMLStream::ESCAPE_ALL:
-		if (c == '<') {
-			str += "&lt;";
-			break;
-		} else if (c == '>') {
-			str += "&gt;";
-			break;
-		}
-	// fall through
-	case XHTMLStream::ESCAPE_AND:
-		if (c == '&')
-			str += "&amp;";
-		else
-			str	+=c ;
-		break;
-	}
-	return str;
-}
-
-
-// escape what needs escaping
-string htmlize(string const & str, XHTMLStream::EscapeSettings e)
-{
-	ostringstream d;
-	string::const_iterator it = str.begin();
-	string::const_iterator en = str.end();
-	for (; it != en; ++it)
-		d << escapeChar(*it, e);
-	return d.str();
-}
-
-
-string cleanAttr(string const & str)
-{
-	string newname;
-	string::const_iterator it = str.begin();
-	string::const_iterator en = str.end();
-	for (; it != en; ++it)
-		newname += isAlnumASCII(*it) ? *it : '_';
-	return newname;
+	LATTEST(static_cast<unsigned char>(c) < 0x80);
+	return escapeChar(static_cast<char_type>(c), e);
 }
 
 
@@ -150,11 +107,11 @@ docstring cleanAttr(docstring const & str)
 
 docstring StartTag::writeTag() const
 {
-	string output = "<" + tag_;
+	docstring output = '<' + from_utf8(tag_);
 	if (!attr_.empty())
-		output += " " + html::htmlize(attr_, XHTMLStream::ESCAPE_NONE);
+		output += ' ' + html::htmlize(from_utf8(attr_), XHTMLStream::ESCAPE_NONE);
 	output += ">";
-	return from_utf8(output);
+	return output;
 }
 
 
@@ -193,11 +150,11 @@ docstring ParTag::writeTag() const
 
 docstring CompTag::writeTag() const
 {
-	string output = "<" + tag_;
+	docstring output = '<' + from_utf8(tag_);
 	if (!attr_.empty())
-		output += " " + html::htmlize(attr_, XHTMLStream::ESCAPE_NONE);
+		output += ' ' + html::htmlize(from_utf8(attr_), XHTMLStream::ESCAPE_NONE);
 	output += " />";
-	return from_utf8(output);
+	return output;
 }
 
 
@@ -495,7 +452,7 @@ XHTMLStream & XHTMLStream::operator<<(char_type c)
 XHTMLStream & XHTMLStream::operator<<(char c)
 {
 	clearTagDeque();
-	string const d = html::escapeChar(c, escape_);
+	os_ << html::escapeChar(c, escape_);
 	escape_ = ESCAPE_ALL;
 	return *this;
 }