From 87a0dbbbe01ad21e7361b18c1f8b7b89873befd7 Mon Sep 17 00:00:00 2001 From: Allan Rae Date: Thu, 28 Sep 2000 02:59:25 +0000 Subject: [PATCH] partial fix for '\n' output problem, still needs fixing of output before/after a table in a float; seems LyXAlignment is a work a progress so I didn't try to hard to get LyX compiling again git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1051 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 13 +++++++++++++ src/LyXView.h | 2 +- src/paragraph.C | 12 +----------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ac073b302..eda8d9dc75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-09-28 Allan Rae + + * src/paragraph.C (TeXOnePar): fixed output of '\n'. The problem was + that the #ifdef's had been applied to part of what should have been + a complete condition. It's possible there are other tests that + were specific to tables that are also wrong now that InsetTabular is + being used. Now we need to fix the output of '\n' after a table in a + float for the same reason as the original condition: + "don't insert this if we would be adding it before or after a table + in a float. This little trick is needed in order to allow use of + tables in \subfigures or \subtables." + Juergen can you check this? + 2000-09-27 Lars Gullik Bjønnes * src/insets/insettext.C (Ascii): return numer of '\n' in the text diff --git a/src/LyXView.h b/src/LyXView.h index 9aa11c0205..9072a3ccf0 100644 --- a/src/LyXView.h +++ b/src/LyXView.h @@ -21,7 +21,7 @@ #include "LString.h" #include "Timeout.h" #include "support/utility.hpp" - +#include "layout.h" class LyXFunc; class Toolbar; diff --git a/src/paragraph.C b/src/paragraph.C index 2c99a748d2..419c7e9145 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -2403,17 +2403,7 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, break; default: // we don't need it for the last paragraph!!! - if (next -#ifndef NEW_INSETS - && !( footnoteflag != LyXParagraph::NO_FOOTNOTE - && footnotekind != LyXParagraph::FOOTNOTE - && footnotekind != LyXParagraph::MARGIN) -#endif - ) { - // don't insert this if we would be adding it - // before or after a table in a float. This - // little trick is needed in order to allow - // use of tables in \subfigures or \subtables. + if (next) { os << '\n'; texrow.newline(); } -- 2.39.2