/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
+ * ======================================================
+ *
+ * LyX, The Document Processor
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* This file is Copyright 1997-1998
* Asger Alstrup
*
- * ======================================================
+ * ======================================================
*/
#include <config.h>
-#include <fstream>
-#include <cstdlib> // atoi
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "Chktex.h"
#include "LaTeX.h" // TeXErrors
-#include "support/filetools.h"
#include "lyxlex.h"
-#include "support/FileInfo.h"
#include "debug.h"
-#include "support/syscall.h"
-#include "support/syscontr.h"
-#include "support/path.h"
#include "gettext.h"
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/systemcall.h"
+#include "support/path.h"
+#include "support/lstrings.h"
+
+#include "support/BoostFormat.h"
+
+#include <fstream>
+
+using namespace lyx::support;
+
using std::ifstream;
using std::getline;
-/*
- * CLASS Chktex
- */
Chktex::Chktex(string const & chktex, string const & f, string const & p)
: cmd(chktex), file(f), path(p)
int Chktex::run(TeXErrors &terr)
{
// run bibtex
- string log = ChangeExtension(file, ".log", true);
+ string log = OnlyFilename(ChangeExtension(file, ".log"));
string tmp = cmd + " -q -v0 -b0 -x " + file + " -o " + log;
- Systemcalls one;
- int result= one.startscript(Systemcalls::System, tmp);
+ Systemcall one;
+ int result = one.startscript(Systemcall::Wait, tmp);
if (result == 0) {
result = scanLogFile(terr);
} else {
string token;
int retval = 0;
- string tmp = ChangeExtension(file, ".log", true);
+ string const tmp = OnlyFilename(ChangeExtension(file, ".log"));
+#if USE_BOOST_FORMAT
+ boost::format msg(STRCONV(_("ChkTeX warning id # %1$d")));
+#else
+ string const msg(_("ChkTeX warning id # "));
+#endif
ifstream ifs(tmp.c_str());
while (getline(ifs, token)) {
- string srcfile, line, pos, warno, warning;
+ string srcfile;
+ string line;
+ string pos;
+ string warno;
+ string warning;
token = split(token, srcfile, ':');
token = split(token, line, ':');
token = split(token, pos, ':');
token = split(token, warno, ':');
token = split(token, warning, ':');
- int lineno = atoi(line.c_str());
- warno = _("ChkTeX warning id #") + warno;
- terr.insertError(lineno, warno, warning);
+ int const lineno = atoi(line);
+
+#if USE_BOOST_FORMAT
+ msg % warno;
+ terr.insertError(lineno, STRCONV(msg.str()), warning);
+ msg.clear();
+#else
+ terr.insertError(lineno, msg + warno, warning);
+#endif
+
++retval;
}
return retval;