* remove various xforms relicts, in particular:

[lyx.git] / src / output_latex.C

diff --git a/src/output_latex.C b/src/output_latex.C
index d1ea46e50d197c2d368ad5c0364f2cc4de97ad5d..c945e19c2d08ff95c3e435f681aadef394a93366 100644 (file)
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -25,21 +25,17 @@
 #include "texrow.h"
 #include "vspace.h"
 
+#include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"
 
 #include "support/lstrings.h"
 
-#ifdef HAVE_LOCALE
-#endif
-
 using lyx::support::subst;
 
 using std::endl;
 using std::ostream;
 using std::string;
 
-extern string bibitemWidest(Buffer const &);
-
 
 namespace {
 
@@ -79,7 +75,7 @@ TeXDeeper(Buffer const & buf,
                                             os, texrow, runparams);
                }
        }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << &*par << endl;
+       lyxerr[Debug::LATEX] << "TeXDeeper...done " << endl;
 
        return par;
 }
@@ -276,7 +272,7 @@ TeXOnePar(Buffer const & buf,
        if (bparams.inputenc == "auto" &&
            language->encoding() != previous_language->encoding()) {
                os << "\\inputencoding{"
-                  << language->encoding()->LatexName()
+                  << language->encoding()->latexName()
                   << "}\n";
                texrow.newline();
        }
@@ -337,7 +333,7 @@ TeXOnePar(Buffer const & buf,
 
        os << everypar;
        bool need_par = pit->simpleTeXOnePar(buf, bparams,
-                       outerFont(pit - paragraphs.begin(), paragraphs),
+                                            outerFont(std::distance(paragraphs.begin(), pit), paragraphs),
                                             os, texrow, runparams);
 
        // Make sure that \\par is done with the font of the last
@@ -350,8 +346,8 @@ TeXOnePar(Buffer const & buf,
        // We do not need to use to change the font for the last paragraph
        // or for a command.
        LyXFont const outerfont =
-                       outerFont(pit - paragraphs.begin(),
-paragraphs);
+               outerFont(std::distance(paragraphs.begin(), pit),
+                         paragraphs);
 
        LyXFont const font =
                (pit->empty()
@@ -467,8 +463,20 @@ void latexParagraphs(Buffer const & buf,
        ParagraphList::const_iterator par = paragraphs.begin();
        ParagraphList::const_iterator endpar = paragraphs.end();
 
+       BOOST_ASSERT(runparams.par_begin <= runparams.par_end);
+       // if only part of the paragraphs will be outputed
+       if (runparams.par_begin !=  runparams.par_end) {
+               par = boost::next(paragraphs.begin(), runparams.par_begin);
+               endpar = boost::next(paragraphs.begin(), runparams.par_end);
+               // runparams will be passed to nested paragraphs, so
+               // we have to reset the range parameters.
+               const_cast<OutputParams&>(runparams).par_begin = 0;
+               const_cast<OutputParams&>(runparams).par_end = 0;
+       }
+
        // if only_body
        while (par != endpar) {
+               ParagraphList::const_iterator lastpar = par;
                // 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
@@ -506,7 +514,7 @@ void latexParagraphs(Buffer const & buf,
 
                        if (layout->is_environment) {
                                par = TeXOnePar(buf, paragraphs, par, os, texrow,
-                                               runparams, everypar);
+                                               runparams, everypar);
                        } else if (layout->isEnvironment() ||
                                !par->params().leftIndent().zero())
                        {
@@ -514,12 +522,14 @@ void latexParagraphs(Buffer const & buf,
                                                     texrow, runparams);
                        } else {
                                par = TeXOnePar(buf, paragraphs, par, os, texrow,
-                                               runparams, everypar);
+                                               runparams, everypar);
                        }
                } else {
                        par = TeXOnePar(buf, paragraphs, par, os, texrow,
-                                       runparams, everypar);
+                                       runparams, everypar);
                }
+               if (std::distance(lastpar, par) >= std::distance(lastpar, endpar))
+                       break;
        }
        // It might be that we only have a title in this document
        if (was_title && !already_title) {