anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend bfe0d52e

Browse Source 
Was forgetting to account for babel.
This commit is contained in:
Enrico Forestieri 2017-05-16 22:02:42 +02:00
parent bfe0d52e97
commit ead148510b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output_latex.cpp
View File

@ -212,10 +212,9 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
// For polyglossia, switch language outside of environment, if possible.
if (par_lang != prev_par_lang) {
if (langOpenedAtThisLevel(state) &&
if ((!use_polyglossia || langOpenedAtThisLevel(state)) &&
!lang_end_command.empty() &&
prev_par_lang != doc_lang &&
atSameLastLangSwitchDepth(state) &&
!prev_par_lang.empty()) {
os << from_ascii(subst(
lang_end_command,
@ -813,7 +812,7 @@ void TeXOnePar(Buffer const & buf,
&& priorpar->getDepth() <= par.getDepth())
|| priorpar->getDepth() < par.getDepth())))
{
if (langOpenedAtThisLevel(state) &&
if ((!use_polyglossia || langOpenedAtThisLevel(state)) &&
!lang_end_command.empty() &&
prev_lang != outer_lang &&
!prev_lang.empty() &&
@ -1111,7 +1110,8 @@ void TeXOnePar(Buffer const & buf,
if (use_polyglossia)
pushPolyglossiaLang(current_lang, localswitch);
}
} else if (langOpenedAtThisLevel(state) &&
} else if ((!use_polyglossia ||
langOpenedAtThisLevel(state)) &&
!par_lang.empty()) {
// If we are in an environment, we have to
// close the "outer" language afterwards