Fix my breakage. Sorry guys.

[lyx.git] / src / output_latex.C

diff --git a/src/output_latex.C b/src/output_latex.C
index 6ad8377c498c17381bc903c2c28280f68737c8c6..d1ea46e50d197c2d368ad5c0364f2cc4de97ad5d 100644 (file)
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -190,21 +190,22 @@ 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;
 }
 
 
-int latexOptArgInsets(Buffer const & buf, Paragraph const & par, 
+int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
                      ostream & os, OutputParams const & runparams, int number)
 {
        int lines = 0;
-       
+
        InsetList::const_iterator it = par.insetlist.begin();
        InsetList::const_iterator end = par.insetlist.end();
        for (; it != end && number > 0 ; ++it) {
                if (it->inset->lyxCode() == InsetBase::OPTARG_CODE) {
-                       InsetOptArg * ins = 
+                       InsetOptArg * ins =
                                static_cast<InsetOptArg *>(it->inset);
                        lines += ins->latexOptional(buf, os, runparams);
                        --number;
@@ -313,7 +314,7 @@ TeXOnePar(Buffer const & buf,
 
                // Separate handling of optional argument inset.
                if (style->optionalargs > 0) {
-                       int ret = latexOptArgInsets(buf, *pit, os, runparams, 
+                       int ret = latexOptArgInsets(buf, *pit, os, runparams,
                                                    style->optionalargs);
                        while (ret > 0) {
                                texrow.newline();
@@ -416,7 +417,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 +444,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;
 }