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

diff --git a/src/Font.cpp b/src/Font.cpp
index 0ca4080db3..86ffcd62cd 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -166,8 +166,11 @@ docstring const stateText(FontInfo const & f)
 		os << bformat(_("Underline %1$s, "),
 			      _(GUIMiscNames[f.underbar()]));
 	if (f.strikeout() != FONT_INHERIT)
-		os << bformat(_("Strikeout %1$s, "),
+		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()]));
@@ -241,6 +244,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";
 	}
@@ -287,6 +293,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 			tmp += "{";
 			os << from_ascii(tmp);
 			count += tmp.length();
+			pushLanguageName(language()->polyglossia(), true);
 		} else if (language()->encoding()->package() != Encoding::CJK) {
 			os << '{';
 			count += 1;
@@ -322,6 +329,8 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 				      "$$lang", language()->babel());
 			os << from_ascii(tmp);
 			count += tmp.length();
+			if (!lyxrc.language_command_end.empty())
+				pushLanguageName(language()->babel(), true);
 		} else if (language()->encoding()->package() != Encoding::CJK) {
 			os << '{';
 			count += 1;
@@ -342,10 +351,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;
 	}
@@ -426,6 +436,11 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		count += 9;
 		++runparams.inulemcmd;
 	}
+	if (f.xout() == FONT_ON) {
+		os << "\\xout{";
+		count += 9;
+		++runparams.inulemcmd;
+	}
 	if (f.uuline() == FONT_ON) {
 		os << "\\uuline{";
 		count += 11;
@@ -447,6 +462,7 @@ 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;
@@ -491,6 +507,11 @@ int Font::latexWriteEndChanges(otexstream & 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;
 		}
@@ -505,6 +526,11 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		++count;
 		--runparams.inulemcmd;
 	}
+	if (f.xout() == FONT_ON) {
+		os << '}';
+		++count;
+		--runparams.inulemcmd;
+	}
 	if (f.uuline() == FONT_ON) {
 		os << '}';
 		++count;
@@ -520,10 +546,11 @@ int Font::latexWriteEndChanges(otexstream & 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 && 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;
 	}
@@ -545,6 +572,11 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 	    && 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;
@@ -564,6 +596,7 @@ 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'
@@ -606,10 +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" ||
-			   token == "uuline" || token == "uwave" ||
-			   token == "strikeout") {
+		} 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);
@@ -620,6 +653,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")
@@ -675,7 +710,12 @@ void Font::validate(LaTeXFeatures & features) const
 	if (bits_.strikeout() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Strikeout enabled. Font: " << to_utf8(stateText(0)));
+		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());
@@ -747,6 +787,7 @@ ostream & operator<<(ostream & os, FontInfo const & f)
 		<< " emph " << f.emph()
 		<< " underbar " << f.underbar()
 		<< " strikeout " << f.strikeout()
+		<< " xout " << f.xout()
 		<< " uuline " << f.uuline()
 		<< " uwave " << f.uwave()
 		<< " noun " << f.noun()