Fix bug 5436, at least for the time being.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27236 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-11-03 13:07:30 +00:00
parent 420603311d
commit ff9d8584f9

View File

@ -724,9 +724,17 @@ TeXOnePar(Buffer const & buf,
// Note from JMarc: we will re-add a \n explicitly in // Note from JMarc: we will re-add a \n explicitly in
// TeXEnvironment, because it is needed in this case // TeXEnvironment, because it is needed in this case
if (nextpit != paragraphs.end()) { if (nextpit != paragraphs.end()) {
// FIXME What we really want to do here is output a newline only if
// we have not just output a newline. But in the present state of play,
// we don't have access to that information. For some ideas about how
// to fix this, see this thread:
// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145787.html
Layout const & next_layout = nextpit->layout(); Layout const & next_layout = nextpit->layout();
// no blank lines before environments! if (style == next_layout
if (!next_layout.isEnvironment() || style == next_layout) { // no blank lines before environments!
|| !next_layout.isEnvironment()
// unless there's a depth change
|| nextpit->params().depth() != pit->params().depth()) {
os << '\n'; os << '\n';
texrow.newline(); texrow.newline();
} }