X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=2cfc1ce6e2275940c4cb69f7f97f0eb3b11634f9;hb=da03e5b1c4a21edf63a2ba73397cb46b59123f4b;hp=39076324334b2d8f70554baef9b585c72669ad60;hpb=a9878d52ed6a34c5e82ab60c3a4dfe0d0568d507;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 3907632433..2cfc1ce6e2 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -614,7 +614,8 @@ char const * simplefeatures[] = {
 	"amscd",
 	"slashed",
 	"multirow",
-	"tfrupee"
+	"tfrupee",
+	"undertilde",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -1202,8 +1203,7 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, bool use_po
 				continue;
 			docstring const type = from_ascii(fl.floattype());
 			docstring const flname = from_utf8(fl.name());
-			docstring name = translateIfPossible(flname,
-				buffer().language()->code());
+			docstring name = buffer().language()->translateLayout(fl.name());
 			// only request translation if we have a real translation
 			// (that differs from the source)
 			if (use_polyglossia && flname != name)
@@ -1215,13 +1215,20 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, bool use_po
 					type, name,
 					from_ascii(buffer().language()->babel())));
 			for (lang_it lit = lbeg; lit != lend; ++lit) {
-				name = translateIfPossible(flname,
-					(*lit)->code());
-				if (use_polyglossia && flname != name)
+				string const code = (*lit)->code();
+				name = (*lit)->translateLayout(fl.name());
+				// we assume we have a suitable translation if
+				// either the language is English (we need to
+				// translate into English if English is a secondary
+				// language) or if translateIfPossible returns
+				// something different to the English source.
+				bool const have_translation =
+					(flname != name || contains(code, "en"));
+				if (use_polyglossia && have_translation)
 					snippets.insert(getFloatI18nPreamble(
 						type, name,
 						from_ascii((*lit)->polyglossia())));
-				else if (flname != name)
+				else if (have_translation)
 					snippets.insert(getFloatI18nPreamble(
 						type, name,
 						from_ascii((*lit)->babel())));
@@ -1341,9 +1348,8 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
 			docstring const ext = from_ascii(fl.ext());
 			docstring const within = from_ascii(fl.within());
 			docstring const style = from_ascii(fl.style());
-			docstring const name = translateIfPossible(
-					from_utf8(fl.name()),
-					buffer().language()->code());
+			docstring const name =
+				buffer().language()->translateLayout(fl.name());
 			os << "\\floatstyle{" << style << "}\n"
 			   << "\\newfloat{" << type << "}{" << placement
 			   << "}{" << ext << '}';