anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly set language after intitle paragraphs

Browse Source 
Fixes: #11514
(cherry picked from commit b5722962fb)
This commit is contained in:
Juergen Spitzmueller 2019-08-16 16:24:09 +02:00
parent bca4c65061
commit 0da95572ad
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/output_latex.cpp
View File

@ -806,11 +806,30 @@ void TeXOnePar(Buffer const & buf,
&& (priorpar->getDepth() > par.getDepth()
|| (priorpar->getDepth() == par.getDepth()
&& priorpar->layout() != par.layout()));
// We need to ignore previous intitle commands since languages
// are switched locally there (# 11514)
// There might be paragraphs before the title, so we check this.
Paragraph * prior_nontitle_par = nullptr;
if (!intitle_command) {
pit_type ppit = pit;
while (ppit > 0) {
--ppit;
Paragraph const * tmppar = &paragraphs.at(ppit);
if (tmppar->layout().intitle && tmppar->layout().isCommand())
continue;
prior_nontitle_par = const_cast<Paragraph*>(tmppar);
break;
}
}
Language const * const prev_language =
(priorpar && !priorpar->isPassThru())
? (use_prev_env_language ? state->prev_env_language_
: priorpar->getParLanguage(bparams))
: outer_language;
runparams_in.for_search
? languages.getLanguage("ignore")
: (prior_nontitle_par && !prior_nontitle_par->isPassThru())
? (use_prev_env_language
? state->prev_env_language_
: prior_nontitle_par->getParLanguage(bparams))
: outer_language;
bool const use_polyglossia = runparams.use_polyglossia;
string const par_lang = use_polyglossia ?
@ -927,7 +946,7 @@ 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) || localswitch)
&& (par_lang != openLanguageName(state) || localswitch || intitle_command)
&& !par_lang.empty()) {
string bc = use_polyglossia ?
getPolyglossiaBegin(lang_begin_command, par_lang,

2
status.23x
View File

@ -61,6 +61,8 @@ What's new
- (Re-)fix problems with activated equal sign and graphic options in Turkish
and Latin documents (bug 2005).
- Correctly set language after intitle paragraphs (bug 11514).
- Fix toprule with booktabs/longtable and captions (bug 11589).
- Avoid adding spaces when parsing an array in a macro template (bug 10499).