X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFont.cpp;h=aa8c235f11a407590d5cb59400dfcd64a173f3c2;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=112b51c5e3cd0d40feb6b98c18d7143e0432a58d;hpb=49e8e3567c72b86b02a89f025fb492790e50dd97;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index 112b51c5e3..aa8c235f11 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -114,18 +114,18 @@ 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());
 }
@@ -228,8 +228,8 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 				    OutputParams const & runparams,
 				    Font const & base,
 				    Font const & prev,
-				    bool const & non_inherit_inset,
-				    bool const & needs_cprotection) const
+				    bool non_inherit_inset,
+				    bool needs_cprotection) const
 {
 	int count = 0;
 
@@ -239,12 +239,8 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	    && language() != prev.language()) {
 		if (!language()->polyglossia().empty()) {
 			string tmp;
-			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					tmp += "\\begingroup\\catcode`\\^=7";
+			if (needs_cprotection)
 				tmp += "\\cprotect";
-			}
 			tmp += "\\text" + language()->polyglossia();
 			if (!language()->polyglossiaOpts().empty()) {
 				tmp += "[" + language()->polyglossiaOpts() + "]";
@@ -252,12 +248,8 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 					// We need to strip the command for
 					// the pdf string, see #11813
 					string tmpp;
-					if (needs_cprotection) {
-						if (contains(runparams.active_chars, '^'))
-							// cprotect relies on ^ being on catcode 7
-							os << "\\begingroup\\catcode`\\^=7";
+					if (needs_cprotection)
 						tmpp = "\\cprotect";
-					}
 					tmp = tmpp + "\\texorpdfstring{" + tmp + "}{}";
 				}
 			}
@@ -273,9 +265,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	    language() != prev.language()) {
 		if (language()->lang() == "farsi") {
 			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				os << "\\cprotect";
 				count += 9;
 			}
@@ -284,9 +273,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 		} else if (!isRightToLeft() &&
 			    base.language()->lang() == "farsi") {
 			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				os << "\\cprotect";
 				count += 9;
 			}
@@ -294,9 +280,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			count += 8;
 		} else if (language()->lang() == "arabic_arabi") {
 			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				os << "\\cprotect";
 				count += 9;
 			}
@@ -305,20 +288,14 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
  		} else if (!isRightToLeft() &&
 				base.language()->lang() == "arabic_arabi") {
 			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				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) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				os << "\\cprotect";
 				count += 9;
 			}
@@ -333,13 +310,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			string const tmp =
 				subst(lyxrc.language_command_local,
 				      "$$lang", language()->babel());
-			if (needs_cprotection && !prefixIs(tmp, "\\begin{")) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
-				os << "\\cprotect";
-				count += 9;
-			}
 			os << from_ascii(tmp);
 			count += tmp.length();
 			if (!lyxrc.language_command_end.empty())
@@ -366,11 +336,18 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	p.reduce(prev.bits_);
 
 	if (f.size() != INHERIT_SIZE) {
-		os << '{';
-		++count;
-		os << '\\'
-		   << LaTeXSizeSwitchNames[f.size()] << termcmd;
-		count += strlen(LaTeXSizeSwitchNames[f.size()]) + 1;
+		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) {
 		if (non_inherit_inset) {
@@ -380,9 +357,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			count += strlen(LaTeXFamilySwitchNames[f.family()]) + 1;
 		} else {
 			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				os << "\\cprotect";
 				count += 9;
 			}
@@ -400,9 +374,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			count += strlen(LaTeXSeriesSwitchNames[f.series()]) + 1;
 		} else {
 			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				os << "\\cprotect";
 				count += 9;
 			}
@@ -420,9 +391,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			count += strlen(LaTeXShapeSwitchNames[f.shape()]) + 1;
 		} else {
 			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
 				os << "\\cprotect";
 				count += 9;
 			}
@@ -438,13 +406,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			os << '}';
 			++count;
 		} else if (f.color() != Color_none) {
-			if (needs_cprotection) {
-				if (contains(runparams.active_chars, '^'))
-					// cprotect relies on ^ being on catcode 7
-					os << "\\begingroup\\catcode`\\^=7";
-				os << "\\cprotect";
-				count += 9;
-			}
 			os << "\\textcolor{"
 			   << from_ascii(lcolor.getLaTeXName(f.color()))
 			   << "}{";
@@ -474,18 +435,18 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 		|| language()->lang() == "arabic_arabi")) {
 		if (runparams.use_polyglossia) {
 			// LuaTeX/luabidi
-			os << "\\LR{";
-			count += 5;
-		} else {
+			// \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) {
-			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being on catcode 7
-				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 			count += 9;
 		}
@@ -495,9 +456,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	// \noun{} is a LyX special macro
 	if (f.noun() == FONT_ON) {
 		if (needs_cprotection) {
-			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being on catcode 7
-				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 			count += 9;
 		}
@@ -509,9 +467,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	// which prevents linebreaks (#8424, #8733)
 	if (f.underbar() == FONT_ON) {
 		if (needs_cprotection) {
-			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being on catcode 7
-				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 			count += 9;
 		}
@@ -521,9 +476,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	}
 	if (f.uuline() == FONT_ON) {
 		if (needs_cprotection) {
-			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being on catcode 7
-				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 			count += 9;
 		}
@@ -533,9 +485,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	}
 	if (f.strikeout() == FONT_ON) {
 		if (needs_cprotection) {
-			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being on catcode 7
-				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 			count += 9;
 		}
@@ -545,9 +494,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 	}
 	if (f.xout() == FONT_ON) {
 		if (needs_cprotection) {
-			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being on catcode 7
-				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 			count += 9;
 		}
@@ -563,9 +509,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			count += 15;
 		}
 		if (needs_cprotection) {
-			if (contains(runparams.active_chars, '^'))
-				// cprotect relies on ^ being on catcode 7
-				os << "\\begingroup\\catcode`\\^=7";
 			os << "\\cprotect";
 			count += 9;
 		}
@@ -585,7 +528,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 				  Font const & base,
 				  Font const & next,
 				  bool & needPar,
-				  bool const & closeLanguage) const
+				  bool closeLanguage) const
 {
 	int count = 0;
 
@@ -670,9 +613,12 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		|| language()->lang() == "arabic_arabi")) {
 		if (runparams.use_polyglossia) {
 			// LuaTeX/luabidi
-			os << "}";
-			count += 1;
-		} else {
+			// 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;
 		}
@@ -698,7 +644,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		bool const using_begin_end =
 			runparams.use_polyglossia ||
 				!lyxrc.language_command_end.empty();
-		if (using_begin_end)
+		if (using_begin_end && !languageStackEmpty())
 			popLanguageName();
 	}
 
@@ -825,34 +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()));
+		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()));
+		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, "Strike out enabled. Font: " << to_utf8(stateText()));
+		LYXERR(Debug::OUTFILE, "Strike out enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.xout() == FONT_ON) {
-		LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
+		LYXERR(Debug::OUTFILE, "font.xout: " << bits_.xout());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText()));
+		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()));
+		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()));
+		LYXERR(Debug::OUTFILE, "Wavy underline enabled. Font: " << to_utf8(stateText()));
 	}
 	switch (bits_.color()) {
 		case Color_none:
@@ -878,7 +824,7 @@ void Font::validate(LaTeXFeatures & features) const
 			break;
 		default:
 			features.require("color");
-			LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText()));
+			LYXERR(Debug::OUTFILE, "Color enabled. Font: " << to_utf8(stateText()));
 	}
 
 	// FIXME: Do something for background and soul package?
@@ -890,7 +836,7 @@ void Font::validate(LaTeXFeatures & features) const
 	    && lang_ != latex_language)
 	{
 		features.useLanguage(lang_);
-		LYXERR(Debug::LATEX, "Found language " << lang_->lang());
+		LYXERR(Debug::OUTFILE, "Found language " << lang_->lang());
 	}
 }
 
@@ -927,7 +873,7 @@ ostream & operator<<(ostream & os, FontInfo const & f)
 ostream & operator<<(ostream & os, Font const & font)
 {
 	return os << font.bits_
-		<< " lang: " << (font.lang_ ? font.lang_->lang() : nullptr);
+		<< " lang: " << (font.lang_ ? font.lang_->lang() : "");
 }