Beamer: autonest column in columns

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 0fd9d01e699938ff2547dd0c4f9e5856c57a6c76..1e99675cee5009c90a9f7f3354185eaff1d34b6a 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -679,11 +679,16 @@ void parStartCommand(Paragraph const & par, otexstream & os,
                break;
        case LATEX_ITEM_ENVIRONMENT:
        case LATEX_LIST_ENVIRONMENT:
-               os << "\\" + style.itemcommand();
-               // Item arguments
-               if (!style.itemargs().empty())
-                       latexArgInsets(par, os, runparams, style.itemargs(), "item:");
-               os << " ";
+               if (runparams.for_search) {
+                       os << "\\" + style.itemcommand() << "{" << style.latexname() << "}";
+               }
+               else {
+                       os << "\\" + style.itemcommand();
+                       // Item arguments
+                       if (!style.itemargs().empty())
+                               latexArgInsets(par, os, runparams, style.itemargs(), "item:");
+                       os << " ";
+               }
                break;
        case LATEX_BIB_ENVIRONMENT:
                // ignore this, the inset will write itself
@@ -814,10 +819,12 @@ void TeXOnePar(Buffer const & buf,
                            || (priorpar->getDepth() == par.getDepth()
                                    && priorpar->layout() != par.layout()));
        Language const * const prev_language =
-               (priorpar && !priorpar->isPassThru())
-               ? (use_prev_env_language ? state->prev_env_language_
-                                        : priorpar->getParLanguage(bparams))
-               : outer_language;
+               runparams_in.for_search ?
+                       languages.getLanguage("ignore")
+               :(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 ?
@@ -845,9 +852,19 @@ void TeXOnePar(Buffer const & buf,
                os << '{';
        }
 
-       // In some insets (such as Arguments), we cannot use \selectlanguage
-       bool const localswitch = text.inset().forceLocalFontSwitch()
-                       || (using_begin_end && text.inset().forcePlainLayout());
+       // In some insets (such as Arguments), we cannot use \selectlanguage.
+       // Also, if an RTL language is set via environment in polyglossia,
+       // only a nested \\text<lang> command will reset the direction for LTR
+       // languages (see # 10111).
+       bool const in_polyglossia_rtl_env =
+               use_polyglossia
+               && runparams.local_font != 0
+               && outer_language->rightToLeft()
+               && !par_language->rightToLeft();
+       bool const localswitch = runparams_in.for_search
+                       || text.inset().forceLocalFontSwitch()
+                       || (using_begin_end && text.inset().forcePlainLayout())
+                       || in_polyglossia_rtl_env;
        if (localswitch) {
                lang_begin_command = use_polyglossia ?
                            "\\text$$lang$$opts{" : lyxrc.language_command_local;
@@ -858,12 +875,12 @@ void TeXOnePar(Buffer const & buf,
        bool const localswitch_needed = localswitch && par_lang != outer_lang;
 
        // localswitches need to be closed and reopened at each par
-       if ((par_lang != prev_lang || localswitch_needed)
+       if (runparams_in.for_search || ((par_lang != prev_lang || localswitch_needed)
             // check if we already put language command in TeXEnvironment()
             && !(style.isEnvironment()
                  && (pit == 0 || (priorpar->layout() != par.layout()
                                   && priorpar->getDepth() <= par.getDepth())
-                     || priorpar->getDepth() < par.getDepth()))) {
+                     || priorpar->getDepth() < par.getDepth())))) {
                if (!localswitch
                    && (!using_begin_end || langOpenedAtThisLevel(state))
                    && !lang_end_command.empty()
@@ -894,8 +911,8 @@ void TeXOnePar(Buffer const & buf,
                        // This behavior is not correct for ArabTeX, though.
                        if (!using_begin_end
                            // not for ArabTeX
-                               && par_language->lang() != "arabic_arabtex"
-                               && outer_language->lang() != "arabic_arabtex"
+                           && par_language->lang() != "arabic_arabtex"
+                           && outer_language->lang() != "arabic_arabtex"
                            // are we in an inset?
                            && runparams.local_font != 0
                            // is the inset within an \L or \R?
@@ -924,7 +941,7 @@ void TeXOnePar(Buffer const & buf,
                                        os << "\\L{";
                        }
                        // With CJK, the CJK tag has to be closed first (see below)
-                       if (runparams.encoding->package() != Encoding::CJK
+                       if ((runparams.encoding->package() != Encoding::CJK || runparams.for_search)
                            && (par_lang != openLanguageName(state) || localswitch)
                            && !par_lang.empty()) {
                                string bc = use_polyglossia ?
@@ -1148,7 +1165,7 @@ void TeXOnePar(Buffer const & buf,
                        os << '\n';
 
                // when the paragraph uses CJK, the language has to be closed earlier
-               if (font.language()->encoding()->package() != Encoding::CJK) {
+               if ((font.language()->encoding()->package() != Encoding::CJK) || runparams_in.for_search) {
                        if (lang_end_command.empty()) {
                                // If this is a child, we should restore the
                                // master language after the last paragraph.
@@ -1188,7 +1205,8 @@ void TeXOnePar(Buffer const & buf,
                                                && style != nextpar->layout())))
                                    || (atSameLastLangSwitchDepth(state)
                                        && state->lang_switch_depth_.size()
-                                       && cur_lang != par_lang))
+                                       && cur_lang != par_lang)
+                                   || in_polyglossia_rtl_env)
                                {
                                        if (using_begin_end && !localswitch)
                                                os << breakln;