anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow LaTeX processes to be canceled.

Browse Source
This commit is contained in:
Richard Heck 2017-12-21 18:46:00 -05:00
parent cf782dfc68
commit 12b03b30f4
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Converter.cpp
View File

@ -810,7 +810,7 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
string const name = buffer.latexName();
LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
buffer.filePath(), buffer.layoutPos(),
buffer.lastPreviewError());
buffer.isClone(), buffer.lastPreviewError());
TeXErrors terr;
// The connection closes itself at the end of the scope when latex is
// destroyed. One cannot close (and destroy) buffer while the converter is

19
src/LaTeX.cpp
View File

@ -93,9 +93,10 @@ bool operator!=(AuxInfo const & a, AuxInfo const & o)
*/
LaTeX::LaTeX(string const & latex, OutputParams const & rp,
FileName const & f, string const & p, string const & lp,
bool const clean_start)
: cmd(latex), file(f), path(p), lpath(lp), runparams(rp), biber(false)
FileName const & f, string const & p, string const & lp,
bool allow_cancellation, bool const clean_start)
: cmd(latex), file(f), path(p), lpath(lp), runparams(rp), biber(false),
allow_cancel(allow_cancellation)
{
num_errors = 0;
// lualatex can still produce a DVI with --output-format=dvi. However,
@ -244,12 +245,16 @@ int LaTeX::run(TeXErrors & terr)
message(runMessage(count));
int exit_code = startscript();
if (exit_code == Systemcall::KILLED)
return Systemcall::KILLED;
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
LYXERR(Debug::LATEX, "Rerunning LaTeX");
terr.clearErrors();
exit_code = startscript();
if (exit_code == Systemcall::KILLED)
return Systemcall::KILLED;
scanres = scanLogFile(terr);
}
@ -339,7 +344,9 @@ int LaTeX::run(TeXErrors & terr)
LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested");
LYXERR(Debug::LATEX, "Run #" << count);
message(runMessage(count));
startscript();
int exitCode = startscript();
if (exitCode == Systemcall::KILLED)
return Systemcall::KILLED;
scanres = scanLogFile(terr);
// update the depedencies
@ -442,7 +449,9 @@ int LaTeX::startscript()
+ quoteName(onlyFileName(file.toFilesystemEncoding()))
+ " > " + os::nulldev();
Systemcall one;
return one.startscript(Systemcall::Wait, tmp, path, lpath);
Systemcall::Starttype const starttype =
allow_cancel ? Systemcall::WaitLoop : Systemcall::Wait;
return one.startscript(starttype, tmp, path, lpath, true);
}

4
src/LaTeX.h
View File

@ -162,6 +162,7 @@ public:
support::FileName const & file,
std::string const & path = empty_string(),
std::string const & lpath = empty_string(),
bool allow_cancellation = false,
bool const clean_start = false);
/// runs LaTeX several times
@ -242,9 +243,10 @@ private:
/// Do we use biber?
bool biber;
///
std::vector <std::string> children;
///
bool allow_cancel;
};