anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/insets/insetgraphics.C (prepareFile): output correct file name

Browse Source 
of compressed files (bug 2231)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13597 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-04-08 10:35:01 +00:00
parent d4104bbaa2
commit e0657f7f6e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/insetgraphics.C
View File

@ -603,10 +603,10 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
// buffer. // buffer.
// "nice" means that the buffer is exported to LaTeX format but not // "nice" means that the buffer is exported to LaTeX format but not
// run through the LaTeX compiler. // run through the LaTeX compiler.
string const output_file = os::external_path(runparams.nice ? string output_file = os::external_path(runparams.nice ?
params().filename.outputFilename(m_buffer->filePath()) : params().filename.outputFilename(m_buffer->filePath()) :
OnlyFilename(temp_file)); OnlyFilename(temp_file));
string const source_file = runparams.nice ? orig_file : temp_file; string source_file = runparams.nice ? orig_file : temp_file;
if (zipped) { if (zipped) {
if (params().noUnzip) { if (params().noUnzip) {
@ -644,6 +644,8 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
} }
string const unzipped_temp_file = unzippedFileName(temp_file); string const unzipped_temp_file = unzippedFileName(temp_file);
output_file = unzippedFileName(output_file);
source_file = unzippedFileName(source_file);
if (compare_timestamps(unzipped_temp_file, temp_file) > 0) { if (compare_timestamps(unzipped_temp_file, temp_file) > 0) {
// temp_file has been unzipped already and // temp_file has been unzipped already and
// orig_file has not changed in the meantime. // orig_file has not changed in the meantime.

2
status.14x
View File

@ -124,6 +124,8 @@ What's new
- Reading the bounding box from eps files does not fail anymore when the - Reading the bounding box from eps files does not fail anymore when the
file contains additional spaces (bug 1235) file contains additional spaces (bug 1235)
- Fix LaTeX error for zipped graphics (bug 2231).
* Configuration/Installation: * Configuration/Installation:
- Don't use the -mms-bitfields compiler switch on mingw and cygwin, since - Don't use the -mms-bitfields compiler switch on mingw and cygwin, since