X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=7e8b3f4f2bcc2e9d8200b14305a0a848adb0460c;hb=f146bded7a1eed37174efca16ea63e65f93f6fbc;hp=c29156d10f1991a58bcfcdea829b77b5e294494a;hpb=1b1f8dd235ba8e168348cd23c824063f2595a0c5;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index c29156d10f..7e8b3f4f2b 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -286,6 +286,9 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 			tmp += "{";
 			os << from_ascii(tmp);
 			count += tmp.length();
+		} else if (language()->encoding()->package() != Encoding::CJK) {
+			os << '{';
+			count += 1;
 		}
 	} else if (language()->babel() != base.language()->babel() &&
 	    language() != prev.language()) {
@@ -318,7 +321,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;
 		}
@@ -392,46 +395,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,46 +482,40 @@ 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.
@@ -707,7 +703,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() && 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)
 	{