anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Smash another case of missing language switch and also avoid redundant switches.

Browse Source 
Essentially, non-default aligned paragraphs should be treated as nested ones.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30766 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-07-24 22:50:32 +00:00
parent 68ae319d7c
commit 49d4119736
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/output_latex.cpp
View File

@ -346,22 +346,31 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
// When the language is changed at the very start of a LyX environment,
// the language switch in the LaTeX code occurs just before switching to
// the corresponding LaTeX environment. So, when the environment ends,
// we have to restore the language that was in effect.
// we have to properly restore the language that was in effect.
bool env_lang_switch = false;
if (!priorpit->hasSameLayout(*pit)) {
ParagraphList::const_iterator outpit = priorpit;
while (outpit != paragraphs.begin()
&& (outpit->hasSameLayout(*priorpit)
|| outpit->getDepth() > priorpit->getDepth()))
&& (outpit->hasSameLayout(*priorpit)
|| outpit->getDepth() > pit->getDepth())
|| outpit->getAlign() != outpit->layout().align)
outpit = boost::prior(outpit);
ParagraphList::const_iterator const inpit = boost::next(outpit);
Language const * const outenv_language
= outpit->getParLanguage(bparams);
Language const * const inenv_language
= inpit->getParLanguage(bparams);
if (outenv_language->babel() != inenv_language->babel())
env_lang_switch = true;
if (outenv_language->babel() != par_language->babel())
ParagraphList::const_iterator inpit = boost::next(outpit);
bool topped = outpit == paragraphs.begin()
&& (outpit->hasSameLayout(*priorpit)
|| outpit->getDepth() > pit->getDepth()
|| outpit->getAlign() != outpit->layout().align);
Language const * const outenv_language = topped ?
outer_language
: outpit->getParLanguage(bparams);
Language const * const inenv_language = topped ?
outpit->getParLanguage(bparams)
: inpit->getParLanguage(bparams);
if (outenv_language->babel() != inenv_language->babel()) {
if (inenv_language->babel() != par_language->babel())
env_lang_switch = true;
prev_language = inenv_language;
} else
prev_language = outenv_language;
}