Change to use preffered calling of Boost.Function

[lyx.git] / src / output_latex.C

diff --git a/src/output_latex.C b/src/output_latex.C
index f775d4af126f668f6ea7f93a8438839baa4a71e7..cc4a7fb921323c3d69fe26a25c56f52fa4949930 100644 (file)
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -42,33 +42,33 @@ extern string bibitemWidest(Buffer const &);
 
 namespace {
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXEnvironment(Buffer const & buf,
               ParagraphList const & paragraphs,
-              ParagraphList::iterator pit,
+              ParagraphList::const_iterator pit,
               ostream & os, TexRow & texrow,
               OutputParams const & runparams);
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXOnePar(Buffer const & buf,
          ParagraphList const & paragraphs,
-         ParagraphList::iterator pit,
+         ParagraphList::const_iterator pit,
          ostream & os, TexRow & texrow,
          OutputParams const & runparams,
          string const & everypar = string());
 
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXDeeper(Buffer const & buf,
          ParagraphList const & paragraphs,
-         ParagraphList::iterator pit,
+         ParagraphList::const_iterator pit,
          ostream & os, TexRow & texrow,
          OutputParams const & runparams)
 {
        lyxerr[Debug::LATEX] << "TeXDeeper...     " << &*pit << endl;
-       ParagraphList::iterator par = pit;
+       ParagraphList::const_iterator par = pit;
 
-       while (par != const_cast<ParagraphList&>(paragraphs).end() &&
+       while (par != paragraphs.end() &&
                     par->params().depth() == pit->params().depth()) {
                if (par->layout()->isEnvironment()) {
                        par = TeXEnvironment(buf, paragraphs, par,
@@ -84,10 +84,10 @@ TeXDeeper(Buffer const & buf,
 }
 
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXEnvironment(Buffer const & buf,
               ParagraphList const & paragraphs,
-              ParagraphList::iterator pit,
+              ParagraphList::const_iterator pit,
               ostream & os, TexRow & texrow,
               OutputParams const & runparams)
 {
@@ -100,7 +100,7 @@ TeXEnvironment(Buffer const & buf,
        Language const * language = pit->getParLanguage(bparams);
        Language const * doc_language = bparams.language;
        Language const * previous_language =
-               (pit != const_cast<ParagraphList&>(paragraphs).begin())
+               (pit != paragraphs.begin())
                ? boost::prior(pit)->getParLanguage(bparams)
                : doc_language;
        if (language->babel() != previous_language->babel()) {
@@ -141,11 +141,17 @@ TeXEnvironment(Buffer const & buf,
                        os << style->latexparam() << '\n';
                texrow.newline();
        }
-       ParagraphList::iterator par = pit;
+       ParagraphList::const_iterator par = pit;
        do {
                par = TeXOnePar(buf, paragraphs, par, os, texrow, runparams);
 
-               if (par != const_cast<ParagraphList&>(paragraphs).end() && par->params().depth() > pit->params().depth()) {
+               if (par == paragraphs.end()) {
+                       // Make sure that the last paragraph is
+                       // correctly terminated (because TeXOnePar does
+                       // not add a \n in this case)
+                       os << '\n';
+                       texrow.newline();
+               } else if (par->params().depth() > pit->params().depth()) {
                            if (par->layout()->isParagraph()) {
 
                            // Thinko!
@@ -168,7 +174,7 @@ TeXEnvironment(Buffer const & buf,
                        par = TeXDeeper(buf, paragraphs, par, os, texrow,
                                        runparams);
                }
-       } while (par != const_cast<ParagraphList&>(paragraphs).end()
+       } while (par != paragraphs.end()
                 && par->layout() == pit->layout()
                 && par->params().depth() == pit->params().depth()
                 && par->params().leftIndent() == pit->params().leftIndent());
@@ -203,10 +209,10 @@ InsetOptArg * optArgInset(Paragraph const & par)
 }
 
 
-ParagraphList::iterator
+ParagraphList::const_iterator
 TeXOnePar(Buffer const & buf,
          ParagraphList const & paragraphs,
-         ParagraphList::iterator pit,
+         ParagraphList::const_iterator pit,
          ostream & os, TexRow & texrow,
          OutputParams const & runparams,
          string const & everypar)
@@ -214,8 +220,6 @@ TeXOnePar(Buffer const & buf,
        lyxerr[Debug::LATEX] << "TeXOnePar...     " << &*pit << " '"
                << everypar << "'" << endl;
        BufferParams const & bparams = buf.params();
-
-       InsetOld const * in = pit->inInset();
        bool further_blank_line = false;
        LyXLayout_ptr style;
 
@@ -223,7 +227,7 @@ TeXOnePar(Buffer const & buf,
        // length (all in one row) if that is true then we don't allow
        // any special options in the paragraph and also we don't allow
        // any environment other then "Standard" to be valid!
-       if (in == 0 || !in->forceDefaultParagraphs(in)) {
+       if (!pit->forceDefaultParagraphs()) {
                style = pit->layout();
 
                if (pit->params().startOfAppendix()) {
@@ -232,7 +236,7 @@ TeXOnePar(Buffer const & buf,
                }
 
                if (!pit->params().spacing().isDefault()
-                       && (pit == const_cast<ParagraphList&>(paragraphs).begin()
+                       && (pit == paragraphs.begin()
                            || !boost::prior(pit)->hasSameLayout(*pit)))
                {
                        os << pit->params().spacing().writeEnvirBegin() << '\n';
@@ -255,14 +259,14 @@ TeXOnePar(Buffer const & buf,
        Language const * language = pit->getParLanguage(bparams);
        Language const * doc_language = bparams.language;
        Language const * previous_language =
-               (pit != const_cast<ParagraphList&>(paragraphs).begin())
+               (pit != paragraphs.begin())
                ? boost::prior(pit)->getParLanguage(bparams)
                : doc_language;
 
        if (language->babel() != previous_language->babel()
            // check if we already put language command in TeXEnvironment()
            && !(style->isEnvironment()
-                && (pit == const_cast<ParagraphList&>(paragraphs).begin() ||
+                && (pit == paragraphs.begin() ||
                     (boost::prior(pit)->layout() != pit->layout() &&
                      boost::prior(pit)->getDepth() <= pit->getDepth())
                     || boost::prior(pit)->getDepth() < pit->getDepth())))
@@ -320,7 +324,7 @@ TeXOnePar(Buffer const & buf,
 
        os << everypar;
        bool need_par = pit->simpleTeXOnePar(buf, bparams,
-                                            outerFont(pit, paragraphs),
+                       outerFont(pit - paragraphs.begin(), paragraphs),
                                             os, texrow, runparams);
 
        // Make sure that \\par is done with the font of the last
@@ -332,7 +336,9 @@ TeXOnePar(Buffer const & buf,
        // Is this really needed ? (Dekel)
        // We do not need to use to change the font for the last paragraph
        // or for a command.
-       LyXFont const outerfont = outerFont(pit, paragraphs);
+       LyXFont const outerfont =
+                       outerFont(pit - paragraphs.begin(),
+paragraphs);
 
        LyXFont const font =
                (pit->empty()
@@ -342,7 +348,7 @@ TeXOnePar(Buffer const & buf,
        bool is_command = style->isCommand();
 
        if (style->resfont.size() != font.size()
-           && boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
+           && boost::next(pit) != paragraphs.end()
            && !is_command) {
                if (!need_par)
                        os << '{';
@@ -355,7 +361,7 @@ TeXOnePar(Buffer const & buf,
        switch (style->latextype) {
        case LATEX_ITEM_ENVIRONMENT:
        case LATEX_LIST_ENVIRONMENT:
-               if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()
+               if (boost::next(pit) != paragraphs.end()
                    && (pit->params().depth() < boost::next(pit)->params().depth())) {
                        os << '\n';
                        texrow.newline();
@@ -364,9 +370,9 @@ TeXOnePar(Buffer const & buf,
        case LATEX_ENVIRONMENT: {
                // if its the last paragraph of the current environment
                // skip it otherwise fall through
-               ParagraphList::iterator next = boost::next(pit);
+               ParagraphList::const_iterator next = boost::next(pit);
 
-               if (next != const_cast<ParagraphList&>(paragraphs).end()
+               if (next != paragraphs.end()
                    && (next->layout() != pit->layout()
                        || next->params().depth() != pit->params().depth()))
                        break;
@@ -375,13 +381,32 @@ TeXOnePar(Buffer const & buf,
                // fall through possible
        default:
                // we don't need it for the last paragraph!!!
-               if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
+               if (boost::next(pit) != paragraphs.end()) {
                        os << '\n';
                        texrow.newline();
                }
        }
 
-       if (in == 0 || !in->forceDefaultParagraphs(in)) {
+       if (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()
+           && language->babel() != doc_language->babel()) {
+               // Since \selectlanguage write the language to the aux file,
+               // we need to reset the language at the end of footnote or
+               // float.
+
+               if (lyxrc.language_command_end.empty())
+                       os << subst(lyxrc.language_command_begin,
+                                   "$$lang",
+                                   doc_language->babel())
+                          << endl;
+               else
+                       os << subst(lyxrc.language_command_end,
+                                   "$$lang",
+                                   language->babel())
+                          << endl;
+               texrow.newline();
+       }
+
+       if (!pit->forceDefaultParagraphs()) {
                further_blank_line = false;
 
                if (further_blank_line) {
@@ -390,7 +415,7 @@ TeXOnePar(Buffer const & buf,
                }
 
                if (!pit->params().spacing().isDefault()
-                       && (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()
+                       && (boost::next(pit) == paragraphs.end()
                            || !boost::next(pit)->hasSameLayout(*pit)))
                {
                        os << pit->params().spacing().writeEnvirEnd() << '\n';
@@ -399,27 +424,11 @@ TeXOnePar(Buffer const & buf,
        }
 
        // we don't need it for the last paragraph!!!
-       if (boost::next(pit) != const_cast<ParagraphList&>(paragraphs).end()) {
+       // Note from JMarc: we will re-add a \n explicitely in
+       // TeXEnvironment, because it is needed in this case
+       if (boost::next(pit) != paragraphs.end()) {
                os << '\n';
                texrow.newline();
-       } else {
-               // Since \selectlanguage write the language to the aux file,
-               // we need to reset the language at the end of footnote or
-               // float.
-
-               if (language->babel() != doc_language->babel()) {
-                       if (lyxrc.language_command_end.empty())
-                               os << subst(lyxrc.language_command_begin,
-                                           "$$lang",
-                                           doc_language->babel())
-                                  << endl;
-                       else
-                               os << subst(lyxrc.language_command_end,
-                                           "$$lang",
-                                           language->babel())
-                                  << endl;
-                       texrow.newline();
-               }
        }
 
        lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl;
@@ -440,17 +449,16 @@ void latexParagraphs(Buffer const & buf,
        bool was_title = false;
        bool already_title = false;
        LyXTextClass const & tclass = buf.params().getLyXTextClass();
-       ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
-       ParagraphList::iterator endpar = const_cast<ParagraphList&>(paragraphs).end();
+       ParagraphList::const_iterator par = paragraphs.begin();
+       ParagraphList::const_iterator endpar = paragraphs.end();
 
        // if only_body
        while (par != endpar) {
-               InsetOld * in = par->inInset();
                // well we have to check if we are in an inset with unlimited
                // length (all in one row) if that is true then we don't allow
                // any special options in the paragraph and also we don't allow
                // any environment other then "Standard" to be valid!
-               if (in == 0 || !in->forceDefaultParagraphs(in)) {
+               if (!par->forceDefaultParagraphs()) {
                        LyXLayout_ptr const & layout = par->layout();
 
                        if (layout->intitle) {