X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=aa8c235f11a407590d5cb59400dfcd64a173f3c2;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=bf99b3e6582e5158719afdc5102f19d5818b0438;hpb=7cbeed2e40691570b5572c58ce51222d487400e6;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index bf99b3e658..aa8c235f11 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"
@@ -44,54 +45,44 @@ namespace lyx {
 //
 // These are defined in FontInfo.cpp
 extern char const * LyXFamilyNames[NUM_FAMILIES + 2];
-extern char const * LyXSeriesNames[4];
-extern char const * LyXShapeNames[6];
-extern char const * LyXSizeNames[14];
+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
-//
+extern char const * GUIMiscNames[5];
 
 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", "rsfs", "wasy", "esint",
-  N_("Inherit"), N_("Ignore") };
-
-char const * GUISeriesNames[4] =
-{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-
-char const * GUIShapeNames[6] =
-{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
-  N_("Ignore") };
-
-char const * GUISizeNames[14] =
-{ 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") };
-
-char const * GUIMiscNames[5] =
-{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
-
 //
 // Strings used to write LaTeX files
 //
-char const * LaTeXFamilyNames[6] =
-{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
+char const * LaTeXFamilyCommandNames[NUM_FAMILIES + 2] =
+{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4",
+  "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+  "error12", "error13", "error14" };
 
-char const * LaTeXSeriesNames[4] =
+char const * LaTeXFamilySwitchNames[NUM_FAMILIES + 2] =
+{ "rmfamily", "sffamily", "ttfamily", "error1", "error2", "error3", "error4",
+  "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+  "error12", "error13", "error14" };
+
+char const * LaTeXSeriesCommandNames[NUM_SERIES + 2] =
 { "textmd", "textbf", "error4", "error5" };
 
-char const * LaTeXShapeNames[6] =
+char const * LaTeXSeriesSwitchNames[NUM_SERIES + 2] =
+{ "mdseries", "bfseries", "error4", "error5" };
+
+char const * LaTeXShapeCommandNames[NUM_SHAPE + 2] =
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
 
-char const * LaTeXSizeNames[14] =
+char const * LaTeXShapeSwitchNames[NUM_SHAPE + 2] =
+{ "upshape", "itshape", "slshape", "scshape", "error6", "error7" };
+
+char const * LaTeXSizeSwitchNames[NUM_SIZE + 4] =
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
 
-} // namespace anon
+} // namespace
 
 
 Font::Font(FontInfo bits, Language const * l)
@@ -123,73 +114,36 @@ void Font::setLanguage(Language const * l)
 
 /// Updates font settings according to request
 void Font::update(Font const & newfont,
-		     Language const * document_language,
+		     Language const * default_lang,
 		     bool toggleall)
 {
 	bits_.update(newfont.fontInfo(), toggleall);
 
 	if (newfont.language() == language() && toggleall)
-		if (language() == document_language)
+		if (language() == default_lang)
 			setLanguage(default_language);
 		else
-			setLanguage(document_language);
+			setLanguage(default_lang);
 	else if (newfont.language() == reset_language)
-		setLanguage(document_language);
+		setLanguage(default_lang);
 	else if (newfont.language() != ignore_language)
 		setLanguage(newfont.language());
 }
 
 
-docstring const stateText(FontInfo const & f)
+docstring const Font::stateText(BufferParams * params, bool const terse) const
 {
 	odocstringstream os;
-	if (f.family() != INHERIT_FAMILY)
-		os << _(GUIFamilyNames[f.family()]) << ", ";
-	if (f.series() != INHERIT_SERIES)
-		os << _(GUISeriesNames[f.series()]) << ", ";
-	if (f.shape() != INHERIT_SHAPE)
-		os << _(GUIShapeNames[f.shape()]) << ", ";
-	if (f.size() != FONT_SIZE_INHERIT)
-		os << _(GUISizeNames[f.size()]) << ", ";
-	if (f.color() != Color_inherit)
-		os << lcolor.getGUIName(f.color()) << ", ";
-	// FIXME: uncomment this when we support background.
-	//if (f.background() != Color_inherit)
-	//	os << lcolor.getGUIName(f.background()) << ", ";
-	if (f.emph() != FONT_INHERIT)
-		os << bformat(_("Emphasis %1$s, "),
-			      _(GUIMiscNames[f.emph()]));
-	if (f.underbar() != FONT_INHERIT)
-		os << bformat(_("Underline %1$s, "),
-			      _(GUIMiscNames[f.underbar()]));
-	if (f.strikeout() != FONT_INHERIT)
-		os << bformat(_("Strikeout %1$s, "),
-			      _(GUIMiscNames[f.strikeout()]));
-	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()]));
-	if (f == inherit_font)
-		os << _("Default") << ", ";
-
-	return os.str();
-}
-
-
-docstring const Font::stateText(BufferParams * params) const
-{
-	odocstringstream os;
-	os << lyx::stateText(bits_);
-	if (!params || (language() != params->language))
+	os << bits_.stateText(terse);
+	if ((!params || (language() != params->language))
+	    && (!terse || language() != ignore_language)) {
+		// reset_language is a null pointer!
 		os << bformat(_("Language: %1$s, "),
-			      _(language()->display()));
+			      (language() == reset_language) ? _("Default")
+							     : _(language()->display()));
+	}
 	if (bits_.number() != FONT_OFF)
-		os << bformat(_("  Number %1$s"),
+		os << "  " << bformat(_("Number %1$s"),
 			      _(GUIMiscNames[bits_.number()]));
 	return rtrim(os.str(), ", ");
 }
@@ -198,7 +152,7 @@ docstring const Font::stateText(BufferParams * params) const
 // Returns size in latex format
 string const Font::latexSize() const
 {
-	return LaTeXSizeNames[bits_.size()];
+	return LaTeXSizeSwitchNames[bits_.size()];
 }
 
 
@@ -215,10 +169,13 @@ void Font::lyxWriteChanges(Font const & orgfont,
 		os << "\\shape " << LyXShapeNames[bits_.shape()] << "\n";
 	if (orgfont.fontInfo().size() != bits_.size())
 		os << "\\size " << LyXSizeNames[bits_.size()] << "\n";
+	// FIXME: shall style be handled there? Probably not.
 	if (orgfont.fontInfo().emph() != bits_.emph())
 		os << "\\emph " << LyXMiscNames[bits_.emph()] << "\n";
 	if (orgfont.fontInfo().number() != bits_.number())
 		os << "\\numeric " << LyXMiscNames[bits_.number()] << "\n";
+	if (orgfont.fontInfo().nospellcheck() != bits_.nospellcheck())
+		os << "\\nospellcheck " << LyXMiscNames[bits_.nospellcheck()] << "\n";
 	if (orgfont.fontInfo().underbar() != bits_.underbar()) {
 		// This is only for backwards compatibility
 		switch (bits_.underbar()) {
@@ -238,6 +195,9 @@ void Font::lyxWriteChanges(Font const & orgfont,
 	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";
 	}
@@ -264,43 +224,81 @@ void Font::lyxWriteChanges(Font const & orgfont,
 
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
-int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 				    OutputParams const & runparams,
 				    Font const & base,
-				    Font const & prev) const
+				    Font const & prev,
+				    bool non_inherit_inset,
+				    bool needs_cprotection) const
 {
-	bool env = false;
-
 	int count = 0;
 
 	// polyglossia or babel?
-	if (runparams.use_polyglossia) {
+	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())
+			string tmp;
+			if (needs_cprotection)
+				tmp += "\\cprotect";
+			tmp += "\\text" + language()->polyglossia();
+			if (!language()->polyglossiaOpts().empty()) {
 				tmp += "[" + language()->polyglossiaOpts() + "]";
+				if (runparams.use_hyperref && runparams.moving_arg) {
+					// We need to strip the command for
+					// the pdf string, see #11813
+					string tmpp;
+					if (needs_cprotection)
+						tmpp = "\\cprotect";
+					tmp = tmpp + "\\texorpdfstring{" + tmp + "}{}";
+				}
+			}
 			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") {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
 			os << "\\textFR{";
 			count += 8;
 		} else if (!isRightToLeft() &&
 			    base.language()->lang() == "farsi") {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
 			os << "\\textLR{";
 			count += 8;
 		} else if (language()->lang() == "arabic_arabi") {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
 			os << "\\textAR{";
 			count += 8;
  		} else if (!isRightToLeft() &&
 				base.language()->lang() == "arabic_arabi") {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
 			os << "\\textLR{";
 			count += 8;
 		// currently the remaining RTL languages are arabic_arabtex and hebrew
-		} else if (isRightToLeft() != prev.isRightToLeft()) {
+		} else if (isRightToLeft() != prev.isRightToLeft() && !runparams.isFullUnicode()) {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
 			if (isRightToLeft()) {
 				os << "\\R{";
 				count += 3;
@@ -314,14 +312,16 @@ 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;
 		}
 	}
 
 	if (language()->encoding()->package() == Encoding::CJK) {
-		pair<bool, int> const c = switchEncoding(os, bparams,
+		pair<bool, int> const c = switchEncoding(os.os(), bparams,
 				runparams, *(language()->encoding()));
 		if (c.first) {
 			open_encoding_ = true;
@@ -330,48 +330,87 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		}
 	}
 
-	// When 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")) {
-		os << "{\\beginL ";
-		count += 9;
-	}
-
 	FontInfo f = bits_;
 	f.reduce(base.bits_);
+	FontInfo p = bits_;
+	p.reduce(prev.bits_);
 
+	if (f.size() != INHERIT_SIZE) {
+		if (!runparams.find_effective()) {
+			os << '{';
+			++count;
+			os << '\\'
+			   << LaTeXSizeSwitchNames[f.size()] << termcmd;
+			count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
+		}
+		else {
+			os << '\\'
+			   << LaTeXSizeSwitchNames[f.size()] << '{';
+			count += strlen(LaTeXSizeSwitchNames[f.size()]) + 2;
+		}
+	}
 	if (f.family() != INHERIT_FAMILY) {
-		os << '\\'
-		   << LaTeXFamilyNames[f.family()]
-		   << '{';
-		count += strlen(LaTeXFamilyNames[f.family()]) + 2;
-		env = true; //We have opened a new environment
+		if (non_inherit_inset) {
+			os << '{';
+			++count;
+			os << '\\' << LaTeXFamilySwitchNames[f.family()] << termcmd;
+			count += strlen(LaTeXFamilySwitchNames[f.family()]) + 1;
+		} else {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
+			os << '\\'
+			   << LaTeXFamilyCommandNames[f.family()]
+			   << '{';
+			count += strlen(LaTeXFamilyCommandNames[f.family()]) + 2;
+		}
 	}
 	if (f.series() != INHERIT_SERIES) {
-		os << '\\'
-		   << LaTeXSeriesNames[f.series()]
-		   << '{';
-		count += strlen(LaTeXSeriesNames[f.series()]) + 2;
-		env = true; //We have opened a new environment
+		if (non_inherit_inset) {
+			os << '{';
+			++count;
+			os << '\\' << LaTeXSeriesSwitchNames[f.series()] << termcmd;
+			count += strlen(LaTeXSeriesSwitchNames[f.series()]) + 1;
+		} else {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
+			os << '\\'
+			   << LaTeXSeriesCommandNames[f.series()]
+			   << '{';
+			count += strlen(LaTeXSeriesCommandNames[f.series()]) + 2;
+		}
 	}
 	if (f.shape() != INHERIT_SHAPE) {
-		os << '\\'
-		   << LaTeXShapeNames[f.shape()]
-		   << '{';
-		count += strlen(LaTeXShapeNames[f.shape()]) + 2;
-		env = true; //We have opened a new environment
+		if (non_inherit_inset) {
+			os << '{';
+			++count;
+			os << '\\' << LaTeXShapeSwitchNames[f.shape()] << termcmd;
+			count += strlen(LaTeXShapeSwitchNames[f.shape()]) + 1;
+		} else {
+			if (needs_cprotection) {
+				os << "\\cprotect";
+				count += 9;
+			}
+			os << '\\'
+			   << LaTeXShapeCommandNames[f.shape()]
+			   << '{';
+			count += strlen(LaTeXShapeCommandNames[f.shape()]) + 2;
+		}
 	}
 	if (f.color() != Color_inherit && f.color() != Color_ignore) {
-		os << "\\textcolor{"
-		   << from_ascii(lcolor.getLaTeXName(f.color()))
-		   << "}{";
-		count += lcolor.getLaTeXName(f.color()).length() + 13;
-		env = true; //We have opened a new environment
+		if (f.color() == Color_none && p.color() != Color_none) {
+			// Color none: Close previous color, if any
+			os << '}';
+			++count;
+		} else if (f.color() != Color_none) {
+			os << "\\textcolor{"
+			   << from_ascii(lcolor.getLaTeXName(f.color()))
+			   << "}{";
+			count += lcolor.getLaTeXName(f.color()).length() + 13;
+		}
 	}
 	// FIXME: uncomment this when we support background.
 	/*
@@ -383,51 +422,99 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		env = true; //We have opened a new environment
 	}
 	*/
+	// If the current language is Hebrew, Arabic, or Farsi
+	// the numbers are written Left-to-Right. ArabTeX package
+	// and bidi (polyglossia with XeTeX) reorder the number automatically
+	// but the packages used for Hebrew and Farsi (Arabi) do not.
+	if (!runparams.useBidiPackage()
+	    && !runparams.pass_thru
+	    && bits_.number() == FONT_ON
+	    && prev.fontInfo().number() != FONT_ON
+	    && (language()->lang() == "hebrew"
+		|| language()->lang() == "farsi"
+		|| language()->lang() == "arabic_arabi")) {
+		if (runparams.use_polyglossia) {
+			// LuaTeX/luabidi
+			// \LR needs extra grouping
+			// (possibly a LuaTeX bug)
+			os << "{\\LR{";
+			count += 6;
+		} else if (!runparams.isFullUnicode()) {
+			// not needed with babel/lua|xetex
+			os << "{\\beginL ";
+			count += 9;
+		}
+	}
 	if (f.emph() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\emph{";
 		count += 6;
-		env = true; //We have opened a new environment
 	}
+	// \noun{} is a LyX special macro
+	if (f.noun() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
+		os << "\\noun{";
+		count += 6;
+	}
+	// 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) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\uline{";
-		count += 10;
-		runparams.inulemcmd = true;
-		env = true; //We have opened a new environment
-	}
-	if (f.strikeout() == FONT_ON) {
-		os << "\\sout{";
-		count += 9;
-		runparams.inulemcmd = true;
-		env = true; //We have opened a new environment
+		count += 7;
+		++runparams.inulemcmd;
 	}
 	if (f.uuline() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\uuline{";
-		count += 11;
-		runparams.inulemcmd = true;
-		env = true; //We have opened a new environment
+		count += 8;
+		++runparams.inulemcmd;
 	}
-	if (f.uwave() == FONT_ON) {
-		os << "\\uwave{";
-		count += 10;
-		runparams.inulemcmd = true;
-		env = true; //We have opened a new environment
+	if (f.strikeout() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
+		os << "\\sout{";
+		count += 6;
+		++runparams.inulemcmd;
 	}
-	// \noun{} is a LyX special macro
-	if (f.noun() == FONT_ON) {
-		os << "\\noun{";
+	if (f.xout() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
+		os << "\\xout{";
 		count += 6;
-		env = true; //We have opened a new environment
+		++runparams.inulemcmd;
 	}
-	if (f.size() != FONT_SIZE_INHERIT) {
-		// If we didn't open an environment above, we open one here
-		if (!env) {
-			os << '{';
-			++count;
+	if (f.uwave() == FONT_ON) {
+		if (runparams.inulemcmd) {
+			// needed with nested uwave in xout
+			// see https://tex.stackexchange.com/a/263042
+			os << "\\ULdepth=1000pt";
+			count += 15;
 		}
-		os << '\\'
-		   << LaTeXSizeNames[f.size()]
-		   << ' ';
-		count += strlen(LaTeXSizeNames[f.size()]) + 2;
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
+		os << "\\uwave{";
+		count += 7;
+		++runparams.inulemcmd;
 	}
 	return count;
 }
@@ -436,14 +523,14 @@ 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 const & closeLanguage) const
+				  bool & needPar,
+				  bool closeLanguage) const
 {
 	int count = 0;
-	bool env = false;
 
 	// reduce the current font to changes against the base
 	// font (of the layout). We use a temporary for this to
@@ -454,93 +541,111 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 	if (f.family() != INHERIT_FAMILY) {
 		os << '}';
 		++count;
-		env = true; // Size change need not bother about closing env.
 	}
 	if (f.series() != INHERIT_SERIES) {
 		os << '}';
 		++count;
-		env = true; // Size change need not bother about closing env.
 	}
 	if (f.shape() != INHERIT_SHAPE) {
 		os << '}';
 		++count;
-		env = true; // Size change need not bother about closing env.
 	}
-	if (f.color() != Color_inherit && f.color() != Color_ignore) {
+	if (f.color() != Color_inherit && f.color() != Color_ignore && f.color() != Color_none) {
 		os << '}';
 		++count;
-		env = true; // Size change need not bother about closing env.
 	}
 	if (f.emph() == FONT_ON) {
 		os << '}';
 		++count;
-		env = true; // Size change need not bother about closing env.
+	}
+	if (f.noun() == FONT_ON) {
+		os << '}';
+		++count;
+	}
+	if (f.size() != INHERIT_SIZE) {
+		// We do not close size group in front of
+		// insets with InheritFont() false (as opposed
+		// to all other font properties) (#8384)
+		if (needPar && !closeLanguage) {
+			os << "\\par";
+			count += 4;
+			needPar = false;
+		}
+		os << '}';
+		++count;
 	}
 	if (f.underbar() == FONT_ON) {
 		os << '}';
 		++count;
-		runparams.inulemcmd = false;
-		env = true; // Size change need not bother about closing env.
+		--runparams.inulemcmd;
 	}
 	if (f.strikeout() == FONT_ON) {
 		os << '}';
 		++count;
-		runparams.inulemcmd = false;
-		env = true; // Size change need not bother about closing env.
+		--runparams.inulemcmd;
 	}
-	if (f.uuline() == FONT_ON) {
+	if (f.xout() == FONT_ON) {
 		os << '}';
 		++count;
-		runparams.inulemcmd = false;
-		env = true; // Size change need not bother about closing env.
+		--runparams.inulemcmd;
 	}
-	if (f.uwave() == FONT_ON) {
+	if (f.uuline() == FONT_ON) {
 		os << '}';
 		++count;
-		runparams.inulemcmd = false;
-		env = true; // Size change need not bother about closing env.
+		--runparams.inulemcmd;
 	}
-	if (f.noun() == FONT_ON) {
+	if (f.uwave() == FONT_ON) {
 		os << '}';
 		++count;
-		env = true; // Size change need not bother about closing env.
-	}
-	if (f.size() != FONT_SIZE_INHERIT) {
-		// We only have to close if only size changed
-		if (!env) {
-			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")) {
-		os << "\\endL}";
-		count += 6;
+	// and bidi (polyglossia with XeTeX) reorder the number automatically
+	// but the packages used for Hebrew and Farsi (Arabi) do not.
+	if (!runparams.useBidiPackage()
+	    && !runparams.pass_thru
+	    && bits_.number() == FONT_ON
+	    && next.fontInfo().number() != FONT_ON
+	    && (language()->lang() == "hebrew"
+		|| language()->lang() == "farsi"
+		|| language()->lang() == "arabic_arabi")) {
+		if (runparams.use_polyglossia) {
+			// LuaTeX/luabidi
+			// luabidi's \LR needs extra grouping
+			// (possibly a LuaTeX bug)
+			os << "}}";
+			count += 2;
+		} else if (!runparams.isFullUnicode()) {
+			// not needed with babel/lua|xetex
+			os << "\\endL}";
+			count += 6;
+		}
 	}
 
 	if (open_encoding_) {
 		// 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 && !languageStackEmpty())
+			popLanguageName();
 	}
 
 	return count;
@@ -560,10 +665,12 @@ string Font::toString(bool const toggle) const
 	   << "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'
+	   << "nospellcheck " << bits_.nospellcheck() << '\n'
 	   << "color " << bits_.color() << '\n'
 	   << "language " << lang << '\n'
 	   << "toggleall " << convert<string>(toggle);
@@ -601,11 +708,12 @@ bool Font::fromString(string const & data, bool & toggle)
 		} else if (token == "size") {
 			int const next = lex.getInteger();
 			bits_.setSize(FontSize(next));
-
-		} else if (token == "emph" || token == "underbar" ||
-			   token == "noun" || token == "number" ||
-			   token == "uuline" || token == "uwave" ||
-			   token == "strikeout") {
+		// FIXME: shall style be handled there? Probably not.
+		} else if (token == "emph" || token == "underbar"
+			|| token == "noun" || token == "number"
+			|| token == "uuline" || token == "uwave"
+			|| token == "strikeout" || token == "xout"
+			|| token == "nospellcheck") {
 
 			int const next = lex.getInteger();
 			FontState const misc = FontState(next);
@@ -616,6 +724,8 @@ bool Font::fromString(string const & data, bool & toggle)
 				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")
@@ -624,6 +734,8 @@ bool Font::fromString(string const & data, bool & toggle)
 				bits_.setNoun(misc);
 			else if (token == "number")
 				bits_.setNumber(misc);
+			else if (token == "nospellcheck")
+				bits_.setNoSpellcheck(misc);
 
 		} else if (token == "color") {
 			int const next = lex.getInteger();
@@ -659,29 +771,34 @@ void Font::validate(LaTeXFeatures & features) const
 	Language const * doc_language = bparams.language;
 
 	if (bits_.noun() == FONT_ON) {
-		LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
+		LYXERR(Debug::OUTFILE, "font.noun: " << bits_.noun());
 		features.require("noun");
-		LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::OUTFILE, "Noun enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.underbar() == FONT_ON) {
-		LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
+		LYXERR(Debug::OUTFILE, "font.underline: " << bits_.underbar());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::OUTFILE, "Underline enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.strikeout() == FONT_ON) {
-		LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
+		LYXERR(Debug::OUTFILE, "font.strikeout: " << bits_.strikeout());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Strikeout enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::OUTFILE, "Strike out enabled. Font: " << to_utf8(stateText()));
+	}
+	if (bits_.xout() == FONT_ON) {
+		LYXERR(Debug::OUTFILE, "font.xout: " << bits_.xout());
+		features.require("ulem");
+		LYXERR(Debug::OUTFILE, "Cross out enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.uuline() == FONT_ON) {
-		LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
+		LYXERR(Debug::OUTFILE, "font.uuline: " << bits_.uuline());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::OUTFILE, "Double underline enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.uwave() == FONT_ON) {
-		LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
+		LYXERR(Debug::OUTFILE, "font.uwave: " << bits_.uwave());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::OUTFILE, "Wavy underline enabled. Font: " << to_utf8(stateText()));
 	}
 	switch (bits_.color()) {
 		case Color_none:
@@ -692,19 +809,34 @@ 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)));
+			LYXERR(Debug::OUTFILE, "Color enabled. Font: " << to_utf8(stateText()));
 	}
 
 	// 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());
+		LYXERR(Debug::OUTFILE, "Found language " << lang_->lang());
 	}
 }
 
@@ -722,23 +854,26 @@ ostream & operator<<(ostream & os, FontInfo const & f)
 		<< " series " << f.series()
 		<< " shape " << f.shape()
 		<< " size " << f.size()
+		<< " style " << f.style()
 		<< " color " << f.color()
 		// FIXME: uncomment this when we support background.
 		//<< " 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();
+		<< " number " << f.number()
+		<< " nospellcheck " << f.nospellcheck();
 }
 
 
 ostream & operator<<(ostream & os, Font const & font)
 {
 	return os << font.bits_
-		<< " lang: " << (font.lang_ ? font.lang_->lang() : 0);
+		<< " lang: " << (font.lang_ ? font.lang_->lang() : "");
 }