X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=82d58a723dfebd97edd1fab4b82b92c166ffade0;hb=5a8e91d1c5381d8c152b12269707b547d5241624;hp=34c5c0b508a230c6933bb09c41d755edfe70e645;hpb=e35bb3126a70384544b315771288db116f894926;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index 34c5c0b508..82d58a723d 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -286,6 +286,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 			tmp += "{";
 			os << from_ascii(tmp);
 			count += tmp.length();
+			pushPolyglossiaLang(language()->polyglossia(), true);
 		} else if (language()->encoding()->package() != Encoding::CJK) {
 			os << '{';
 			count += 1;
@@ -544,6 +545,8 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 	    && language()->encoding()->package() != Encoding::CJK) {
 		os << '}';
 		++count;
+		if (runparams.use_polyglossia)
+			popPolyglossiaLang();
 	}
 
 	return count;
@@ -707,6 +710,7 @@ void Font::validate(LaTeXFeatures & features) const
 		case Color_teal:
 		case Color_violet:
 			features.require("xcolor");
+			break;
 		default:
 			features.require("color");
 			LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));