mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-16 07:55:41 +00:00
1dbf0e5aab
Systemcall::startscript returns the exit code of the LaTeX command that is run, but the return value was not being checked by LaTeX::run. Instead, we relied on parsing log files. However, this parsing is not perfect. The return value is now checked and if the exit code of the command is non-zero, an enum value is added to the return and the user is notified of the error. At a higher level, if the LaTeX command returns a non-zero exit code, in the GUI a message such as "Error while exporting format: PDF (LuaTeX)" will be given instead of "Successful preview of format: PDF (LuaTeX)". When run on the commandline, lyx -e lualatex example.lyx will give "Error: LaTeX failed" and a non-zero exit code where before it gave a zero exit code. A real example of the bug this commit fixes is LyX's (as of this commit) ACM-sigplan.lyx template. Before this commit: $ lyx -e pdf2 ACM-sigplan.lyx [...snip...] support/Systemcall.cpp (288): Systemcall: 'pdflatex "ACM-sigplan.tex"' finished with exit code 1 $ echo $? 0 Starting with this commit: $ mylyx master -e pdf2 ACM-sigplan.lyx support/Systemcall.cpp (288): Systemcall: 'pdflatex "ACM-sigplan.tex"' finished with exit code 1 Error: LaTeX failed ---------------------------------------- LaTeX did not run successfully. The command that was run exited with error. $ echo $? 1
243 lines
4.9 KiB
C++
243 lines
4.9 KiB
C++
// -*- C++ -*-
|
|
/**
|
|
* \file LaTeX.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Lars Gullik Bjønnes
|
|
* \author Angus Leeming
|
|
* \author Dekel Tsur
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#ifndef LATEX_H
|
|
#define LATEX_H
|
|
|
|
#include "OutputParams.h"
|
|
|
|
#include "support/docstring.h"
|
|
#include "support/FileName.h"
|
|
|
|
#include <boost/signal.hpp>
|
|
|
|
#include <vector>
|
|
#include <set>
|
|
|
|
|
|
namespace lyx {
|
|
|
|
class DepTable;
|
|
|
|
///
|
|
class TeXErrors {
|
|
private:
|
|
///
|
|
class Error {
|
|
public:
|
|
///
|
|
Error () : error_in_line(0) {}
|
|
///
|
|
Error(int line, docstring const & desc, docstring const & text,
|
|
std::string const & fname)
|
|
: error_in_line(line),
|
|
error_desc(desc),
|
|
error_text(text),
|
|
child_name(fname) {}
|
|
/// what line in the TeX file the error occurred in
|
|
int error_in_line;
|
|
/// The kind of error
|
|
docstring error_desc;
|
|
/// The line/cmd that caused the error.
|
|
docstring error_text;
|
|
/// The name of the child where error occurred, empty otherwise.
|
|
std::string child_name;
|
|
};
|
|
public:
|
|
///
|
|
typedef std::vector<Error> Errors;
|
|
///
|
|
Errors::const_iterator begin() const { return errors.begin(); }
|
|
///
|
|
Errors::const_iterator end() const { return errors.end(); }
|
|
///
|
|
void insertError(int line, docstring const & error_desc,
|
|
docstring const & error_text,
|
|
std::string const & child_name = empty_string());
|
|
private:
|
|
///
|
|
Errors errors;
|
|
};
|
|
|
|
|
|
class AuxInfo {
|
|
public:
|
|
///
|
|
AuxInfo() {}
|
|
///
|
|
support::FileName aux_file;
|
|
///
|
|
std::set<std::string> citations;
|
|
///
|
|
std::set<std::string> databases;
|
|
///
|
|
std::set<std::string> styles;
|
|
};
|
|
|
|
|
|
///
|
|
bool operator==(AuxInfo const &, AuxInfo const &);
|
|
bool operator!=(AuxInfo const &, AuxInfo const &);
|
|
|
|
|
|
/**
|
|
* Class to run the LaTeX compiler and needed auxiliary programs.
|
|
* The main .tex file must be in the current directory. The current directory
|
|
* must not change as long as an object of this class lives.
|
|
* This is required by the LaTeX compiler, and we also make use of it by
|
|
* various support::makeAbsPath() calls.
|
|
*/
|
|
class LaTeX {
|
|
public:
|
|
/** Return values from scanLogFile() and run() (to come)
|
|
|
|
This enum should be enlarged a bit so that one could
|
|
get more feedback from the LaTeX run.
|
|
*/
|
|
enum log_status {
|
|
///
|
|
NO_ERRORS = 0,
|
|
///
|
|
NO_LOGFILE = 1,
|
|
///
|
|
NO_OUTPUT = 2,
|
|
///
|
|
UNDEF_REF = 4, // Reference '...' on page ... undefined.
|
|
///
|
|
UNDEF_CIT = 8, // Citation '...' on page ... undefined.
|
|
///
|
|
RERUN = 16, // Label(s) may have changed. Rerun to get...
|
|
///
|
|
TEX_ERROR = 32,
|
|
///
|
|
TEX_WARNING = 64,
|
|
///
|
|
LATEX_ERROR = 128,
|
|
///
|
|
LATEX_WARNING = 256,
|
|
///
|
|
PACKAGE_WARNING = 512,
|
|
///
|
|
NO_FILE = 1024,
|
|
///
|
|
NO_CHANGE = 2048,
|
|
///
|
|
TOO_MANY_ERRORS = 4096,
|
|
///
|
|
ERROR_RERUN = 8192,
|
|
///
|
|
BIBTEX_ERROR = 16384,
|
|
///
|
|
NONZERO_ERROR = 32768, // the command exited with nonzero status
|
|
///
|
|
//FIXME: BIBTEX_ERROR has been removed from ERRORS for now, since users were irritated
|
|
// about those errors which prevented compilation of previously compiling documents.
|
|
// Think about a "gentle" transfer to BibTeX error reporting.
|
|
ERRORS = TEX_ERROR + LATEX_ERROR + NONZERO_ERROR,
|
|
///
|
|
WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
|
|
};
|
|
|
|
/// This signal emits an informative message
|
|
boost::signal<void(docstring)> message;
|
|
|
|
|
|
/**
|
|
cmd = the latex command, file = name of the (temporary) latex file,
|
|
path = name of the files original path.
|
|
*/
|
|
LaTeX(std::string const & cmd, OutputParams const &,
|
|
support::FileName const & file,
|
|
std::string const & path = empty_string());
|
|
|
|
/// runs LaTeX several times
|
|
int run(TeXErrors &);
|
|
|
|
///
|
|
int getNumErrors() { return num_errors;}
|
|
|
|
///
|
|
int scanLogFile(TeXErrors &);
|
|
|
|
private:
|
|
/// noncopyable
|
|
LaTeX(LaTeX const &);
|
|
void operator=(LaTeX const &);
|
|
|
|
/// use this for running LaTeX once
|
|
int startscript();
|
|
|
|
/// The dependency file.
|
|
support::FileName depfile;
|
|
|
|
///
|
|
void deplog(DepTable & head);
|
|
|
|
///
|
|
bool runMakeIndex(std::string const &, OutputParams const &,
|
|
std::string const & = std::string());
|
|
|
|
///
|
|
bool runMakeIndexNomencl(support::FileName const &,
|
|
std::string const &, std::string const &);
|
|
|
|
///
|
|
std::vector<AuxInfo> const scanAuxFiles(support::FileName const &);
|
|
|
|
///
|
|
AuxInfo const scanAuxFile(support::FileName const &);
|
|
|
|
///
|
|
void scanAuxFile(support::FileName const &, AuxInfo &);
|
|
|
|
///
|
|
void updateBibtexDependencies(DepTable &,
|
|
std::vector<AuxInfo> const &);
|
|
|
|
///
|
|
int scanBlgFile(DepTable & head, TeXErrors & terr);
|
|
|
|
///
|
|
bool runBibTeX(std::vector<AuxInfo> const &,
|
|
OutputParams const &);
|
|
|
|
///
|
|
void deleteFilesOnError() const;
|
|
|
|
///
|
|
std::string cmd;
|
|
|
|
///
|
|
support::FileName file;
|
|
|
|
///
|
|
std::string path;
|
|
|
|
/// used by scanLogFile
|
|
int num_errors;
|
|
|
|
/// The name of the final output file.
|
|
support::FileName output_file;
|
|
|
|
///
|
|
OutputParams runparams;
|
|
|
|
/// Do we use biber?
|
|
bool biber;
|
|
};
|
|
|
|
|
|
} // namespace lyx
|
|
|
|
#endif
|