X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.C;h=bca30a65471e4667b3a210f1e9e705108d590a23;hb=e7ef29fa2d516b8593aa3cccb6548de5686e8a9a;hp=3fb0fe5d3dc461d86f7f12aef525868941985033;hpb=68b0cca2e701e4959ffb4754184b9b28110b8e7f;p=lyx.git

diff --git a/src/output_latex.C b/src/output_latex.C
index 3fb0fe5d3d..bca30a6547 100644
--- 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;
 }
@@ -190,8 +186,9 @@ TeXEnvironment(Buffer const & buf,
 		texrow.newline();
 	}
 
-	lyxerr[Debug::LATEX] << "TeXEnvironment...done " << &*par << endl;
-	return par;  // ale970302
+	if (par != paragraphs.end() && lyxerr.debugging(Debug::LATEX))
+		lyxerr << "TeXEnvironment...done " << &*par << endl;
+	return par;
 }
 
 
@@ -416,7 +413,7 @@ paragraphs);
 		}
 	}
 
-	if (boost::next(pit) == const_cast<ParagraphList&>(paragraphs).end()
+	if (boost::next(pit) == 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
@@ -443,7 +440,9 @@ paragraphs);
 		texrow.newline();
 	}
 
-	lyxerr[Debug::LATEX] << "TeXOnePar...done " << &*boost::next(pit) << endl;
+	if (boost::next(pit) != paragraphs.end() &&
+	    lyxerr.debugging(Debug::LATEX))
+		lyxerr << "TeXOnePar...done " << &*boost::next(pit) << endl;
 	return ++pit;
 }