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

Fix language end command

Browse Source 
The code that sets open_polyglossia_lang_ is not only executed for polyglossia,
but also for babel, so we have to use the correct language end command.
This commit is contained in:
Georg Baum 2015-10-18 20:55:53 +02:00
parent 6186608a3c
commit 86325e50d0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/output_latex.cpp
View File

@ -60,7 +60,7 @@ struct OutputState
prev_env_language_(0), open_polyglossia_lang_("")
{
}
int open_encoding_;
OpenEncoding open_encoding_;
int cjk_inherited_;
Language const * prev_env_language_;
string open_polyglossia_lang_;
@ -1240,7 +1240,7 @@ void latexParagraphs(Buffer const & buf,
}
// if "auto end" is switched off, explicitly close the language at the end
// but only if the last par is in a babel language
// but only if the last par is in a babel or polyglossia language
string const lang_end_command = runparams.use_polyglossia ?
"\\end{$$lang}" : lyxrc.language_command_end;
if (maintext && !lyxrc.language_auto_end && !mainlang.empty() &&
@ -1259,7 +1259,10 @@ void latexParagraphs(Buffer const & buf,
}
// Likewise for polyglossia
if (maintext && !is_child && state->open_polyglossia_lang_ != "") {
os << "\\end{" << state->open_polyglossia_lang_ << "}\n";
os << from_utf8(subst(lang_end_command,
"$$lang",
state->open_polyglossia_lang_))
<< '\n';
state->open_polyglossia_lang_ = "";
}