diff --git a/ChangeLog b/ChangeLog index 2c83e57806..0b22991d2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-12-11 Jean-Marc Lasgouttes + + * README: + * INSTALL: make it clear that the preferred version of xforms is + 1.0 + 2002-10-29 Jean-Marc Lasgouttes * configure.in: workaround problem with autoconf 2.5x (off_t not diff --git a/INSTALL b/INSTALL index e6f6c8625a..cb76ff2552 100644 --- a/INSTALL +++ b/INSTALL @@ -50,22 +50,19 @@ Both an Xforms and Xpm libraries should be installed to compile LyX. It is imperative that you have the correct versions of these libraries, and their associated header files. -As of LyX version 1.2.0, you will need to have Xforms library and -header version 0.88 or 0.89. Version 0.89.6 is the one which works -best, but the old stable 0.88.1 version is still supported. On some -systems, such as linux ELF, there are shared library versions of the -Xforms library, which require an installation step to configure the -system. +As of LyX version 1.2.2, you will need to have Xforms library and +header version 0.88, 0.89 or 1.0.0. The later is the one which works +best (many bugs have been fixed in this version after reports from the +LyX team). On some systems, such as linux ELF, there are shared +library versions of the Xforms library, which require an installation +step to configure the system. -Xforms is available (free) only in binary format, source code is not -available. If it is not available for your machine, contact the Xforms -developers to request a version for your system. You can get it from +Xforms 1.0 is available in source form at the following addresses + ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/ + ftp://ftp.lyx.org/pub/xforms/OpenSource/ - http://world.std.com/~xforms/ - ftp://ncmir.ucsd.edu/pub/xforms/ - ftp://ftp.lyx.org/pub/xforms/ - ftp://ftp.fu-berlin.de/unix/X11/gui/xforms - ftp://ftp.cs.ruu.nl/pub/XFORMS/ +Older 0.x versions are available (free) only in binary format on the +same ftp sites , source code is not available. If you use a rpm-based linux distribution, such as RedHat or Mandrake, we recommend that you grab a version of xforms from diff --git a/README b/README index c7dd89c735..a7fe42dcb6 100644 --- a/README +++ b/README @@ -100,7 +100,8 @@ What do I need to compile LyX from the source distribution? gcc/g++, but some others work. As of LyX 1.2.0, you need at least gcc 2.95.X (or egcs 1.1.x). Another compiler known to work is compaq cxx 6.1. - 2. The Xforms library version 0.89.6 (recommended) or 0.88.1. + 2. The Xforms library version 1.0 (recommended) or the older + 0.89.6/0.88.1. 3. LibXpm version 4.7 (or newer). Read the file "INSTALL" for more information on compiling. diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index c573e0ad68..e1a5835ad9 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ +2002-12-10 Jean-Marc Lasgouttes + + * insetgraphics.C (prepareFile): do not remove the extension of + the file name if it is not the default extension for the given + format (that is, in latex output, remove extension from foo.eps, + but not from foo.epsi) + 2002-11-20 Juergen Vigna * insettabular.C (resetPos): temporary fix for endless loop in diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 966a2fac5c..2cc8d24e30 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -708,12 +708,22 @@ string const InsetGraphics::prepareFile(Buffer const *buf) const lyxerr[Debug::GRAPHICS] << "\t we have: from " << from << " to " << to << '\n'; if (from == to) { - // No conversion is needed. LaTeX can handle the graphic file as is. - // This is true even if the orig_file is compressed. We have to return - // the orig_file_with_path, maybe it is a zipped one - if (lyxrc.use_tempdir) - return RemoveExtension(temp_file); - return RemoveExtension(orig_file_with_path); + // No conversion is needed. LaTeX can handle the + // graphic file as is. This is true even if the + // orig_file is compressed. We have to return the + // orig_file_with_path, maybe it is a zipped one + + // If the extension is not the default one (e.g. .epsi + // instead of .eps), then we do not remove it. (JMarc 20021210) + if (formats.getFormat(to)->extension() == GetExtension(orig_file)) { + if (lyxrc.use_tempdir) + return RemoveExtension(temp_file); + return RemoveExtension(orig_file_with_path); + } else { + if (lyxrc.use_tempdir) + return temp_file; + return orig_file_with_path; + } } string const outfile_base = RemoveExtension(temp_file); diff --git a/status.12x b/status.12x index 827ef0d779..1d97110383 100644 --- a/status.12x +++ b/status.12x @@ -19,6 +19,10 @@ What's new ** Updates +- LyX build with the newly released xforms 1.0. Actually, it is + advised to use this version of xforms, since it fixes many bugs and + support for older versions will probably be dropped in LyX 1.3.0 + - selecting a word by double clicking now sets the X clipboard (like when dragging the mouse)