Properly restore the file encoding after a LaTeX environment with local scope.

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 534bf48be4bf217360674612de12b7e42c0d2cc9..1aa55e30180e2d55be68708aa1c298506988e57e 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -52,6 +52,7 @@ enum OpenEncoding {
 
 static int open_encoding_ = none;
 static int cjk_inherited_ = 0;
+Language const * prev_env_language_ = 0;
 
 
 ParagraphList::const_iterator
@@ -111,12 +112,22 @@ TeXEnvironment(Buffer const & buf,
                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()) {
 
@@ -169,8 +180,12 @@ TeXEnvironment(Buffer const & buf,
                           << pit->params().labelWidthString()
                           << "}\n";
                } else if (style.labeltype == LABEL_BIBLIO) {
-                       // ale970405
-                       os << '{' << bibitemWidest(buf) << "}\n";
+                       if (pit->params().labelWidthString().empty())
+                               os << '{' << bibitemWidest(buf) << "}\n";
+                       else
+                               os << '{'
+                                 << pit->params().labelWidthString()
+                                 << "}\n";
                } else
                        os << from_ascii(style.latexparam()) << '\n';
                texrow.newline();
@@ -236,11 +251,15 @@ TeXEnvironment(Buffer const & buf,
        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())
@@ -332,12 +351,22 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
        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
+
+       // 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()) ?
-                       priorpit->getParLanguage(bparams) : outer_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()
@@ -476,6 +505,8 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                }
        }
 
+       Encoding const * const prev_encoding = runparams.encoding;
+
        bool const useSetSpace = bparams.documentClass().provides("SetSpace");
        if (pit->allowParagraphCustomization()) {
                if (pit->params().startOfAppendix()) {
@@ -557,8 +588,10 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                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) {