mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-20 06:49:56 +00:00
fix quoted graphics file names
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10093 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c6a8675855
commit
82c5848058
@ -1,3 +1,9 @@
|
|||||||
|
2005-06-20 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||||
|
|
||||||
|
* insetgraphics.C (prepareFile): don't strip the extension of quoted
|
||||||
|
filenames
|
||||||
|
* insetgraphics.C (stripExtensionIfPossible): fix lyxdot replacement
|
||||||
|
|
||||||
2005-06-16 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
2005-06-16 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
|
||||||
|
|
||||||
* insettabular.C (getStatus): disable LFUN_TABULAR_INSERT
|
* insettabular.C (getStatus): disable LFUN_TABULAR_INSERT
|
||||||
|
@ -518,7 +518,7 @@ copyToDirIfNeeded(string const & file_in, string const & dir, bool zipped)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
string const stripExtension(string const & file)
|
string const stripExtensionIfPossible(string const & file)
|
||||||
{
|
{
|
||||||
// Remove the extension so the LaTeX will use whatever
|
// Remove the extension so the LaTeX will use whatever
|
||||||
// is appropriate (when there are several versions in
|
// is appropriate (when there are several versions in
|
||||||
@ -526,7 +526,12 @@ string const stripExtension(string const & file)
|
|||||||
// This works only if the filename contains no dots besides
|
// This works only if the filename contains no dots besides
|
||||||
// the just removed one. We can fool here by replacing all
|
// the just removed one. We can fool here by replacing all
|
||||||
// dots with a macro whose definition is just a dot ;-)
|
// dots with a macro whose definition is just a dot ;-)
|
||||||
return subst(RemoveExtension(file), ".", "\\lyxdot ");
|
// The automatic format selection does not work if the file
|
||||||
|
// name is escaped.
|
||||||
|
string const latex_name = latex_path(file);
|
||||||
|
if (latex_name[0] == '"')
|
||||||
|
return latex_name;
|
||||||
|
return subst(latex_path(RemoveExtension(file)), ".", "\\lyxdot ");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -540,8 +545,8 @@ string const stripExtensionIfPossible(string const & file, string const & to)
|
|||||||
if (to_format == file_format ||
|
if (to_format == file_format ||
|
||||||
(to_format == "eps" && file_format == "ps") ||
|
(to_format == "eps" && file_format == "ps") ||
|
||||||
(to_format == "ps" && file_format == "eps"))
|
(to_format == "ps" && file_format == "eps"))
|
||||||
return stripExtension(file);
|
return stripExtensionIfPossible(file);
|
||||||
return file;
|
return latex_path(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace anon
|
} // namespace anon
|
||||||
@ -628,7 +633,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
|
|||||||
source_file, output_file);
|
source_file, output_file);
|
||||||
// We can't strip the extension, because we don't know
|
// We can't strip the extension, because we don't know
|
||||||
// the unzipped file format
|
// the unzipped file format
|
||||||
return output_file;
|
return latex_path(output_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
string const unzipped_temp_file = unzippedFileName(temp_file);
|
string const unzipped_temp_file = unzippedFileName(temp_file);
|
||||||
@ -688,7 +693,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
|
|||||||
output_to_file);
|
output_to_file);
|
||||||
runparams.exportdata->addExternalFile("dvi", to_file,
|
runparams.exportdata->addExternalFile("dvi", to_file,
|
||||||
output_to_file);
|
output_to_file);
|
||||||
return stripExtension(output_file);
|
return stripExtensionIfPossible(output_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
lyxerr[Debug::GRAPHICS]
|
lyxerr[Debug::GRAPHICS]
|
||||||
@ -704,7 +709,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
|
|||||||
to_file, output_to_file);
|
to_file, output_to_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
return stripExtension(output_file);
|
return stripExtensionIfPossible(output_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -760,7 +765,7 @@ int InsetGraphics::latex(Buffer const & buf, ostream & os,
|
|||||||
// Convert the file if necessary.
|
// Convert the file if necessary.
|
||||||
// Remove the extension so LaTeX will use whatever is appropriate
|
// Remove the extension so LaTeX will use whatever is appropriate
|
||||||
// (when there are several versions in different formats)
|
// (when there are several versions in different formats)
|
||||||
latex_str += latex_path(prepareFile(buf, runparams));
|
latex_str += prepareFile(buf, runparams);
|
||||||
latex_str += '}' + after;
|
latex_str += '}' + after;
|
||||||
os << latex_str;
|
os << latex_str;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user