X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FEncoding.cpp;h=7900aed06f631fd85cf572c2857b5d29ef6cdbc8;hb=c7e6a677c4df14b0f2f7d701e1f1976c4005a629;hp=5df64457708bc36e897d171f54c815cf6f4e378e;hpb=7728b5cbb94017541a38d98abadee9cdaf7b23cc;p=lyx.git

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 5df6445770..7900aed06f 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -344,7 +344,7 @@ void Encoding::init() const
 }
 
 
-docstring Encoding::latexChar(char_type c, bool for_mathed) const
+docstring Encoding::latexChar(char_type c, bool no_commands) const
 {
 	// assure the used encoding is properly initialized
 	init();
@@ -355,7 +355,7 @@ docstring Encoding::latexChar(char_type c, bool for_mathed) const
 		return docstring(1, c);
 	if (encodable_.find(c) != encodable_.end())
 		return docstring(1, c);
-	if (for_mathed)
+	if (no_commands)
 		return docstring();
 
 	// c cannot (or should not) be encoded in this encoding
@@ -436,8 +436,11 @@ char_type Encodings::fromLaTeXCommand(docstring const & cmd, bool & combining)
 }
 
 
-docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
+docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem,
+				      int cmdtype)
 {
+	bool const mathmode = cmdtype & MATH_CMD;
+	bool const textmode = cmdtype & TEXT_CMD;
 	docstring symbols;
 	size_t i = 0;
 	size_t const cmdend = cmd.size();
@@ -468,8 +471,10 @@ docstring Encodings::fromLaTeXCommand(docstring const & cmd, docstring & rem)
 		size_t unicmd_size = 0;
 		char_type c = 0;
 		for (; it != uniend; ++it) {
-			docstring const math = it->second.mathcommand;
-			docstring const text = it->second.textcommand;
+			docstring const math = mathmode ? it->second.mathcommand
+							: docstring();
+			docstring const text = textmode ? it->second.textcommand
+							: docstring();
 			size_t cur_size = max(math.size(), text.size());
 			// The current math or text unicode command cannot
 			// match, or we already matched a longer one
@@ -533,6 +538,7 @@ void Encodings::initUnicodeMath(Buffer const & buffer, bool clear_sets)
 #ifdef TEX2LYX
 	// The code below is not needed in tex2lyx and requires additional stuff
 	(void)buffer;
+	(void)clear_sets;
 #else
 	if (clear_sets) {
 		mathcmd.clear();
@@ -600,7 +606,7 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
 		}
 	}
 	if (for_mathed && isMathSym(c)) {
-		features.require("relsize");
+		features.require("amstext");
 		features.require("lyxmathsym");
 	}
 #endif
@@ -690,8 +696,14 @@ Encoding const * Encodings::fromLyXName(string const & name) const
 }
 
 
-Encoding const * Encodings::fromLaTeXName(string const & name) const
+Encoding const * Encodings::fromLaTeXName(string const & n) const
 {
+	string name = n;
+	// FIXME: if we have to test for too many of these synonyms,
+	// we should instead extend the format of lib/encodings
+	if (n == "ansinew")
+		name = "cp1252";
+
 	// We don't use find_if because it makes copies of the pairs in
 	// the map.
 	// This linear search is OK since we don't have many encodings.
@@ -813,7 +825,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 	// Now read the encodings
 	enum {
 		et_encoding = 1,
-		et_end,
+		et_end
 	};
 
 	LexerKeyword encodingtags[] = {