X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=7e0798d8ac59b123182b0b609b351d561c5f6db5;hb=26ba2a65838731ce639a09539f617cb0f0be3b22;hp=bcfb47782f1b1f7862bab979f0de327be0dcd82e;hpb=3b6fec38357949da2675dd4524282f1c790eff6e;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index bcfb47782f..7e0798d8ac 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -56,18 +56,29 @@ namespace {
 //
 // Strings used to write LaTeX files
 //
-char const * LaTeXFamilyNames[NUM_FAMILIES + 2] =
+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[NUM_SERIES + 2] =
+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[NUM_SHAPE + 2] =
+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[NUM_SIZE + 4] =
+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" };
 
@@ -103,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());
 }
@@ -141,7 +152,7 @@ docstring const Font::stateText(BufferParams * params, bool const terse) const
 // Returns size in latex format
 string const Font::latexSize() const
 {
-	return LaTeXSizeNames[bits_.size()];
+	return LaTeXSizeSwitchNames[bits_.size()];
 }
 
 
@@ -213,10 +224,12 @@ 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
 {
 	int count = 0;
 
@@ -225,13 +238,20 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	    && language()->lang() != base.language()->lang()
 	    && language() != prev.language()) {
 		if (!language()->polyglossia().empty()) {
-			string tmp = "\\text" + language()->polyglossia();
+			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)
+				if (runparams.use_hyperref && runparams.moving_arg) {
 					// We need to strip the command for
 					// the pdf string, see #11813
-					tmp = "\\texorpdfstring{" + tmp + "}{}";
+					string tmpp;
+					if (needs_cprotection)
+						tmpp = "\\cprotect";
+					tmp = tmpp + "\\texorpdfstring{" + tmp + "}{}";
+				}
 			}
 			tmp += "{";
 			os << from_ascii(tmp);
@@ -244,21 +264,41 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	} 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;
@@ -281,7 +321,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	}
 
 	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;
@@ -296,30 +336,69 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	p.reduce(prev.bits_);
 
 	if (f.size() != INHERIT_SIZE) {
-		os << '{';
-		++count;
-		os << '\\'
-		   << LaTeXSizeNames[f.size()]
-		   << "{}";
-		count += strlen(LaTeXSizeNames[f.size()]) + 3;
+		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;
+		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;
+		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;
+		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) {
 		if (f.color() == Color_none && p.color() != Color_none) {
@@ -347,7 +426,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	// 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()
+	if (!bparams.useBidiPackage(runparams)
 	    && !runparams.pass_thru
 	    && bits_.number() == FONT_ON
 	    && prev.fontInfo().number() != FONT_ON
@@ -356,19 +435,30 @@ int Font::latexWriteStartChanges(odocstream & 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) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\emph{";
 		count += 6;
 	}
 	// \noun{} is a LyX special macro
 	if (f.noun() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\noun{";
 		count += 6;
 	}
@@ -376,34 +466,54 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 	// 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;
+		count += 7;
 		++runparams.inulemcmd;
 	}
 	if (f.uuline() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\uuline{";
-		count += 11;
+		count += 8;
 		++runparams.inulemcmd;
 	}
 	if (f.strikeout() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\sout{";
-		count += 9;
+		count += 6;
 		++runparams.inulemcmd;
 	}
 	if (f.xout() == FONT_ON) {
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
+		}
 		os << "\\xout{";
-		count += 9;
+		count += 6;
 		++runparams.inulemcmd;
 	}
 	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 << "\\ULdepth=\\maxdimen";
+			count += 18;
+		}
+		if (needs_cprotection) {
+			os << "\\cprotect";
+			count += 9;
 		}
 		os << "\\uwave{";
-		count += 10;
+		count += 7;
 		++runparams.inulemcmd;
 	}
 	return count;
@@ -418,8 +528,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 				  Font const & base,
 				  Font const & next,
 				  bool & needPar,
-				  bool const & closeLanguage,
-				  bool const & non_inherit_inset) const
+				  bool closeLanguage) const
 {
 	int count = 0;
 
@@ -457,15 +566,13 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		// We do not close size group in front of
 		// insets with InheritFont() false (as opposed
 		// to all other font properties) (#8384)
-		if (!non_inherit_inset) {
-			if (needPar && !closeLanguage) {
-				os << "\\par";
-				count += 4;
-				needPar = false;
-			}
-			os << '}';
-			++count;
+		if (needPar && !closeLanguage) {
+			os << "\\par";
+			count += 4;
+			needPar = false;
 		}
+		os << '}';
+		++count;
 	}
 	if (f.underbar() == FONT_ON) {
 		os << '}';
@@ -497,7 +604,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 	// 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()
+	if (!bparams.useBidiPackage(runparams)
 	    && !runparams.pass_thru
 	    && bits_.number() == FONT_ON
 	    && next.fontInfo().number() != FONT_ON
@@ -506,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;
 		}
@@ -534,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();
 	}
 
@@ -661,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:
@@ -714,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?
@@ -726,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());
 	}
 }
 
@@ -763,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() : "");
 }