More fixes to the autocollapsing of paragraphs.

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 48b3a755c0d1da2fb0a4dab7ed73f602d9ad166d..7ae0873b3715c7cc0c0819677febdeb8b9b85a50 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -542,9 +542,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                                        + layoutname + _(" to ")
                                        + textclasslist.NameOfLayout(params.textclass, par->layout);
                                InsetError * new_inset = new InsetError(s);
-                               par->insertInset(0, new_inset);
-                               par->setFont(0, LyXFont(LyXFont::ALL_INHERIT,
-                                                       params.language));
+                               par->insertInset(0, new_inset, 
+                                                LyXFont(LyXFont::ALL_INHERIT,
+                                                        params.language));
                        }
                        // Test whether the layout is obsolete.
                        LyXLayout const & layout =
@@ -1182,9 +1182,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                        + " " + lex.text()  + "\n";
 
                InsetError * new_inset = new InsetError(s);
-               par->insertInset(pos, new_inset);
-               par->setFont(pos, LyXFont(LyXFont::ALL_INHERIT,
-                                         params.language));
+               par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT,
+                                                        params.language));
 
 #ifndef NO_COMPABILITY
                }
@@ -2449,6 +2448,7 @@ void Buffer::makeLaTeXFile(string const & fname,
        }
        
        lyxerr[Debug::INFO] << "Finished making latex file." << endl;
+       lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl;
 }
 
 
@@ -2980,8 +2980,8 @@ void Buffer::sgmlError(Paragraph * par, int pos,
 {
        // insert an error marker in text
        InsetError * new_inset = new InsetError(message);
-       par->insertInset(pos, new_inset);
-       par->setFont(pos, LyXFont(LyXFont::ALL_INHERIT, params.language));
+       par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT, 
+                                                params.language));
 }