test-insets-basic.tex: remove (in my opinion) wrong parser test

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 3595a089fa60e03224e83c7a749ae4046ca9dab2..6df77f1b66fc2e57f2a8036809a61cc00a0494a8 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -33,12 +33,11 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/lyxalgo.h"
 #include "support/textutils.h"
 
 #include <QThreadStorage>
 
-#include <algorithm>
-#include <boost/next_prior.hpp>
 #include <list>
 
 using namespace std;
@@ -89,6 +88,20 @@ string const getPolyglossiaEnvName(Language const * lang)
 }
 
 
+string const getPolyglossiaBegin(string const & lang_begin_command,
+                                string const & lang, string const & opts)
+{
+       string result;
+       if (!lang.empty())
+               result = subst(lang_begin_command, "$$lang", lang);
+       string options = opts.empty() ?
+                   string() : "[" + opts + "]";
+       result = subst(result, "$$opts", options);
+
+       return result;
+}
+
+
 struct TeXEnvironmentData
 {
        bool cjk_nested;
@@ -116,7 +129,7 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
 
        ParagraphList const & paragraphs = text.paragraphs();
        ParagraphList::const_iterator const priorpit =
-               pit == paragraphs.begin() ? pit : boost::prior(pit);
+               pit == paragraphs.begin() ? pit : prev(pit, 1);
 
        OutputState * state = getOutputState();
        bool const use_prev_env_language = state->prev_env_language_ != 0
@@ -161,17 +174,13 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
                if ((lang_end_command.empty() ||
                    par_lang != doc_lang) &&
                    !par_lang.empty()) {
-                       os << from_ascii(subst(
-                               lang_begin_command,
-                               "$$lang",
-                               par_lang));
-                       if (use_polyglossia
-                           && !data.par_language->polyglossiaOpts().empty())
-                                       os << "["
-                                          << from_ascii(data.par_language->polyglossiaOpts())
-                                          << "]";
-                         // the '%' is necessary to prevent unwanted whitespace
-                       os << "%\n";
+                           string bc = use_polyglossia ?
+                                       getPolyglossiaBegin(lang_begin_command, par_lang,
+                                                           data.par_language->polyglossiaOpts())
+                                     : subst(lang_begin_command, "$$lang", par_lang);
+                           os << bc;
+                           // the '%' is necessary to prevent unwanted whitespace
+                           os << "%\n";
                }
        }
 
@@ -460,9 +469,9 @@ void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pi
        // get the first paragraph in sequence with this layout and depth
        pit_type offset = 0;
        while (true) {
-               if (boost::prior(pit, offset) == pars.begin())
+               if (prev(pit, offset) == pars.begin())
                        break;
-               ParagraphList::const_iterator priorpit = boost::prior(pit, offset + 1);
+               ParagraphList::const_iterator priorpit = prev(pit, offset + 1);
                if (priorpit->layout() == current_layout
                    && priorpit->params().depth() == current_depth)
                        ++offset;
@@ -470,7 +479,7 @@ void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pi
                        break;
        }
 
-       ParagraphList::const_iterator spit = boost::prior(pit, offset);
+       ParagraphList::const_iterator spit = prev(pit, offset);
 
        for (; spit != pars.end(); ++spit) {
                if (spit->layout() != current_layout || spit->params().depth() < current_depth)
@@ -664,17 +673,17 @@ void TeXOnePar(Buffer const & buf,
        string const outer_lang = use_polyglossia ?
                getPolyglossiaEnvName(outer_language) : outer_language->babel();
        string lang_begin_command = use_polyglossia ?
-               "\\begin{$$lang}" : lyxrc.language_command_begin;
+               "\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
        string lang_end_command = use_polyglossia ?
                "\\end{$$lang}" : lyxrc.language_command_end;
        // the '%' is necessary to prevent unwanted whitespace
        string lang_command_termination = "%\n";
 
        // In some insets (such as Arguments), we cannot use \selectlanguage
-       bool const localswitch = !use_polyglossia
-               && text.inset().getLayout().forcelocalfontswitch();
+       bool const localswitch = text.inset().forceLocalFontSwitch();
        if (localswitch) {
-               lang_begin_command = lyxrc.language_command_local;
+               lang_begin_command = use_polyglossia ?
+                           "\\text$$lang$$opts{" : lyxrc.language_command_local;
                lang_end_command = "}";
                lang_command_termination.clear();
        }
@@ -742,15 +751,10 @@ 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.empty()) {
-                               os << from_ascii(subst(
-                                       lang_begin_command,
-                                       "$$lang",
-                                       par_lang));
-                               if (use_polyglossia
-                                   && !par_language->polyglossiaOpts().empty())
-                                               os << "["
-                                                 << from_ascii(par_language->polyglossiaOpts())
-                                                 << "]";
+                               string bc = use_polyglossia ?
+                                         getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts())
+                                         : subst(lang_begin_command, "$$lang", par_lang);
+                               os << bc;
                                os << lang_command_termination;
                        }
                }
@@ -955,10 +959,11 @@ void TeXOnePar(Buffer const & buf,
                                        ? getPolyglossiaEnvName(current_language)
                                        : current_language->babel();
                                if (!current_lang.empty()) {
-                                       os << from_ascii(subst(
-                                               lang_begin_command,
-                                               "$$lang",
-                                               current_lang));
+                                       string bc = use_polyglossia ?
+                                                   getPolyglossiaBegin(lang_begin_command, current_lang,
+                                                                       current_language->polyglossiaOpts())
+                                                 : subst(lang_begin_command, "$$lang", current_lang);
+                                       os << bc;
                                        pending_newline = !localswitch;
                                        unskip_newline = !localswitch;
                                }
@@ -1073,6 +1078,7 @@ void TeXOnePar(Buffer const & buf,
                        DocumentClass const & tclass = bparams.documentClass();
                        if ((style == next_layout
                             && !style.parbreak_is_newline
+                            && !text.inset().getLayout().parbreakIsNewline()
                             && style.latextype != LATEX_ITEM_ENVIRONMENT
                             && style.latextype != LATEX_LIST_ENVIRONMENT
                             && style.align == par.getAlign()
@@ -1133,19 +1139,16 @@ void latexParagraphs(Buffer const & buf,
                ? getPolyglossiaEnvName(bparams.language)
                : bparams.language->babel();
        string const lang_begin_command = runparams.use_polyglossia ?
-               "\\begin{$$lang}" : lyxrc.language_command_begin;
+               "\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
 
        if (maintext && !lyxrc.language_auto_begin &&
            !mainlang.empty()) {
                // FIXME UNICODE
-               os << from_utf8(subst(lang_begin_command,
-                                       "$$lang",
-                                       mainlang));
-               if (runparams.use_polyglossia
-                   && !bparams.language->polyglossiaOpts().empty())
-                       os << "["
-                           << from_ascii(bparams.language->polyglossiaOpts())
-                           << "]";
+               string bc = runparams.use_polyglossia ?
+                           getPolyglossiaBegin(lang_begin_command, mainlang,
+                                               bparams.language->polyglossiaOpts())
+                         : subst(lang_begin_command, "$$lang", mainlang);
+               os << bc;
                os << '\n';
        }