]> git.lyx.org Git - lyx.git/commitdiff
PassThru paragraphs have latex_language; consider this when checking
authorJuergen Spitzmueller <spitz@lyx.org>
Sun, 29 Apr 2018 11:18:05 +0000 (13:18 +0200)
committerJuergen Spitzmueller <spitz@lyx.org>
Sun, 29 Apr 2018 11:19:27 +0000 (13:19 +0200)
previous language

Fixes: #10793.
src/output_latex.cpp

index c36ed2587b8d1a6718455e49595b1be7dbb5630f..25ec597387efb1e9e97f12358f46d4b54f8bd15a 100644 (file)
@@ -790,6 +790,9 @@ void TeXOnePar(Buffer const & buf,
        // 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.
+       // Note further that we take the outer language also if the prior par
+       // is PassThru, since in that case it has latex_language, and all secondary
+       // languages have been closed (#10793).
        bool const use_prev_env_language = state->prev_env_language_ != 0
                        && priorpar
                        && priorpar->layout().isEnvironment()
@@ -797,12 +800,11 @@ void TeXOnePar(Buffer const & buf,
                            || (priorpar->getDepth() == par.getDepth()
                                    && priorpar->layout() != par.layout()));
        Language const * const prev_language =
-               (pit != 0)
+               (priorpar && !priorpar->isPassThru())
                ? (use_prev_env_language ? state->prev_env_language_
                                         : priorpar->getParLanguage(bparams))
                : outer_language;
 
-
        bool const use_polyglossia = runparams.use_polyglossia;
        string const par_lang = use_polyglossia ?
                getPolyglossiaEnvName(par_language): par_language->babel();