* Paragraph: reserve memory by chunks of 100 chars. This improve the loading of big...

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 247e8a399b618a25824971b4fc5bf43e0ee77c23..bf04a243c35e73af5ccdd1e063dbdf791a444859 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -16,6 +16,7 @@
 #include "BufferParams.h"
 #include "debug.h"
 #include "Encoding.h"
+#include "InsetList.h"
 #include "Language.h"
 #include "Layout.h"
 #include "LyXRC.h"
@@ -31,6 +32,7 @@
 
 #include "support/lstrings.h"
 
+#include <boost/next_prior.hpp>
 
 namespace lyx {
 
@@ -222,10 +224,10 @@ int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
 {
        int lines = 0;
 
-       InsetList::const_iterator it = par.insetlist.begin();
-       InsetList::const_iterator end = par.insetlist.end();
+       InsetList::const_iterator it = par.insetList().begin();
+       InsetList::const_iterator end = par.insetList().end();
        for (; it != end && number > 0 ; ++it) {
-               if (it->inset->lyxCode() == Inset::OPTARG_CODE) {
+               if (it->inset->lyxCode() == OPTARG_CODE) {
                        InsetOptArg * ins =
                                static_cast<InsetOptArg *>(it->inset);
                        lines += ins->latexOptional(buf, os, runparams);
@@ -439,7 +441,7 @@ TeXOnePar(Buffer const & buf,
 
        // FIXME UNICODE
        os << from_utf8(everypar);
-       bool need_par = pit->simpleTeXOnePar(buf, bparams, outerfont,
+       bool need_par = pit->latex(buf, bparams, outerfont,
                                             os, texrow, runparams);
 
        // Make sure that \\par is done with the font of the last
@@ -556,7 +558,7 @@ TeXOnePar(Buffer const & buf,
        if (closing_rtl_ltr_environment)
                os << "}";
 
-       if (pending_newline) {
+       if (pending_newline && !runparams.verbatim) {
                os << '\n';
                texrow.newline();
        }