X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=b6ed0cec18d886ecdc9a7d7bcc0880197eac2202;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=0875fbfe9043c681f594bcb523e848a1a1429d44;hpb=8c14d9e0413978aa11f581e9c6f2d0587bb0b189;p=lyx.git

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 0875fbfe90..b6ed0cec18 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -107,7 +107,25 @@ bool atSameLastLangSwitchDepth(OutputState const * state)
 
 	return state->lang_switch_depth_.size() == 0
 			? true
-			: state->lang_switch_depth_.top() == state->nest_level_;
+			: abs(state->lang_switch_depth_.top()) == state->nest_level_;
+}
+
+
+bool isLocalSwitch(OutputState const * state)
+{
+	// Return true if the language was opened by the \text<lang> command.
+
+	return state->lang_switch_depth_.size()
+		&& state->lang_switch_depth_.top() < 0;
+}
+
+
+bool langOpenedAtThisLevel(OutputState const * state)
+{
+	// Return true if the language was opened at the current nesting level.
+
+	return state->lang_switch_depth_.size()
+		&& abs(state->lang_switch_depth_.top()) == state->nest_level_;
 }
 
 
@@ -204,15 +222,21 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 				prev_par_lang))
 			  // the '%' is necessary to prevent unwanted whitespace
 			  << "%\n";
-			if (use_polyglossia) {
-				state->lang_switch_depth_.pop();
-				state->open_polyglossia_lang_.pop();
-			}
+			if (use_polyglossia)
+				popPolyglossiaLang();
 		}
 
+		// If no language was explicitly opened and we are using
+		// polyglossia, then the current polyglossia language is
+		// the document language.
+		string const & pol_lang = use_polyglossia
+					  && state->lang_switch_depth_.size()
+						  ? openPolyglossiaLang(state)
+						  : doc_lang;
+
 		if ((lang_end_command.empty() ||
 		    par_lang != doc_lang ||
-		    par_lang != openPolyglossiaLang(state)) &&
+		    par_lang != pol_lang) &&
 		    !par_lang.empty()) {
 			    string bc = use_polyglossia ?
 					getPolyglossiaBegin(lang_begin_command, par_lang,
@@ -221,10 +245,8 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 			    os << bc;
 			    // the '%' is necessary to prevent unwanted whitespace
 			    os << "%\n";
-			    if (use_polyglossia) {
-				    state->lang_switch_depth_.push(state->nest_level_);
-				    state->open_polyglossia_lang_.push(par_lang);
-			    }
+			    if (use_polyglossia)
+				    pushPolyglossiaLang(par_lang);
 		}
 	}
 
@@ -290,13 +312,15 @@ static void finishEnvironment(otexstream & os, OutputParams const & runparams,
 		os << breakln;
 		// Close any polyglossia language opened at this nest level
 		if (runparams.use_polyglossia) {
-			OutputState * state = getOutputState();
-			while (state->lang_switch_depth_.size()
-			       && state->lang_switch_depth_.top() == state->nest_level_) {
-				os << "\\end{" << openPolyglossiaLang(state)
-				   << "}%\n";
-				state->lang_switch_depth_.pop();
-				state->open_polyglossia_lang_.pop();
+			while (langOpenedAtThisLevel(state)) {
+				if (isLocalSwitch(state)) {
+					os << "}";
+				} else {
+					os << "\\end{"
+					   << openPolyglossiaLang(state)
+					   << "}%\n";
+				}
+				popPolyglossiaLang();
 			}
 		}
 		state->nest_level_ -= 1;
@@ -478,11 +502,12 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX
 } // namespace anon
 
 
-void pushPolyglossiaLang(string const & lang_name)
+void pushPolyglossiaLang(string const & lang_name, bool localswitch)
 {
 	OutputState * state = getOutputState();
 
-	state->lang_switch_depth_.push(state->nest_level_);
+	int nest_level = localswitch ? -state->nest_level_ : state->nest_level_;
+	state->lang_switch_depth_.push(nest_level);
 	state->open_polyglossia_lang_.push(lang_name);
 }
 
@@ -782,10 +807,8 @@ void TeXOnePar(Buffer const & buf,
 				"$$lang",
 				prev_lang))
 			   << lang_command_termination;
-			if (use_polyglossia && !localswitch) {
-				state->lang_switch_depth_.pop();
-				state->open_polyglossia_lang_.pop();
-			}
+			if (use_polyglossia)
+				popPolyglossiaLang();
 		}
 
 		// We need to open a new language if we couldn't close the previous
@@ -842,10 +865,8 @@ void TeXOnePar(Buffer const & buf,
 					  : subst(lang_begin_command, "$$lang", par_lang);
 				os << bc;
 				os << lang_command_termination;
-				if (use_polyglossia && !localswitch) {
-					state->lang_switch_depth_.push(state->nest_level_);
-					state->open_polyglossia_lang_.push(par_lang);
-				}
+				if (use_polyglossia)
+					pushPolyglossiaLang(par_lang, localswitch);
 			}
 		}
 	}
@@ -904,10 +925,8 @@ void TeXOnePar(Buffer const & buf,
 						"$$lang",
 						par_lang))
 					<< lang_command_termination;
-					if (use_polyglossia && !localswitch) {
-						state->lang_switch_depth_.push(state->nest_level_);
-						state->open_polyglossia_lang_.push(par_lang);
-					}
+					if (use_polyglossia)
+						pushPolyglossiaLang(par_lang, localswitch);
 				}
 				runparams.encoding = encoding;
 			}
@@ -982,8 +1001,8 @@ void TeXOnePar(Buffer const & buf,
 	switch (style.latextype) {
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
-		if (nextpar && par_lang != nextpar_lang
-		    && nextpar->getDepth() == par.getDepth()
+		if ((nextpar && par_lang != nextpar_lang
+			     && nextpar->getDepth() == par.getDepth())
 		    || (atSameLastLangSwitchDepth(state) && nextpar
 			    && nextpar->getDepth() < par.getDepth()))
 			close_lang_switch = use_polyglossia;
@@ -1073,11 +1092,8 @@ void TeXOnePar(Buffer const & buf,
 					os << bc;
 					pending_newline = !localswitch;
 					unskip_newline = !localswitch;
-					if (use_polyglossia && !localswitch) {
-						state->lang_switch_depth_.push(
-								state->nest_level_);
-						state->open_polyglossia_lang_.push(current_lang);
-					}
+					if (use_polyglossia)
+						pushPolyglossiaLang(current_lang, localswitch);
 				}
 			} else if (!par_lang.empty()) {
 				// If we are in an environment, we have to close the "outer" language afterwards
@@ -1102,10 +1118,8 @@ void TeXOnePar(Buffer const & buf,
 						par_lang));
 					pending_newline = !localswitch;
 					unskip_newline = !localswitch;
-					if (use_polyglossia && !localswitch) {
-						state->lang_switch_depth_.pop();
-						state->open_polyglossia_lang_.pop();
-					}
+					if (use_polyglossia)
+						popPolyglossiaLang();
 				}
 			}
 		}
@@ -1283,15 +1297,10 @@ void latexParagraphs(Buffer const & buf,
 			  : subst(lang_begin_command, "$$lang", mainlang);
 		os << bc;
 		os << '\n';
-		if (runparams.use_polyglossia) {
-			state->lang_switch_depth_.push(state->nest_level_);
-			state->open_polyglossia_lang_.push(mainlang);
-		}
+		if (runparams.use_polyglossia)
+			pushPolyglossiaLang(mainlang);
 	}
 
-	runparams.pushPolyglossiaLang = pushPolyglossiaLang;
-	runparams.popPolyglossiaLang = popPolyglossiaLang;
-
 	ParagraphList const & paragraphs = text.paragraphs();
 
 	if (runparams.par_begin == runparams.par_end) {
@@ -1394,10 +1403,8 @@ void latexParagraphs(Buffer const & buf,
 					"$$lang",
 					mainlang))
 			<< '\n';
-		if (runparams.use_polyglossia) {
-			state->lang_switch_depth_.pop();
-			state->open_polyglossia_lang_.pop();
-		}
+		if (runparams.use_polyglossia)
+			popPolyglossiaLang();
 	}
 
 	// If the last paragraph is an environment, we'll have to close
@@ -1413,10 +1420,8 @@ void latexParagraphs(Buffer const & buf,
 					"$$lang",
 					pol_lang))
 		   << '\n';
-		if (runparams.use_polyglossia) {
-			state->lang_switch_depth_.pop();
-			state->open_polyglossia_lang_.pop();
-		}
+		if (runparams.use_polyglossia)
+			popPolyglossiaLang();
 	}
 
 	// reset inherited encoding