X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput_latex.cpp;h=bdc7cb28efd40c513460f75581b327debaab38e2;hb=4480b72a9dc8a5453a17edf55d4d4a60847a68ae;hp=e0163ad2fad3ad85754341da38cdbb9416cfa984;hpb=6dc1884d05ee0d51dd896c7b924fdec758ea3d8e;p=lyx.git

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index e0163ad2fa..bdc7cb28ef 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -142,11 +142,16 @@ string const getPolyglossiaEnvName(Language const * lang)
 
 
 string const getPolyglossiaBegin(string const & lang_begin_command,
-				 string const & lang, string const & opts)
+				 string const & lang, string const & opts,
+				 bool const localswitch = false)
 {
 	string result;
-	if (!lang.empty())
-		result = subst(lang_begin_command, "$$lang", lang);
+	if (!lang.empty()) {
+		// we need to revert the upcasing done in getPolyglossiaEnvName()
+		// in case we have a local polyglossia command (\textarabic).
+		string language = localswitch ? ascii_lowercase(lang) : lang;
+		result = subst(lang_begin_command, "$$lang", language);
+	}
 	string options = opts.empty() ?
 		    string() : "[" + opts + "]";
 	result = subst(result, "$$opts", options);
@@ -532,6 +537,14 @@ void popLanguageName()
 }
 
 
+string const & openLanguageName()
+{
+	OutputState * state = getOutputState();
+
+	return openLanguageName(state);
+}
+
+
 namespace {
 
 void addArgInsets(Paragraph const & par, string const & prefix,
@@ -675,7 +688,8 @@ void TeXOnePar(Buffer const & buf,
 	       otexstream & os,
 	       OutputParams const & runparams_in,
 	       string const & everypar,
-	       int start_pos, int end_pos)
+	       int start_pos, int end_pos,
+	       bool const force)
 {
 	BufferParams const & bparams = runparams_in.is_child
 		? buf.masterParams() : buf.params();
@@ -686,7 +700,7 @@ void TeXOnePar(Buffer const & buf,
 	Layout const & style = text.inset().forcePlainLayout() ?
 		bparams.documentClass().plainLayout() : par.layout();
 
-	if (style.inpreamble)
+	if (style.inpreamble && !force)
 		return;
 
 	LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '"
@@ -720,18 +734,22 @@ void TeXOnePar(Buffer const & buf,
 				os << '\n';
 		}
 
-		par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
+		par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force);
 		return;
 	}
 
 	Paragraph const * nextpar = runparams.isLastPar
 		? 0 : &paragraphs.at(pit + 1);
 
+	bool const intitle_command = style.intitle && style.latextype == LATEX_COMMAND;
+
 	if (style.pass_thru) {
 		Font const outerfont = text.outerFont(pit);
 		parStartCommand(par, os, runparams, style);
+		if (intitle_command)
+			os << '{';
 
-		par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
+		par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force);
 
 		// I did not create a parEndCommand for this minuscule
 		// task because in the other user of parStartCommand
@@ -772,6 +790,9 @@ void TeXOnePar(Buffer const & buf,
 	// environment with nesting depth greater than (or equal to, but with
 	// a different layout) the current one. If there is no previous
 	// paragraph, the previous language is the outer language.
+	// Note further that we take the outer language also if the prior par
+	// is PassThru, since in that case it has latex_language, and all secondary
+	// languages have been closed (#10793).
 	bool const use_prev_env_language = state->prev_env_language_ != 0
 			&& priorpar
 			&& priorpar->layout().isEnvironment()
@@ -779,12 +800,11 @@ void TeXOnePar(Buffer const & buf,
 			    || (priorpar->getDepth() == par.getDepth()
 				    && priorpar->layout() != par.layout()));
 	Language const * const prev_language =
-		(pit != 0)
+		(priorpar && !priorpar->isPassThru())
 		? (use_prev_env_language ? state->prev_env_language_
 					 : priorpar->getParLanguage(bparams))
 		: outer_language;
 
-
 	bool const use_polyglossia = runparams.use_polyglossia;
 	string const par_lang = use_polyglossia ?
 		getPolyglossiaEnvName(par_language): par_language->babel();
@@ -804,32 +824,50 @@ void TeXOnePar(Buffer const & buf,
 	bool const using_begin_end = use_polyglossia ||
 					!lang_end_command.empty();
 
-	// In some insets (such as Arguments), we cannot use \selectlanguage
+	// For InTitle commands, we need to switch the language inside the command
+	// (see #10849); thus open the command here.
+	if (intitle_command) {
+		parStartCommand(par, os, runparams, style);
+		os << '{';
+	}
+
+	// In some insets (such as Arguments), we cannot use \selectlanguage.
+	// Also, if an RTL language is set via environment in polyglossia,
+	// only a nested \\text<lang> command will reset the direction for LTR
+	// languages (see # 10111).
+	bool const in_polyglossia_rtl_env =
+		use_polyglossia
+		&& runparams.local_font != 0
+		&& outer_language->rightToLeft()
+		&& !par_language->rightToLeft();
 	bool const localswitch = text.inset().forceLocalFontSwitch()
-			|| (using_begin_end && text.inset().forcePlainLayout());
+			|| (using_begin_end && text.inset().forcePlainLayout())
+			|| in_polyglossia_rtl_env;
 	if (localswitch) {
 		lang_begin_command = use_polyglossia ?
 			    "\\text$$lang$$opts{" : lyxrc.language_command_local;
 		lang_end_command = "}";
 		lang_command_termination.clear();
 	}
-
-	if (par_lang != prev_lang
-		// check if we already put language command in TeXEnvironment()
-		&& !(style.isEnvironment()
-		     && (pit == 0 || (priorpar->layout() != par.layout()
-			                  && priorpar->getDepth() <= par.getDepth())
-		                  || priorpar->getDepth() < par.getDepth())))
-	{
-		if ((!using_begin_end || langOpenedAtThisLevel(state)) &&
-		    !lang_end_command.empty() &&
-		    prev_lang != outer_lang &&
-		    !prev_lang.empty() &&
-		    (!using_begin_end || !style.isEnvironment()))
-		{
+	
+	bool const localswitch_needed = localswitch && par_lang != outer_lang;
+
+	// localswitches need to be closed and reopened at each par
+	if ((par_lang != prev_lang || localswitch_needed)
+	     // check if we already put language command in TeXEnvironment()
+	     && !(style.isEnvironment()
+		  && (pit == 0 || (priorpar->layout() != par.layout()
+			           && priorpar->getDepth() <= par.getDepth())
+		      || priorpar->getDepth() < par.getDepth()))) {
+		if (!localswitch
+		    && (!using_begin_end || langOpenedAtThisLevel(state))
+		    && !lang_end_command.empty()
+		    && prev_lang != outer_lang 
+		    && !prev_lang.empty()
+		    && (!using_begin_end || !style.isEnvironment())) {
 			os << from_ascii(subst(lang_end_command,
-				"$$lang",
-				prev_lang))
+					       "$$lang",
+					       prev_lang))
 			   << lang_command_termination;
 			if (using_begin_end)
 				popLanguageName();
@@ -882,10 +920,12 @@ void TeXOnePar(Buffer const & buf,
 			}
 			// With CJK, the CJK tag has to be closed first (see below)
 			if (runparams.encoding->package() != Encoding::CJK
-			    && par_lang != openLanguageName(state)
+			    && (par_lang != openLanguageName(state) || localswitch)
 			    && !par_lang.empty()) {
 				string bc = use_polyglossia ?
-					  getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts())
+					  getPolyglossiaBegin(lang_begin_command, par_lang,
+					  		      par_language->polyglossiaOpts(),
+					  		      localswitch)
 					  : subst(lang_begin_command, "$$lang", par_lang);
 				os << bc;
 				os << lang_command_termination;
@@ -944,11 +984,13 @@ void TeXOnePar(Buffer const & buf,
 				if (runparams.encoding->package() == Encoding::CJK
 				    && par_lang != openLanguageName(state)
 				    && !par_lang.empty()) {
-					os << from_ascii(subst(
-						lang_begin_command,
-						"$$lang",
-						par_lang))
-					<< lang_command_termination;
+				    	string bc = use_polyglossia ?
+						    getPolyglossiaBegin(lang_begin_command, par_lang,
+						    			par_language->polyglossiaOpts(),
+						    			localswitch)
+						    : subst(lang_begin_command, "$$lang", par_lang);
+					os << bc
+					   << lang_command_termination;
 					if (using_begin_end)
 						pushLanguageName(par_lang, localswitch);
 				}
@@ -967,24 +1009,39 @@ void TeXOnePar(Buffer const & buf,
 			os << "\n\\appendix\n";
 		}
 
-		if (!par.params().spacing().isDefault()
-			&& (pit == 0 || !priorpar->hasSameLayout(par)))
-		{
-			os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
-			    << '\n';
-		}
+		// InTitle commands must use switches (not environments)
+		// inside the commands (see #9332)
+		if (style.intitle) {
+			if (!par.params().spacing().isDefault())
+			{
+				if (runparams.moving_arg)
+					os << "\\protect";
+				os << from_ascii(par.params().spacing().writeCmd(useSetSpace));
+			}
+		} else {
+			if (!par.params().spacing().isDefault()
+				&& (pit == 0 || !priorpar->hasSameLayout(par)))
+			{
+				os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
+				    << '\n';
+			}
 
-		if (style.isCommand()) {
-			os << '\n';
+			if (style.isCommand()) {
+				os << '\n';
+			}
 		}
 	}
 
-	parStartCommand(par, os, runparams, style);
+	// For InTitle commands, we already started the command before
+	// the language switch
+	if (!intitle_command)
+		parStartCommand(par, os, runparams, style);
+
 	Font const outerfont = text.outerFont(pit);
 
 	// FIXME UNICODE
 	os << from_utf8(everypar);
-	par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
+	par.latex(bparams, outerfont, os, runparams, start_pos, end_pos, force);
 
 	Font const font = par.empty()
 		 ? par.getLayoutFont(bparams, outerfont)
@@ -992,13 +1049,16 @@ void TeXOnePar(Buffer const & buf,
 
 	bool const is_command = style.isCommand();
 
-	if (is_command) {
-		os << '}';
-		if (!style.postcommandargs().empty())
-			latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
-		if (runparams.encoding != prev_encoding) {
-			runparams.encoding = prev_encoding;
-			os << setEncoding(prev_encoding->iconvName());
+	// InTitle commands need to be closed after the language has been closed.
+	if (!intitle_command) {
+		if (is_command) {
+			os << '}';
+			if (!style.postcommandargs().empty())
+				latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
+			if (runparams.encoding != prev_encoding) {
+				runparams.encoding = prev_encoding;
+				os << setEncoding(prev_encoding->iconvName());
+			}
 		}
 	}
 
@@ -1031,12 +1091,13 @@ void TeXOnePar(Buffer const & buf,
 	// possible
 	// fall through
 	default:
-		// we don't need it for the last paragraph!!!
-		if (nextpar)
+		// we don't need it for the last paragraph and in InTitle commands!!!
+		if (nextpar && !intitle_command)
 			pending_newline = true;
 	}
 
-	if (par.allowParagraphCustomization()) {
+	// InTitle commands use switches (not environments) for space settings
+	if (par.allowParagraphCustomization() && !style.intitle) {
 		if (!par.params().spacing().isDefault()
 			&& (runparams.isLastPar || !nextpar->hasSameLayout(par))) {
 			if (pending_newline)
@@ -1052,9 +1113,10 @@ void TeXOnePar(Buffer const & buf,
 		}
 	}
 
-	// Closing the language is needed for the last paragraph; it is also
-	// needed if we're within an \L or \R that we may have opened above (not
-	// necessarily in this paragraph) and are about to close.
+	// Closing the language is needed for the last paragraph in a given language
+	// as well as for any InTitleCommand (since these set the language locally);
+	// it is also needed if we're within an \L or \R that we may have opened above
+	// (not necessarily in this paragraph) and are about to close.
 	bool closing_rtl_ltr_environment = !using_begin_end
 		// not for ArabTeX
 		&& (par_language->lang() != "arabic_arabtex"
@@ -1066,7 +1128,9 @@ void TeXOnePar(Buffer const & buf,
 		&&((nextpar && par_lang != nextpar_lang)
 		   || (runparams.isLastPar && par_lang != outer_lang));
 
-	if (closing_rtl_ltr_environment
+	if (localswitch_needed
+	    || (intitle_command && using_begin_end)
+	    || closing_rtl_ltr_environment
 	    || ((runparams.isLastPar || close_lang_switch)
 	        && (par_lang != outer_lang || (using_begin_end
 						&& style.isEnvironment()
@@ -1075,7 +1139,7 @@ void TeXOnePar(Buffer const & buf,
 		// we need to reset the language at the end of footnote or
 		// float.
 
-		if (pending_newline || close_lang_switch)
+		if (!localswitch && (pending_newline || close_lang_switch))
 			os << '\n';
 
 		// when the paragraph uses CJK, the language has to be closed earlier
@@ -1094,7 +1158,8 @@ void TeXOnePar(Buffer const & buf,
 				    && current_lang != openLanguageName(state)) {
 					string bc = use_polyglossia ?
 						    getPolyglossiaBegin(lang_begin_command, current_lang,
-									current_language->polyglossiaOpts())
+									current_language->polyglossiaOpts(),
+									localswitch)
 						  : subst(lang_begin_command, "$$lang", current_lang);
 					os << bc;
 					pending_newline = !localswitch;
@@ -1118,7 +1183,8 @@ void TeXOnePar(Buffer const & buf,
 						&& style != nextpar->layout())))
 				    || (atSameLastLangSwitchDepth(state)
 					&& state->lang_switch_depth_.size()
-					&& cur_lang != par_lang))
+					&& cur_lang != par_lang)
+				    || in_polyglossia_rtl_env)
 				{
 					if (using_begin_end && !localswitch)
 						os << breakln;
@@ -1137,6 +1203,19 @@ void TeXOnePar(Buffer const & buf,
 	if (closing_rtl_ltr_environment)
 		os << "}";
 
+	// InTitle commands need to be closed after the language has been closed.
+	if (intitle_command) {
+		if (is_command) {
+			os << '}';
+			if (!style.postcommandargs().empty())
+				latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
+			if (runparams.encoding != prev_encoding) {
+				runparams.encoding = prev_encoding;
+				os << setEncoding(prev_encoding->iconvName());
+			}
+		}
+	}
+
 	bool const last_was_separator =
 		par.size() > 0 && par.isEnvSeparator(par.size() - 1);
 
@@ -1480,7 +1559,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 	// * with useNonTeXFonts: "utf8plain",
 	// * with XeTeX and TeX fonts: "ascii" (inputenc fails),
 	// * with LuaTeX and TeX fonts: only one encoding accepted by luainputenc.
-	if (runparams.isFullUnicode())
+	if (runparams.isFullUnicode() || newEnc.name() == "inherit")
 		return make_pair(false, 0);
 
 	Encoding const & oldEnc = *runparams.encoding;