Revert UI fix for two digit numbers. It actually does not work.

[lyx.git] / src / Chktex.cpp

diff --git a/src/Chktex.cpp b/src/Chktex.cpp
index 02271e308c603d381c83b089acb81423f30d8853..2db47b44c5b6968085dec793f09f11f8654293fc 100644 (file)
--- a/src/Chktex.cpp
+++ b/src/Chktex.cpp
@@ -21,8 +21,6 @@
 #include "support/lstrings.h"
 #include "support/Systemcall.h"
 
-#include <boost/format.hpp>
-
 using namespace std;
 using namespace lyx::support;
 
@@ -36,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;
 }
 
@@ -58,11 +62,7 @@ int Chktex::scanLogFile(TeXErrors & terr)
        // or whether makeAbsPath(onlyFileName()) is a noop here
        FileName const tmp(makeAbsPath(onlyFileName(changeExtension(file, ".log"))));
 
-#if USE_BOOST_FORMAT
-       boost::basic_format<char_type> msg(_("ChkTeX warning id # %1$d"));
-#else
-       docstring const msg(_("ChkTeX warning id # "));
-#endif
+       docstring const msg(_("ChkTeX warning id # %1$s"));
        docstring token;
        // FIXME UNICODE
        // We have no idea what the encoding of the error file is
@@ -81,13 +81,7 @@ int Chktex::scanLogFile(TeXErrors & terr)
 
                int const lineno = convert<int>(line);
 
-#if USE_BOOST_FORMAT
-               msg % warno;
-               terr.insertError(lineno, msg.str(), warning);
-               msg.clear();
-#else
-               terr.insertError(lineno, msg + warno, warning);
-#endif
+               terr.insertError(lineno, bformat(msg, warno), warning);
 
                ++retval;
        }