Fix indentation fix.

[features.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index ac22116976d7cf8cbb08b0b7ed91802637dc1a78..bf841fea3f5d247cd8c4ae6fc53195fd68298b54 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -409,7 +409,7 @@ void TeXEnvironment(Buffer const & buf, Text const & text,
 {
        ParagraphList const & paragraphs = text.paragraphs();
        ParagraphList::const_iterator ipar = paragraphs.iterator_at(pit);
-       LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << pit);
+       LYXERR(Debug::OUTFILE, "TeXEnvironment for paragraph " << pit);
 
        Layout const & current_layout = ipar->layout();
        depth_type const current_depth = ipar->params().depth();
@@ -490,7 +490,7 @@ void TeXEnvironment(Buffer const & buf, Text const & text,
        }
 
        if (pit != runparams.par_end)
-               LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done.");
+               LYXERR(Debug::OUTFILE, "TeXEnvironment for paragraph " << par_begin << " done.");
 }
 
 
@@ -607,6 +607,14 @@ void popLanguageName()
 }
 
 
+bool languageStackEmpty()
+{
+       OutputState * state = getOutputState();
+
+       return state->lang_switch_depth_.empty();
+}
+
+
 string const & openLanguageName()
 {
        OutputState * state = getOutputState();
@@ -792,8 +800,8 @@ void TeXOnePar(Buffer const & buf,
            && !par.empty() && par.isDeleted(0, par.size()) && !bparams.output_changes)
                return;
 
-       LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '"
-               << everypar << "'");
+       LYXERR(Debug::OUTFILE, "TeXOnePar for paragraph " << pit << " ptr " << &par << " '"
+                                                         << everypar << "'");
 
        OutputParams runparams = runparams_in;
        runparams.isLastPar = (pit == pit_type(paragraphs.size() - 1));
@@ -925,10 +933,12 @@ void TeXOnePar(Buffer const & buf,
                        break;
                }
        }
+       bool const have_prior_nptpar =
+                       prior_nontitle_par && !prior_nontitle_par->isPassThru();
        Language const * const prev_language =
                runparams_in.for_searchAdv != OutputParams::NoSearch
                        ? languages.getLanguage("ignore")
-                       : (prior_nontitle_par && !prior_nontitle_par->isPassThru())
+                       : (have_prior_nptpar)
                                ? (use_prev_env_language 
                                        ? state->prev_env_language_
                                        : prior_nontitle_par->getParLanguage(bparams))
@@ -974,7 +984,9 @@ void TeXOnePar(Buffer const & buf,
                use_polyglossia
                && runparams.local_font != nullptr
                && outer_language->rightToLeft()
-               && !par_language->rightToLeft();
+               && !par_language->rightToLeft()
+               && !(have_prior_nptpar
+                    && (prev_language->rightToLeft() != par_language->rightToLeft()));
        bool const localswitch =
                        (runparams_in.for_searchAdv != OutputParams::NoSearch
                        || text.inset().forceLocalFontSwitch()
@@ -1543,8 +1555,8 @@ void TeXOnePar(Buffer const & buf,
        if (intitle_command)
                state->nest_level_ -= 1;
 
-       LYXERR(Debug::LATEX, "TeXOnePar for paragraph " << pit << " done; ptr "
-               << &par << " next " << nextpar);
+       LYXERR(Debug::OUTFILE, "TeXOnePar for paragraph " << pit << " done; ptr "
+                                                         << &par << " next " << nextpar);
 
        return;
 }
@@ -1768,7 +1780,7 @@ void latexParagraphs(Buffer const & buf,
                        << '\n';
                // If we have language_auto_begin, the stack will
                // already be empty, nothing to pop()
-               if (using_begin_end && !lyxrc.language_auto_begin)
+               if (using_begin_end && langOpenedAtThisLevel(state))
                        popLanguageName();
        }
 
@@ -1851,7 +1863,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
        // but it is the best we can do.
 
        // change encoding
-       LYXERR(Debug::LATEX, "Changing LaTeX encoding from "
+       LYXERR(Debug::OUTFILE, "Changing LaTeX encoding from "
                   << oldEnc.name() << " to " << newEnc.name());
        os << setEncoding(newEnc.iconvName());
        if (bparams.inputenc == "auto-legacy-plain")