X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=9124f0ab05c94f3e848c898966379939594bd87a;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=6b072d8b6761ce5811e64061ad7a1c35a5508093;hpb=f67cf6f4bb3e3d22ac9aebfa22027c3537cbdf61;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index 6b072d8b67..9124f0ab05 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"
@@ -286,6 +287,10 @@ 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;
 		}
 	} else if (language()->babel() != base.language()->babel() &&
 	    language() != prev.language()) {
@@ -318,7 +323,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 				      "$$lang", language()->babel());
 			os << from_ascii(tmp);
 			count += tmp.length();
-		} else {
+		} else if (language()->encoding()->package() != Encoding::CJK) {
 			os << '{';
 			count += 1;
 		}
@@ -338,10 +343,11 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	// 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;
 	}
@@ -392,46 +398,45 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		count += 6;
 		env = true; //We have opened a new environment
 	}
+	// \noun{} is a LyX special macro
+	if (f.noun() == FONT_ON) {
+		os << "\\noun{";
+		count += 6;
+		env = true; //We have opened a new environment
+	}
+	if (f.size() != FONT_SIZE_INHERIT) {
+		// If we didn't open an environment above, we open one here
+		if (!env) {
+			os << '{';
+			++count;
+		}
+		os << '\\'
+		   << LaTeXSizeNames[f.size()]
+		   << "{}";
+		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 = true;
-		env = true; //We have opened a new environment
+		++runparams.inulemcmd;
 	}
 	if (f.strikeout() == FONT_ON) {
 		os << "\\sout{";
 		count += 9;
-		runparams.inulemcmd = true;
-		env = true; //We have opened a new environment
+		++runparams.inulemcmd;
 	}
 	if (f.uuline() == FONT_ON) {
 		os << "\\uuline{";
 		count += 11;
-		runparams.inulemcmd = true;
-		env = true; //We have opened a new environment
+		++runparams.inulemcmd;
 	}
 	if (f.uwave() == FONT_ON) {
 		os << "\\uwave{";
 		count += 10;
-		runparams.inulemcmd = true;
-		env = true; //We have opened a new environment
-	}
-	// \noun{} is a LyX special macro
-	if (f.noun() == FONT_ON) {
-		os << "\\noun{";
-		count += 6;
-		env = true; //We have opened a new environment
-	}
-	if (f.size() != FONT_SIZE_INHERIT) {
-		// If we didn't open an environment above, we open one here
-		if (!env) {
-			os << '{';
-			++count;
-		}
-		os << '\\'
-		   << LaTeXSizeNames[f.size()]
-		   << '{';
-		count += strlen(LaTeXSizeNames[f.size()]) + 2;
+		++runparams.inulemcmd;
 	}
 	return count;
 }
@@ -480,53 +485,48 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
-	if (f.underbar() == FONT_ON) {
+	if (f.noun() == FONT_ON) {
 		os << '}';
 		++count;
-		runparams.inulemcmd = false;
 		env = true; // Size change need not bother about closing env.
 	}
-	if (f.strikeout() == FONT_ON) {
-		os << '}';
-		++count;
-		runparams.inulemcmd = false;
-		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;
+		}
 	}
-	if (f.uuline() == FONT_ON) {
+	if (f.underbar() == 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.strikeout() == 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.uuline() == FONT_ON) {
 		os << '}';
 		++count;
-		env = true; // Size change need not bother about closing env.
+		--runparams.inulemcmd;
 	}
-	if (f.size() != FONT_SIZE_INHERIT) {
-		// We only have to close if only size changed
-		if (!env) {
-			os << '}';
-			++count;
-		}
+	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;
 	}
@@ -537,7 +537,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		Encoding const * const ascii = encodings.fromLyXName("ascii");
 		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;
@@ -548,6 +548,8 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 	    && language()->encoding()->package() != Encoding::CJK) {
 		os << '}';
 		++count;
+		if (runparams.use_polyglossia)
+			popPolyglossiaLang();
 	}
 
 	return count;
@@ -699,6 +701,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)));
@@ -707,7 +722,8 @@ void Font::validate(LaTeXFeatures & features) const
 	// FIXME: Do something for background and soul package?
 
 	if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
-	     || (features.useBabel(true) && lang_->babel() != doc_language->babel()))
+	     || (features.useBabel() && lang_->babel() != doc_language->babel())
+	     || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language))
 	    && lang_ != ignore_language
 	    && lang_ != latex_language)
 	{