From 881dedcce701025b05a4193f958174a62db6b602 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 29 Jun 2001 13:37:32 +0000 Subject: [PATCH] fix footnotes spacing git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_1_6@2160 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 9 +++++++++ INSTALL | 29 +++++++++++------------------ src/paragraph.C | 8 ++++---- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9e778e5a5..2bc04073c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-06-29 Jean-Marc Lasgouttes + + * src/paragraph.C (TeXFootnote): fix spacing in LaTeX output of + footnotes + +2001-06-29 John Levon + + * INSTALL: change RedHat stuff to insist on updating gcc + 2001-06-28 Jean-Marc Lasgouttes * lib/layouts/extletter.layout: diff --git a/INSTALL b/INSTALL index 1beaa941a0..6fedffb514 100644 --- a/INSTALL +++ b/INSTALL @@ -306,6 +306,10 @@ notify us. are needed for compilation). A 'make symlinks' in linux kernel sources fixes that. + o if you are using RedHat Linux 7.x, you must make sure you have the + latest updated gcc and related packages installed (at least -85), + or LyX will not compile or will be mis-compiled. + o if you get an error message when compiling LyX that looks like this : ../../src/minibuffer.h:17: using directive `Object' introduced @@ -314,17 +318,6 @@ notify us. then you need to upgrade the version of the xforms library you have installed. - o If you are using RedHat 7.0 and the option --with-frontend=kde, you - will need to configure LyX as follows : - - export QTDIR=/usr/lib/qt-1.45 - export CC="egcs -L/usr/lib" - export CXX="egcs++ -L/usr/lib" - ./configure --with-frontend=kde - - If you your version of gcc-c++ is > 2.96-69, you may not need to do - this. - o If you have GNU gettext installed on your system (e.g. on linux), you may get tons of warnings like: @@ -335,6 +328,13 @@ notify us. will be solved if you use --with-included-gettext when configuring LyX. + o On Solaris, compiling with Sun CC 6.0 or less will fail in the sigc++ + directory. Sun's compiler can't handle some of the constructs in this + library. If possible find and install a libsigc++ package and then + configure using the --without-included-libsigc option. + + The alternative is to compile LyX using GNU gcc. + o It is possible to compile lyx with Tru64 Unix cxx compiler version 6.2, provided one uses CXX='cxx -std strict_ansi' @@ -407,10 +407,3 @@ Warning: Linking some objects which contain exception information sections You can safely ignore it. - o On Solaris, compiling with Sun CC 6.0 or less will fail in the sigc++ - directory. Sun's compiler can't handle some of the constructs in this - library. If possible find and install a libsigc++ package and then - configure using the --without-included-libsigc option. - - The alternative is to compile LyX using GNU gcc. - diff --git a/src/paragraph.C b/src/paragraph.C index ea147b7e2d..30ea986893 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -3532,13 +3532,13 @@ LyXParagraph * LyXParagraph::TeXFootnote(Buffer const * buf, switch (footnotekind) { case LyXParagraph::FOOTNOTE: if (style.intitle) { - os << "\\thanks{\n"; + os << "%\n\\thanks{"; footer_in_body = false; moving_arg = true; } else { if (foot_count == -1) { // we're at depth 0 so we can use: - os << "\\footnote{%\n"; + os << "%\n\\footnote{"; footer_in_body = false; } else { os << "\\footnotemark{}%\n"; @@ -3555,7 +3555,7 @@ LyXParagraph * LyXParagraph::TeXFootnote(Buffer const * buf, } break; case LyXParagraph::MARGIN: - os << "\\marginpar{\n"; + os << "%\n\\marginpar{"; break; case LyXParagraph::FIG: if (pextra_type == PEXTRA_FLOATFLT @@ -3692,7 +3692,7 @@ LyXParagraph * LyXParagraph::TeXFootnote(Buffer const * buf, if (footer_in_body) { // This helps tell which of the multiple // footnotetexts an error was in. - foot << "}%\n"; + foot << "%\n}"; foot_texrow.newline(); } else { os << '}';