anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tex2lyx: exit earlier if input file could not be found

Browse Source 
In particular, do not write an empty .lyx file (#12339)
This commit is contained in:
Juergen Spitzmueller 2022-12-28 14:05:23 +01:00
parent 992e3aec88
commit 9047d60c5a
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/tex2lyx/tex2lyx.cpp
View File

@ -979,16 +979,9 @@ bool tex2lyx(idocstream & is, ostream & os, string const & encoding,
/// convert TeX from \p infilename to LyX and write it to \p os
bool tex2lyx(FileName const & infilename_in, ostream & os, string encoding,
bool tex2lyx(FileName const & infilename, ostream & os, string encoding,
string const & outfiledir)
{
FileName infilename = infilename_in;
// Like TeX, we consider files without extensions as *.tex files
// and append the extension if the file without ext does not exist
// (#12340)
if (!infilename.exists() && infilename.extension().empty())
infilename.changeExtension("tex");
// Set a sensible default encoding.
// This is used until an encoding command is found.
// For child documents use the encoding of the master, else try to
@ -1046,6 +1039,18 @@ bool tex2lyx(FileName const & infilename_in, ostream & os, string encoding,
bool tex2lyx(string const & infilename, FileName const & outfilename,
string const & encoding)
{
FileName ifname = FileName(infilename);
// Like TeX, we consider files without extensions as *.tex files
// and append the extension if the file without ext does not exist
// (#12340)
if (!ifname.exists() && ifname.extension().empty()) {
ifname.changeExtension("tex");
if (!ifname.exists()) {
cerr << "Could not open input file \"" << infilename
<< "\" for reading." << endl;
return false;
}
}
if (outfilename.isReadableFile()) {
if (overwrite_files) {
cerr << "Overwriting existing file "
@ -1065,10 +1070,10 @@ bool tex2lyx(string const & infilename, FileName const & outfilename,
return false;
}
#ifdef FILEDEBUG
cerr << "Input file: " << infilename << "\n";
cerr << "Input file: " << ifname << "\n";
cerr << "Output file: " << outfilename << "\n";
#endif
return tex2lyx(FileName(infilename), os, encoding,
return tex2lyx(ifname, os, encoding,
outfilename.onlyPath().absFileName() + '/');
}