I'd +1 this for 2.3.x, too.

Richard



On 10/11/2017 03:19 AM, Enrico Forestieri wrote:
> commit ce4f39d414a26edcf54c1e24d6142e6b929586d7
> Author: Enrico Forestieri <for...@lyx.org>
> Date:   Wed Oct 11 09:13:11 2017 +0200
>
>     Fix issue with language switch in Arguments insets
>     
>     In some insets such as Arguments, a local language switch has to be
>     used. However, if the language inside the inset was set to be equal
>     to the outer language, the code decided not to switch language. But
>     then got confused and tried to close a switch that was never opened.
>     This patch forces the switch even if the outer language is the same.
> ---
>  src/output_latex.cpp |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/output_latex.cpp b/src/output_latex.cpp
> index e0163ad..02667aa 100644
> --- a/src/output_latex.cpp
> +++ b/src/output_latex.cpp
> @@ -882,7 +882,7 @@ void TeXOnePar(Buffer const & buf,
>                       }
>                       // With CJK, the CJK tag has to be closed first (see 
> below)
>                       if (runparams.encoding->package() != Encoding::CJK
> -                         && par_lang != openLanguageName(state)
> +                         && (par_lang != openLanguageName(state) || 
> localswitch)
>                           && !par_lang.empty()) {
>                               string bc = use_polyglossia ?
>                                         
> getPolyglossiaBegin(lang_begin_command, par_lang, 
> par_language->polyglossiaOpts())


Reply via email to