static int open_encoding_ = none;
static int cjk_inherited_ = 0;
+Language const * prev_env_language_ = 0;
ParagraphList::const_iterator
bparams.documentClass().plainLayout() : pit->layout();
ParagraphList const & paragraphs = text.paragraphs();
+ ParagraphList::const_iterator const priorpit =
+ pit == paragraphs.begin() ? pit : boost::prior(pit);
+
+ bool const use_prev_env_language = prev_env_language_ != 0
+ && priorpit->layout().isEnvironment()
+ && (priorpit->getDepth() > pit->getDepth()
+ || (priorpit->getDepth() == pit->getDepth()
+ && priorpit->layout() != pit->layout()));
+ Encoding const * const prev_encoding = runparams.encoding;
Language const * const par_language = pit->getParLanguage(bparams);
Language const * const doc_language = bparams.language;
Language const * const prev_par_language =
(pit != paragraphs.begin())
- ? boost::prior(pit)->getParLanguage(bparams)
+ ? (use_prev_env_language ? prev_env_language_
+ : priorpit->getParLanguage(bparams))
: doc_language;
if (par_language->babel() != prev_par_language->babel()) {
if (style.isEnvironment()) {
os << "\\end{" << from_ascii(style.latexname()) << "}\n";
texrow.newline();
+ prev_env_language_ = par_language;
+ runparams.encoding = prev_encoding;
}
if (leftindent_open) {
os << "\\end{LyXParagraphLeftIndent}\n";
texrow.newline();
+ prev_env_language_ = par_language;
+ runparams.encoding = prev_encoding;
}
if (par != paragraphs.end())
Language const * const outer_language =
(runparams.local_font != 0) ?
runparams.local_font->language() : doc_language;
- // The previous language that was in effect is either the language of
- // the previous paragraph, if there is one, or else the outer language
- // if there is no previous paragraph
- Language const * prev_language =
- (pit != paragraphs.begin()) ?
- priorpit->getParLanguage(bparams) : outer_language;
-
- // 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 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() > pit->getDepth()
- || outpit->getAlign() != outpit->layout().align))
- outpit = boost::prior(outpit);
- 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;
- }
- if ((par_language->babel() != prev_language->babel() || env_lang_switch)
+ // The previous language that was in effect is the language of the
+ // previous paragraph, unless the previous paragraph is inside an
+ // environment with nesting depth greater than (or equal to, but with
+ // a different layout) the current one. If there is no previous
+ // paragraph, the previous language is the outer language.
+ bool const use_prev_env_language = prev_env_language_ != 0
+ && priorpit->layout().isEnvironment()
+ && (priorpit->getDepth() > pit->getDepth()
+ || (priorpit->getDepth() == pit->getDepth()
+ && priorpit->layout() != pit->layout()));
+ Language const * const prev_language =
+ (pit != paragraphs.begin())
+ ? (use_prev_env_language ? prev_env_language_
+ : priorpit->getParLanguage(bparams))
+ : outer_language;
+
+ if (par_language->babel() != prev_language->babel()
// check if we already put language command in TeXEnvironment()
&& !(style.isEnvironment()
&& (pit == paragraphs.begin() ||
}
}
+ Encoding const * const prev_encoding = runparams.encoding;
+
bool const useSetSpace = bparams.documentClass().provides("SetSpace");
if (pit->allowParagraphCustomization()) {
if (pit->params().startOfAppendix()) {
os << "\\" << from_ascii(font.latexSize()) << " \\par}";
} else if (need_par) {
os << "\\par}";
- } else if (is_command)
+ } else if (is_command) {
os << '}';
+ runparams.encoding = prev_encoding;
+ }
bool pending_newline = false;
switch (style.latextype) {