adjust

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 6f9a040f254c3823e7f7381ad84c116cecce0aef..a5c0d02df7b84b8e3cc40c269f3dea89d0c0a5e4 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -17,6 +17,7 @@
 #include "debug.h"
 #include "Encoding.h"
 #include "Language.h"
+#include "Layout.h"
 #include "LyXRC.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
@@ -30,6 +31,7 @@
 
 #include "support/lstrings.h"
 
+#include <boost/next_prior.hpp>
 
 namespace lyx {
 
@@ -170,12 +172,12 @@ TeXEnvironment(Buffer const & buf,
                        os << '\n';
                        texrow.newline();
                } else if (par->params().depth() > pit->params().depth()) {
-                           if (par->layout()->isParagraph()) {
+                       if (par->layout()->isParagraph()) {
+                         // Thinko!
+                         // How to handle this? (Lgb)
+                         //&& !suffixIs(os, "\n\n")
+                                 //) {
 
-                           // Thinko!
-                           // How to handle this? (Lgb)
-                           //&& !suffixIs(os, "\n\n")
-                                   //) {
                                // There should be at least one '\n' already
                                // but we need there to be two for Standard
                                // paragraphs that are depth-increment'ed to be
@@ -207,8 +209,9 @@ TeXEnvironment(Buffer const & buf,
                texrow.newline();
        }
 
-       if (par != paragraphs.end())
+       if (par != paragraphs.end()) {
                LYXERR(Debug::LATEX) << "TeXEnvironment...done " << &*par << endl;
+       }
        return par;
 }
 
@@ -223,7 +226,7 @@ int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
        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);
@@ -585,8 +588,9 @@ TeXOnePar(Buffer const & buf,
                texrow.newline();
        }
 
-       if (boost::next(pit) != paragraphs.end())
+       if (boost::next(pit) != paragraphs.end()) {
                LYXERR(Debug::LATEX) << "TeXOnePar...done " << &*boost::next(pit) << endl;
+       }
 
        return ++pit;
 }