* Only enter inset which return true on isActive(). This is the behavior in the curso...

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 152fd89e09b242b471d9210f5448572e39926a61..10a4191c0330e23b8bcb254202a988ad754d924e 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -115,8 +115,8 @@ TeXEnvironment(Buffer const & buf,
                        texrow.newline();
                }
 
-               if (lyxrc.language_command_end.empty() ||
-                   par_language->babel() != doc_language->babel() &&
+               if ((lyxrc.language_command_end.empty() ||
+                    par_language->babel() != doc_language->babel()) &&
                    !par_language->babel().empty()) {
                        os << from_ascii(subst(
                                lyxrc.language_command_begin,
@@ -283,10 +283,9 @@ TeXOnePar(Buffer const & buf,
                        texrow.newline();
                }
 
-               if (lyxrc.language_command_end.empty() ||
-                   par_language->babel() != doc_language->babel() &&
-                   !par_language->babel().empty())
-               {
+               if ((lyxrc.language_command_end.empty() ||
+                    par_language->babel() != doc_language->babel()) &&
+                   !par_language->babel().empty()) {
                        os << from_ascii(subst(
                                lyxrc.language_command_begin,
                                "$$lang",
@@ -316,7 +315,7 @@ TeXOnePar(Buffer const & buf,
                                pit->getFontSettings(bparams, i).language()->encoding();
                        if (encoding->package() == Encoding::inputenc &&
                            switchEncoding(os, bparams, false,
-                                          *(runparams.encoding), *encoding) > 0) {
+                                          *(runparams.encoding), *encoding) > 0) {
                                runparams.encoding = encoding;
                                os << '\n';
                                texrow.newline();
@@ -570,7 +569,7 @@ void latexParagraphs(Buffer const & buf,
                                par = TeXOnePar(buf, paragraphs, par, os, texrow,
                                                runparams, everypar);
                        } else if (layout->isEnvironment() ||
-                                  !par->params().leftIndent().zero()) {
+                                  !par->params().leftIndent().zero()) {
                                par = TeXEnvironment(buf, paragraphs, par, os,
                                                     texrow, runparams);
                        } else {
@@ -600,8 +599,8 @@ void latexParagraphs(Buffer const & buf,
 
 
 int switchEncoding(odocstream & os, BufferParams const & bparams,
-                   bool moving_arg, Encoding const & oldEnc,
-                   Encoding const & newEnc)
+                  bool moving_arg, Encoding const & oldEnc,
+                  Encoding const & newEnc)
 {
        if ((bparams.inputenc != "auto" || moving_arg)
                && bparams.inputenc != "default")