That didn't really work. So revert to old CSS for gray notes.

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 2f4e765ebacdba2f7f1f0fcbe34b5c9bf53574a6..a87416d7b7955e22066fcdeb797ab5465206ceca 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -252,14 +252,22 @@ TeXEnvironment(Buffer const & buf,
                os << "\\end{" << from_ascii(style.latexname()) << "}\n";
                texrow.newline();
                prev_env_language_ = par_language;
-               runparams.encoding = prev_encoding;
+               if (runparams.encoding != prev_encoding) {
+                       runparams.encoding = prev_encoding;
+                       if (!bparams.useXetex)
+                               os << setEncoding(prev_encoding->iconvName());
+               }
        }
 
        if (leftindent_open) {
                os << "\\end{LyXParagraphLeftIndent}\n";
                texrow.newline();
                prev_env_language_ = par_language;
-               runparams.encoding = prev_encoding;
+               if (runparams.encoding != prev_encoding) {
+                       runparams.encoding = prev_encoding;
+                       if (!bparams.useXetex)
+                               os << setEncoding(prev_encoding->iconvName());
+               }
        }
 
        if (par != paragraphs.end())
@@ -589,7 +597,11 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                os << "\\par}";
        } else if (is_command) {
                os << '}';
-               runparams.encoding = prev_encoding;
+               if (runparams.encoding != prev_encoding) {
+                       runparams.encoding = prev_encoding;
+                       if (!bparams.useXetex)
+                               os << setEncoding(prev_encoding->iconvName());
+               }
        }
 
        bool pending_newline = false;
@@ -659,11 +671,18 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                // when the paragraph uses CJK, the language has to be closed earlier
                if (font.language()->encoding()->package() != Encoding::CJK) {
                        if (lyxrc.language_command_end.empty()) {
-                               if (!prev_language->babel().empty()) {
+                               // If this is a child, we should restore the
+                               // master language after the last paragraph.
+                               Language const * const current_language =
+                                       (nextpit == paragraphs.end()
+                                       && runparams.master_language)
+                                               ? runparams.master_language
+                                               : prev_language;
+                               if (!current_language->babel().empty()) {
                                        os << from_ascii(subst(
                                                lyxrc.language_command_begin,
                                                "$$lang",
-                                               prev_language->babel()));
+                                               current_language->babel()));
                                        pending_newline = true;
                                }
                        } else if (!par_language->babel().empty()) {