anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1051 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2000-09-28 02:59:25 +00:00
parent d705c75da9
commit 87a0dbbbe0
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2000-09-28 Allan Rae <rae@lyx.org>
* 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 <larsbj@lyx.org>
* src/insets/insettext.C (Ascii): return numer of '\n' in the text

2
src/LyXView.h
View File

@ -21,7 +21,7 @@
#include "LString.h"
#include "Timeout.h"
#include "support/utility.hpp"
#include "layout.h"
class LyXFunc;
class Toolbar;

12
src/paragraph.C
View File

@ -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();
}