fix extension output for epsi file; update INSTALL/README files wrt xforms 1.0

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@5804 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-12-11 15:47:30 +00:00
parent 89001fd647
commit a51473266f
6 changed files with 46 additions and 21 deletions

View File

@ -1,3 +1,9 @@
2002-12-11 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* README:
* INSTALL: make it clear that the preferred version of xforms is
1.0
2002-10-29 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* configure.in: workaround problem with autoconf 2.5x (off_t not

25
INSTALL
View File

@ -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

3
README
View File

@ -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.

View File

@ -1,3 +1,10 @@
2002-12-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* 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 <jug@sad.it>
* insettabular.C (resetPos): temporary fix for endless loop in

View File

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

View File

@ -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)