X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=86ffcd62cd6d65df7a8ba94fcc86c2c24aefa0b8;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=234314e05b7a00297b05a8116231d899fe08caf2;hpb=29c40527e56424d9c66ffb2e6c9709d8e4a30e1e;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index 234314e05b..86ffcd62cd 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -25,6 +25,7 @@
 #include "LyXRC.h"
 #include "output_latex.h"
 #include "OutputParams.h"
+#include "texstream.h"
 
 #include "support/lassert.h"
 #include "support/convert.h"
@@ -39,6 +40,16 @@ using namespace lyx::support;
 
 namespace lyx {
 
+//
+// Strings used to read and write .lyx format files
+//
+// These are defined in FontInfo.cpp
+extern char const * LyXFamilyNames[NUM_FAMILIES + 2];
+extern char const * LyXSeriesNames[NUM_SERIES + 2];
+extern char const * LyXShapeNames[NUM_SHAPE + 2];
+extern char const * LyXSizeNames[NUM_SIZE + 4];
+extern char const * LyXMiscNames[5];
+
 //
 // Names for the GUI
 //
@@ -47,17 +58,17 @@ namespace {
 
 char const * GUIFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
 { N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
-  N_("Inherit"), N_("Ignore") };
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "stmry",
+  "wasy", "esint", N_("Inherit"), N_("Ignore") };
 
-char const * GUISeriesNames[4] =
+char const * GUISeriesNames[NUM_SERIES + 2 /* default & error */] =
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
 
-char const * GUIShapeNames[6] =
+char const * GUIShapeNames[NUM_SHAPE + 2 /* default & error */] =
 { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
   N_("Ignore") };
 
-char const * GUISizeNames[14] =
+char const * GUISizeNames[NUM_SIZE + 4 /* increase, decrease, default & error */] =
 { N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"),
   N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
   N_("Inherit"), N_("Ignore") };
@@ -65,42 +76,21 @@ char const * GUISizeNames[14] =
 char const * GUIMiscNames[5] =
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
-
-//
-// Strings used to read and write .lyx format files
-//
-char const * LyXFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
-{ "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
-  "default", "error" };
-
-char const * LyXSeriesNames[4] =
-{ "medium", "bold", "default", "error" };
-
-char const * LyXShapeNames[6] =
-{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-
-char const * LyXSizeNames[14] =
-{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
-  "larger", "largest", "huge", "giant",
-  "increase", "decrease", "default", "error" };
-
-char const * LyXMiscNames[5] =
-{ "off", "on", "toggle", "default", "error" };
-
 //
 // Strings used to write LaTeX files
 //
-char const * LaTeXFamilyNames[6] =
-{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
+char const * LaTeXFamilyNames[NUM_FAMILIES + 2] =
+{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4",
+  "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+  "error12", "error13" };
 
-char const * LaTeXSeriesNames[4] =
+char const * LaTeXSeriesNames[NUM_SERIES + 2] =
 { "textmd", "textbf", "error4", "error5" };
 
-char const * LaTeXShapeNames[6] =
+char const * LaTeXShapeNames[NUM_SHAPE + 2] =
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
 
-char const * LaTeXSizeNames[14] =
+char const * LaTeXSizeNames[NUM_SIZE + 4] =
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
 
@@ -108,7 +98,7 @@ char const * LaTeXSizeNames[14] =
 
 
 Font::Font(FontInfo bits, Language const * l)
-	: bits_(bits), lang_(l), misspelled_(false), open_encoding_(false)
+	: bits_(bits), lang_(l), open_encoding_(false)
 {
 	if (!lang_)
 		lang_ = default_language;
@@ -175,6 +165,18 @@ docstring const stateText(FontInfo const & f)
 	if (f.underbar() != FONT_INHERIT)
 		os << bformat(_("Underline %1$s, "),
 			      _(GUIMiscNames[f.underbar()]));
+	if (f.strikeout() != FONT_INHERIT)
+		os << bformat(_("Strike out %1$s, "),
+			      _(GUIMiscNames[f.strikeout()]));
+	if (f.xout() != FONT_INHERIT)
+		os << bformat(_("Cross out %1$s, "),
+			      _(GUIMiscNames[f.xout()]));
+	if (f.uuline() != FONT_INHERIT)
+		os << bformat(_("Double underline %1$s, "),
+			      _(GUIMiscNames[f.uuline()]));
+	if (f.uwave() != FONT_INHERIT)
+		os << bformat(_("Wavy underline %1$s, "),
+			      _(GUIMiscNames[f.uwave()]));
 	if (f.noun() != FONT_INHERIT)
 		os << bformat(_("Noun %1$s, "),
 			      _(GUIMiscNames[f.noun()]));
@@ -193,98 +195,12 @@ docstring const Font::stateText(BufferParams * params) const
 		os << bformat(_("Language: %1$s, "),
 			      _(language()->display()));
 	if (bits_.number() != FONT_OFF)
-		os << bformat(_("  Number %1$s"),
+		os << "  " << bformat(_("Number %1$s"),
 			      _(GUIMiscNames[bits_.number()]));
 	return rtrim(os.str(), ", ");
 }
 
 
-// Set family according to lyx format string
-void setLyXFamily(string const & fam, FontInfo & f)
-{
-	string const s = ascii_lowercase(fam);
-
-	int i = 0;
-	while (LyXFamilyNames[i] != s &&
-	       LyXFamilyNames[i] != string("error"))
-		++i;
-	if (s == LyXFamilyNames[i])
-		f.setFamily(FontFamily(i));
-	else
-		lyxerr << "setLyXFamily: Unknown family `"
-		       << s << '\'' << endl;
-}
-
-
-// Set series according to lyx format string
-void setLyXSeries(string const & ser, FontInfo & f)
-{
-	string const s = ascii_lowercase(ser);
-
-	int i = 0;
-	while (LyXSeriesNames[i] != s &&
-	       LyXSeriesNames[i] != string("error")) ++i;
-	if (s == LyXSeriesNames[i]) {
-		f.setSeries(FontSeries(i));
-	} else
-		lyxerr << "setLyXSeries: Unknown series `"
-		       << s << '\'' << endl;
-}
-
-
-// Set shape according to lyx format string
-void setLyXShape(string const & sha, FontInfo & f)
-{
-	string const s = ascii_lowercase(sha);
-
-	int i = 0;
-	while (LyXShapeNames[i] != s && LyXShapeNames[i] != string("error"))
-			++i;
-	if (s == LyXShapeNames[i])
-		f.setShape(FontShape(i));
-	else
-		lyxerr << "Font::setLyXShape: Unknown shape `"
-		       << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-void setLyXSize(string const & siz, FontInfo & f)
-{
-	string const s = ascii_lowercase(siz);
-	int i = 0;
-	while (LyXSizeNames[i] != s && LyXSizeNames[i] != string("error"))
-		++i;
-	if (s == LyXSizeNames[i]) {
-		f.setSize(FontSize(i));
-	} else
-		lyxerr << "Font::setLyXSize: Unknown size `"
-		       << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-FontState Font::setLyXMisc(string const & siz)
-{
-	string const s = ascii_lowercase(siz);
-	int i = 0;
-	while (LyXMiscNames[i] != s &&
-	       LyXMiscNames[i] != string("error")) ++i;
-	if (s == LyXMiscNames[i])
-		return FontState(i);
-	lyxerr << "Font::setLyXMisc: Unknown misc flag `"
-	       << s << '\'' << endl;
-	return FONT_OFF;
-}
-
-
-/// Sets color after LyX text format
-void setLyXColor(string const & col, FontInfo & f)
-{
-	f.setColor(lcolor.getFromLyXName(col));
-}
-
-
 // Returns size in latex format
 string const Font::latexSize() const
 {
@@ -292,69 +208,6 @@ string const Font::latexSize() const
 }
 
 
-// Read a font definition from given file in lyx format
-// Used for layouts
-FontInfo lyxRead(Lexer & lex, FontInfo const & fi)
-{
-	FontInfo f = fi;
-	bool error = false;
-	bool finished = false;
-	while (!finished && lex.isOK() && !error) {
-		lex.next();
-		string const tok = ascii_lowercase(lex.getString());
-
-		if (tok.empty()) {
-			continue;
-		} else if (tok == "endfont") {
-			finished = true;
-		} else if (tok == "family") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXFamily(ttok, f);
-		} else if (tok == "series") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXSeries(ttok, f);
-		} else if (tok == "shape") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXShape(ttok, f);
-		} else if (tok == "size") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXSize(ttok, f);
-		} else if (tok == "misc") {
-			lex.next();
-			string const ttok = ascii_lowercase(lex.getString());
-
-			if (ttok == "no_bar") {
-				f.setUnderbar(FONT_OFF);
-			} else if (ttok == "no_emph") {
-				f.setEmph(FONT_OFF);
-			} else if (ttok == "no_noun") {
-				f.setNoun(FONT_OFF);
-			} else if (ttok == "emph") {
-				f.setEmph(FONT_ON);
-			} else if (ttok == "underbar") {
-				f.setUnderbar(FONT_ON);
-			} else if (ttok == "noun") {
-				f.setNoun(FONT_ON);
-			} else {
-				lex.printError("Illegal misc type");
-			}
-		} else if (tok == "color") {
-			lex.next();
-			string const ttok = lex.getString();
-			setLyXColor(ttok, f);
-		} else {
-			lex.printError("Unknown tag");
-			error = true;
-		}
-	}
-	return f;
-}
-
-
 /// Writes the changes from this font to orgfont in .lyx format in file
 void Font::lyxWriteChanges(Font const & orgfont,
 			      ostream & os) const
@@ -388,6 +241,18 @@ void Font::lyxWriteChanges(Font const & orgfont,
 		break;
 		}
 	}
+	if (orgfont.fontInfo().strikeout() != bits_.strikeout()) {
+		os << "\\strikeout " << LyXMiscNames[bits_.strikeout()] << "\n";
+	}
+	if (orgfont.fontInfo().xout() != bits_.xout()) {
+		os << "\\xout " << LyXMiscNames[bits_.xout()] << "\n";
+	}
+	if (orgfont.fontInfo().uuline() != bits_.uuline()) {
+		os << "\\uuline " << LyXMiscNames[bits_.uuline()] << "\n";
+	}
+	if (orgfont.fontInfo().uwave() != bits_.uwave()) {
+		os << "\\uwave " << LyXMiscNames[bits_.uwave()] << "\n";
+	}
 	if (orgfont.fontInfo().noun() != bits_.noun()) {
 		os << "\\noun " << LyXMiscNames[bits_.noun()] << "\n";
 	}
@@ -416,7 +281,24 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	bool env = false;
 
 	int count = 0;
-	if (language()->babel() != base.language()->babel() &&
+
+	// polyglossia or babel?
+	if (runparams.use_polyglossia
+	    && language()->lang() != base.language()->lang()
+	    && language() != prev.language()) {
+		if (!language()->polyglossia().empty()) {
+			string tmp = "\\text" + language()->polyglossia();
+			if (!language()->polyglossiaOpts().empty())
+				tmp += "[" + language()->polyglossiaOpts() + "]";
+			tmp += "{";
+			os << from_ascii(tmp);
+			count += tmp.length();
+			pushLanguageName(language()->polyglossia(), true);
+		} else if (language()->encoding()->package() != Encoding::CJK) {
+			os << '{';
+			count += 1;
+		}
+	} else if (language()->babel() != base.language()->babel() &&
 	    language() != prev.language()) {
 		if (language()->lang() == "farsi") {
 			os << "\\textFR{";
@@ -447,7 +329,9 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 				      "$$lang", language()->babel());
 			os << from_ascii(tmp);
 			count += tmp.length();
-		} else {
+			if (!lyxrc.language_command_end.empty())
+				pushLanguageName(language()->babel(), true);
+		} else if (language()->encoding()->package() != Encoding::CJK) {
 			os << '{';
 			count += 1;
 		}
@@ -463,14 +347,15 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		}
 	}
 
-	// When the current language is Hebrew, Arabic, or Farsi
+	// If the current language is Hebrew, Arabic, or Farsi
 	// the numbers are written Left-to-Right. ArabTeX package
 	// reorders the number automatically but the packages used
 	// for Hebrew and Farsi (Arabi) do not.
-	if (bits_.number() == FONT_ON && prev.fontInfo().number() != FONT_ON
-		&& (language()->lang() == "hebrew"
-			|| language()->lang() == "farsi" 
-			|| language()->lang() == "arabic_arabi")) {
+	if (!runparams.pass_thru && bits_.number() == FONT_ON
+	    && prev.fontInfo().number() != FONT_ON
+	    && (language()->lang() == "hebrew"
+		|| language()->lang() == "farsi" 
+		|| language()->lang() == "arabic_arabi")) {
 		os << "{\\beginL ";
 		count += 9;
 	}
@@ -521,11 +406,6 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		count += 6;
 		env = true; //We have opened a new environment
 	}
-	if (f.underbar() == FONT_ON) {
-		os << "\\underbar{";
-		count += 10;
-		env = true; //We have opened a new environment
-	}
 	// \noun{} is a LyX special macro
 	if (f.noun() == FONT_ON) {
 		os << "\\noun{";
@@ -540,8 +420,36 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		}
 		os << '\\'
 		   << LaTeXSizeNames[f.size()]
-		   << ' ';
-		count += strlen(LaTeXSizeNames[f.size()]) + 2;
+		   << "{}";
+		count += strlen(LaTeXSizeNames[f.size()]) + 3;
+	}
+	// The ulem commands need to be on the deepest nesting level
+	// because ulem puts every nested group or macro in a box,
+	// which prevents linebreaks (#8424, #8733)
+	if (f.underbar() == FONT_ON) {
+		os << "\\uline{";
+		count += 10;
+		++runparams.inulemcmd;
+	}
+	if (f.strikeout() == FONT_ON) {
+		os << "\\sout{";
+		count += 9;
+		++runparams.inulemcmd;
+	}
+	if (f.xout() == FONT_ON) {
+		os << "\\xout{";
+		count += 9;
+		++runparams.inulemcmd;
+	}
+	if (f.uuline() == FONT_ON) {
+		os << "\\uuline{";
+		count += 11;
+		++runparams.inulemcmd;
+	}
+	if (f.uwave() == FONT_ON) {
+		os << "\\uwave{";
+		count += 10;
+		++runparams.inulemcmd;
 	}
 	return count;
 }
@@ -550,10 +458,11 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 /// Writes ending block of LaTeX needed to close use of this font
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
-int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 				  OutputParams const & runparams,
 				  Font const & base,
 				  Font const & next,
+				  bool & needPar,
 				  bool const & closeLanguage) const
 {
 	int count = 0;
@@ -590,11 +499,6 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
-	if (f.underbar() == FONT_ON) {
-		os << '}';
-		++count;
-		env = true; // Size change need not bother about closing env.
-	}
 	if (f.noun() == FONT_ON) {
 		os << '}';
 		++count;
@@ -603,19 +507,50 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 	if (f.size() != FONT_SIZE_INHERIT) {
 		// We only have to close if only size changed
 		if (!env) {
+			if (needPar && !closeLanguage) {
+				os << "\\par";
+				count += 4;
+				needPar = false;
+			}
 			os << '}';
 			++count;
 		}
 	}
+	if (f.underbar() == FONT_ON) {
+		os << '}';
+		++count;
+		--runparams.inulemcmd;
+	}
+	if (f.strikeout() == FONT_ON) {
+		os << '}';
+		++count;
+		--runparams.inulemcmd;
+	}
+	if (f.xout() == FONT_ON) {
+		os << '}';
+		++count;
+		--runparams.inulemcmd;
+	}
+	if (f.uuline() == FONT_ON) {
+		os << '}';
+		++count;
+		--runparams.inulemcmd;
+	}
+	if (f.uwave() == FONT_ON) {
+		os << '}';
+		++count;
+		--runparams.inulemcmd;
+	}
 
-	// When the current language is Hebrew, Arabic, or Farsi
+	// If the current language is Hebrew, Arabic, or Farsi
 	// the numbers are written Left-to-Right. ArabTeX package
 	// reorders the number automatically but the packages used
 	// for Hebrew and Farsi (Arabi) do not.
-	if (bits_.number() == FONT_ON && next.fontInfo().number() != FONT_ON
-		&& (language()->lang() == "hebrew"
-			|| language()->lang() == "farsi"
-			|| language()->lang() == "arabic_arabi")) {
+	if (!runparams.pass_thru && bits_.number() == FONT_ON
+	    && next.fontInfo().number() != FONT_ON
+	    && (language()->lang() == "hebrew"
+		|| language()->lang() == "farsi"
+		|| language()->lang() == "arabic_arabi")) {
 		os << "\\endL}";
 		count += 6;
 	}
@@ -624,18 +559,24 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 		// We need to close the encoding even if it does not change
 		// to do correct environment nesting
 		Encoding const * const ascii = encodings.fromLyXName("ascii");
-		pair<bool, int> const c = switchEncoding(os, bparams,
+		pair<bool, int> const c = switchEncoding(os.os(), bparams,
 				runparams, *ascii);
-		LASSERT(c.first, /**/);
+		LATTEST(c.first);
 		count += c.second;
 		runparams.encoding = ascii;
 		open_encoding_ = false;
 	}
 
-	if (closeLanguage &&
-			language() != base.language() && language() != next.language()) {
+	if (closeLanguage
+	    && language() != base.language() && language() != next.language()
+	    && language()->encoding()->package() != Encoding::CJK) {
 		os << '}';
 		++count;
+		bool const using_begin_end =
+			runparams.use_polyglossia ||
+				!lyxrc.language_command_end.empty();
+		if (using_begin_end)
+			popLanguageName();
 	}
 
 	return count;
@@ -654,6 +595,10 @@ string Font::toString(bool const toggle) const
 	   << "size " << bits_.size() << '\n'
 	   << "emph " << bits_.emph() << '\n'
 	   << "underbar " << bits_.underbar() << '\n'
+	   << "strikeout " << bits_.strikeout() << '\n'
+	   << "xout " << bits_.xout() << '\n'
+	   << "uuline " << bits_.uuline() << '\n'
+	   << "uwave " << bits_.uwave() << '\n'
 	   << "noun " << bits_.noun() << '\n'
 	   << "number " << bits_.number() << '\n'
 	   << "color " << bits_.color() << '\n'
@@ -694,8 +639,10 @@ bool Font::fromString(string const & data, bool & toggle)
 			int const next = lex.getInteger();
 			bits_.setSize(FontSize(next));
 
-		} else if (token == "emph" || token == "underbar" ||
-			   token == "noun" || token == "number") {
+		} else if (token == "emph" || token == "underbar"
+			|| token == "noun" || token == "number"
+			|| token == "uuline" || token == "uwave"
+			|| token == "strikeout" || token == "xout") {
 
 			int const next = lex.getInteger();
 			FontState const misc = FontState(next);
@@ -704,6 +651,14 @@ bool Font::fromString(string const & data, bool & toggle)
 				bits_.setEmph(misc);
 			else if (token == "underbar")
 				bits_.setUnderbar(misc);
+			else if (token == "strikeout")
+				bits_.setStrikeout(misc);
+			else if (token == "xout")
+				bits_.setXout(misc);
+			else if (token == "uuline")
+				bits_.setUuline(misc);
+			else if (token == "uwave")
+				bits_.setUwave(misc);
 			else if (token == "noun")
 				bits_.setNoun(misc);
 			else if (token == "number")
@@ -747,6 +702,31 @@ void Font::validate(LaTeXFeatures & features) const
 		features.require("noun");
 		LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
 	}
+	if (bits_.underbar() == FONT_ON) {
+		LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
+		features.require("ulem");
+		LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText(0)));
+	}
+	if (bits_.strikeout() == FONT_ON) {
+		LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
+		features.require("ulem");
+		LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText(0)));
+	}
+	if (bits_.xout() == FONT_ON) {
+		LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
+		features.require("ulem");
+		LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText(0)));
+	}
+	if (bits_.uuline() == FONT_ON) {
+		LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
+		features.require("ulem");
+		LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText(0)));
+	}
+	if (bits_.uwave() == FONT_ON) {
+		LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
+		features.require("ulem");
+		LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText(0)));
+	}
 	switch (bits_.color()) {
 		case Color_none:
 		case Color_inherit:
@@ -756,6 +736,19 @@ void Font::validate(LaTeXFeatures & features) const
 		case Color_latex:
 		case Color_notelabel:
 			break;
+		case Color_brown:
+		case Color_darkgray:
+		case Color_gray:
+		case Color_lightgray:
+		case Color_lime:
+		case Color_olive:
+		case Color_orange:
+		case Color_pink:
+		case Color_purple:
+		case Color_teal:
+		case Color_violet:
+			features.require("xcolor");
+			break;
 		default:
 			features.require("color");
 			LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));
@@ -763,9 +756,11 @@ void Font::validate(LaTeXFeatures & features) const
 
 	// FIXME: Do something for background and soul package?
 
-	if (lang_->babel() != doc_language->babel() &&
-		lang_ != ignore_language &&
-		lang_ != latex_language)
+	if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
+	     || (features.useBabel() && lang_->babel() != doc_language->babel())
+	     || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language))
+	    && lang_ != ignore_language
+	    && lang_ != latex_language)
 	{
 		features.useLanguage(lang_);
 		LYXERR(Debug::LATEX, "Found language " << lang_->lang());
@@ -791,6 +786,10 @@ ostream & operator<<(ostream & os, FontInfo const & f)
 		//<< " background " << f.background()
 		<< " emph " << f.emph()
 		<< " underbar " << f.underbar()
+		<< " strikeout " << f.strikeout()
+		<< " xout " << f.xout()
+		<< " uuline " << f.uuline()
+		<< " uwave " << f.uwave()
 		<< " noun " << f.noun()
 		<< " number " << f.number();
 }