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

Adapt to new ChkTeX return values.

Browse Source 
As of v. 1.7.7, chktex has four exit values. Only consider the program
failed with EXIT_FAILURE (1). This is backwards compatible to chktex
up to v. 1.7.5 and later patched versions included in TeXLive, where
there was the distinction EXIT_FAILURE (program failed) and EXIT_SUCCESS
(program successfully run, with or without something to report).

Note that ChkTeX v. 1.7.5 and 1.7.6 vanilla (as included in MikTeX) also
returned EXITE_FAILURE if ChkTeX found something to report.

We do not, and never did, support this case.

Fixes: #9989 (after ChkTeX 1.7.7. is released).
(cherry picked from commit 0d806799aa)
This commit is contained in:
Juergen Spitzmueller 2018-02-17 11:25:28 +01:00 committed by Richard Heck
parent 8bf7e691bc
commit 0e08b4e4f5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Chktex.cpp
View File

@ -34,16 +34,22 @@ Chktex::Chktex(string const & chktex, string const & f, string const & p)
int Chktex::run(TeXErrors &terr)
{
// run bibtex
// run chktex
string log = onlyFileName(changeExtension(file, ".log"));
string tmp = cmd + " -q -v0 -b0 -x " + file + " -o " + log;
Systemcall one;
int result = one.startscript(Systemcall::Wait, tmp);
if (result == 0) {
result = scanLogFile(terr);
} else {
// ChkTeX (as of v. 1.7.7) has the following return values:
// 0 = EXIT_SUCCESS : program ran successfully, nothing to report
// 1 = EXIT_FAILURE : program ran unsucessfully
// 2 = EXIT_WARNINGS : program ran successfully, only warnings to report
// 3 = EXIT_ERRORS : program ran successfully, errors to report
// We only check for EXIT_FAILURE here, since older versions of ChkTeX
// returned 0 also in case 2 and 3.
if (result == EXIT_FAILURE)
result = -1;
}
else
result = scanLogFile(terr);
return result;
}

2
status.23x
View File

@ -52,6 +52,8 @@ What's new
- Do not use English, but the context language, when pasting from math
(bug 2596).
- Fix ChkTeX on Windows (requires ChkTeX 1.7.7 at least) (bug 9989).
* INTERNALS